-#!/bin/bash
-
-die() { echo "$@" 1>&2 ; exit 1; }
+#!/bin/bash -e
prompt_for_number() {
local prompt_text=$1
done
}
+# On a release the following actions are performed
+# * DEVELOPMENT_BUILD is set to false
+# * android versionCode is bumped
+# * appdata release version and date are updated
+# * Commit the changes
+# * Tag with current version
+perform_release() {
+ RELEASE_DATE=$(date +%Y-%m-%d)
+
+ sed -i -re "s/^set\(DEVELOPMENT_BUILD TRUE\)$/set(DEVELOPMENT_BUILD FALSE)/" CMakeLists.txt
+
+ sed -i 's/project.ext.set("versionExtra", "-dev")/project.ext.set("versionExtra", "")/' android/build.gradle
+ sed -i -re "s/\"versionCode\", [0-9]+/\"versionCode\", $NEW_ANDROID_VERSION_CODE/" android/build.gradle
+
+ sed -i '/\<release/s/\(version\)="[^"]*"/\1="'"$RELEASE_VERSION"'"/' misc/net.minetest.minetest.appdata.xml
+ sed -i 's/\(<release date\)="[^"]*"/\1="'"$RELEASE_DATE"'"/' misc/net.minetest.minetest.appdata.xml
+
+ git add -f CMakeLists.txt android/build.gradle misc/net.minetest.minetest.appdata.xml
+
+ git commit -m "Bump version to $RELEASE_VERSION"
+ echo "Tagging $RELEASE_VERSION"
+
+ git tag -a "$RELEASE_VERSION" -m "$RELEASE_VERSION"
+}
+
+# After release
+# * Set DEVELOPMENT_BUILD to true
+# * Bump version in CMakeLists and docs
+# * Commit the changes
+back_to_devel() {
+ echo 'Creating "return back to development" commit'
+
+ # Update CMakeList.txt versions
+ sed -i -re 's/^set\(DEVELOPMENT_BUILD FALSE\)$/set(DEVELOPMENT_BUILD TRUE)/' CMakeLists.txt
+ sed -i -re "s/^set\(VERSION_MAJOR [0-9]+\)$/set(VERSION_MAJOR $NEXT_VERSION_MAJOR)/" CMakeLists.txt
+ sed -i -re "s/^set\(VERSION_MINOR [0-9]+\)$/set(VERSION_MINOR $NEXT_VERSION_MINOR)/" CMakeLists.txt
+ sed -i -re "s/^set\(VERSION_PATCH [0-9]+\)$/set(VERSION_PATCH $NEXT_VERSION_PATCH)/" CMakeLists.txt
+
+ # Update Android versions
+ sed -i 's/set("versionExtra", "")/set("versionExtra", "-dev")/' android/build.gradle
+ sed -i -re "s/set\(\"versionMajor\", [0-9]+\)/set(\"versionMajor\", $NEXT_VERSION_MAJOR)/" android/build.gradle
+ sed -i -re "s/set\(\"versionMinor\", [0-9]+\)/set(\"versionMinor\", $NEXT_VERSION_MINOR)/" android/build.gradle
+ sed -i -re "s/set\(\"versionPatch\", [0-9]+\)/set(\"versionPatch\", $NEXT_VERSION_PATCH)/" android/build.gradle
+
+ # Update doc versions
+ sed -i -re "1s/[0-9]+\.[0-9]+\.[0-9]+/$NEXT_VERSION/g" doc/menu_lua_api.txt
+ sed -i -re "1s/[0-9]+\.[0-9]+\.[0-9]+/$NEXT_VERSION/g" doc/client_lua_api.txt
+
+ # Commit
+ git add -f CMakeLists.txt android/build.gradle doc/menu_lua_api.txt doc/client_lua_api.txt
+ git commit -m "Continue with $NEXT_VERSION-dev"
+}
##################################
# Switch to top minetest directory
##################################
#######################
# Make sure all the files we need exist
-grep -q -E '^set\(VERSION_MAJOR [0-9]+\)$' CMakeLists.txt || die "error: Could not find CMakeLists.txt"
-grep -q -E '^set\(VERSION_MINOR [0-9]+\)$' CMakeLists.txt || die "error: Could not find CMakeLists.txt"
-grep -q -E '^set\(VERSION_PATCH [0-9]+\)$' CMakeLists.txt || die "error: Could not find CMakeLists.txt"
-grep -q -E '^ANDROID_VERSION_CODE = [0-9]+$' build/android/Makefile || die "error: Could not find build/android/Makefile"
+grep -q -E '^set\(VERSION_MAJOR [0-9]+\)$' CMakeLists.txt
+grep -q -E '^set\(VERSION_MINOR [0-9]+\)$' CMakeLists.txt
+grep -q -E '^set\(VERSION_PATCH [0-9]+\)$' CMakeLists.txt
+grep -q -E '\("versionCode", [0-9]+\)' android/build.gradle
VERSION_MAJOR=$(grep -E '^set\(VERSION_MAJOR [0-9]+\)$' CMakeLists.txt | tr -dC 0-9)
VERSION_MINOR=$(grep -E '^set\(VERSION_MINOR [0-9]+\)$' CMakeLists.txt | tr -dC 0-9)
VERSION_PATCH=$(grep -E '^set\(VERSION_PATCH [0-9]+\)$' CMakeLists.txt | tr -dC 0-9)
-ANDROID_VERSION_CODE=$(grep -E '^ANDROID_VERSION_CODE = [0-9]+$' build/android/Makefile | tr -dC 0-9)
+ANDROID_VERSION_CODE=$(grep -E '"versionCode", [0-9]+' android/build.gradle | tr -dC 0-9)
-echo "Current Minetest version: $VERSION_MAJOR.$VERSION_MINOR.$VERSION_PATCH"
-echo "Current Android version code: $ANDROID_VERSION_CODE"
+RELEASE_VERSION="$VERSION_MAJOR.$VERSION_MINOR.$VERSION_PATCH"
+echo "Current Minetest version: $RELEASE_VERSION"
+echo "Current Android version code: $ANDROID_VERSION_CODE"
-########################
-# Prompt for new version
-########################
-
-NEW_VERSION_MAJOR=$VERSION_MAJOR
-NEW_VERSION_MINOR=$VERSION_MINOR
-NEW_VERSION_PATCH=$(expr $VERSION_PATCH + 1)
-
-NEW_VERSION_MAJOR=$(prompt_for_number "Set major" $NEW_VERSION_MAJOR)
-
-if [ "$NEW_VERSION_MAJOR" != "$VERSION_MAJOR" ]; then
- NEW_VERSION_MINOR=0
- NEW_VERSION_PATCH=0
-fi
-
-NEW_VERSION_MINOR=$(prompt_for_number "Set minor" $NEW_VERSION_MINOR)
-
-if [ "$NEW_VERSION_MINOR" != "$VERSION_MINOR" ]; then
- NEW_VERSION_PATCH=0
-fi
-
-NEW_VERSION_PATCH=$(prompt_for_number "Set patch" $NEW_VERSION_PATCH)
-
-NEW_ANDROID_VERSION_CODE=$(expr $ANDROID_VERSION_CODE + 1)
+# +1 for ARM and +1 for ARM64 APKs
+NEW_ANDROID_VERSION_CODE=$(expr $ANDROID_VERSION_CODE + 2)
NEW_ANDROID_VERSION_CODE=$(prompt_for_number "Set android version code" $NEW_ANDROID_VERSION_CODE)
-NEW_VERSION="$NEW_VERSION_MAJOR.$NEW_VERSION_MINOR.$NEW_VERSION_PATCH"
-
-
echo
-echo "New version: $NEW_VERSION"
echo "New android version code: $NEW_ANDROID_VERSION_CODE"
+########################
+# Perform release
+########################
-#######################################
-# Replace version everywhere and commit
-#######################################
-
-sed -i -re "s/^set\(VERSION_MAJOR [0-9]+\)$/set(VERSION_MAJOR $NEW_VERSION_MAJOR)/" CMakeLists.txt || die "Failed to update VERSION_MAJOR"
-
-sed -i -re "s/^set\(VERSION_MINOR [0-9]+\)$/set(VERSION_MINOR $NEW_VERSION_MINOR)/" CMakeLists.txt || die "Failed to update VERSION_MINOR"
-
-sed -i -re "s/^set\(VERSION_PATCH [0-9]+\)$/set(VERSION_PATCH $NEW_VERSION_PATCH)/" CMakeLists.txt || die "Failed to update VERSION_PATCH"
-
-sed -i -re "s/^set\(DEVELOPMENT_BUILD TRUE\)$/set(DEVELOPMENT_BUILD FALSE)/" CMakeLists.txt || die "Failed to unset DEVELOPMENT_BUILD"
-
-sed -i -re "s/^ANDROID_VERSION_CODE = [0-9]+$/ANDROID_VERSION_CODE = $NEW_ANDROID_VERSION_CODE/" build/android/Makefile || die "Failed to update ANDROID_VERSION_CODE"
-
-sed -i -re "1s/[0-9]+\.[0-9]+\.[0-9]+/$NEW_VERSION/g" doc/lua_api.txt || die "Failed to update doc/lua_api.txt"
-
-sed -i -re "1s/[0-9]+\.[0-9]+\.[0-9]+/$NEW_VERSION/g" doc/menu_lua_api.txt || die "Failed to update doc/menu_lua_api.txt"
+perform_release
-git add -f CMakeLists.txt build/android/Makefile doc/lua_api.txt doc/menu_lua_api.txt || die "git add failed"
+########################
+# Prompt for next version
+########################
-git commit -m "Bump version to $NEW_VERSION" || die "git commit failed"
+NEXT_VERSION_MAJOR=$VERSION_MAJOR
+NEXT_VERSION_MINOR=$VERSION_MINOR
+NEXT_VERSION_PATCH=$(expr $VERSION_PATCH + 1)
-############
-# Create tag
-############
+NEXT_VERSION_MAJOR=$(prompt_for_number "Set next major" $NEXT_VERSION_MAJOR)
-echo "Tagging $NEW_VERSION"
+if [ "$NEXT_VERSION_MAJOR" != "$VERSION_MAJOR" ]; then
+ NEXT_VERSION_MINOR=0
+ NEXT_VERSION_PATCH=0
+fi
-git tag -a "$NEW_VERSION" -m "$NEW_VERSION" || die 'Adding tag failed'
+NEXT_VERSION_MINOR=$(prompt_for_number "Set next minor" $NEXT_VERSION_MINOR)
-######################
-# Create revert commit
-######################
+if [ "$NEXT_VERSION_MINOR" != "$VERSION_MINOR" ]; then
+ NEXT_VERSION_PATCH=0
+fi
-echo 'Creating "revert to development" commit'
+NEXT_VERSION_PATCH=$(prompt_for_number "Set next patch" $NEXT_VERSION_PATCH)
-sed -i -re 's/^set\(DEVELOPMENT_BUILD FALSE\)$/set(DEVELOPMENT_BUILD TRUE)/' CMakeLists.txt || die 'Failed to set DEVELOPMENT_BUILD'
+NEXT_VERSION="$NEXT_VERSION_MAJOR.$NEXT_VERSION_MINOR.$NEXT_VERSION_PATCH"
-git add -f CMakeLists.txt || die 'git add failed'
+echo
+echo "New version: $NEXT_VERSION"
-git commit -m "Continue with $NEW_VERSION-dev" || die 'git commit failed'
+########################
+# Return back to devel
+########################
+back_to_devel
projects / dragonfireclient.git / blobdiff