townforge/Urho3D
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

For Travis CI - wrap the 'make package' inside 'setarch' command.

Browse Source 
Related to fc14b30e42. [ci package]
This commit is contained in:
Yao Wei Tjong 姚伟忠 2015-04-07 18:06:30 +08:00
parent 4ddc71b769
commit c93327bf00
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -136,7 +136,7 @@ if (URHO3D_64BIT)
set (CPACK_SYSTEM_NAME ${CPACK_SYSTEM_NAME}-64bit)
else ()
set (CPACK_DEBIAN_PACKAGE_ARCHITECTURE i386)
set (CPACK_RPM_PACKAGE_ARCHITECTURE i686) # On RPM-based host systems such as Fedora or RedHat, the 'package' target should be built with the help of 'setarch i686' command
set (CPACK_RPM_PACKAGE_ARCHITECTURE i686) # The 'package' target should be built with the help of 'setarch i686' command on a 64-bit host system
endif ()
set (CPACK_SYSTEM_NAME ${CPACK_SYSTEM_NAME}-${URHO3D_LIB_TYPE})
if (WIN32 AND NOT URHO3D_OPENGL)

3
Rakefile
View File

@ -313,7 +313,8 @@ task :ci_package_upload do
if ENV['URHO3D_USE_LIB64_RPM']
system "cd ../Build && cmake . -DURHO3D_USE_LIB64_RPM=#{ENV['URHO3D_USE_LIB64_RPM']}" or abort 'Failed to reconfigure to generate 64-bit RPM package'
end
system 'cd ../Build && make package' or abort 'Failed to make binary package'
wrapper = ENV['CI'] && ENV['URHO3D_64BIT'] ? 'setarch i686' : ''
system "cd ../Build && #{wrapper} make package" or abort 'Failed to make binary package'
end
# Determine the upload location
setup_digital_keys