[ehb54/ultrascan3] b8c767: SOMO CMake: the root build puts SOMO in build/us_s...
Branch: refs/heads/ehb54-issue-943 Home: https://github.com/ehb54/ultrascan3 Commit: b8c76765db5577f0805794e2395d52a3acdffb3d https://github.com/ehb54/ultrascan3/commit/b8c76765db5577f0805794e2395d52a3a... Author: ehb54 <brookes@uthscsa.edu> Date: 2026-10-11 (Sun, 11 Oct 2026) Changed paths: M .github/workflows/somo-cmake-build.yml M us_somo/develop/CMakeLists.txt M us_somo/develop/README-cmake.md Log Message: ----------- SOMO CMake: the root build puts SOMO in build/us_somo, ready to run SOMO takes the directory above its program's bin/ as its system directory and, on its first start, installs its reference tables from etc/somo.*.new there. In a root build its programs were in the root's bin/, so that directory was the build directory, whose etc/ is UltraScan's (a link to the repository's etc/). There was nothing to install, and us3_somo stopped at "The somo.hybrid file ... could not be read". A root build now puts SOMO's programs and library in us_somo/bin and us_somo/lib under the build directory, and lays that subtree out as a SOMO-only build tree is: somo/ and etc/ linked to us_somo's, the helpers next to the programs, and bin64 linked to bin on Linux. So the programs run from there. UltraScan's own bin/, lib/ and etc/ are left as they are. The configure step prints where the programs are, and the CI's root job now also runs a batch from there. The root's deploy steps take SOMO from the source tree, where makesomo.sh puts it, as before. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Commit: 7c4b89f1106f74489fb34f4b7a02c22861474ccb https://github.com/ehb54/ultrascan3/commit/7c4b89f1106f74489fb34f4b7a02c2286... Author: ehb54 <brookes@uthscsa.edu> Date: 2026-10-11 (Sun, 11 Oct 2026) Changed paths: M .github/workflows/somo-cmake-build.yml M us_somo/develop/CMakeLists.txt M us_somo/develop/README-cmake.md M us_somo/develop/docker/build.sh Log Message: ----------- SOMO CMake: don't build us_admin us_admin is UltraScan II's administrator-password program: - no SOMO menu starts it (the entries are commented out); - nothing reads the password it writes to etc/db_admin.pd; - it does not start without an UltraScan II license file, but stops at "UltraScan could not find your license file", as the review found. So the CMake build leaves it out, and somo_add_gui_app loses the OUTPUT_NAME option it had only for it. qmake still builds it; removing it from SOMO is ehb54/ultrascan-tickets#1138. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Compare: https://github.com/ehb54/ultrascan3/compare/f9d74f93116b...7c4b89f1106f To unsubscribe from these emails, change your notification settings at https://github.com/ehb54/ultrascan3/settings/notifications
participants (1)
-
emre brookes