Merge pull request #2663 from Ghabry/release/0.7.0

Release 0.7.0
EasyRPG · Oct 29, 2021 · 281be71 · 281be71
2 parents 2c07263 + 5f8f99d
commit 281be71
Show file tree

Hide file tree

Showing 14 changed files with 662 additions and 316 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,7 +4,7 @@ if(${CMAKE_VERSION} VERSION_LESS 3.12)
 	cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
 endif()
 
-project(EasyRPG_Player VERSION 0.6.2 LANGUAGES CXX)
+project(EasyRPG_Player VERSION 0.7.0 LANGUAGES CXX)
 
 # Extra CMake Module files
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/builds/cmake/Modules")

diff --git a/README.md b/README.md
@@ -77,8 +77,8 @@ Building requirements:
 
 Step-by-step instructions:
 
-    tar xf easyrpg-player-0.6.2.tar.xz # unpack the tarball
-    cd easyrpg-player-0.6.2            # enter in the package directory
+    tar xf easyrpg-player-0.7.0.tar.xz # unpack the tarball
+    cd easyrpg-player-0.7.0            # enter in the package directory
     ./configure                        # find libraries, set options
     make                               # compile the executable
 
@@ -106,8 +106,8 @@ Building requirements:
 
 Step-by-step instructions:
 
-    tar xf easyrpg-player-0.6.2.tar.xz    # unpack the tarball
-    cd easyrpg-player-0.6.2               # enter in the package directory
+    tar xf easyrpg-player-0.7.0.tar.xz    # unpack the tarball
+    cd easyrpg-player-0.7.0               # 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
@@ -145,8 +145,8 @@ Building requirements:
 
 Step-by-step instructions:
 
-    tar xf easyrpg-player-0.6.2.tar.xz     # unpack the tarball
-    cd easyrpg-player-0.6.2/builds/android # enter in the android directory
+    tar xf easyrpg-player-0.7.0.tar.xz     # unpack the tarball
+    cd easyrpg-player-0.7.0/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/builds/android/gradle.properties b/builds/android/gradle.properties
@@ -1,8 +1,27 @@
-android.enableJetifier=true
-android.useAndroidX=true
+# Human readable version name
+VERSION_NAME=0.7.0
 
-VERSION_NAME=1.0
-VERSION_CODE=1
+# Internal version number
+# Must be increased before publishing a new APK
+VERSION_CODE=8073
 
+# Architectures to build for when developing (debug)
 ABI_FILTERS_DEBUG=armeabi-v7a
+
+# Architectures to build for when creating a release
 ABI_FILTERS_RELEASE=armeabi-v7a,arm64-v8a,x86,x86_64
+
+# Path to the "android" directory of the buildscripts repository
+# These dependencies are required for a successful build
+# See: https://github.com/EasyRPG/buildscripts
+#toolchainDirs=PATH_TO_BUILDSCRIPTS/android
+
+# Additional parameters to pass to CMake
+# e.g. -DPlayer_BUILD_LIBLCF=ON - Build liblcf together with the Player
+#cmakeOptions=
+
+
+## Do not edit below this line!
+## ----------------------------
+android.enableJetifier=true
+android.useAndroidX=true
diff --git a/builds/libretro/libretro-common b/builds/libretro/libretro-common
diff --git a/builds/release-helper.sh b/builds/release-helper.sh
@@ -1,7 +1,9 @@
 #!/bin/bash
 
 # release-helper.sh - maintainer utility script to change the release version
-# by carstene1ns 2020, released under the MIT license
+# by carstene1ns 2021, released under the MIT license
+
+set -e
 
 version=$1
 
@@ -27,6 +29,11 @@ sed -i "/EasyRPG_Player VERSION/,1 s/[0-9]\.[0-9]\.[0-9]/$version/" CMakeLists.t
 echo "  configure.ac"
 sed -i "/AC_INIT/,1 s/[0-9]\.[0-9]\.[0-9]/$version/" configure.ac
 
+echo "  builds/android/gradle.properties"
+_android_commits=`git rev-list HEAD --count`
+sed -i -e "/VERSION_NAME/,1 s/[0-9]\.[0-9]\.[0-9]/$version/" \
+       -e "/VERSION_CODE/,1 s/[0-9]\+/${_android_commits}/" builds/android/gradle.properties
+
 echo "  builds/switch/Makefile"
 sed -i "/APP_VERSION/,1 s/[0-9]\.[0-9]\.[0-9]/$version/" builds/switch/Makefile
 

diff --git a/builds/switch/Makefile b/builds/switch/Makefile
@@ -47,7 +47,7 @@ INCLUDES	:=	../../src
 
 APP_TITLE	:= EasyRPG Player
 APP_AUTHOR	:= EasyRPG Team & Rinnegatamante
-APP_VERSION	:= 0.6.2
+APP_VERSION	:= 0.7.0
 ICON		:= icon.jpg
 
 #---------------------------------------------------------------------------------

diff --git a/builds/wii/meta.xml b/builds/wii/meta.xml
@@ -2,8 +2,8 @@
 <app version="1">
   <name>EasyRPG Player</name>
   <coder>EasyRPG Team</coder>
-  <version>0.6.2</version>
-  <release_date>20200426000000</release_date>
+  <version>0.7.0</version>
+  <release_date>20211029000000</release_date>
   <short_description>RPG Maker 2000/2003 player</short_description>
   <long_description>EasyRPG Player is a Role Playing Game interpreter for playing games created by RPG Maker 2000/2003.
 

diff --git a/configure.ac b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT([easyrpg-player],[0.6.2],[https://github.com/EasyRPG/Player/issues],[easyrpg-player],[https://easyrpg.org])
+AC_INIT([easyrpg-player],[0.7.0],[https://github.com/EasyRPG/Player/issues],[easyrpg-player],[https://easyrpg.org])
 
 AC_CONFIG_AUX_DIR([builds/autoconf/aux])
 AM_INIT_AUTOMAKE([1.11.4 foreign subdir-objects tar-ustar -Wall dist-xz])

diff --git a/resources/osx/Info.plist b/resources/osx/Info.plist
@@ -31,7 +31,7 @@
     <string>APPL</string>
 
     <key>CFBundleShortVersionString</key>
-    <string>0.6.2</string>
+    <string>0.7.0</string>
 
     <key>NSSupportsAutomaticGraphicsSwitching</key>
     <true/>

diff --git a/resources/player.rc b/resources/player.rc
@@ -3,8 +3,8 @@
 1 24 "player.xml"
 #endif
 1 VERSIONINFO
-FILEVERSION 0,6,2,0
-PRODUCTVERSION 0,6,2,0
+FILEVERSION 0,7,0,0
+PRODUCTVERSION 0,7,0,0
 FILETYPE 0x00000001L
 {
 	BLOCK "StringFileInfo"
@@ -13,13 +13,13 @@ FILETYPE 0x00000001L
 		{
 			VALUE "Comments", "https://easyrpg.org"
 			VALUE "CompanyName", "EasyRPG Project"
-			VALUE "FileVersion", "0.6.2.0"
+			VALUE "FileVersion", "0.7.0.0"
 			VALUE "FileDescription", "EasyRPG Player"
 			VALUE "InternalName", "easyrpg-player"
-			VALUE "LegalCopyright", "2007-2019 EasyRPG Project"
+			VALUE "LegalCopyright", "2007-2021 EasyRPG Project"
 			VALUE "OriginalFilename", "Player.exe"
 			VALUE "ProductName", "EasyRPG Player"
-			VALUE "ProductVersion", "0.6.2.0"
+			VALUE "ProductVersion", "0.7.0.0"
 		}
 	}
 	BLOCK "VarFileInfo"

diff --git a/resources/psvita/template.xml b/resources/psvita/template.xml
@@ -12,7 +12,7 @@
 	<frame id="frame3">
 		<liveitem>
 			<text valign="bottom" text-valign="bottom" align="center" text-align="center"  line-space="3" ellipsis="on">
-				<str color="#ffffff" size="30" bold="on" shadow="on">EasyRPG Player 0.6.2</str>
+				<str color="#ffffff" size="30" bold="on" shadow="on">EasyRPG Player 0.7.0</str>
 			</text>
 		</liveitem>
 	</frame>

diff --git a/src/filefinder_rtp.cpp b/src/filefinder_rtp.cpp
@@ -168,7 +168,7 @@ FileFinder_RTP::FileFinder_RTP(bool no_rtp, bool no_rtp_warnings, std::string rt
 
 void FileFinder_RTP::AddPath(StringView p) {
 	using namespace FileFinder;
-	auto fs = FileFinder::Root().Create(ToString(p));
+	auto fs = FileFinder::Root().Create(FileFinder::MakeCanonical(p));
 	if (fs) {
 		Output::Debug("Adding {} to RTP path", p);
 

diff --git a/src/version.h b/src/version.h
@@ -27,8 +27,8 @@
  * FIXME: Make this a proper, generated version header redefined by the build system.
  */
 #define PLAYER_MAJOR 0
-#define PLAYER_MINOR 6
-#define PLAYER_PATCH 2
+#define PLAYER_MINOR 7
+#define PLAYER_PATCH 0
 #define PLAYER_ADDTL ""
 #define PLAYER_VERSION TO_STRING(PLAYER_MAJOR) "." TO_STRING(PLAYER_MINOR) "." TO_STRING(PLAYER_PATCH)
+58 −0		Makefile.test
+4 −3		audio/audio_mix.c
+63 −26		audio/audio_mixer.c
+71 −53		audio/conversion/float_to_s16.c
+1 −1		audio/conversion/float_to_s16_neon.S
+1 −1		audio/conversion/float_to_s16_neon.c
+58 −43		audio/conversion/s16_to_float.c
+1 −1		audio/conversion/s16_to_float_neon.S
+1 −1		audio/conversion/s16_to_float_neon.c
+37 −0		audio/dsp_filters/Makefile
+102 −48		audio/resampler/drivers/sinc_resampler.c
+1 −1		audio/resampler/drivers/sinc_resampler_neon.S
+26 −7		features/features_cpu.c
+2 −7		file/archive_file.c
+49 −46		file/archive_file_7z.c
+49 −7		file/archive_file_zlib.c
+123 −32		file/config_file.c
+170 −76		file/file_path.c
+5 −13		file/file_path_io.c
+9 −0		file/nbio/nbio_stdio.c
+2 −1		formats/cdfs/cdfs.c
+316 −0		formats/json/jsonsax.c
+3,894 −0		formats/json/jsonsax_full.c
+5 −4		formats/json/rjson.c
+7 −1		formats/libchdr/libchdr_chd.c
+1 −1		formats/libchdr/libchdr_lzma.c
+4 −2		formats/png/rpng.c
+3 −1		formats/tga/rtga.c
+284 −0		include/array/rhmap.h
+2 −1		include/audio/audio_mix.h
+8 −2		include/audio/audio_mixer.h
+1 −1		include/audio/conversion/float_to_s16.h
+1 −1		include/audio/conversion/s16_to_float.h
+26 −12		include/compat/intrinsics.h
+73 −0		include/defines/cocoa_defines.h
+92 −0		include/defines/d3d_defines.h
+96 −0		include/defines/gx_defines.h
+707 −0		include/defines/ps3_defines.h
+145 −0		include/defines/psp_defines.h
+2 −4		include/file/archive_file.h
+1 −0		include/file/config_file.h
+7 −0		include/file/file_path.h
+1 −1		include/formats/rjson.h
+730 −1		include/libretro.h
+3 −3		include/lists/file_list.h
+298 −0		include/lists/linked_list.h
+242 −0		include/lists/nested_list.h
+11 −0		include/net/net_compat.h
+2 −0		include/net/net_http.h
+2 −1		include/net/net_natt.h
+208 −0		include/queues/generic_queue.h
+0 −1		include/retro_dirent.h
+96 −0		include/retro_math.h
+16 −0		include/retro_miscellaneous.h
+4 −0		include/retro_timers.h
+2 −0		include/streams/file_stream.h
+55 −3		include/string/stdstring.h
+1 −1		libco/aarch64.c
+2 −0		libco/libco.c
+66 −0		libco/ps2.c
+1 −1		lists/file_list.c
+479 −0		lists/linked_list.c
+613 −0		lists/nested_list.c
+59 −1		net/net_compat.c
+5 −0		net/net_http.c
+1 −1		net/net_ifinfo.c
+25 −16		net/net_natt.c
+19 −3		net/net_socket.c
+1 −1		playlists/label_sanitization.c
+303 −0		queues/generic_queue.c
+8 −1		rthreads/rthreads.c
+6 −0		samples/core_options/README.md
+80 −0		samples/core_options/example_categories/conversion_scripts/core_option_regex.py
+419 −0		samples/core_options/example_categories/conversion_scripts/v1_to_v2_converter.py
+454 −0		samples/core_options/example_categories/libretro_core_options.h
+157 −0		samples/core_options/example_categories/libretro_core_options_intl.h
+ −		samples/net/http_test
+ −		samples/net/net_ifinfo
+102 −0		samples/streams/rzip/Makefile
+364 −0		samples/streams/rzip/rzip.c
+22 −6		streams/file_stream.c
+1 −1		streams/file_stream_transforms.c
+6 −4		streams/rzip_stream.c
+1 −1		streams/stdin_stream.c
+174 −55		string/stdstring.c
+86 −0		test/hash/test_hash.c
+1,300 −0		test/lists/test_linked_list.c
+410 −0		test/queues/test_generic_queue.c
+321 −0		test/string/test_stdstring.c
+112 −0		test/utils/test_utils.c
+51 −1		vfs/vfs_implementation.c
+954 −631		vfs/vfs_implementation_uwp.cpp