Sfoglia il codice sorgente

Remove the no longer needed "file in use on sign" workaround from Setup.iss now that ISPP.dll and ISCmplr.dll are presigned (=use signcheck instead of signonce). Also remove it for islzma.dll since it was already presigned. Presign ISCC.exe as well to so the workaround can be removed all together. Simplies both Setup.iss and the setup-sign.bat which needs to be created.

Martijn Laan 4 mesi fa
parent
commit
96995aec37
3 ha cambiato i file con 6 aggiunte e 18 eliminazioni
  1. 1 1
      build-ce.bat
  2. 1 1
      build.bat
  3. 4 16
      setup.iss

+ 1 - 1
build-ce.bat

@@ -70,7 +70,7 @@ timeout /t 2 /nobreak >nul
 echo Compiling Inno Setup done
 
 if exist .\setup-presign.bat (
-  call .\setup-presign.bat Files\ISCmplr.dll Files\ISPP.dll
+  call .\setup-presign.bat Files\ISCC.exe Files\ISCmplr.dll Files\ISPP.dll
 )
 
 call .\issig.bat sign

+ 1 - 1
build.bat

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

+ 4 - 16
setup.iss

@@ -125,14 +125,8 @@ Source: "files\ISetup-dark.chm"; DestDir: "{app}"; Flags: ignoreversion touch
 Source: "files\Compil32.exe"; DestDir: "{app}"; Flags: ignoreversion signonce touch
 Source: "files\isscint.dll"; DestDir: "{app}"; Flags: ignoreversion signcheck touch
 Source: "files\isscint.dll.issig"; DestDir: "{app}"; Flags: ignoreversion touch
-#ifndef isccexe
-  #define isccexe "ISCC.exe"
-#endif
-Source: "files\{#isccexe}"; DestName: "ISCC.exe"; DestDir: "{app}"; Flags: ignoreversion signonce touch
-#ifndef iscmplrdll
-  #define iscmplrdll "ISCmplr.dll"
-#endif
-Source: "files\{#iscmplrdll}"; DestName: "ISCmplr.dll"; DestDir: "{app}"; Flags: ignoreversion {#signcheck} touch
+Source: "files\ISCC.exe"; DestDir: "{app}"; Flags: ignoreversion {#signcheck} touch
+Source: "files\ISCmplr.dll"; DestDir: "{app}"; Flags: ignoreversion {#signcheck} touch
 Source: "files\ISCmplr.dll.issig"; DestDir: "{app}"; Flags: ignoreversion touch
 Source: "files\Setup.e32"; DestDir: "{app}"; Flags: ignoreversion touch
 Source: "files\SetupLdr.e32"; DestDir: "{app}"; Flags: ignoreversion touch
@@ -149,17 +143,11 @@ Source: "files\isunzlib.dll"; DestDir: "{app}"; Flags: ignoreversion signonce to
 Source: "files\isbzip.dll"; DestDir: "{app}"; Flags: ignoreversion signcheck touch
 Source: "files\isbzip.dll.issig"; DestDir: "{app}"; Flags: ignoreversion touch
 Source: "files\isbunzip.dll"; DestDir: "{app}"; Flags: ignoreversion signonce touch
-#ifndef islzmadll
-  #define islzmadll "islzma.dll"
-#endif
-Source: "files\{#islzmadll}"; DestName: "islzma.dll"; DestDir: "{app}"; Flags: ignoreversion signcheck touch
+Source: "files\islzma.dll"; DestDir: "{app}"; Flags: ignoreversion signcheck touch
 Source: "files\islzma.dll.issig"; DestDir: "{app}"; Flags: ignoreversion touch
 Source: "files\islzma32.exe"; DestDir: "{app}"; Flags: ignoreversion signonce touch
 Source: "files\islzma64.exe"; DestDir: "{app}"; Flags: ignoreversion signonce touch
-#ifndef isppdll
-  #define isppdll "ispp.dll"
-#endif
-Source: "files\{#isppdll}"; DestName: "ISPP.dll"; DestDir: "{app}"; Flags: ignoreversion {#signcheck} touch
+Source: "files\ISPP.dll"; DestDir: "{app}"; Flags: ignoreversion {#signcheck} touch
 Source: "files\ISPP.dll.issig"; DestDir: "{app}"; Flags: ignoreversion touch
 Source: "files\ISPPBuiltins.iss"; DestDir: "{app}"; Flags: ignoreversion touch
 Source: "files\ISSigTool.exe"; DestDir: "{app}"; Flags: ignoreversion signonce touch