diff --git a/.github/workflows/build.sh b/.github/workflows/build.sh index 9dc68dd2..190baefe 100755 --- a/.github/workflows/build.sh +++ b/.github/workflows/build.sh @@ -18,6 +18,7 @@ sudo ${PROCURSUS}/bin/apt install make cmake coreutils pkg-config findutils sed echo 'step 3:' cd ${BASE}/../.. export FUTURERESTORE_VERSION=$(git rev-parse HEAD | tr -d '\n') +export FUTURERESTORE_VERSION_RELEASE=$(cat version.txt | tr -d '\n') echo 'step 4:' git submodule init; git submodule update --recursive cd external/tsschecker @@ -34,8 +35,8 @@ gtar xf ${BASE}/build_base.tar echo 'step 5:' make futurerestore NO_PGP=1 MEMO_TARGET=darwin-amd64 MEMO_CFVER=1300 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} -otool -L futurerestore || true -./futurerestore || true +otool -L ${BASE}/futurerestore-${FUTURERESTORE_VERSION_RELEASE} || true +./futurerestore-${FUTURERESTORE_VERSION_RELEASE} || true echo 'End' diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cf23ea6d..56dba08a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,4 +25,4 @@ jobs: with: name: futurerestore path: | - /Users/runner/work/futurerestore/futurerestore/.github/workflows/futurerestore \ No newline at end of file + /Users/runner/work/futurerestore/futurerestore/.github/workflows/futurerestore-* \ No newline at end of file diff --git a/configure.ac b/configure.ac index 15f7193c..8ca42e00 100644 --- a/configure.ac +++ b/configure.ac @@ -11,8 +11,10 @@ AC_CONFIG_MACRO_DIRS([m4]) # Versioning. 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_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_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. AC_PROG_CXX diff --git a/futurerestore/main.cpp b/futurerestore/main.cpp index 71a08c22..09fde82c 100644 --- a/futurerestore/main.cpp +++ b/futurerestore/main.cpp @@ -17,6 +17,7 @@ extern "C"{ #include "tsschecker.h" #undef VERSION_COMMIT_SHA #undef VERSION_COMMIT_COUNT +#undef VERSION_RELEASE }; #include @@ -99,7 +100,7 @@ int main_r(int argc, const char * argv[]) { SetConsoleMode(handle, termFlags | ENABLE_VIRTUAL_TERMINAL_PROCESSING); #endif 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()); #ifdef HAVE_LIBIPATCHER printf("%s\n",libipatcher::version()); diff --git a/version.txt b/version.txt new file mode 100644 index 00000000..38000ef4 --- /dev/null +++ b/version.txt @@ -0,0 +1 @@ +v2.0.0-test \ No newline at end of file