From e680457a607b06dcdab7d13457ade71d9676483b Mon Sep 17 00:00:00 2001 From: Wouter Wijsman Date: Fri, 11 Oct 2024 14:10:55 +0200 Subject: [PATCH 1/2] Display build date instead of unchanged version number --- .github/workflows/doxygen.yml | 2 +- README.md | 2 +- VERSION | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) delete mode 100644 VERSION diff --git a/.github/workflows/doxygen.yml b/.github/workflows/doxygen.yml index 1a6a625b..28be09d5 100644 --- a/.github/workflows/doxygen.yml +++ b/.github/workflows/doxygen.yml @@ -15,7 +15,7 @@ jobs: - name: Prepare Doxyfile run: | sed -e 's/\$(PROJECT)/PSPSDK/' \ - -e 's/\$(VERSION)/'`cat VERSION | xargs echo -n`'/' \ + -e 's/\$(VERSION)/'`date +"%Y.%m.%d" | xargs echo -n`'/' \ -e 's/\$(SRCDIR)/src/g' \ -e 's/\$(GENERATE_LATEX)/NO/' \ -e 's/\$(HAVE_DOT)/YES/' \ diff --git a/README.md b/README.md index 7bde60ae..1c951875 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![CI](https://img.shields.io/github/actions/workflow/status/pspdev/pspsdk/.github/workflows/compilation.yml?branch=master&style=for-the-badge&logo=github&label=CI)](https://github.com/pspdev/pspsdk/actions?query=workflow:CI) [![CI-Docker](https://img.shields.io/github/actions/workflow/status/pspdev/pspsdk/.github/workflows/docker.yml?branch=master&style=for-the-badge&logo=github&label=CI-Docker)](https://github.com/pspdev/pspsdk/actions?query=workflow:CI-Docker) -Version 1.0+beta2 - https://github.com/pspdev/pspsdk +https://github.com/pspdev/pspsdk ## Introduction diff --git a/VERSION b/VERSION deleted file mode 100644 index 5519b6c2..00000000 --- a/VERSION +++ /dev/null @@ -1 +0,0 @@ -1.0+beta2 From 65b82e3742e37c8f377ba4ceb7c2309801515043 Mon Sep 17 00:00:00 2001 From: Wouter Wijsman Date: Fri, 11 Oct 2024 14:33:01 +0200 Subject: [PATCH 2/2] Create version file in bootstrap It is being used in the build process --- .github/workflows/doxygen.yml | 2 +- .gitignore | 1 + bootstrap | 9 +++------ 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/doxygen.yml b/.github/workflows/doxygen.yml index 28be09d5..1628c7e5 100644 --- a/.github/workflows/doxygen.yml +++ b/.github/workflows/doxygen.yml @@ -15,7 +15,7 @@ jobs: - name: Prepare Doxyfile run: | sed -e 's/\$(PROJECT)/PSPSDK/' \ - -e 's/\$(VERSION)/'`date +"%Y.%m.%d" | xargs echo -n`'/' \ + -e 's/\$(VERSION)/'`date +"%Y-%m-%d" | xargs echo -n`'/' \ -e 's/\$(SRCDIR)/src/g' \ -e 's/\$(GENERATE_LATEX)/NO/' \ -e 's/\$(HAVE_DOT)/YES/' \ diff --git a/.gitignore b/.gitignore index b9c5dee1..69323ad4 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ stamp-h1 compile_flags.txt EBOOT.PBP PARAM.SFO +VERSION diff --git a/bootstrap b/bootstrap index 053b1153..2b0d6852 100755 --- a/bootstrap +++ b/bootstrap @@ -36,12 +36,6 @@ msg() { [ $quiet -eq 0 ] && echo $1 } -if [ ! -f $top_srcdir/VERSION ]; then - echo "${progname}:" - echo " Installation problem: Can't find file VERSION" - exit 1 -fi - while [ $# -gt 0 ]; do case $1 in -h|--help) @@ -64,6 +58,9 @@ while [ $# -gt 0 ]; do esac done +# Create version file used while building +date +"%Y-%m-%d" > $top_srcdir/VERSION + # default mode is generation if [ $generate -eq 1 ]; then msg "Running aclocal:"