From 084992075ece12d5e9f52202ace2b85eedfa4db0 Mon Sep 17 00:00:00 2001 From: Ghabry Date: Wed, 26 Apr 2023 21:24:55 +0200 Subject: [PATCH 1/3] Change version to 0.8 --- CMakeLists.txt | 3 +-- builds/android/gradle.properties | 4 ++-- configure.ac | 2 +- docs/BUILDING.md | 12 ++++++------ src/version.cpp | 2 +- 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 49e0ff60e6..44f670b451 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,6 @@ cmake_minimum_required(VERSION 3.13...3.24 FATAL_ERROR) -project(EasyRPG_Player - VERSION 0.7 +project(EasyRPG_Player VERSION 0.8 DESCRIPTION "Interpreter for RPG Maker 2000/2003 games" HOMEPAGE_URL "https://easyrpg.org" LANGUAGES CXX) diff --git a/builds/android/gradle.properties b/builds/android/gradle.properties index a2c2c06e3d..3b5ab9e16d 100644 --- a/builds/android/gradle.properties +++ b/builds/android/gradle.properties @@ -3,11 +3,11 @@ # To use them simply prefix them with "ORG_GRADLE_PROJECT_", e.g. ORG_GRADLE_PROJECT_toolchainDirs # Human readable version name -VERSION_NAME=0.7 +VERSION_NAME=0.8 # Internal version number # Must be increased before publishing a new APK -VERSION_CODE=8073 +VERSION_CODE=8827 # Architectures to build for when developing (debug) ABI_FILTERS_DEBUG=armeabi-v7a diff --git a/configure.ac b/configure.ac index 46005e3098..3b96d481e3 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ AC_PREREQ([2.69]) # version magic m4_define([ep_version_major], [0]) -m4_define([ep_version_minor], [7]) +m4_define([ep_version_minor], [8]) m4_define([ep_version_patch], [0]) m4_define([ep_version_tweak], [0]) m4_define([ep_version], [ep_version_major.ep_version_minor]) diff --git a/docs/BUILDING.md b/docs/BUILDING.md index 93fc84f134..83856138b6 100644 --- a/docs/BUILDING.md +++ b/docs/BUILDING.md @@ -18,8 +18,8 @@ Building requirements: Step-by-step instructions: - tar xf easyrpg-player-0.7.tar.xz # unpack the tarball - cd easyrpg-player-0.7 # enter in the package directory + tar xf easyrpg-player-0.8.tar.xz # unpack the tarball + cd easyrpg-player-0.8 # enter in the package directory ./configure # find libraries, set options make # compile the executable @@ -43,8 +43,8 @@ Building requirements: Step-by-step instructions: - tar xf easyrpg-player-0.7.tar.xz # unpack the tarball - cd easyrpg-player-0.7 # enter in the package directory + tar xf easyrpg-player-0.8.tar.xz # unpack the tarball + cd easyrpg-player-0.8 # enter in the package directory cmake . -DCMAKE_BUILD_TYPE=Release # configure project cmake --build . # compile the executable sudo cmake --build . --target install # install system-wide @@ -78,8 +78,8 @@ Building requirements: Step-by-step instructions: - tar xf easyrpg-player-0.7.tar.xz # unpack the tarball - cd easyrpg-player-0.7/builds/android # enter in the android directory + tar xf easyrpg-player-0.8.tar.xz # unpack the tarball + cd easyrpg-player-0.8/builds/android # enter in the android directory ./gradlew -PtoolchainDirs="DIR1;DIR2" assembleRelease # create the APK Replace ``DIR1`` etc. with the path to the player dependencies. You can use diff --git a/src/version.cpp b/src/version.cpp index 53e18d827e..fd3d0a06ba 100644 --- a/src/version.cpp +++ b/src/version.cpp @@ -27,7 +27,7 @@ // Set by release-helper.sh #define EP_VERSION_MAJOR 0 - #define EP_VERSION_MINOR 7 + #define EP_VERSION_MINOR 8 #define EP_VERSION_PATCH 0 #define EP_VERSION_TWEAK 0 From 1ecc6e115207b153f178c62f27ab56e341176066 Mon Sep 17 00:00:00 2001 From: Ghabry Date: Thu, 27 Apr 2023 13:22:53 +0200 Subject: [PATCH 2/3] Require liblcf >= 0.8 Update release-helper script to add this in automatically --- CMakeLists.txt | 5 +++-- builds/android/gradle.properties | 2 +- builds/release-helper.sh | 9 +++++++++ configure.ac | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 44f670b451..b6d498cf91 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -807,8 +807,9 @@ if(PLAYER_BUILD_LIBLCF) target_link_libraries(${PROJECT_NAME} lcf) else() # Use system package - find_package(liblcf REQUIRED CONFIG) - target_link_libraries(${PROJECT_NAME} liblcf::liblcf) + player_find_package(NAME liblcf VERSION 0.8 + TARGET liblcf::liblcf + REQUIRED) endif() # Detect all required libraries diff --git a/builds/android/gradle.properties b/builds/android/gradle.properties index 3b5ab9e16d..5bc541123b 100644 --- a/builds/android/gradle.properties +++ b/builds/android/gradle.properties @@ -7,7 +7,7 @@ VERSION_NAME=0.8 # Internal version number # Must be increased before publishing a new APK -VERSION_CODE=8827 +VERSION_CODE=8834 # Architectures to build for when developing (debug) ABI_FILTERS_DEBUG=armeabi-v7a diff --git a/builds/release-helper.sh b/builds/release-helper.sh index eb3c51580f..2663457aea 100755 --- a/builds/release-helper.sh +++ b/builds/release-helper.sh @@ -51,11 +51,18 @@ IFS='.' read -r _maj _min _pat _twk <<< $version _pat=${_pat:-0} _twk=${_twk:-0} +if [ $_pat == 0 ]; then + lcfversion="${_maj}.${_min}" +else + lcfversion="${_maj}.${_min}.${_pat}" +fi + echo "Updating Version in:" file="CMakeLists.txt" print_file sed -i "/EasyRPG_Player VERSION/,1 s/[0-9]\(.[0-9]\)\{1,3\}/$version/" $file +sed -i "/liblcf VERSION/,1 s/[0-9]\(.[0-9]\)\{1,3\}/$lcfversion/" $file print_verbose " VERSION " $file file=configure.ac @@ -64,7 +71,9 @@ sed -i -e "/ep_version_major/,1 s/\[[0-9]\+\]/[$_maj]/" \ -e "/ep_version_minor/,1 s/\[[0-9]\+\]/[$_min]/" \ -e "/ep_version_patch/,1 s/\[[0-9]\+\]/[$_pat]/" \ -e "/ep_version_tweak/,1 s/\[[0-9]\+\]/[$_twk]/" $file +sed -i "/liblcf >= /,1 s/[0-9]\(.[0-9]\)\{1,3\}/$lcfversion/" $file print_verbose 'm4_define(\[ep_version_' $file +print_verbose "liblcf >= [0-9]" $file file="builds/android/gradle.properties" print_file diff --git a/configure.ac b/configure.ac index 3b96d481e3..1b43ac77fa 100644 --- a/configure.ac +++ b/configure.ac @@ -68,7 +68,7 @@ AC_DEFUN([EP_PKG_CHECK],[ dnl VARIABLE-PREFIX, MODULES, [DESCRIPTION], [DEFAULT= ]) ]) -PKG_CHECK_MODULES([LCF],[liblcf]) +PKG_CHECK_MODULES([LCF],[liblcf >= 0.8]) PKG_CHECK_MODULES([PIXMAN],[pixman-1]) PKG_CHECK_MODULES([ZLIB],[zlib]) PKG_CHECK_MODULES([PNG],[libpng]) From 5c957f6ad09d3ccce994824c192493cefeab5aab Mon Sep 17 00:00:00 2001 From: Ghabry Date: Sat, 29 Apr 2023 20:31:43 +0200 Subject: [PATCH 3/3] Release helper: Increment commit count by 2 for Android code Matches the real amount upon release (version commit + merge commit) --- builds/android/gradle.properties | 2 +- builds/release-helper.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/builds/android/gradle.properties b/builds/android/gradle.properties index 5bc541123b..e48fe2d1f1 100644 --- a/builds/android/gradle.properties +++ b/builds/android/gradle.properties @@ -7,7 +7,7 @@ VERSION_NAME=0.8 # Internal version number # Must be increased before publishing a new APK -VERSION_CODE=8834 +VERSION_CODE=8843 # Architectures to build for when developing (debug) ABI_FILTERS_DEBUG=armeabi-v7a diff --git a/builds/release-helper.sh b/builds/release-helper.sh index 2663457aea..0f9469f6e1 100755 --- a/builds/release-helper.sh +++ b/builds/release-helper.sh @@ -75,9 +75,10 @@ sed -i "/liblcf >= /,1 s/[0-9]\(.[0-9]\)\{1,3\}/$lcfversion/" $file print_verbose 'm4_define(\[ep_version_' $file print_verbose "liblcf >= [0-9]" $file +# + 2 because of two extra commits: version commit itself & merge commit file="builds/android/gradle.properties" print_file -_android_commits=`git rev-list HEAD --count` +_android_commits=$((`git rev-list HEAD --count` + 2)) sed -i -e "/VERSION_NAME/,1 s/[0-9]\(.[0-9]\)\{1,3\}/$version/" \ -e "/VERSION_CODE/,1 s/[0-9]\+/${_android_commits}/" $file print_verbose 'VERSION_.*=[0-9]' $file