archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-04 05:51:27 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Unify versioning

Browse source 
Use the same version value across all scripts instead of program side version and repository side version separatedly
This commit is contained in:
Ani 2019-09-17 21:17:20 +01:00
parent 6a0ce010eb
commit f8153fca58
4 changed files with 9 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.travis/deploy-linux.bash
View file

@ -31,11 +31,11 @@ if [ "$DEPLOY_APPIMAGE" = "true" ]; then
# Package it up and send it off # Package it up and send it off
./squashfs-root/usr/bin/appimagetool /rpcs3/build/appdir ./squashfs-root/usr/bin/appimagetool /rpcs3/build/appdir
ls ls
COMM_TAG="$(git describe --tags $(git rev-list --tags --max-count=1))" COMM_TAG="$(grep 'version{.*}' rpcs3/rpcs3_version.cpp | awk -F[{,] '{printf \"%d.%d.%d\", $2, $3, $4}')"
COMM_COUNT="$(git rev-list --count HEAD)" COMM_COUNT="$(git rev-list --count HEAD)"
curl -sLO https://github.com/hcorion/uploadtool/raw/master/upload.sh curl -sLO https://github.com/hcorion/uploadtool/raw/master/upload.sh
mv ./RPCS3*.AppImage rpcs3-${COMM_TAG}-${COMM_COUNT}-${TRAVIS_COMMIT:0:8}_linux64.AppImage mv ./RPCS3*.AppImage rpcs3-v${COMM_TAG}-${COMM_COUNT}-${TRAVIS_COMMIT:0:8}_linux64.AppImage
FILESIZE=($(stat -c %s ./rpcs3*.AppImage)) FILESIZE=($(stat -c %s ./rpcs3*.AppImage))
SHA256SUM=($(sha256sum ./rpcs3*.AppImage)) SHA256SUM=($(sha256sum ./rpcs3*.AppImage))

6
appveyor.yml
View file

@ -21,16 +21,16 @@ cache:
install: install:
- ps: | # set env vars for versioning - ps: | # set env vars for versioning
$env:COMM_TAG = $(git describe --tags $(git rev-list --tags --max-count=1)) $env:COMM_TAG = $(Get-Content ./rpcs3/rpcs3_version.cpp | findstr 'version{.*}' | %{ $ver = $_ -split "[{,]"; "{0}.{1}.{2}" -f [int]$ver[1],[int]$ver[2],[int]$ver[3]; })
$env:COMM_COUNT = $(git rev-list --count HEAD) $env:COMM_COUNT = $(git rev-list --count HEAD)
$env:COMM_HASH = $(git rev-parse --short=8 HEAD) $env:COMM_HASH = $(git rev-parse --short=8 HEAD)
if ($env:APPVEYOR_PULL_REQUEST_NUMBER) { if ($env:APPVEYOR_PULL_REQUEST_NUMBER) {
$env:BUILD = "rpcs3-{0}-{1}_win64.7z" -f $env:COMM_TAG, $env:COMM_HASH $env:BUILD = "rpcs3-v{0}-{1}_win64.7z" -f $env:COMM_TAG, $env:COMM_HASH
$env:AVVER = "{0}-{1}" -f $env:COMM_TAG.TrimStart("v"), $env:COMM_HASH $env:AVVER = "{0}-{1}" -f $env:COMM_TAG.TrimStart("v"), $env:COMM_HASH
} }
else { else {
$env:BUILD = "rpcs3-{0}-{1}-{2}_win64.7z" -f $env:COMM_TAG, $env:COMM_COUNT, $env:COMM_HASH $env:BUILD = "rpcs3-v{0}-{1}-{2}_win64.7z" -f $env:COMM_TAG, $env:COMM_COUNT, $env:COMM_HASH
$env:AVVER = "{0}-{1}" -f $env:COMM_TAG.TrimStart("v"), $env:COMM_COUNT $env:AVVER = "{0}-{1}" -f $env:COMM_TAG.TrimStart("v"), $env:COMM_COUNT
} }

15
rpcs3/git-version.cmake
View file

@ -1,6 +1,5 @@
set(RPCS3_GIT_VERSION "unknown") set(RPCS3_GIT_VERSION "unknown")
set(RPCS3_GIT_BRANCH "unknown") set(RPCS3_GIT_BRANCH "unknown")
set(RPCS3_GIT_TAG "unknown")
find_package(Git) find_package(Git)
if(GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git/") if(GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git/")
@ -33,16 +32,6 @@ if(GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git/")
else() else()
string(STRIP ${RPCS3_GIT_BRANCH} RPCS3_GIT_BRANCH) string(STRIP ${RPCS3_GIT_BRANCH} RPCS3_GIT_BRANCH)
endif() endif()
execute_process(COMMAND ${GIT_EXECUTABLE} describe --tags --abbrev=0
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
RESULT_VARIABLE exit_code
OUTPUT_VARIABLE RPCS3_GIT_TAG)
if(NOT ${exit_code} EQUAL 0)
message(WARNING "git describe failed, unable to include git tag.")
else()
string(STRIP ${RPCS3_GIT_TAG} RPCS3_GIT_TAG)
string(REPLACE "v" "" RPCS3_GIT_TAG ${RPCS3_GIT_TAG})
endif()
else() else()
message(WARNING "git not found, unable to include version.") message(WARNING "git not found, unable to include version.")
@ -54,7 +43,6 @@ function(gen_git_version rpcs3_src_dir)
message(STATUS "RPCS3_GIT_VERSION: " ${RPCS3_GIT_VERSION}) message(STATUS "RPCS3_GIT_VERSION: " ${RPCS3_GIT_VERSION})
message(STATUS "RPCS3_GIT_BRANCH: " ${RPCS3_GIT_BRANCH}) message(STATUS "RPCS3_GIT_BRANCH: " ${RPCS3_GIT_BRANCH})
message(STATUS "RPCS3_GIT_TAG: " ${RPCS3_GIT_TAG})
if(EXISTS ${GIT_VERSION_FILE}) if(EXISTS ${GIT_VERSION_FILE})
# Don't update if marked not to update. # Don't update if marked not to update.
@ -74,8 +62,7 @@ function(gen_git_version rpcs3_src_dir)
set(code_string "// This is a generated file.\n\n" set(code_string "// This is a generated file.\n\n"
"#define RPCS3_GIT_VERSION \"${RPCS3_GIT_VERSION}\"\n" "#define RPCS3_GIT_VERSION \"${RPCS3_GIT_VERSION}\"\n"
"#define RPCS3_GIT_BRANCH \"${RPCS3_GIT_BRANCH}\"\n" "#define RPCS3_GIT_BRANCH \"${RPCS3_GIT_BRANCH}\"\n\n"
"#define RPCS3_GIT_TAG \"${RPCS3_GIT_TAG}\"\n\n"
"// If you don't want this file to update/recompile, change to 1.\n" "// If you don't want this file to update/recompile, change to 1.\n"
"#define RPCS3_GIT_VERSION_NO_UPDATE 0\n") "#define RPCS3_GIT_VERSION_NO_UPDATE 0\n")

1
rpcs3/rpcs3_version.cpp
View file

@ -10,5 +10,6 @@ namespace rpcs3
} }
// TODO: Make this accessible from cmake and keep in sync with MACOSX_BUNDLE_BUNDLE_VERSION. // TODO: Make this accessible from cmake and keep in sync with MACOSX_BUNDLE_BUNDLE_VERSION.
// Currently accessible by Windows and Linux build scripts, see implementations when doing MACOSX
const extern utils::version version{ 0, 0, 7, utils::version_type::alpha, 1, RPCS3_GIT_VERSION }; const extern utils::version version{ 0, 0, 7, utils::version_type::alpha, 1, RPCS3_GIT_VERSION };
} }