livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pass -m64 down to autobuild during "box" step, or the wrong packages end up in the resulting .txt-file.

master
Nicky 2015-05-08 15:52:59 +02:00
parent 83a545bc6e
commit 55f65bce71
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/cmake/BuildPackagesInfo.cmake
View File

@ -2,9 +2,15 @@
# Construct the version and copyright information based on package data.
include(Python)
if( ND_BUILD64BIT_ARCH )
set( ND_PKG_FLAGS "-m64" )
else( ND_BUILD64BIT_ARCH )
set( ND_PKG_FLAGS "" )
endif( ND_BUILD64BIT_ARCH )
add_custom_command(OUTPUT packages-info.txt
COMMENT Generating packages-info.txt for the about box
MAIN_DEPENDENCY ${CMAKE_SOURCE_DIR}/../autobuild.xml
DEPENDS ${CMAKE_SOURCE_DIR}/../scripts/packages-formatter.py
COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/../scripts/packages-formatter.py > packages-info.txt
COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/../scripts/packages-formatter.py ${ND_PKG_FLAGS} > packages-info.txt
)

5
scripts/packages-formatter.py
View File

@ -57,6 +57,11 @@ def autobuild(*args):
# no exceptions yet, let caller read stdout
return child.stdout
# <FS:ND> Pass -m64 down to autobuild if needed
if len( sys.argv ) > 1 and sys.argv[1] == "-m64":
os.environ[ "ND_AUTOBUILD_ARCH" ] = "x64"
# </FS:ND>
version={}
versions=autobuild('install', '--versions')
for line in versions: