瀏覽代碼

Shorten the package name for ARM build due to space constraint.
Fix 32-bit ARM packaging build on 64-bit Travis-CI host system.
[ci package]

Yao Wei Tjong 姚伟忠 9 年之前
父節點
當前提交
98414a9ad6
共有 2 個文件被更改,包括 3 次插入1 次删除
  1. 2 0
      CMakeLists.txt
  2. 1 1
      Rakefile

+ 2 - 0
CMakeLists.txt

@@ -153,6 +153,8 @@ elseif (RPI AND RPI_ABI MATCHES ^armeabi-v7a)
     set (CPACK_SYSTEM_NAME ${CPACK_SYSTEM_NAME}-v7a)
     set (CPACK_SYSTEM_NAME ${CPACK_SYSTEM_NAME}-v7a)
 elseif (ARM_ABI_FLAGS)
 elseif (ARM_ABI_FLAGS)
     string (REGEX REPLACE "^.*mcpu=([^ ]+).*$" -\\1 CPU_NAME "${ARM_ABI_FLAGS}")
     string (REGEX REPLACE "^.*mcpu=([^ ]+).*$" -\\1 CPU_NAME "${ARM_ABI_FLAGS}")
+    string (REGEX REPLACE .*- - CPU_NAME "${CPU_NAME}")
+    string (TOUPPER "${CPU_NAME}" CPU_NAME)
     set (CPACK_SYSTEM_NAME ${CPACK_SYSTEM_NAME}${CPU_NAME})
     set (CPACK_SYSTEM_NAME ${CPACK_SYSTEM_NAME}${CPU_NAME})
 endif ()
 endif ()
 if (NOT DEFINED ENV{RELEASE_TAG})
 if (NOT DEFINED ENV{RELEASE_TAG})

+ 1 - 1
Rakefile

@@ -590,7 +590,7 @@ task :ci_package_upload do
       system 'rake cmake' or abort 'Failed to reconfigure to generate 64-bit RPM package'
       system 'rake cmake' or abort 'Failed to reconfigure to generate 64-bit RPM package'
       system "rm #{ENV['build_tree']}/Urho3D-*" or abort 'Failed to remove previously generated artifacts'  # This task can be invoked more than one time
       system "rm #{ENV['build_tree']}/Urho3D-*" or abort 'Failed to remove previously generated artifacts'  # This task can be invoked more than one time
      end
      end
-    system "bash -c '#{!ENV['OS'] && (ENV['URHO3D_64BIT'] || ENV['RPI']) ? 'setarch i686' : ''} rake make target=package'" or abort 'Failed to make binary package'
+    system "bash -c '#{!ENV['OS'] && (ENV['URHO3D_64BIT'] || ENV['RPI'] || ENV['ARM']) ? 'setarch i686' : ''} rake make target=package'" or abort 'Failed to make binary package'
   end
   end
   next if timeup
   next if timeup
   # Determine the upload location
   # Determine the upload location