From 25b95c61aed4bd7baf889d084cab5c2bdb3802e3 Mon Sep 17 00:00:00 2001 From: bnnm Date: Sun, 8 Aug 2021 14:00:58 +0200 Subject: [PATCH] builds: clean version makers a bit --- CMakeLists.txt | 4 ++-- Makefile | 8 ++++---- bootstrap | 2 +- cli/vgmstream_cli.vcxproj | 4 ++-- fb2k/foo_input_vgmstream.vcxproj | 4 ++-- version.sh => version-get.sh | 0 version.bat => version-make.bat | 2 +- version-make.sh | 21 +++++++++++++++++++++ winamp/in_vgmstream.vcxproj | 4 ++-- xmplay/xmp-vgmstream.vcxproj | 4 ++-- 10 files changed, 37 insertions(+), 16 deletions(-) rename version.sh => version-get.sh (100%) mode change 100755 => 100644 rename version.bat => version-make.bat (93%) create mode 100644 version-make.sh diff --git a/CMakeLists.txt b/CMakeLists.txt index 70ee6114..389fc4cb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -96,9 +96,9 @@ if(WIN32) if(MSVC) file(TO_NATIVE_PATH "${VGM_BINARY_DIR}/version.h" VERSION_H_PATH) add_custom_command(OUTPUT ${VGM_BINARY_DIR}/version.h - COMMAND "${VGM_SOURCE_DIR}/version.bat" + COMMAND "${VGM_SOURCE_DIR}/version-make.bat" ARGS ${VERSION_H_PATH} - DEPENDS ${VGM_SOURCE_DIR}/version.bat) + DEPENDS ${VGM_SOURCE_DIR}/version-make.bat) add_custom_target(version_h DEPENDS ${VGM_BINARY_DIR}/version.h) else() find_package(Git) diff --git a/Makefile b/Makefile index d2b0bef3..62ddb6a7 100644 --- a/Makefile +++ b/Makefile @@ -4,9 +4,9 @@ ifeq ($(VGMSTREAM_VERSION),) # for current dir (expanded later) - VGMSTREAM_VERSION_CURR=`./version.sh` + VGMSTREAM_VERSION_CURR=`./version-get.sh` # for subdirs (expanded later) - VGMSTREAM_VERSION_PREV=`../version.sh` + VGMSTREAM_VERSION_PREV=`../version-get.sh` else VGMSTREAM_VERSION_CURR=$(VGMSTREAM_VERSION) VGMSTREAM_VERSION_PREV=$(VGMSTREAM_VERSION) @@ -183,8 +183,8 @@ sourceball: rm -rf vgmstream-$(VGMSTREAM_VERSION_CURR) git checkout-index -f -a --prefix=vgmstream-$(VGMSTREAM_VERSION_CURR)/ # git archive --format zip --output vgmstream-$(VGMSTREAM_VERSION_CURR).zip master - echo "#!/bin/sh" > vgmstream-$(VGMSTREAM_VERSION_CURR)/version.sh - echo "echo \"$(VGMSTREAM_VERSION_CURR)\"" >> vgmstream-$(VGMSTREAM_VERSION_CURR)/version.sh + echo "#!/bin/sh" > vgmstream-$(VGMSTREAM_VERSION_CURR)/version-get.sh + echo "echo \"$(VGMSTREAM_VERSION_CURR)\"" >> vgmstream-$(VGMSTREAM_VERSION_CURR)/version-get.sh tar cvzf "vgmstream-$(VGMSTREAM_VERSION_CURR).tar.gz" vgmstream-$(VGMSTREAM_VERSION_CURR)/* rm -rf vgmstream-$(VGMSTREAM_VERSION_CURR) diff --git a/bootstrap b/bootstrap index bd313649..74bc9255 100755 --- a/bootstrap +++ b/bootstrap @@ -27,7 +27,7 @@ sed -i -e "s/EXTRA_DIST =.*/EXTRA_DIST = $AUDACIOUS_HDRS/g" ./audacious/Makefile # get version to show in about dialogs # again, not very pretty -VGMSTREAM_VERSION=`./version.sh` +VGMSTREAM_VERSION=`./version-get.sh` sed -i -e "s/VGMSTREAM_VERSION/$VGMSTREAM_VERSION/g" ./audacious/Makefile.autotools.am sed -i -e "s/VGMSTREAM_VERSION/$VGMSTREAM_VERSION/g" ./cli/Makefile.autotools.am diff --git a/cli/vgmstream_cli.vcxproj b/cli/vgmstream_cli.vcxproj index ca2f37c3..1e82e191 100644 --- a/cli/vgmstream_cli.vcxproj +++ b/cli/vgmstream_cli.vcxproj @@ -88,7 +88,7 @@ MachineX86 - "$(ProjectDir)..\version.bat" + "$(ProjectDir)..\version-make.bat" Generating version @@ -116,7 +116,7 @@ MachineX86 - "$(ProjectDir)..\version.bat" + "$(ProjectDir)..\version-make.bat" Generating version diff --git a/fb2k/foo_input_vgmstream.vcxproj b/fb2k/foo_input_vgmstream.vcxproj index 87b6029b..954e10b2 100644 --- a/fb2k/foo_input_vgmstream.vcxproj +++ b/fb2k/foo_input_vgmstream.vcxproj @@ -88,7 +88,7 @@ true - "$(ProjectDir)..\version.bat" + "$(ProjectDir)..\version-make.bat" Generating version @@ -118,7 +118,7 @@ Windows - "$(ProjectDir)..\version.bat" + "$(ProjectDir)..\version-make.bat" Generating version diff --git a/version.sh b/version-get.sh old mode 100755 new mode 100644 similarity index 100% rename from version.sh rename to version-get.sh diff --git a/version.bat b/version-make.bat similarity index 93% rename from version.bat rename to version-make.bat index 1499e56b..e50680ba 100644 --- a/version.bat +++ b/version-make.bat @@ -23,7 +23,7 @@ for /f %%v in ('git describe --always') do set version=%%v if not "%version%"=="" set version=!version:^:=_! if not "%version%"=="" goto :got_version -echo Git version cannot be found, can't autogenerate version.h +echo Git version not found, can't autogenerate version.h goto :exit diff --git a/version-make.sh b/version-make.sh new file mode 100644 index 00000000..107a838f --- /dev/null +++ b/version-make.sh @@ -0,0 +1,21 @@ +#!/bin/sh + +# make current git version (overwrites version.h) +VERSION_NAME=VGMSTREAM_VERSION +VERSION_FILE=version.h + + +# test if git exists +if ! command -v git > /dev/null ; then + VERSION="" +else + VERSION=$(git describe --always 2>&1 | tr : _ ) +fi + + +# ignore git stderr "fatal:*" or blank +if [[ $VERSION != fatal* ]] && [ ! -z "$VERSION" ] ; then + echo "#define $VERSION_NAME \"$VERSION\" /* autogenerated */" > $VERSION_FILE +else + echo "Git version not found, can't autogenerate version.h" +fi; diff --git a/winamp/in_vgmstream.vcxproj b/winamp/in_vgmstream.vcxproj index a6f8e506..126a5eb1 100644 --- a/winamp/in_vgmstream.vcxproj +++ b/winamp/in_vgmstream.vcxproj @@ -89,7 +89,7 @@ MachineX86 - "$(ProjectDir)..\version.bat" + "$(ProjectDir)..\version-make.bat" Generating version @@ -119,7 +119,7 @@ MachineX86 - "$(ProjectDir)..\version.bat" + "$(ProjectDir)..\version-make.bat" Generating version diff --git a/xmplay/xmp-vgmstream.vcxproj b/xmplay/xmp-vgmstream.vcxproj index 7130b6d8..742435e6 100644 --- a/xmplay/xmp-vgmstream.vcxproj +++ b/xmplay/xmp-vgmstream.vcxproj @@ -77,7 +77,7 @@ xmpin.def - "$(ProjectDir)..\version.bat" + "$(ProjectDir)..\version-make.bat" Generating version @@ -107,7 +107,7 @@ xmpin.def - "$(ProjectDir)..\version.bat" + "$(ProjectDir)..\version-make.bat" Generating version