From dbb32aed9ea02c715a54336b49f9934aca71344c Mon Sep 17 00:00:00 2001 From: Phillip Mienk Date: Fri, 6 Nov 2026 22:16:53 -0800 Subject: [PATCH 1/2] Modify tag creation script for redundancy without error. --- maintenance/create-version-tag.sh | 36 +++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/maintenance/create-version-tag.sh b/maintenance/create-version-tag.sh index da802eb8..28a3d69d 100755 --- a/maintenance/create-version-tag.sh +++ b/maintenance/create-version-tag.sh @@ -154,27 +154,45 @@ echo "Computed tag: ${TAG}" # ------------------------------------------------------------------ echo "=== Creating tag ===" +TAG_EXISTS_LOCALLY=0 if git rev-parse "${TAG}" >/dev/null 2>&1; then - echo "Error: Tag ${TAG} already exists." >&2 - exit 1 + echo "Tag ${TAG} already exists locally." + TAG_EXISTS_LOCALLY=1 fi if [[ ${DRY_RUN} -eq 1 ]]; then - echo "[dry-run] Would create annotated tag: ${TAG}" - echo "[dry-run] Message: ${DESCRIPTION}" + if [[ ${TAG_EXISTS_LOCALLY} -eq 0 ]]; then + echo "[dry-run] Would create annotated tag: ${TAG}" + echo "[dry-run] Message: ${DESCRIPTION}" + else + echo "[dry-run] Tag ${TAG} already exists locally; would skip creation." + fi if [[ -n "${REMOTE}" ]]; then - echo "[dry-run] Would push: git push ${REMOTE} ${TAG}" + if git ls-remote --exit-code --tags "${REMOTE}" "refs/tags/${TAG}" >/dev/null 2>&1; then + echo "[dry-run] Tag ${TAG} already exists on remote '${REMOTE}'; would skip push." + else + echo "[dry-run] Would push: git push ${REMOTE} ${TAG}" + fi else echo "[dry-run] Would not push (no remote specified)" fi exit 0 fi -git tag -a "${TAG}" -m "${DESCRIPTION}" +if [[ ${TAG_EXISTS_LOCALLY} -eq 0 ]]; then + git tag -a "${TAG}" -m "${DESCRIPTION}" + echo "Created annotated tag '${TAG}' locally." +else + echo "Skipping local tag creation (already exists)." +fi if [[ -n "${REMOTE}" ]]; then - git push "${REMOTE}" "${TAG}" - echo "Created tag '${TAG}' and pushed to remote '${REMOTE}'." + if git ls-remote --exit-code --tags "${REMOTE}" "refs/tags/${TAG}" >/dev/null 2>&1; then + echo "Tag '${TAG}' already exists on remote '${REMOTE}'; skipping push." + else + git push "${REMOTE}" "${TAG}" + echo "Pushed tag '${TAG}' to remote '${REMOTE}'." + fi else - echo "Created tag '${TAG}' locally (no push)." + echo "No remote specified; tag remains local only." fi From 3da734f292a57e16fbccd2fc2bc58742711454af Mon Sep 17 00:00:00 2001 From: Phillip Mienk Date: Mon, 16 Nov 2026 14:05:30 -0800 Subject: [PATCH 2/2] Rationalize CMakePresets and install script --hardware- by removing --hardware- (including optimized) options, adding native to presets. --- templates/shell/install-bash.gsl | 164 +++++++++++++------------- version4.xml | 195 +++++++++++++++++++------------ 2 files changed, 207 insertions(+), 152 deletions(-) diff --git a/templates/shell/install-bash.gsl b/templates/shell/install-bash.gsl index fbd8f4ec..b00c5c71 100644 --- a/templates/shell/install-bash.gsl +++ b/templates/shell/install-bash.gsl @@ -589,45 +589,47 @@ $(fix_column("", " $(_option->hint.text)", my.column, my.prefix, my.suffix)) . endfor . endnew . -. new platforms as _platforms -. compute_unique_hardware_platforms(_platforms, my.configuration, my.repository, \ - my.install) +. if defined(my.meta->hardware) & is_defined_positive(my.meta->hardware, "enabled") +. new platforms as _platforms +. compute_unique_hardware_platforms(_platforms, my.configuration, my.repository, \ + my.install) . -. for _platforms.platform as _platform +. for _platforms.platform as _platform . $(my.prefix)$(my.suffix) $(my.prefix)Hardware configuration options for $(_platform.name):$(my.suffix) . -. for my.install.dependency as _depend -. if (count_matches_name(my.configuration, "repository", _depend.name) = 0) -. next -. endif -. -. define my.deprepo = my.configuration->repository(.name = _depend.name) -. -. for my.deprepo. as _target -. if !(name(_target) = "library") & \ - !(_depend.name = my.repository.name) +. for my.install.dependency as _depend +. if (count_matches_name(my.configuration, "repository", _depend.name) = 0) . next . endif . -. if !defined(_target->compiler) -. next -. endif +. define my.deprepo = my.configuration->repository(.name = _depend.name) +. +. for my.deprepo. as _target +. if !(name(_target) = "library") & \ + !(_depend.name = my.repository.name) +. next +. endif +. +. if !defined(_target->compiler) +. next +. endif . -. for _target->compiler. as _cele \ - where defined(_cele.option) & \ - defined(_cele.platform) & \ - (_cele.platform = _platform.name) +. for _target->compiler. as _cele \ + where defined(_cele.option) & \ + defined(_cele.platform) & \ + (_cele.platform = _platform.name) . -. define my.option = _target->option(.name = _cele.option) +. define my.option = _target->option(.name = _cele.option) . $(fix_column(option_flag_hardware(my.option, my.meta), my.option.hardware, my.column, my.prefix, my.suffix)) +. endfor . endfor . endfor . endfor -. endfor -. endnew +. endnew +. endif . $(my.prefix)$(my.suffix) $(my.prefix)Recognized pass-through options:$(my.suffix) @@ -1283,40 +1285,42 @@ $(my.c_indent)case ${OPTION} in $(indent_column("(--build-$(option_name(_depend)))", "BUILD_$(option_name(_depend))=\"yes\";;", my.column, my.o_indent)) . endfor . -. new platforms as _platforms -. compute_unique_hardware_platforms(_platforms, my.configuration, my.repository, \ - my.install) -. -. for _platforms.platform as _platform -. for my.install.dependency as _depend -. if (count_matches_name(my.configuration, "repository", _depend.name) = 0) -. next -. endif +. if defined(my.meta->hardware) & is_defined_positive(my.meta->hardware, "enabled") +. new platforms as _platforms +. compute_unique_hardware_platforms(_platforms, my.configuration, my.repository, \ + my.install) . -. define my.deprepo = my.configuration->repository(.name = _depend.name) -. -. for my.deprepo. as _target -. if !(name(_target) = "library") & \ - !(_depend.name = my.repository.name) +. for _platforms.platform as _platform +. for my.install.dependency as _depend +. if (count_matches_name(my.configuration, "repository", _depend.name) = 0) . next . endif . -. if !defined(_target->compiler) -. next -. endif +. define my.deprepo = my.configuration->repository(.name = _depend.name) +. +. for my.deprepo. as _target +. if !(name(_target) = "library") & \ + !(_depend.name = my.repository.name) +. next +. endif +. +. if !defined(_target->compiler) +. next +. endif . -. for _target->compiler. as _cele \ - where defined(_cele.option) & \ - defined(_cele.platform) & \ - (_cele.platform = _platform.name) +. for _target->compiler. as _cele \ + where defined(_cele.option) & \ + defined(_cele.platform) & \ + (_cele.platform = _platform.name) . -. define my.option = _target->option(.name = _cele.option) +. define my.option = _target->option(.name = _cele.option) $(indent_column("($(option_flag_hardware(my.option, my.meta)))", "HARDWARE_$(my.option.name:c,upper)=\"yes\";;", my.column, my.o_indent)) +. endfor . endfor . endfor . endfor -. endfor -. endnew +. endnew +. endif . . new options as _build_options . canonicalize(_build_options, my.meta, my.configuration->registrar(id = "build-options"), "option", "id") @@ -1361,40 +1365,42 @@ $(my.indent)remove_configure_option "$(option_symbol("short", _symbol, _option, . endfor . endnew . -. new platforms as _platforms -. compute_unique_hardware_platforms(_platforms, my.configuration, my.repository, \ - my.install) +. if defined(my.meta->hardware) & is_defined_positive(my.meta->hardware, "enabled") +. new platforms as _platforms +. compute_unique_hardware_platforms(_platforms, my.configuration, my.repository, \ + my.install) . -. for _platforms.platform as _platform -. for my.install.dependency as _depend -. if (count_matches_name(my.configuration, "repository", _depend.name) = 0) -. next -. endif -. -. define my.deprepo = my.configuration->repository(.name = _depend.name) -. -. for my.deprepo. as _target -. if !(name(_target) = "library") & \ - !(_depend.name = my.repository.name) +. for _platforms.platform as _platform +. for my.install.dependency as _depend +. if (count_matches_name(my.configuration, "repository", _depend.name) = 0) . next . endif . -. if !defined(_target->compiler) -. next -. endif +. define my.deprepo = my.configuration->repository(.name = _depend.name) . -. for _target->compiler. as _cele \ - where defined(_cele.option) & \ - defined(_cele.platform) & \ - (_cele.platform = _platform.name) +. for my.deprepo. as _target +. if !(name(_target) = "library") & \ + !(_depend.name = my.repository.name) +. next +. endif . -. define my.option = _target->option(.name = _cele.option) +. if !defined(_target->compiler) +. next +. endif +. +. for _target->compiler. as _cele \ + where defined(_cele.option) & \ + defined(_cele.platform) & \ + (_cele.platform = _platform.name) +. +. define my.option = _target->option(.name = _cele.option) $(my.indent)remove_configure_option "--hardware-$(my.option.name)" +. endfor . endfor . endfor . endfor -. endfor -. endnew +. endnew +. endif . . define my.canonical = my.meta->build(is_defined_positive(build, "canonical")) . @@ -1694,17 +1700,19 @@ $(my.indent)msg_verbose "*** SANITIZED: ${CONFIGURE_OPTIONS[*]}" msg_verbose "MACOSX_DEPLOYMENT_TARGET using defined value '${MACOSX_DEPLOYMENT_TARGET}'" fi +. if defined(my.meta->hardware) & is_defined_positive(my.meta->hardware, "enabled") # HARDWARE_OPTIMIZED if [[ "${HARDWARE_OPTIMIZED}" == "yes" ]]; then ARCHTUNE="-march=native -mtune=native" fi . -. new platforms as _platforms -. compute_unique_hardware_platforms(_platforms, my.configuration, my.repository, \ - my.install) -. define_platform_hardware_options(_platforms, my.meta, my.configuration, \ - my.repository, my.install, " ") -. endnew +. new platforms as _platforms +. compute_unique_hardware_platforms(_platforms, my.configuration, my.repository, \ + my.install) +. define_platform_hardware_options(_platforms, my.meta, my.configuration, \ + my.repository, my.install, " ") +. endnew +. endif . .# for my.install.dependency as _depend .# if (count_matches_name(my.configuration, "repository", _depend.name) = 0) diff --git a/version4.xml b/version4.xml index 4fa9fe6f..a88dfd7e 100644 --- a/version4.xml +++ b/version4.xml @@ -4243,9 +4243,16 @@ -