diff --git a/android/build.gradle b/android/build.gradle index 0d014cef28..4915087bd4 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -273,6 +273,9 @@ Properties properties = new Properties() properties.load(project.rootProject.file('local.properties').newDataInputStream()) def NDK_BUILD = properties.getProperty('ndk.dir') + '/ndk-build' +if (System.properties['os.name'].toLowerCase().contains('windows')) + NDK_BUILD += ".cmd" + task ndkBuildDebug(type: Exec, dependsOn: 'cppLibsBuildDebug', description: 'Building DEBUG jni sources') { def clArgs = ([NDK_BUILD, '-j' + NUM_OF_PARALLEL_MAKE_TASKS] + propDebugNdkFlags.split(' ')).flatten() commandLine clArgs diff --git a/android/replace_links.bat b/android/replace_links.bat new file mode 100644 index 0000000000..c9823dfd5c --- /dev/null +++ b/android/replace_links.bat @@ -0,0 +1,48 @@ +rm -rf assets/ +mkdir assets +cp ../data/categories.txt assets/ +cp ../data/classificator.txt assets/ +cp ../data/copyright.html assets/ +cp ../data/countries.txt assets/ +cp ../data/drules_proto.bin assets/ +cp ../data/drules_proto_dark.bin assets/ +cp ../data/external_resources.txt assets/ +cp ../data/faq.html assets/ +cp ../data/fonts_blacklist.txt assets/ +cp ../data/fonts_whitelist.txt assets/ +cp ../data/languages.txt assets/ +cp ../data/packed_polygons.bin assets/ +cp ../data/types.txt assets/ +cp ../data/unicode_blocks.txt assets/ + +cp -r ../data/resources-hdpi/ assets/ +cp -r ../data/resources-hdpi_dark/ assets/ +cp -r ../data/resources-ldpi/ assets/ +cp -r ../data/resources-ldpi_dark/ assets/ +cp -r ../data/resources-mdpi/ assets/ +cp -r ../data/resources-mdpi_dark/ assets/ +cp -r ../data/resources-xhdpi/ assets/ +cp -r ../data/resources-xhdpi_dark/ assets/ +cp -r ../data/resources-xxhdpi/ assets/ +cp -r ../data/resources-xxhdpi_dark/ assets/ + +cp -r ../data/sound-strings/ assets/ + +rm -rf flavors/mwm-ttf-assets +mkdir flavors\\mwm-ttf-assets +cp ../data/01_dejavusans.ttf flavors/mwm-ttf-assets/ +cp ../data/02_droidsans-fallback.ttf flavors/mwm-ttf-assets/ +cp ../data/03_jomolhari-id-a3d.ttf flavors/mwm-ttf-assets/ +cp ../data/04_padauk.ttf flavors/mwm-ttf-assets/ +cp ../data/05_khmeros.ttf flavors/mwm-ttf-assets/ +cp ../data/06_code2000.ttf flavors/mwm-ttf-assets/ +cp ../data/World.mwm flavors/mwm-ttf-assets/ +cp ../data/WorldCoasts.mwm flavors/mwm-ttf-assets/ + +rm -rf res/values-zh-rHK/ +mkdir res\\values-zh-rHK +cp res/values-zh-rTW/strings.xml res/values-zh-rHK/ + +rm -rf res/values-zh-rMO/ +mkdir res\\values-zh-rMO +cp res/values-zh-rTW/strings.xml res/values-zh-rMO/ diff --git a/tools/autobuild/build.sh b/tools/autobuild/build.sh index aca940816a..efb7284215 100644 --- a/tools/autobuild/build.sh +++ b/tools/autobuild/build.sh @@ -10,7 +10,7 @@ source "$MY_PATH/detect_qmake.sh" GetCPUCores() { case "$OSTYPE" in # it's GitBash under Windows - msys) echo $NUMBER_OF_PROCESSORS + cygwin) echo $NUMBER_OF_PROCESSORS ;; linux-gnu) grep -c ^processor /proc/cpuinfo 2>/dev/null ;; @@ -23,6 +23,20 @@ GetCPUCores() { return 0 } + +# Replaces "/cygwin/c" prefix with "c:" one on Windows platform. +# Does nothing under other OS. +# 1st param: path to be modified. +StripCygwinPrefix() { + if [[ $(GetNdkHost) == "windows-x86_64" ]]; then + echo "c:`(echo "$1" | cut -c 12-)`" + return 0 + fi + + echo "$1" + return 0 +} + # 1st param: shadow directory path # 2nd param: mkspec # 3rd param: additional qmake parameters @@ -38,7 +52,7 @@ BuildQt() { cd "$SHADOW_DIR" if [ ! -f "$SHADOW_DIR/Makefile" ]; then echo "Launching qmake..." - "$QMAKE" CONFIG-=sdk -r "$QMAKE_PARAMS" -spec "$MKSPEC" "$MY_PATH/../../omim.pro" + "$QMAKE" CONFIG-=sdk -r "$QMAKE_PARAMS" -spec "$(StripCygwinPrefix $MKSPEC)" "$(StripCygwinPrefix $MY_PATH)/../../omim.pro" fi # make clean > /dev/null || true make -j $(GetCPUCores) diff --git a/tools/autobuild/detect_qmake.sh b/tools/autobuild/detect_qmake.sh index 1e760d8785..d64b531541 100644 --- a/tools/autobuild/detect_qmake.sh +++ b/tools/autobuild/detect_qmake.sh @@ -13,6 +13,7 @@ KNOWN_QMAKE_PATHS=( \ ~/Qt5.3.0/5.3/clang_64/bin/qmake \ ~/Developer/Qt/5.4/clang_64/bin/qmake \ ~/Developer/Qt/5.5/clang_64/bin/qmake \ + /cygdrive/c/Qt/5.5/msvc2013_64/bin/qmake.exe \ ) # Prints path to directory with found qmake binary or prints nothing if not found diff --git a/tools/autobuild/ndk_helper.sh b/tools/autobuild/ndk_helper.sh index 627174296e..97ae0eaf2e 100644 --- a/tools/autobuild/ndk_helper.sh +++ b/tools/autobuild/ndk_helper.sh @@ -28,8 +28,8 @@ GetNdkHost() echo "darwin-x86_64" return 0 fi - if [[ "$OSTYPE" == "msys" ]]; then - echo windows + if [[ "$OSTYPE" == "cygwin" ]]; then + echo windows-x86_64 return 0 fi echo "ERROR: Can't detect your host OS"