Merge pull request #41 from kbuma/issue-40

making it easier to build on a base image
CCSI-Toolset · Jul 26, 2023 · 71e2d75 · 71e2d75
2 parents 516e2b3 + 2dacdaf
commit 71e2d75
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 34 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,15 +1,27 @@
 *.DS_Store
 *.msm
+*.opensdf
 *.sdf
 *.snk
 *.suo
+*.swp
+*.user
+*.*~
+.vs/
 Debug*/
 Debug/
+Master/ipch/
 Master/UC2/UC2_i.c
 Master/UC2/UC2_i.h
 Master/UC2/UC2_p.c
 Master/UC2/dlldata.c
 Master/packages/
+Master/test/Flash_Example/trunk/ACM/AM_Flash_Example/
+Master/test/LongRun/ACM/AM_long
+Master/test/gPROMStest/input/
+Master/test/gPROMStest/sinterInput.xml
+Master/test/models/SimpleExcelTest/test-ouputs.json
 Release*/
 SimSinter-Build.trx
 ccsi_W7-BUILD*
+Administrator_WIN-*/
diff --git a/Master/SimSinter.sln b/Master/SimSinter.sln
@@ -34,20 +34,16 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VariableTree", "VariableTree\VariableTree.csproj", "{91A832D4-F4D3-463A-AE9B-86EA66A7E94A}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sinter", "Sinter\Sinter.csproj", "{7AA14B52-B1B5-4B84-A884-48F0E6710AC4}"
+	ProjectSection(ProjectDependencies) = postProject
+		{9C401C39-FE2D-4D9F-B085-24591DEFE125} = {9C401C39-FE2D-4D9F-B085-24591DEFE125}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UC2", "UC2\UC2.vcxproj", "{9C401C39-FE2D-4D9F-B085-24591DEFE125}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UC2PS", "UC2\UC2PS.vcxproj", "{0E8BE5CE-936E-4EF5-AE48-26CAFB2858B7}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DefaultBuilder", "DefaultBuilder\DefaultBuilder.csproj", "{5D744A9E-5ACD-4FCC-910A-7E3D5640F284}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{1E46E861-5105-4388-B2D0-F182634A14E3}"
-	ProjectSection(SolutionItems) = preProject
-		.nuget\NuGet.Config = .nuget\NuGet.Config
-		.nuget\NuGet.exe = .nuget\NuGet.exe
-		.nuget\NuGet.targets = .nuget\NuGet.targets
-	EndProjectSection
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataGrid2DLibrary", "DataGrid2DLibrary\DataGrid2DLibrary.csproj", "{7D76D9E7-AF25-4AA5-995B-E1A526F192EA}"
 EndProject
 Global

diff --git a/Master/SinterRegressionTests/app.config b/Master/SinterRegressionTests/app.config
@@ -8,46 +8,46 @@
     <userSettings>
         <SinterRegressionTests.Properties.Settings>
             <setting name="ExcelSinterJson" serializeAs="String">
-                <value>..\..\..\test\models\SimpleExcelTest\exceltest-sinter.json</value>
+                <value>..\..\..\SimSinter\Master\test\models\SimpleExcelTest\exceltest-sinter.json</value>
             </setting>
             <setting name="ExcelSinterDefaults" serializeAs="String">
-                <value>..\..\..\test\models\SimpleExcelTest\exceltest-defaults.json</value>
+                <value>..\..\..\SimSinter\Master\test\models\SimpleExcelTest\exceltest-defaults.json</value>
             </setting>
             <setting name="ExcelSinterInputs" serializeAs="String">
-                <value>..\..\..\test\models\SimpleExcelTest\exceltest-inputs.json</value>
+                <value>..\..\..\SimSinter\Master\test\models\SimpleExcelTest\exceltest-inputs.json</value>
             </setting>
             <setting name="ExcelSinterOutputs" serializeAs="String">
-                <value>..\..\..\test\models\SimpleExcelTest\test-ouputs.json</value>
+                <value>..\..\..\SimSinter\Master\test\models\SimpleExcelTest\test-ouputs.json</value>
             </setting>
             <setting name="ExcelSinterCanonicalOutputs" serializeAs="String">
-                <value>..\..\..\test\models\SimpleExcelTest\outputs-canonical.json</value>
+                <value>..\..\..\SimSinter\Master\test\models\SimpleExcelTest\outputs-canonical.json</value>
             </setting>
             <setting name="UnitsTestSinter" serializeAs="String">
-                <value>..\..\..\test\UnitsTest\unitstest-sinter.json</value>
+                <value>..\..\..\SimSinter\Master\test\UnitsTest\unitstest-sinter.json</value>
             </setting>
             <setting name="UnitsTestInputs" serializeAs="String">
-                <value>..\..\..\test\UnitsTest\unitstest-inputs.json</value>
+                <value>..\..\..\SimSinter\Master\test\UnitsTest\unitstest-inputs.json</value>
             </setting>
             <setting name="UnitsWorkingDir" serializeAs="String">
                 <value>..\..\UnitsTest\</value>
             </setting>
             <setting name="FlashACMConfig" serializeAs="String">
-                <value>..\..\..\test\Flash_Example\trunk\ACM\Flash_Example_ACM.json</value>
+                <value>..\..\..\SimSinter\Master\test\Flash_Example\trunk\ACM\Flash_Example_ACM.json</value>
             </setting>
             <setting name="FlashAPConfig" serializeAs="String">
-                <value>..\..\..\test\Flash_Example\trunk\Aspen_Plus\Flash_Example_AP.json</value>
+                <value>..\..\..\SimSinter\Master\test\Flash_Example\trunk\Aspen_Plus\Flash_Example_AP.json</value>
             </setting>
             <setting name="sinterConfiguration" serializeAs="String">
-                <value>..\..\..\test\Flash_Example\trunk\Aspen_Plus\Flash_Example_AP.json</value>
+                <value>..\..\..\SimSinter\Master\test\Flash_Example\trunk\Aspen_Plus\Flash_Example_AP.json</value>
             </setting>
             <setting name="simulationBackup" serializeAs="String">
-                <value>..\..\..\test\Flash_Example\trunk\Aspen_Plus\Flash_Example.bkp</value>
+                <value>..\..\..\SimSinter\Master\test\Flash_Example\trunk\Aspen_Plus\Flash_Example.bkp</value>
             </setting>
             <setting name="jsonConfiguration" serializeAs="String">
-                <value>..\..\..\test\Flash_Example\trunk\Aspen_Plus\Flash_Example_AP.json</value>
+                <value>..\..\..\SimSinter\Master\test\Flash_Example\trunk\Aspen_Plus\Flash_Example_AP.json</value>
             </setting>
             <setting name="ACMConfiguration" serializeAs="String">
-                <value>..\..\..\test\Flash_Example\trunk\ACM\Flash_Example_ACM.json</value>
+                <value>..\..\..\SimSinter\Master\test\Flash_Example\trunk\ACM\Flash_Example_ACM.json</value>
             </setting>
             <setting name="ACMFilename" serializeAs="String">
                 <value>Flash_Example_ACM.json</value>
@@ -56,34 +56,34 @@
                 <value>Flash_Example_AP.json</value>
             </setting>
             <setting name="ACMDir" serializeAs="String">
-                <value>..\..\..\test\Flash_Example\trunk\ACM</value>
+                <value>..\..\..\SimSinter\Master\test\Flash_Example\trunk\ACM</value>
             </setting>
             <setting name="APDir" serializeAs="String">
-                <value>..\..\..\test\Flash_Example\trunk\Aspen_Plus\</value>
+                <value>..\..\..\SimSinter\Master\test\Flash_Example\trunk\Aspen_Plus\</value>
             </setting>
             <setting name="ExcelWorksheet" serializeAs="String">
-                <value>..\..\..\SinterExcelTest\models\SimpleExcelTest\exceltest.xlsm</value>
+                <value>..\..\..\SimSinter\Master\SinterExcelTest\models\SimpleExcelTest\exceltest.xlsm</value>
             </setting>
             <setting name="LongACMConfig" serializeAs="String">
-                <value>..\..\..\test\LongRun\ACM\long.json</value>
+                <value>..\..\..\SimSinter\Master\test\LongRun\ACM\long.json</value>
             </setting>
             <setting name="LongACMFilename" serializeAs="String">
                 <value>long.json</value>
             </setting>
             <setting name="LongACMDir" serializeAs="String">
-                <value>..\..\..\test\LongRun\ACM\</value>
+                <value>..\..\..\SimSinter\Master\test\LongRun\ACM\</value>
             </setting>
             <setting name="LongAPConfig" serializeAs="String">
-                <value>..\..\..\test\LongRun\AP\long.json</value>
+                <value>..\..\..\SimSinter\Master\test\LongRun\AP\long.json</value>
             </setting>
             <setting name="LongAPFilename" serializeAs="String">
                 <value>long.json</value>
             </setting>
             <setting name="LongAPDir" serializeAs="String">
-                <value>..\..\..\test\LongRun\AP</value>
+                <value>..\..\..\SimSinter\Master\test\LongRun\AP</value>
             </setting>
             <setting name="DynamicACMDir" serializeAs="String">
-                <value>..\..\..\test\DynamicTest</value>
+                <value>..\..\..\SimSinter\Master\test\DynamicTest</value>
             </setting>
             <setting name="DynamicACMFilename" serializeAs="String">
                 <value>BFB.json</value>
@@ -95,13 +95,13 @@
                 <value>Inputs_2.json</value>
             </setting>
             <setting name="gPROMSConfig" serializeAs="String">
-                <value>..\..\..\test\gPROMStest\BufferTank_FO.json</value>
+                <value>..\..\..\SimSinter\Master\test\gPROMStest\BufferTank_FO.json</value>
             </setting>
             <setting name="gPROMSFilename" serializeAs="String">
                 <value>BufferTank_FO.json</value>
             </setting>
             <setting name="gPROMSDir" serializeAs="String">
-                <value>..\..\..\test\gPROMStest</value>
+                <value>..\..\..\SimSinter\Master\test\gPROMStest</value>
             </setting>
         </SinterRegressionTests.Properties.Settings>
     </userSettings>

diff --git a/Master/UC2/UC2.vcxproj b/Master/UC2/UC2.vcxproj
@@ -136,6 +136,12 @@
       <AddModuleNamesToAssembly>
       </AddModuleNamesToAssembly>
     </Link>
+    <PostBuildEvent>
+      <Command>"C:\Windows\System32\regsvr32.exe" /s "$(TargetPath)"</Command>
+    </PostBuildEvent>
+    <PostBuildEvent>
+      <Message>Register UC2Lib COM</Message>
+    </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="dllmain.cpp">

diff --git a/make.bat b/make.bat
@@ -12,13 +12,17 @@ REM   - NuGet Package Manager
 REM   - Wix Toolset v3.10
 
 REM Copy installer files to local directory
-copy "C:\Program Files\Common files\Merge Modules\Microsoft_VC110_CRT_x86.msm" Master\CCSIUnitsInstaller
-copy "C:\Program Files\Common files\Merge Modules\Microsoft_VC110_ATL_x86.msm" Master\CCSIUnitsInstaller
+REM - this didn't work - copy "C:\Program Files\Common files\Merge Modules\Microsoft_VC110_CRT_x86.msm" Master\CCSIUnitsInstaller
+REM - this didn't work - copy "C:\Program Files\Common files\Merge Modules\Microsoft_VC110_ATL_x86.msm" Master\CCSIUnitsInstaller
+copy "C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC110_CRT_x86.msm" Master\CCSIUnitsInstaller
+copy "C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC110_ATL_x86.msm" Master\CCSIUnitsInstaller
 
 REM Compile the UC2 udunits2 library
 cd Master\UC2\udunits2
 cmake clean .
 cmake --build . --config Release
+copy expat\Release\expat.dll C:\Windows\expat.dll
+copy lib\Release\udunits2.dll C:\Windows\udunits2.dll
 cd ..\..\..
 
 REM Get SimSinter dependencies
@@ -27,7 +31,7 @@ nuget.exe restore Master
 
 REM Compile the SimSinter project
 REM    MSBuild.exe must be in the PATH
-MSBuild.exe /t:Clean Master\SimSinter.sln  
+MSBuild.exe /t:Clean /p:Configuration=Release Master\SimSinter.sln  
 MSBuild.exe /p:Configuration=Release Master\SimSinter.sln 
 
 REM Run the Tests
@@ -37,4 +41,4 @@ REM Delete the previous test results
 if EXIST SimSinter-Build.trx. (
   del SimSinter-Build.trx 
 )
-MSTest.exe /resultsfile:SimSinter-Build.trx /test:SinterRegressionTests.SinterInputTests.ParseVariableTest /testcontainer:C:\Jenkins\workspace\SimSinter\Master\SinterRegressionTests\bin\Release\SinterRegressionTests.dll
+MSTest.exe /resultsfile:SimSinter-Build.trx /testcontainer:Master\SinterRegressionTests\bin\Release\SinterRegressionTests.dll