encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Save the version in VERSION.txt instead of VERSION 

Fixes https://github.com/libsdl-org/SDL/issues/6558
This commit is contained in:
Sam Lantinga 2022-11-21 06:57:02 -08:00
parent 802c624ab3
commit 8ae46a49ea
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -15,7 +15,7 @@ build
gen gen
Build Build
buildbot buildbot
/VERSION /VERSION.txt
*.so *.so
*.so.* *.so.*

2
Android.mk
View File

@ -12,7 +12,7 @@ LOCAL_MODULE := SDL2
LOCAL_C_INCLUDES := $(LOCAL_PATH)/include LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES) LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)/include
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
$(subst $(LOCAL_PATH)/,, \ $(subst $(LOCAL_PATH)/,, \

4
CMakeLists.txt
View File

@ -2960,8 +2960,8 @@ set(EXTRA_CFLAGS ${_EXTRA_CFLAGS})
# Compat helpers for the configuration files # Compat helpers for the configuration files
if(EXISTS "${PROJECT_SOURCE_DIR}/VERSION") if(EXISTS "${PROJECT_SOURCE_DIR}/VERSION.txt")
file(READ "${PROJECT_SOURCE_DIR}/VERSION" SDL_SOURCE_VERSION) file(READ "${PROJECT_SOURCE_DIR}/VERSION.txt" SDL_SOURCE_VERSION)
string(STRIP "${SDL_SOURCE_VERSION}" SDL_SOURCE_VERSION) string(STRIP "${SDL_SOURCE_VERSION}" SDL_SOURCE_VERSION)
endif() endif()

4
build-scripts/showrev.sh
View File

@ -5,8 +5,8 @@
SDL_ROOT=$(dirname $0)/.. SDL_ROOT=$(dirname $0)/..
cd $SDL_ROOT cd $SDL_ROOT
if [ -e ./VERSION ]; then if [ -e ./VERSION.txt ]; then
cat ./VERSION cat ./VERSION.txt
exit 0 exit 0
fi fi

2
build-scripts/updaterev.sh
View File

@ -29,7 +29,7 @@ done
rev=`sh showrev.sh 2>/dev/null` rev=`sh showrev.sh 2>/dev/null`
if [ "$rev" != "" ]; then if [ "$rev" != "" ]; then
if [ -n "$dist" ]; then if [ -n "$dist" ]; then
echo "$rev" > "$outdir/VERSION" echo "$rev" > "$outdir/VERSION.txt"
fi fi
echo "/* Generated by updaterev.sh, do not edit */" >"$header.new" echo "/* Generated by updaterev.sh, do not edit */" >"$header.new"
if [ -n "$vendor" ]; then if [ -n "$vendor" ]; then