X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=build-projects%2Fandroid%2Fbuild-scripts%2Fcreate_manifest.sh;h=0cab89b4fe489fd27408be097685242d6d5ff287;hp=a1e4e98fafba340d3d35c5aa5e21dfd3e48a7d3d;hb=51d5e483a5d8b50e0c0956053e0e264c20382928;hpb=233a6e8536ef2ff2c799011417b9f55e1db54300

diff --git a/build-projects/android/build-scripts/create_manifest.sh b/build-projects/android/build-scripts/create_manifest.sh
index a1e4e98f..0cab89b4 100755
--- a/build-projects/android/build-scripts/create_manifest.sh
+++ b/build-projects/android/build-scripts/create_manifest.sh
@@ -1,11 +1,16 @@
 #!/bin/bash
 
-BASE_DIR="jni"
+APP_DIR="app"
+SRC_DIR="$APP_DIR/jni/src"
+MAIN_DIR="$APP_DIR/src/main"
 
-MANIFEST_FILE="AndroidManifest.xml"
+BUILD_FILE="$APP_DIR/build.gradle"
+BUILD_TMPL="$BUILD_FILE.tmpl"
+
+MANIFEST_FILE="$MAIN_DIR/AndroidManifest.xml"
 MANIFEST_TMPL="$MANIFEST_FILE.tmpl"
 
-MAIN_H="$BASE_DIR/src/main.h"
+MAIN_H="$SRC_DIR/main.h"
 
 VERSION_SUPER=`grep "#define PROGRAM_VERSION_SUPER" $MAIN_H | awk '{print $3}'`
 VERSION_MAJOR=`grep "#define PROGRAM_VERSION_MAJOR" $MAIN_H | awk '{print $3}'`
@@ -35,6 +40,11 @@ fi
 # echo "::: VERSION_NAME == '$VERSION_NAME'"
 # echo "::: VERSION_CODE == '$VERSION_CODE'"
 
+cat "$BUILD_TMPL"					\
+    | sed -e "s/__VERSION_NAME__/$VERSION_NAME/"	\
+    | sed -e "s/__VERSION_CODE__/$VERSION_CODE/"	\
+    > "$BUILD_FILE"
+
 cat "$MANIFEST_TMPL"					\
     | sed -e "s/__VERSION_NAME__/$VERSION_NAME/"	\
     | sed -e "s/__VERSION_CODE__/$VERSION_CODE/"	\