Merge pull request #2975 from Ghabry/release/0.8

Release/0.8

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)
@@ -808,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

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=8843
 
 # Architectures to build for when developing (debug)
 ABI_FILTERS_DEBUG=armeabi-v7a

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,11 +71,14 @@ 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
 
+# + 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

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])
@@ -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])

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

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