From e356fc0a10e2e2f5660ad42c2c5b2f577d3a636e Mon Sep 17 00:00:00 2001 From: amc1999 <29126882+amc1999@users.noreply.github.com> Date: Wed, 31 Jul 2024 16:11:38 -0400 Subject: [PATCH] update MacOS Xcode projects --- .../RiskPaths/Model.xcodeproj/project.pbxproj | 4 ++-- models/omc-compile.sh | 10 ++++++---- openm/omc/omc.xcodeproj/project.pbxproj | 18 ++++++++++++------ 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/models/RiskPaths/Model.xcodeproj/project.pbxproj b/models/RiskPaths/Model.xcodeproj/project.pbxproj index 7fa7a234d..8a5325bd3 100644 --- a/models/RiskPaths/Model.xcodeproj/project.pbxproj +++ b/models/RiskPaths/Model.xcodeproj/project.pbxproj @@ -251,7 +251,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "${SRCROOT}/../stop-ompp-ui-mac.sh\n"; + shellScript = "${SRCROOT}/stop-ompp-ui-mac.sh\n"; }; D8ECB9062493EBE100713545 /* Start UI */ = { isa = PBXShellScriptBuildPhase; @@ -269,7 +269,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "if [ \"$START_OMPP_UI\" = \"1\" ] || [ \"$START_OMPP_UI\" = \"true\" ] || [ \"$START_OMPP_UI\" = \"yes\" ] ; then ${SRCROOT}/../start-ompp-ui-mac.sh; fi\n"; + shellScript = "if [ \"$START_OMPP_UI\" = \"1\" ] || [ \"$START_OMPP_UI\" = \"true\" ] || [ \"$START_OMPP_UI\" = \"yes\" ] ; then ${SRCROOT}/start-ompp-ui-mac.sh; fi\n"; }; /* End PBXShellScriptBuildPhase section */ diff --git a/models/omc-compile.sh b/models/omc-compile.sh index 74dbe0dc6..23f9d9315 100755 --- a/models/omc-compile.sh +++ b/models/omc-compile.sh @@ -38,7 +38,11 @@ fi # OMC_MODEL_DOC_OPTS= if [ -z "${MODEL_DOC_DISABLE}" ]; then - OMC_MODEL_DOC_OPTS="-Omc.ModelDoc true -Omc.ModelDevDoc true" + + [ -z "${MODEL_INDOC_DIR}" ] && MODEL_INDOC_DIR="doc" + [ -z "${MODEL_OUTDOC_DIR}" ] && MODEL_OUTDOC_DIR="${TARGET_BUILD_DIR}/doc" + + OMC_MODEL_DOC_OPTS="-Omc.ModelDoc true -d ${MODEL_INDOC_DIR} -omc.OutDocDir ${MODEL_OUTDOC_DIR}" if [ ! -d "${MODEL_OUTDOC_DIR}" ]; then mkdir "${MODEL_OUTDOC_DIR}" @@ -58,8 +62,6 @@ ${OMC_EXE} \ ${OMC_FIXED_OPT} \ ${OMC_NO_LINE_OPT} \ ${OMC_CODE_PAGE_OPT} \ - ${OMC_MODEL_DOC_OPTS} \ - -d ${MODEL_INDOC_DIR} \ - -omc.OutDocDir ${MODEL_OUTDOC_DIR} + ${OMC_MODEL_DOC_OPTS} # done diff --git a/openm/omc/omc.xcodeproj/project.pbxproj b/openm/omc/omc.xcodeproj/project.pbxproj index c97bbdb08..754c88c83 100644 --- a/openm/omc/omc.xcodeproj/project.pbxproj +++ b/openm/omc/omc.xcodeproj/project.pbxproj @@ -9,8 +9,9 @@ /* Begin PBXBuildFile section */ D807DC6424CBC765002E55F6 /* Literal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D807DC6224CBC765002E55F6 /* Literal.cpp */; }; D807DC6524CBC765002E55F6 /* omc_csv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D807DC6324CBC765002E55F6 /* omc_csv.cpp */; }; - D810E02D2B68355F00BFF166 /* omc_model_doc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D810E02B2B68355F00BFF166 /* omc_model_doc.cpp */; }; D81B6808262DF61400E5CD68 /* AnonGroupSymbol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D81B6806262DF61400E5CD68 /* AnonGroupSymbol.cpp */; }; + D83D70132C5AAD2300182DF2 /* omc_markup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D83D70112C5AAD2300182DF2 /* omc_markup.cpp */; }; + D83D70142C5AAD2300182DF2 /* omc_model_doc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D83D70122C5AAD2300182DF2 /* omc_model_doc.cpp */; }; D893973E247EB25300D61DAA /* libiconv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = D893973D247EB20600D61DAA /* libiconv.tbd */; }; D8939740247EB25E00D61DAA /* liblibsqlite.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D893973F247EB25E00D61DAA /* liblibsqlite.a */; }; D8939742247EB26400D61DAA /* liblibopenm_omc_db.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D8939741247EB26400D61DAA /* liblibopenm_omc_db.a */; }; @@ -108,10 +109,12 @@ D807DC6124CBC765002E55F6 /* omc_csv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = omc_csv.h; sourceTree = ""; }; D807DC6224CBC765002E55F6 /* Literal.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Literal.cpp; sourceTree = ""; }; D807DC6324CBC765002E55F6 /* omc_csv.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = omc_csv.cpp; sourceTree = ""; }; - D810E02B2B68355F00BFF166 /* omc_model_doc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = omc_model_doc.cpp; sourceTree = ""; }; - D810E02C2B68355F00BFF166 /* omc_model_doc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = omc_model_doc.h; sourceTree = ""; }; D81B6806262DF61400E5CD68 /* AnonGroupSymbol.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AnonGroupSymbol.cpp; sourceTree = ""; }; D81B6807262DF61400E5CD68 /* AnonGroupSymbol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AnonGroupSymbol.h; sourceTree = ""; }; + D83D700F2C5AAD2300182DF2 /* omc_markup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = omc_markup.h; sourceTree = ""; }; + D83D70102C5AAD2300182DF2 /* omc_model_doc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = omc_model_doc.h; sourceTree = ""; }; + D83D70112C5AAD2300182DF2 /* omc_markup.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = omc_markup.cpp; sourceTree = ""; }; + D83D70122C5AAD2300182DF2 /* omc_model_doc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = omc_model_doc.cpp; sourceTree = ""; }; D893973D247EB20600D61DAA /* libiconv.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libiconv.tbd; path = usr/lib/libiconv.tbd; sourceTree = SDKROOT; }; D893973F247EB25E00D61DAA /* liblibsqlite.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = liblibsqlite.a; sourceTree = BUILT_PRODUCTS_DIR; }; D8939741247EB26400D61DAA /* liblibopenm_omc_db.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = liblibopenm_omc_db.a; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -450,6 +453,10 @@ D8FD88AD247D846C0006D608 /* omc.cpp */, D807DC6124CBC765002E55F6 /* omc_csv.h */, D807DC6324CBC765002E55F6 /* omc_csv.cpp */, + D83D700F2C5AAD2300182DF2 /* omc_markup.h */, + D83D70102C5AAD2300182DF2 /* omc_model_doc.h */, + D83D70122C5AAD2300182DF2 /* omc_model_doc.cpp */, + D83D70112C5AAD2300182DF2 /* omc_markup.cpp */, D8FD88B3247D846C0006D608 /* ParameterGroupSymbol.cpp */, D8FD88A4247D846B0006D608 /* ParameterGroupSymbol.h */, D8FD884C247D84300006D608 /* BoolSymbol.h */, @@ -541,8 +548,6 @@ D8FD890C247DA27A0006D608 /* Xcode-src */ = { isa = PBXGroup; children = ( - D810E02B2B68355F00BFF166 /* omc_model_doc.cpp */, - D810E02C2B68355F00BFF166 /* omc_model_doc.h */, D8FD8916247DAF1C0006D608 /* location.hh */, D8FD8917247DAF1C0006D608 /* parser.hpp */, D8FD8918247DAF1C0006D608 /* position.hh */, @@ -674,13 +679,13 @@ D8FD88C5247D846C0006D608 /* ModelTypeSymbol.cpp in Sources */, D8FD8903247D84B30006D608 /* ParseContext.cpp in Sources */, D8FD88BC247D846C0006D608 /* omc_file.cpp in Sources */, - D810E02D2B68355F00BFF166 /* omc_model_doc.cpp in Sources */, D8FD8884247D84330006D608 /* DependencyGroupSymbol.cpp in Sources */, D8FD8882247D84330006D608 /* BuiltinAttributeSymbol.cpp in Sources */, D8ED3FA62AF47E2C00CFC26C /* omc_model_metrics.cpp in Sources */, D8FD8893247D84330006D608 /* ExtendParameterSymbol.cpp in Sources */, D8FD888C247D84330006D608 /* EntitySymbol.cpp in Sources */, D8FD88BF247D846C0006D608 /* ModelSymbol.cpp in Sources */, + D83D70142C5AAD2300182DF2 /* omc_model_doc.cpp in Sources */, D8FD88C6247D846C0006D608 /* ImportSymbol.cpp in Sources */, D8FD88C8247D846C0006D608 /* NumericSymbol.cpp in Sources */, D8FD8892247D84330006D608 /* ClassificationSymbol.cpp in Sources */, @@ -719,6 +724,7 @@ D8FD888B247D84330006D608 /* DerivedTableSymbol.cpp in Sources */, D8FD88BA247D846C0006D608 /* GroupSymbol.cpp in Sources */, D8FD8891247D84330006D608 /* EntityIncrementSymbol.cpp in Sources */, + D83D70132C5AAD2300182DF2 /* omc_markup.cpp in Sources */, D8FD8913247DA43B0006D608 /* scanner.cpp in Sources */, D8FD8832247D83D20006D608 /* BoolSymbol.cpp in Sources */, D8FD88FA247D84B30006D608 /* TypeSymbol.cpp in Sources */,