Browse Source

Merge branch 'main' into darker

Martijn Laan 2 months ago
parent
commit
632d48c55e

+ 0 - 0
Examples/MyProg/MyProg.manifest.txt → Examples/MyProg/MyProg.manifest


+ 1 - 1
Examples/MyProg/MyProg.rc

@@ -39,4 +39,4 @@ BEGIN
     END
     END
 END
 END
 
 
-1 24 MyProg.manifest.txt
+1 24 MyProg.manifest

+ 0 - 0
Projects/Res/Compil32.manifest.txt → Projects/Res/Compil32.manifest


+ 1 - 1
Projects/Res/Compil32.manifest.rc

@@ -1 +1 @@
-1 24 Compil32.manifest.txt
+1 24 Compil32.manifest

+ 0 - 0
Projects/Res/ISCC.manifest.txt → Projects/Res/ISCC.manifest


+ 1 - 1
Projects/Res/ISCC.manifest.rc

@@ -1 +1 @@
-1 24 ISCC.manifest.txt
+1 24 ISCC.manifest

+ 0 - 0
Projects/Res/ISSigTool.manifest.txt → Projects/Res/ISSigTool.manifest


+ 1 - 1
Projects/Res/ISSigTool.manifest.rc

@@ -1 +1 @@
-1 24 ISSigTool.manifest.txt
+1 24 ISSigTool.manifest

+ 0 - 0
Projects/Src/Setup.HelperEXEs/Helper/Helper.manifest.txt → Projects/Src/Setup.HelperEXEs/Helper/Helper.manifest


+ 1 - 1
Projects/Src/Setup.HelperEXEs/Helper/Helper.rc

@@ -1 +1 @@
-1 24 Helper.manifest.txt
+1 24 Helper.manifest

+ 1 - 0
build-ce.bat

@@ -83,6 +83,7 @@ echo Compiling Inno Setup done
 if exist .\setup-presign.bat (
 if exist .\setup-presign.bat (
   echo - Presigning
   echo - Presigning
   call .\setup-presign.bat Files\ISCC.exe Files\ISCmplr.dll Files\ISPP.dll
   call .\setup-presign.bat Files\ISCC.exe Files\ISCmplr.dll Files\ISPP.dll
+  if errorlevel 1 goto failed
   echo Presign done
   echo Presign done
 )
 )
 
 

+ 1 - 0
build.bat

@@ -77,6 +77,7 @@ echo Compiling Inno Setup done
 if exist .\setup-presign.bat (
 if exist .\setup-presign.bat (
   echo - Presigning
   echo - Presigning
   call .\setup-presign.bat Files\ISCC.exe Files\ISCmplr.dll Files\ISPP.dll
   call .\setup-presign.bat Files\ISCC.exe Files\ISCmplr.dll Files\ISPP.dll
+  if errorlevel 1 goto failed
   echo Presign done
   echo Presign done
 ) 
 )