diff options
| author | kazer_ <kazer_@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2015-07-31 22:42:39 +0000 |
|---|---|---|
| committer | kazer_ <kazer_@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2015-07-31 22:42:39 +0000 |
| commit | 4fc190606a774a28dd4ecd62ae5a61ecfc5d3b2e (patch) | |
| tree | 8d91e8e781e14d98c1a6f6e91b5f94b1414293e9 | |
| parent | d693160815dfb374d802e1359932c64635316732 (diff) | |
| download | navit-svn-4fc190606a774a28dd4ecd62ae5a61ecfc5d3b2e.tar.gz | |
Fix:Ci:Fixed the regexp to not choke on commit messages containing 'svn'
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@6132 ffa7fe5e-494d-0410-b361-a75ebd5db220
| -rw-r--r-- | ci/build_android.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ci/build_android.sh b/ci/build_android.sh index 0d482fab..708b6740 100644 --- a/ci/build_android.sh +++ b/ci/build_android.sh @@ -130,7 +130,7 @@ mkdir -p $BUILD_PATH cd $BUILD_PATH export PATH=$ANDROID_NDK_BIN:$ANDROID_SDK_TOOLS:$ANDROID_SDK_PLATFORM_TOOLS:$PATH android list targets -svn_rev=` cd ~/navit/; git log -1|grep svn|cut -c 65-68` +svn_rev=` cd ~/navit/; git log -1|grep git-svn-id:|cut -c 65-68` sed -i -e "s/ANDROID_VERSION_INT=\"0\"/ANDROID_VERSION_INT=\"${svn_rev}\"/g" ~/navit/navit/android/CMakeLists.txt cp ~/navit/navit/android/CMakeLists.txt $CIRCLE_ARTIFACTS/ |