From 5f1e456716768d900a2479053f5c6f253c756456 Mon Sep 17 00:00:00 2001 From: David Black Date: Mon, 5 Aug 2013 10:14:28 +0100 Subject: [PATCH] chmod 755 all executables in core Osmand srclib --- build/extlib/perms-osmand_145.diff | 69 ++++++++++++++++++++++++++++++ metadata/net.osmand.plus.txt | 5 ++- 2 files changed, 72 insertions(+), 2 deletions(-) create mode 100644 build/extlib/perms-osmand_145.diff diff --git a/build/extlib/perms-osmand_145.diff b/build/extlib/perms-osmand_145.diff new file mode 100644 index 0000000000..fa9e03d647 --- /dev/null +++ b/build/extlib/perms-osmand_145.diff @@ -0,0 +1,69 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +old mode 100644 +new mode 100755 +diff --git a/OsmAnd-java/native.sh b/OsmAnd-java/native.sh +old mode 100644 +new mode 100755 +diff --git a/android-configure.sh b/android-configure.sh +old mode 100644 +new mode 100755 +diff --git a/avian/prepare-osmand-avian.sh b/avian/prepare-osmand-avian.sh +old mode 100644 +new mode 100755 +diff --git a/avian/prepare-osmand-avian_wp8.sh b/avian/prepare-osmand-avian_wp8.sh +old mode 100644 +new mode 100755 +diff --git a/externals/clean.sh b/externals/clean.sh +old mode 100644 +new mode 100755 +diff --git a/externals/configure.sh b/externals/configure.sh +old mode 100644 +new mode 100755 +diff --git a/externals/expat/configure.sh b/externals/expat/configure.sh +old mode 100644 +new mode 100755 +diff --git a/externals/freetype/configure.sh b/externals/freetype/configure.sh +old mode 100644 +new mode 100755 +diff --git a/externals/giflib/configure.sh b/externals/giflib/configure.sh +old mode 100644 +new mode 100755 +diff --git a/externals/harfbuzz/configure.sh b/externals/harfbuzz/configure.sh +old mode 100644 +new mode 100755 +diff --git a/externals/jpeg/configure.sh b/externals/jpeg/configure.sh +old mode 100644 +new mode 100755 +diff --git a/externals/libpng/configure.sh b/externals/libpng/configure.sh +old mode 100644 +new mode 100755 +diff --git a/externals/protobuf/configure.sh b/externals/protobuf/configure.sh +old mode 100644 +new mode 100755 +diff --git a/externals/skia/configure.sh b/externals/skia/configure.sh +old mode 100644 +new mode 100755 +diff --git a/externals/zlib/configure.sh b/externals/zlib/configure.sh +old mode 100644 +new mode 100755 +diff --git a/targets/.cmake/utils/makefile.sh b/targets/.cmake/utils/makefile.sh +old mode 100644 +new mode 100755 +diff --git a/targets/.cmake/utils/xcode.sh b/targets/.cmake/utils/xcode.sh +old mode 100644 +new mode 100755 +diff --git a/targets/amd64-linux-gcc.sh b/targets/amd64-linux-gcc.sh +old mode 100644 +new mode 100755 +diff --git a/targets/amd64-windows-vc11.cmd b/targets/amd64-windows-vc11.cmd +old mode 100644 +new mode 100755 +diff --git a/targets/i686-linux-gcc.sh b/targets/i686-linux-gcc.sh +old mode 100644 +new mode 100755 +diff --git a/targets/intel-darwin.sh b/targets/intel-darwin.sh +old mode 100644 +new mode 100755 +diff --git a/targets/x86-windows-vc11.cmd b/targets/x86-windows-vc11.cmd +old mode 100644 +new mode 100755 diff --git a/metadata/net.osmand.plus.txt b/metadata/net.osmand.plus.txt index 4337e76fbf..80314ef3d6 100644 --- a/metadata/net.osmand.plus.txt +++ b/metadata/net.osmand.plus.txt @@ -98,13 +98,14 @@ forcevercode=yes,\ rm=SherlockBar/build.xml,\ encoding=utf-8,\ srclibs=tools@bfee93a8d;core@r1.1.4;resources@836be71481,\ +extlibs=perms-osmand_145.diff,\ patch=remove_analytics_android_145.diff,\ prebuild=rm ../../core/OsmAnd-java/src/net/osmand/plus/download/DownloadTracker.java && \ - chmod a+x ../../core/android-configure.sh && \ sed -i 's/debuggable="true"/debuggable="false"/g' AndroidManifest.xml && \ $$SDK$$/tools/android update project -p ../SherlockBar && \ sed -i 's/app_version">[^<]*/app_version">1.5-ARM/' \ - res/values/no_translate.xml && sed -i '/keys/d' ant.properties,\ + res/values/no_translate.xml && sed -i '/keys/d' ant.properties && \ + cd ../../core/ && git apply ../android/OsmAnd/libs/perms-osmand_145.diff,\ build=ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ OSMAND_ARM_ONLY=true ./ndk-build.sh && \ ant jar native-libs -f $$tools$$/OsmAndMapCreator/build.xml && \ ant build -f ../OsmAnd-java/build.xml,\