diff --git a/Makefile b/Makefile index b2c3ea1..7a4b2b3 100644 --- a/Makefile +++ b/Makefile @@ -18,12 +18,8 @@ tag: git tag $(PROFILE_VERSION) version: - echo !define VERSIONMAJOR $(VERSIONMAJOR) > src/nsis/i2pbrowser-version.nsi - echo !define VERSIONMINOR $(VERSIONMINOR) >> src/nsis/i2pbrowser-version.nsi - echo !define VERSIONBUILD $(VERSIONBUILD) >> src/nsis/i2pbrowser-version.nsi - sed 's|!define VERSION||g' src/nsis/i2pbrowser-version.nsi | sed 's| |=|g' > .version - rm -f version.txt - make version.txt i2pbrowser-jpackage.nsi + ./buildscripts/version.sh + make version.txt "$SCRIPT_DIR version.txt: build echo "$(PROFILE_VERSION)" > build/version.txt diff --git a/buildscripts/version.sh b/buildscripts/version.sh new file mode 100755 index 0000000..a3042cc --- /dev/null +++ b/buildscripts/version.sh @@ -0,0 +1,25 @@ +#! /usr/bin/env bash + +SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)/.. +cd "$SCRIPT_DIR" || exit 1 + +. "$SCRIPT_DIR/i2pversion" + +if [ -f i2pversion_override ]; then + . "$SCRIPT_DIR/i2pversion_override" +fi + +. "$SCRIPT_DIR/config.sh" + +if [ -f "$SCRIPT_DIR/config_override.sh" ]; then + . "$SCRIPT_DIR/config_override.sh" +fi + +echo "!define VERSIONMAJOR $VERSIONMAJOR" > "$SCRIPT_DIR"/src/nsis/i2pbrowser-version.nsi +echo "!define VERSIONMINOR $VERSIONMINOR" >> "$SCRIPT_DIR"/src/nsis/i2pbrowser-version.nsi +echo "!define VERSIONBUILD $VERSIONBUILD" >> "$SCRIPT_DIR"/src/nsis/i2pbrowser-version.nsi +echo "!define I2P_VERSION $PROFILE_VERSION" > "$SCRIPT_DIR"src/nsis/i2pbrowser-jpackage.nsi + +echo "$PROFILE_VERSION" > "$SCRIPT_DIR"/build/version.txt +echo "$PROFILE_VERSION" > "$SCRIPT_DIR"/build/version.txt +sed 's|!define VERSION||g' src/nsis/i2pbrowser-version.nsi | sed 's| |=|g' > .version