Skip to content

Commit 71e2d75

Browse files
boverhofboverhof
authored
Merge pull request #41 from kbuma/issue-40
making it easier to build on a base image
2 parents 516e2b3 + 2dacdaf commit 71e2d75

5 files changed

Lines changed: 52 additions & 34 deletions

File tree

‎.gitignore‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,27 @@
11
*.DS_Store
22
*.msm
3+
*.opensdf
34
*.sdf
45
*.snk
56
*.suo
7+
*.swp
8+
*.user
9+
*.*~
10+
.vs/
611
Debug*/
712
Debug/
13+
Master/ipch/
814
Master/UC2/UC2_i.c
915
Master/UC2/UC2_i.h
1016
Master/UC2/UC2_p.c
1117
Master/UC2/dlldata.c
1218
Master/packages/
19+
Master/test/Flash_Example/trunk/ACM/AM_Flash_Example/
20+
Master/test/LongRun/ACM/AM_long
21+
Master/test/gPROMStest/input/
22+
Master/test/gPROMStest/sinterInput.xml
23+
Master/test/models/SimpleExcelTest/test-ouputs.json
1324
Release*/
1425
SimSinter-Build.trx
1526
ccsi_W7-BUILD*
27+
Administrator_WIN-*/

‎Master/SimSinter.sln‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,20 +34,16 @@ EndProject
3434
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VariableTree", "VariableTree\VariableTree.csproj", "{91A832D4-F4D3-463A-AE9B-86EA66A7E94A}"
3535
EndProject
3636
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sinter", "Sinter\Sinter.csproj", "{7AA14B52-B1B5-4B84-A884-48F0E6710AC4}"
37+
ProjectSection(ProjectDependencies) = postProject
38+
{9C401C39-FE2D-4D9F-B085-24591DEFE125} = {9C401C39-FE2D-4D9F-B085-24591DEFE125}
39+
EndProjectSection
3740
EndProject
3841
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UC2", "UC2\UC2.vcxproj", "{9C401C39-FE2D-4D9F-B085-24591DEFE125}"
3942
EndProject
4043
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UC2PS", "UC2\UC2PS.vcxproj", "{0E8BE5CE-936E-4EF5-AE48-26CAFB2858B7}"
4144
EndProject
4245
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DefaultBuilder", "DefaultBuilder\DefaultBuilder.csproj", "{5D744A9E-5ACD-4FCC-910A-7E3D5640F284}"
4346
EndProject
44-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{1E46E861-5105-4388-B2D0-F182634A14E3}"
45-
ProjectSection(SolutionItems) = preProject
46-
.nuget\NuGet.Config = .nuget\NuGet.Config
47-
.nuget\NuGet.exe = .nuget\NuGet.exe
48-
.nuget\NuGet.targets = .nuget\NuGet.targets
49-
EndProjectSection
50-
EndProject
5147
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataGrid2DLibrary", "DataGrid2DLibrary\DataGrid2DLibrary.csproj", "{7D76D9E7-AF25-4AA5-995B-E1A526F192EA}"
5248
EndProject
5349
Global

‎Master/SinterRegressionTests/app.config‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -8,46 +8,46 @@
88
<userSettings>
99
<SinterRegressionTests.Properties.Settings>
1010
<setting name="ExcelSinterJson" serializeAs="String">
11-
<value>..\..\..\test\models\SimpleExcelTest\exceltest-sinter.json</value>
11+
<value>..\..\..\SimSinter\Master\test\models\SimpleExcelTest\exceltest-sinter.json</value>
1212
</setting>
1313
<setting name="ExcelSinterDefaults" serializeAs="String">
14-
<value>..\..\..\test\models\SimpleExcelTest\exceltest-defaults.json</value>
14+
<value>..\..\..\SimSinter\Master\test\models\SimpleExcelTest\exceltest-defaults.json</value>
1515
</setting>
1616
<setting name="ExcelSinterInputs" serializeAs="String">
17-
<value>..\..\..\test\models\SimpleExcelTest\exceltest-inputs.json</value>
17+
<value>..\..\..\SimSinter\Master\test\models\SimpleExcelTest\exceltest-inputs.json</value>
1818
</setting>
1919
<setting name="ExcelSinterOutputs" serializeAs="String">
20-
<value>..\..\..\test\models\SimpleExcelTest\test-ouputs.json</value>
20+
<value>..\..\..\SimSinter\Master\test\models\SimpleExcelTest\test-ouputs.json</value>
2121
</setting>
2222
<setting name="ExcelSinterCanonicalOutputs" serializeAs="String">
23-
<value>..\..\..\test\models\SimpleExcelTest\outputs-canonical.json</value>
23+
<value>..\..\..\SimSinter\Master\test\models\SimpleExcelTest\outputs-canonical.json</value>
2424
</setting>
2525
<setting name="UnitsTestSinter" serializeAs="String">
26-
<value>..\..\..\test\UnitsTest\unitstest-sinter.json</value>
26+
<value>..\..\..\SimSinter\Master\test\UnitsTest\unitstest-sinter.json</value>
2727
</setting>
2828
<setting name="UnitsTestInputs" serializeAs="String">
29-
<value>..\..\..\test\UnitsTest\unitstest-inputs.json</value>
29+
<value>..\..\..\SimSinter\Master\test\UnitsTest\unitstest-inputs.json</value>
3030
</setting>
3131
<setting name="UnitsWorkingDir" serializeAs="String">
3232
<value>..\..\UnitsTest\</value>
3333
</setting>
3434
<setting name="FlashACMConfig" serializeAs="String">
35-
<value>..\..\..\test\Flash_Example\trunk\ACM\Flash_Example_ACM.json</value>
35+
<value>..\..\..\SimSinter\Master\test\Flash_Example\trunk\ACM\Flash_Example_ACM.json</value>
3636
</setting>
3737
<setting name="FlashAPConfig" serializeAs="String">
38-
<value>..\..\..\test\Flash_Example\trunk\Aspen_Plus\Flash_Example_AP.json</value>
38+
<value>..\..\..\SimSinter\Master\test\Flash_Example\trunk\Aspen_Plus\Flash_Example_AP.json</value>
3939
</setting>
4040
<setting name="sinterConfiguration" serializeAs="String">
41-
<value>..\..\..\test\Flash_Example\trunk\Aspen_Plus\Flash_Example_AP.json</value>
41+
<value>..\..\..\SimSinter\Master\test\Flash_Example\trunk\Aspen_Plus\Flash_Example_AP.json</value>
4242
</setting>
4343
<setting name="simulationBackup" serializeAs="String">
44-
<value>..\..\..\test\Flash_Example\trunk\Aspen_Plus\Flash_Example.bkp</value>
44+
<value>..\..\..\SimSinter\Master\test\Flash_Example\trunk\Aspen_Plus\Flash_Example.bkp</value>
4545
</setting>
4646
<setting name="jsonConfiguration" serializeAs="String">
47-
<value>..\..\..\test\Flash_Example\trunk\Aspen_Plus\Flash_Example_AP.json</value>
47+
<value>..\..\..\SimSinter\Master\test\Flash_Example\trunk\Aspen_Plus\Flash_Example_AP.json</value>
4848
</setting>
4949
<setting name="ACMConfiguration" serializeAs="String">
50-
<value>..\..\..\test\Flash_Example\trunk\ACM\Flash_Example_ACM.json</value>
50+
<value>..\..\..\SimSinter\Master\test\Flash_Example\trunk\ACM\Flash_Example_ACM.json</value>
5151
</setting>
5252
<setting name="ACMFilename" serializeAs="String">
5353
<value>Flash_Example_ACM.json</value>
@@ -56,34 +56,34 @@
5656
<value>Flash_Example_AP.json</value>
5757
</setting>
5858
<setting name="ACMDir" serializeAs="String">
59-
<value>..\..\..\test\Flash_Example\trunk\ACM</value>
59+
<value>..\..\..\SimSinter\Master\test\Flash_Example\trunk\ACM</value>
6060
</setting>
6161
<setting name="APDir" serializeAs="String">
62-
<value>..\..\..\test\Flash_Example\trunk\Aspen_Plus\</value>
62+
<value>..\..\..\SimSinter\Master\test\Flash_Example\trunk\Aspen_Plus\</value>
6363
</setting>
6464
<setting name="ExcelWorksheet" serializeAs="String">
65-
<value>..\..\..\SinterExcelTest\models\SimpleExcelTest\exceltest.xlsm</value>
65+
<value>..\..\..\SimSinter\Master\SinterExcelTest\models\SimpleExcelTest\exceltest.xlsm</value>
6666
</setting>
6767
<setting name="LongACMConfig" serializeAs="String">
68-
<value>..\..\..\test\LongRun\ACM\long.json</value>
68+
<value>..\..\..\SimSinter\Master\test\LongRun\ACM\long.json</value>
6969
</setting>
7070
<setting name="LongACMFilename" serializeAs="String">
7171
<value>long.json</value>
7272
</setting>
7373
<setting name="LongACMDir" serializeAs="String">
74-
<value>..\..\..\test\LongRun\ACM\</value>
74+
<value>..\..\..\SimSinter\Master\test\LongRun\ACM\</value>
7575
</setting>
7676
<setting name="LongAPConfig" serializeAs="String">
77-
<value>..\..\..\test\LongRun\AP\long.json</value>
77+
<value>..\..\..\SimSinter\Master\test\LongRun\AP\long.json</value>
7878
</setting>
7979
<setting name="LongAPFilename" serializeAs="String">
8080
<value>long.json</value>
8181
</setting>
8282
<setting name="LongAPDir" serializeAs="String">
83-
<value>..\..\..\test\LongRun\AP</value>
83+
<value>..\..\..\SimSinter\Master\test\LongRun\AP</value>
8484
</setting>
8585
<setting name="DynamicACMDir" serializeAs="String">
86-
<value>..\..\..\test\DynamicTest</value>
86+
<value>..\..\..\SimSinter\Master\test\DynamicTest</value>
8787
</setting>
8888
<setting name="DynamicACMFilename" serializeAs="String">
8989
<value>BFB.json</value>
@@ -95,13 +95,13 @@
9595
<value>Inputs_2.json</value>
9696
</setting>
9797
<setting name="gPROMSConfig" serializeAs="String">
98-
<value>..\..\..\test\gPROMStest\BufferTank_FO.json</value>
98+
<value>..\..\..\SimSinter\Master\test\gPROMStest\BufferTank_FO.json</value>
9999
</setting>
100100
<setting name="gPROMSFilename" serializeAs="String">
101101
<value>BufferTank_FO.json</value>
102102
</setting>
103103
<setting name="gPROMSDir" serializeAs="String">
104-
<value>..\..\..\test\gPROMStest</value>
104+
<value>..\..\..\SimSinter\Master\test\gPROMStest</value>
105105
</setting>
106106
</SinterRegressionTests.Properties.Settings>
107107
</userSettings>

‎Master/UC2/UC2.vcxproj‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,12 @@
136136
<AddModuleNamesToAssembly>
137137
</AddModuleNamesToAssembly>
138138
</Link>
139+
<PostBuildEvent>
140+
<Command>"C:\Windows\System32\regsvr32.exe" /s "$(TargetPath)"</Command>
141+
</PostBuildEvent>
142+
<PostBuildEvent>
143+
<Message>Register UC2Lib COM</Message>
144+
</PostBuildEvent>
139145
</ItemDefinitionGroup>
140146
<ItemGroup>
141147
<ClCompile Include="dllmain.cpp">

‎make.bat‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,17 @@ REM - NuGet Package Manager
1212
REM - Wix Toolset v3.10
1313

1414
REM Copy installer files to local directory
15-
copy "C:\Program Files\Common files\Merge Modules\Microsoft_VC110_CRT_x86.msm" Master\CCSIUnitsInstaller
16-
copy "C:\Program Files\Common files\Merge Modules\Microsoft_VC110_ATL_x86.msm" Master\CCSIUnitsInstaller
15+
REM - this didn't work - copy "C:\Program Files\Common files\Merge Modules\Microsoft_VC110_CRT_x86.msm" Master\CCSIUnitsInstaller
16+
REM - this didn't work - copy "C:\Program Files\Common files\Merge Modules\Microsoft_VC110_ATL_x86.msm" Master\CCSIUnitsInstaller
17+
copy "C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC110_CRT_x86.msm" Master\CCSIUnitsInstaller
18+
copy "C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC110_ATL_x86.msm" Master\CCSIUnitsInstaller
1719

1820
REM Compile the UC2 udunits2 library
1921
cd Master\UC2\udunits2
2022
cmake clean .
2123
cmake --build . --config Release
24+
copy expat\Release\expat.dll C:\Windows\expat.dll
25+
copy lib\Release\udunits2.dll C:\Windows\udunits2.dll
2226
cd ..\..\..
2327

2428
REM Get SimSinter dependencies
@@ -27,7 +31,7 @@ nuget.exe restore Master
2731

2832
REM Compile the SimSinter project
2933
REM MSBuild.exe must be in the PATH
30-
MSBuild.exe /t:Clean Master\SimSinter.sln
34+
MSBuild.exe /t:Clean /p:Configuration=Release Master\SimSinter.sln
3135
MSBuild.exe /p:Configuration=Release Master\SimSinter.sln
3236

3337
REM Run the Tests
@@ -37,4 +41,4 @@ REM Delete the previous test results
3741
if EXIST SimSinter-Build.trx. (
3842
del SimSinter-Build.trx
3943
)
40-
MSTest.exe /resultsfile:SimSinter-Build.trx /test:SinterRegressionTests.SinterInputTests.ParseVariableTest /testcontainer:C:\Jenkins\workspace\SimSinter\Master\SinterRegressionTests\bin\Release\SinterRegressionTests.dll
44+
MSTest.exe /resultsfile:SimSinter-Build.trx /testcontainer:Master\SinterRegressionTests\bin\Release\SinterRegressionTests.dll

0 commit comments

Comments
 (0)