Pārlūkot izejas kodu

For Travis CI - escape bracket character to fix commit message parsing.
[ci skip]

Yao Wei Tjong 姚伟忠 11 gadi atpakaļ
vecāks
revīzija
77a87b824c
2 mainītis faili ar 3 papildinājumiem un 3 dzēšanām
  1. 1 1
      .travis.yml
  2. 2 2
      Rakefile

+ 1 - 1
.travis.yml

@@ -42,7 +42,7 @@ language: cpp
 compiler: gcc
 before_install:
     - bash -c "[ '$TRAVIS_BRANCH' == 'master' ] && [ '$TRAVIS_PULL_REQUEST' == 'false' ]" && export ON_MASTER_COMMIT=1 && bash -c "[ $SITE_UPDATE ]" && export SITE_UPDATE_ON_MASTER_COMMIT=1 || true
-    - bash -c "[ $ON_MASTER_COMMIT ]" && export COMMIT_MESSAGE=$(git log --format=%B -n 1 $TRAVIS_COMMIT) && echo $COMMIT_MESSAGE |grep -q '[ci package]' && git pull --depth=2000 origin $TRAVIS_BRANCH && git checkout -qf $TRAVIS_COMMIT && export PACKAGE_UPLOAD=1 || true
+    - bash -c "[ $ON_MASTER_COMMIT ]" && export COMMIT_MESSAGE=$(git log --format=%B -n 1 $TRAVIS_COMMIT) && echo $COMMIT_MESSAGE |grep -cq '\[ci package\]' && git pull --depth=2000 origin $TRAVIS_BRANCH && git checkout -qf $TRAVIS_COMMIT && export PACKAGE_UPLOAD=1 || true
     - bash -c "[ $ANDROID ]" && wget -q http://dl.google.com/android/ndk/android-ndk-r9c-linux-x86_64.tar.bz2 && tar xjf *.bz2 && rm *.bz2 && ln -s android-ndk* android-ndk && export ANDROID_NDK=$(pwd)/android-ndk || true
     - bash -c "( [ $SITE_UPDATE_ON_MASTER_COMMIT ] || [ $PACKAGE_UPLOAD ] )" && sudo add-apt-repository ppa:george-edison55/precise-backports -y || true
     - sudo apt-get update -q -y

+ 2 - 2
Rakefile

@@ -100,17 +100,17 @@ task :travis_ci_package_upload do
   end
   # Generate the documentation if necessary
   unless ENV['SITE_UPDATE_ON_MASTER_COMMIT']
-    system 'echo Generating documentation...'
+    system 'echo Generate documentation'
     if ENV['XCODE']
       xcode_build(ENV['IOS'], "#{platform_prefix}Build/Urho3D.xcodeproj", 'doc', false, '>/dev/null') or abort 'Failed to generate documentation'
     else
       system "cd #{platform_prefix}Build && make doc >/dev/null" or abort 'Failed to generate documentation'
     end
-    system 'echo Done generating documentation'
   end
   # Make the package
   if ENV['IOS']
     # Build Mach-O universal binary consisting of iphoneos (universal ARM archs including 'arm64' if 64-bit is enabled) and iphonesimulator (i386 arch and also x86_64 arch if 64-bit is enabled)
+    system 'echo Rebuild Urho3D library as Mach-O universal binary'
     xcode_build(0, "#{platform_prefix}Build/Urho3D.xcodeproj", 'Urho3D_universal', false) or abort 'Failed to build Mach-O universal binary'
     # There is a bug in CMake/CPack that causes the 'package' scheme failed to build for IOS platform, workaround by calling cpack directly
     system "cd #{platform_prefix}Build && cpack -G TGZ 2>/dev/null" or abort 'Failed to make binary package'