From 9d91f76cbdeed55d78c04be1b896e0e47588ea39 Mon Sep 17 00:00:00 2001 From: Andy Galasso Date: Sat, 11 Jan 2025 12:18:23 -0500 Subject: [PATCH] make-release: fix for phd.h having been moved to src/ --- build/build_help.sh | 2 +- build/build_help_pdf.sh | 2 +- build/make-release | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build/build_help.sh b/build/build_help.sh index 554331f4f..28e444e6c 100755 --- a/build/build_help.sh +++ b/build/build_help.sh @@ -44,7 +44,7 @@ cp -p "$help"/* "$TMP"/ echo "building web pages..." # generate the HTML table of contents page - phdversion=$("$build"/get_phd_version "$top"/phd.h) + phdversion=$("$build"/get_phd_version "$top"/src/phd.h) "$build"/build_help_toc_html "$phdversion" > index.html # generate the online help files diff --git a/build/build_help_pdf.sh b/build/build_help_pdf.sh index 2736c0d1d..810b0dcde 100755 --- a/build/build_help_pdf.sh +++ b/build/build_help_pdf.sh @@ -26,7 +26,7 @@ trap "rm -rf '$TMP'" 2 3 15 files=$(grep '' | cut -d\" -f4 | awk '!x[$0]++ {print "'$help\/'" $0}') -phdversion=$("$build"/get_phd_version "$top"/phd.h) +phdversion=$("$build"/get_phd_version "$top"/src/phd.h) date=$(LC_ALL=C date '+%B %d, %Y') # create pdf diff --git a/build/make-release b/build/make-release index 0008601de..5b770bf73 100755 --- a/build/make-release +++ b/build/make-release @@ -116,7 +116,7 @@ update_translations () ( ) bump_rev () ( - cur_rev=$(./build/get_phd_version phd.h) + cur_rev=$(./build/get_phd_version src/phd.h) if [[ $cur_rev == $rev ]]; then echo "version update not neeed" return @@ -124,18 +124,18 @@ bump_rev () ( echo "update phd.h version to $rev" TMP=$(mktemp) trap "rm -f '$TMP'" EXIT - cp phd.h "$TMP" + cp src/phd.h "$TMP" ver=${rev/dev*} subver=${rev/$ver} awk -v q='"' -v VER=$ver -v SUBVER=$subver ' /^#define PHDVERSION/ { print "#define PHDVERSION _T(" q VER q ")"; next } /^#define PHDSUBVER/ { print "#define PHDSUBVER _T(" q SUBVER q ")"; next } { print } - ' "$TMP" > phd.h + ' "$TMP" > src/phd.h # normalize line endings - dos2unix phd.h - unix2dos phd.h - git add phd.h + dos2unix src/phd.h + unix2dos src/phd.h + git add src/phd.h # update the debian changelog if is_full_release; then changelog=ChangeLog-full