Skip to content

Commit

Permalink
make-release: fix for phd.h having been moved to src/
Browse files Browse the repository at this point in the history
  • Loading branch information
agalasso committed Jan 11, 2025
1 parent 5d9b1ae commit 9d91f76
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion build/build_help.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build/build_help_pdf.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ trap "rm -rf '$TMP'" 2 3 15
files=$(grep '<param name="Local" value=' $help/PHD2GuideHelp.hhc \
| grep 'htm">' | 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
Expand Down
12 changes: 6 additions & 6 deletions build/make-release
Original file line number Diff line number Diff line change
Expand Up @@ -116,26 +116,26 @@ 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
fi
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
Expand Down

0 comments on commit 9d91f76

Please sign in to comment.