root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'R12.00' of http://10.65.20.33/sirio/CAMPO/campo into R12.00

Browse Source
This commit is contained in:
Alessandro Bonazzi 2021-11-24 13:23:57 +01:00
commit 0d36c066c9
9 changed files with 70 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/ci0.vcxproj
View File

@ -157,7 +157,8 @@
<OutputFile>$(IntDir)</OutputFile>
</Xdcmake>
<PostBuildEvent>
<Command>"C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x64\signtool.exe" sign /a /s MY /n "Sirio Informatica e Sistemi SPA" /t http://timestamp.verisign.com/scripts/timstamp.dll /v "$(TargetPath)"</Command>
<Command>
</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
@ -238,9 +239,6 @@
<ItemGroup>
<DirCompiler Include="..\src\ci\f125.dir" />
</ItemGroup>
<ItemGroup>
<TrrCompiler Include="..\src\ci\f125.trr" />
</ItemGroup>
<ItemGroup>
<CustomBuildStep Include="..\LIB\AgaLib.lib">
<FileType>Document</FileType>

8
build/ci0.vcxproj.filters
View File

@ -26,9 +26,6 @@
<Filter Include="Dir">
<UniqueIdentifier>{89609fb6-5a2f-4797-9a96-4c11c36f6ba9}</UniqueIdentifier>
</Filter>
<Filter Include="Trr">
<UniqueIdentifier>{b8783e0e-d110-4d0f-91fa-d216f945d8d0}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\src\ci\ci0.cpp">
@ -183,9 +180,4 @@
<Filter>Dir</Filter>
</DirCompiler>
</ItemGroup>
<ItemGroup>
<TrrCompiler Include="..\src\ci\f125.trr">
<Filter>Trr</Filter>
</TrrCompiler>
</ItemGroup>
</Project>

10
build/ci1.vcxproj
View File

@ -150,7 +150,8 @@
<OutputFile>$(IntDir)</OutputFile>
</Xdcmake>
<PostBuildEvent>
<Command>"C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x64\signtool.exe" sign /a /s MY /n "Sirio Informatica e Sistemi SPA" /t http://timestamp.verisign.com/scripts/timstamp.dll /v "$(TargetPath)"</Command>
<Command>
</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
@ -224,7 +225,9 @@
<SubType>Designer</SubType>
</RepCompiler>
<RepCompiler Include="..\src\ci\ci1300a.rep" />
<RepCompiler Include="..\src\ci\ci1300ab.rep" />
<RepCompiler Include="..\src\ci\ci1300ab.rep">
<SubType>Designer</SubType>
</RepCompiler>
<RepCompiler Include="..\src\ci\ci1300b.rep">
<SubType>Designer</SubType>
</RepCompiler>
@ -252,6 +255,9 @@
<Project>{0042619a-6b7c-4d3d-9cd9-9bdd8d200c15}</Project>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<TrrCompiler Include="..\src\ci\f125.trr" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="CampoRules.targets" />

8
build/ci1.vcxproj.filters
View File

@ -24,6 +24,9 @@
<UniqueIdentifier>{761cedef-6287-4694-85db-ae1a863da451}</UniqueIdentifier>
<Extensions>ini</Extensions>
</Filter>
<Filter Include="Masks\Trr">
<UniqueIdentifier>{b32c8fe3-ea2d-4e80-ba84-a6b647228aa2}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\src\ca\calib01.cpp">
@ -177,4 +180,9 @@
<ItemGroup>
<ResourceCompile Include="campo.rc" />
</ItemGroup>
<ItemGroup>
<TrrCompiler Include="..\src\ci\f125.trr">
<Filter>Masks\Trr</Filter>
</TrrCompiler>
</ItemGroup>
</Project>

3
build/ci2.vcxproj
View File

@ -154,7 +154,8 @@
<OutputFile>$(IntDir)</OutputFile>
</Xdcmake>
<PostBuildEvent>
<Command>"C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x64\signtool.exe" sign /a /s MY /n "Sirio Informatica e Sistemi SPA" /t http://timestamp.verisign.com/scripts/timstamp.dll /v "$(TargetPath)"</Command>
<Command>
</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>

3
build/xvaga.vcxproj
View File

@ -95,7 +95,8 @@
<OutputFile>$(IntDir)$(TargetName).bsc</OutputFile>
</Bscmake>
<PostBuildEvent>
<Command>"C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x64\signtool.exe" sign /a /s MY /n "Sirio Informatica e Sistemi SPA" /fd sha256 /tr http://timestamp.digicert.com /v "$(TargetPath)"</Command>
<Command>
</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

7
cd/test/ba1096.txt Normal file
View File

@ -0,0 +1,7 @@
ba0.exe
ba7100a.msk
ba8300b.msk
Controllata l'esistenza delle cartelle
temporanee nell'avvio del menù. Se non possono essere create il menù non parte.
Aggiunta la gestione moduli ai report.

41
cd/test/ba1096a.ini Normal file
View File

@ -0,0 +1,41 @@
[Main]
Demo=0
[ba0]
File(2) = ba0.exe|X
Patch = 1096
Versione = 21511200
[ba7]
File(507) = ba7100a.msk|X
Patch = 1096
Versione = 21511200
[ba8]
File(514) = ba8300b.msk|X
Patch = 1096
Versione = 21511200
[ba99]
Kill(0) = wxmsw240.dll|x
Kill(1) = batbsce.txt|x
Kill(2) = bastfsc.rep|x
Kill(3) = bastfsc.msk|x
Kill(4) = bastcms.msk|x
Kill(5) = bastcms.rep|x
Kill(6) = bastuue.rep|x
Kill(7) = bastuue.msk|x
[ba]
Data = 24-11-2021
Descrizione = Base
Dischi = 1
Moduli = sy
OEM =
Patch = 1096
PostProcess = bainst -0 BA
PreProcess =
Prezzo(1) =
Prezzo(2) =
Versione = 21511200

BIN
cd/test/ba1096a1.zip Normal file
View File

Binary file not shown.