mirrors/futurerestore
1
0
Fork 0
mirror of https://github.com/tihmstar/futurerestore.git synced 2025-09-11 04:57:04 +00:00
Code Issues Projects Releases Wiki Activity

New versioning

Browse source
This commit is contained in:
Cryptiiiic 2021-06-07 15:35:01 -07:00
parent 00c914d81e
commit 1d10663eb2
No known key found for this signature in database
GPG key ID: 4CCAE32CC026C76D
5 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.github/workflows/build.sh vendored
View file

@ -18,6 +18,7 @@ sudo ${PROCURSUS}/bin/apt install make cmake coreutils pkg-config findutils sed
echo 'step 3:' echo 'step 3:'
cd ${BASE}/../.. cd ${BASE}/../..
export FUTURERESTORE_VERSION=$(git rev-parse HEAD | tr -d '\n') export FUTURERESTORE_VERSION=$(git rev-parse HEAD | tr -d '\n')
export FUTURERESTORE_VERSION_RELEASE=$(cat version.txt | tr -d '\n')
echo 'step 4:' echo 'step 4:'
git submodule init; git submodule update --recursive git submodule init; git submodule update --recursive
cd external/tsschecker cd external/tsschecker
@ -34,8 +35,8 @@ gtar xf ${BASE}/build_base.tar
echo 'step 5:' echo 'step 5:'
make futurerestore NO_PGP=1 MEMO_TARGET=darwin-amd64 MEMO_CFVER=1300 make futurerestore NO_PGP=1 MEMO_TARGET=darwin-amd64 MEMO_CFVER=1300
echo 'step 6:' echo 'step 6:'
cp build_stage/darwin-amd64/1300/futurerestore/opt/procursus/bin/futurerestore ${BASE} cp build_stage/darwin-amd64/1300/futurerestore/opt/procursus/bin/futurerestore ${BASE}/futurerestore-${FUTURERESTORE_VERSION_RELEASE}
cd ${BASE} cd ${BASE}
otool -L futurerestore || true otool -L ${BASE}/futurerestore-${FUTURERESTORE_VERSION_RELEASE} || true
./futurerestore || true ./futurerestore-${FUTURERESTORE_VERSION_RELEASE} || true
echo 'End' echo 'End'

2
.github/workflows/ci.yml vendored
View file

@ -25,4 +25,4 @@ jobs:
with: with:
name: futurerestore name: futurerestore
path: | path: |
/Users/runner/work/futurerestore/futurerestore/.github/workflows/futurerestore /Users/runner/work/futurerestore/futurerestore/.github/workflows/futurerestore-*

2
configure.ac
View file

@ -11,8 +11,10 @@ AC_CONFIG_MACRO_DIRS([m4])
# Versioning. # Versioning.
AC_DEFINE([VERSION_COMMIT_COUNT], "m4_esyscmd([git rev-list --count HEAD | tr -d '\n'])", [Git commit count]) AC_DEFINE([VERSION_COMMIT_COUNT], "m4_esyscmd([git rev-list --count HEAD | tr -d '\n'])", [Git commit count])
AC_DEFINE([VERSION_COMMIT_SHA], "m4_esyscmd([git rev-parse HEAD | tr -d '\n'])", [Git commit sha]) AC_DEFINE([VERSION_COMMIT_SHA], "m4_esyscmd([git rev-parse HEAD | tr -d '\n'])", [Git commit sha])
AC_DEFINE([VERSION_RELEASE], "m4_esyscmd([cat version.txt | tr -d '\n'])", [Futurerestore release version])
AC_SUBST([VERSION_COMMIT_COUNT], ["m4_esyscmd([git rev-list --count HEAD | tr -d '\n'])"]) AC_SUBST([VERSION_COMMIT_COUNT], ["m4_esyscmd([git rev-list --count HEAD | tr -d '\n'])"])
AC_SUBST([VERSION_COMMIT_SHA], ["m4_esyscmd([git rev-parse HEAD | tr -d '\n'])"]) AC_SUBST([VERSION_COMMIT_SHA], ["m4_esyscmd([git rev-parse HEAD | tr -d '\n'])"])
AC_SUBST([VERSION_RELEASE], ["m4_esyscmd([cat version.txt | tr -d '\n'])"])
# Checks for programs. # Checks for programs.
AC_PROG_CXX AC_PROG_CXX

3
futurerestore/main.cpp
View file

@ -17,6 +17,7 @@ extern "C"{
#include "tsschecker.h" #include "tsschecker.h"
#undef VERSION_COMMIT_SHA #undef VERSION_COMMIT_SHA
#undef VERSION_COMMIT_COUNT #undef VERSION_COMMIT_COUNT
#undef VERSION_RELEASE
}; };
#include <libgeneral/macros.h> #include <libgeneral/macros.h>
@ -99,7 +100,7 @@ int main_r(int argc, const char * argv[]) {
SetConsoleMode(handle, termFlags | ENABLE_VIRTUAL_TERMINAL_PROCESSING); SetConsoleMode(handle, termFlags | ENABLE_VIRTUAL_TERMINAL_PROCESSING);
#endif #endif
int err=0; int err=0;
printf("Version: " VERSION_COMMIT_SHA " - " VERSION_COMMIT_COUNT "\n"); printf("Version: " VERSION_RELEASE "(" VERSION_COMMIT_SHA "-" VERSION_COMMIT_COUNT ")\n");
printf("%s\n",tihmstar::img4tool::version()); printf("%s\n",tihmstar::img4tool::version());
#ifdef HAVE_LIBIPATCHER #ifdef HAVE_LIBIPATCHER
printf("%s\n",libipatcher::version()); printf("%s\n",libipatcher::version());

1
version.txt Normal file
View file

@ -0,0 +1 @@
v2.0.0-test