From 53bc590af4e97c2ae1ed770e604371618dfff36a Mon Sep 17 00:00:00 2001
From: amc1999 <amc1999@gmail.com>
Date: Wed, 10 Apr 2024 14:24:56 -0400
Subject: [PATCH] MSBuild: change targets order to copy model ini files before
 run the model

---
 props/model-ompp.4.build.targets | 66 ++++++++++++++++----------------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/props/model-ompp.4.build.targets b/props/model-ompp.4.build.targets
index 8118281f8..3ae5d36fd 100644
--- a/props/model-ompp.4.build.targets
+++ b/props/model-ompp.4.build.targets
@@ -161,41 +161,12 @@
   </PropertyGroup>
 
   <!--
-  ModelPublish
-  -->
-  
-  <!-- The following properties help make the ModelPublish target and output more readable. -->
-  <PropertyGroup>
-    <PUBLISH_TICKLE>$(MODEL_BIN_DIR)/$(MODEL_NAME).publish.tickle</PUBLISH_TICKLE>
-    <PUBLISH_SQLITE_REL>$([MSBuild]::MakeRelative($(ProjectDir),$(PUBLISH_SQLITE)))</PUBLISH_SQLITE_REL>
-    <OM_SQL_DIR_REL>$([MSBuild]::MakeRelative($(ProjectDir),$(OM_SQL_DIR)))</OM_SQL_DIR_REL>
-    <!--  Replace back slash by forward slash. -->
-    <OM_SQL_DIR_REL>$(OM_SQL_DIR_REL.Replace(&quot;\&quot;,&quot;/&quot;))</OM_SQL_DIR_REL>
-  </PropertyGroup>
-
-  <Target Name="ModelPublish" 
-          Inputs="@(OMC_SQL_OUTPUTS)"
-          Outputs="$(PUBLISH_TICKLE)"
-          AfterTargets="link"
-          >
-    <Message Text="$(SQLITE_EXE) $(PUBLISH_SQLITE_REL) &lt; $(OM_SQL_DIR_REL)/sqlite/optional_meta_views_sqlite.sql" />
-    <Exec Command="$(COMPLETE_SQLITE_EXE) $(PUBLISH_SQLITE_REL) &lt; $(OM_SQL_DIR_REL)/sqlite/optional_meta_views_sqlite.sql" />
-
-    <Message Text="$(SQLITE_EXE) $(PUBLISH_SQLITE_REL) &lt; src/$(MODEL_NAME)_optional_views_sqlite.sql" />
-    <Exec Command="$(COMPLETE_SQLITE_EXE) $(PUBLISH_SQLITE_REL) &lt; src/$(MODEL_NAME)_optional_views_sqlite.sql" />
-
-    <Touch  Files="$(PUBLISH_TICKLE)"
-            AlwaysCreate="true"
-            />
-  </Target>
-
-  <!--
-  ModelIniPublish
+  ModelIniPublish: copy model ini file into model bin diretcory
   -->
   <Target Name="ModelIniPublish" 
           Inputs="$(MODEL_INI_PATH)"
           Outputs="$(MODEL_BIN_DIR)/$(MODEL_INI)"
-          AfterTargets="link"
+          BeforeTargets="ModelPublish"
           >
     <!--  Skip copy if $(MODEL_INI) is empty or absent. -->
     <Message Text="Copy $(MODEL_INI) to $(MODEL_BIN_DIR)" Condition="'$(MODEL_INI)'!='' And Exists('$(MODEL_INI_PATH)')" />
@@ -208,12 +179,12 @@
   </Target>
 
   <!--
-  ModelMessageIniPublish
+  ModelMessageIniPublish: copy model translated messages ini file into model bin diretcory
   -->
   <Target Name="ModelMessageIniPublish" 
           Inputs="$(MODEL_MSG_INI_OMC_OUT)"
           Outputs="$(MODEL_BIN_DIR)/$(MODEL_MSG_INI)"
-          AfterTargets="link"
+          BeforeTargets="ModelPublish"
           >
     <!--  Skip copy if $(MODEL_MSG_INI) is absent. -->
     <Message Text="Copy $(MODEL_MSG_INI) to $(MODEL_BIN_DIR)" Condition="Exists('$(MODEL_MSG_INI_OMC_OUT)')" />
@@ -225,6 +196,35 @@
     />
   </Target>
   
+  <!--
+  ModelPublish
+  -->
+
+  <!-- The following properties help make the ModelPublish target and output more readable. -->
+  <PropertyGroup>
+    <PUBLISH_TICKLE>$(MODEL_BIN_DIR)/$(MODEL_NAME).publish.tickle</PUBLISH_TICKLE>
+    <PUBLISH_SQLITE_REL>$([MSBuild]::MakeRelative($(ProjectDir),$(PUBLISH_SQLITE)))</PUBLISH_SQLITE_REL>
+    <OM_SQL_DIR_REL>$([MSBuild]::MakeRelative($(ProjectDir),$(OM_SQL_DIR)))</OM_SQL_DIR_REL>
+    <!--  Replace back slash by forward slash. -->
+    <OM_SQL_DIR_REL>$(OM_SQL_DIR_REL.Replace(&quot;\&quot;,&quot;/&quot;))</OM_SQL_DIR_REL>
+  </PropertyGroup>
+
+  <Target Name="ModelPublish"
+          Inputs="@(OMC_SQL_OUTPUTS)"
+          Outputs="$(PUBLISH_TICKLE)"
+          AfterTargets="link"
+          >
+    <Message Text="$(SQLITE_EXE) $(PUBLISH_SQLITE_REL) &lt; $(OM_SQL_DIR_REL)/sqlite/optional_meta_views_sqlite.sql" />
+    <Exec Command="$(COMPLETE_SQLITE_EXE) $(PUBLISH_SQLITE_REL) &lt; $(OM_SQL_DIR_REL)/sqlite/optional_meta_views_sqlite.sql" />
+
+    <Message Text="$(SQLITE_EXE) $(PUBLISH_SQLITE_REL) &lt; src/$(MODEL_NAME)_optional_views_sqlite.sql" />
+    <Exec Command="$(COMPLETE_SQLITE_EXE) $(PUBLISH_SQLITE_REL) &lt; src/$(MODEL_NAME)_optional_views_sqlite.sql" />
+
+    <Touch  Files="$(PUBLISH_TICKLE)"
+            AlwaysCreate="true"
+            />
+  </Target>
+
   <!--
   RunModel
   -->