This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Evergreen ILS". The branch, rel_3_14 has been updated via 42c72b86214c7ed37f54a4b1169b57e8494834e2 (commit) from d2e6a09d931796915cdb8c83acae2fe24cf6711d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 42c72b86214c7ed37f54a4b1169b57e8494834e2 Author: Jason Stephenson <jason@sigio.com> Date: Fri Jun 20 11:22:01 2025 -0400 LP2092338: Remove obsolete -j option from make_release The -j option to make_release could be used to set the OSRF_JS_PATH varialbe to an alternate location when making a release on a system where OpenSRF has not been previously installed. Other than set and check the value of this variable, make_release does nothing with it. The variable was possibly used when building the XUL clien and is now obsolete. Since the variable is obsolete and failing to set it causes a failure to build an Evergreen release, this commit removes the variable and the option to set it (-j). To test this patch, you can run build/tools/make_release on a system where OpenSRF has not been installed and see that it still works. If you compare the results to a system where OpensRF was installed or even just checked out, the result should be the same. Release-note: Remove an obsolete option from the build tools' make_release script. Signed-off-by: Jason Stephenson <jason@sigio.com> Signed-off-by: Jane Sandberg <sandbergja@gmail.com> diff --git a/build/tools/make_release b/build/tools/make_release index b6568519db..af46d6f98a 100755 --- a/build/tools/make_release +++ b/build/tools/make_release @@ -24,11 +24,7 @@ PG_USER=NONE # -U PG_PASS=NONE # -P PG_PORT=NONE # -O -# path to OpenSRF libraries -[ "$(which osrf_config)" ] && OSRF_JS_PATH="$(osrf_config --libdir)/javascript"; - - -while getopts ":hv:f:F:nptbrij:CH:D:U:P:O:" opt; do +while getopts ":hv:f:F:nptbriCH:D:U:P:O:" opt; do case $opt in v) VERSION=$OPTARG @@ -57,10 +53,6 @@ while getopts ":hv:f:F:nptbrij:CH:D:U:P:O:" opt; do b) BUILD_ONLY=YES ;; - - j) - OSRF_JS_PATH="$OPTARG" - ;; C) SKIP_BUILD_BROWSER_CLIENT=YES ;; @@ -95,7 +87,6 @@ while getopts ":hv:f:F:nptbrij:CH:D:U:P:O:" opt; do echo " -b turns on build only mode." echo " -r prompt to preview upgrade SQL in editor before committing." echo " -i skip i18n; primarily useful for (quickly) testing this script." - echo " -j opensrf javascript library path. If osrf_config is found, the value derived from osrf_config --libdir." echo " -C Skip building the browser client. Useful only if all you want to do is generate the DB update script." echo " -H Postgres [H]ostname (optional)" echo " -D Postgres [D]atabase name (optional)" @@ -124,11 +115,6 @@ while getopts ":hv:f:F:nptbrij:CH:D:U:P:O:" opt; do esac done -if [ -z "$OSRF_JS_PATH" ]; then - echo "Unable to find OpenSRF JavaScript library path. Specify with -j"; - exit 1; -fi; - if [ "$TAG_ONLY" == "YES" ]; then PREV_BRANCH="TAG" fi ----------------------------------------------------------------------- Summary of changes: build/tools/make_release | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) hooks/post-receive -- Evergreen ILS