瀏覽代碼

Don't check ISCmplr.dll and ISPP.dll on Debug since the required postbuild events complicate building from the IDE using a fresh checkout which is undesirable.

Martijn Laan 5 月之前
父節點
當前提交
a52c1462cf
共有 4 個文件被更改,包括 3 次插入7 次删除
  1. 0 2
      Projects/ISCmplr.dproj
  2. 0 2
      Projects/ISPP.dproj
  3. 1 1
      Projects/Src/Compiler.SetupCompiler.pas
  4. 2 2
      Projects/Src/Shared.CompilerInt.pas

+ 0 - 2
Projects/ISCmplr.dproj

@@ -73,8 +73,6 @@
         <DCC_ExeOutput>Bin</DCC_ExeOutput>
         <DCC_ExeOutput>Bin</DCC_ExeOutput>
         <Debugger_HostApplication>Bin\Compil32.exe</Debugger_HostApplication>
         <Debugger_HostApplication>Bin\Compil32.exe</Debugger_HostApplication>
         <Debugger_RunParams>Debug.iss</Debugger_RunParams>
         <Debugger_RunParams>Debug.iss</Debugger_RunParams>
-        <PostBuildEvent><![CDATA[..\Files\ISSigTool.exe sign $(OUTPUTPATH)
-$(PostBuildEvent)]]></PostBuildEvent>
     </PropertyGroup>
     </PropertyGroup>
     <ItemGroup>
     <ItemGroup>
         <DelphiCompile Include="$(MainSource)">
         <DelphiCompile Include="$(MainSource)">

+ 0 - 2
Projects/ISPP.dproj

@@ -71,8 +71,6 @@
         <DCC_ExeOutput>Bin</DCC_ExeOutput>
         <DCC_ExeOutput>Bin</DCC_ExeOutput>
         <Debugger_HostApplication>Bin\Compil32.exe</Debugger_HostApplication>
         <Debugger_HostApplication>Bin\Compil32.exe</Debugger_HostApplication>
         <Debugger_RunParams>Debug.iss</Debugger_RunParams>
         <Debugger_RunParams>Debug.iss</Debugger_RunParams>
-        <PostBuildEvent><![CDATA[..\Files\ISSigTool.exe sign $(OUTPUTPATH)
-$(PostBuildEvent)]]></PostBuildEvent>
     </PropertyGroup>
     </PropertyGroup>
     <ItemGroup>
     <ItemGroup>
         <DelphiCompile Include="$(MainSource)">
         <DelphiCompile Include="$(MainSource)">

+ 1 - 1
Projects/Src/Compiler.SetupCompiler.pas

@@ -512,7 +512,7 @@ begin
 {$IFNDEF STATICPREPROC}
 {$IFNDEF STATICPREPROC}
   var Filename := CompilerDir + 'ISPP.dll';
   var Filename := CompilerDir + 'ISPP.dll';
   if NewFileExists(Filename) then begin
   if NewFileExists(Filename) then begin
-    if TrustedFileExists(Filename) then begin
+    if {$IFNDEF DEBUG} TrustedFileExists(Filename) {$ELSE} True {$ENDIF} then begin
       var M := SafeLoadLibrary(Filename, SEM_NOOPENFILEERRORBOX);
       var M := SafeLoadLibrary(Filename, SEM_NOOPENFILEERRORBOX);
       if M = 0 then
       if M = 0 then
         AbortCompileFmt('Failed to load ISPP.dll (%d)', [GetLastError]);
         AbortCompileFmt('Failed to load ISPP.dll (%d)', [GetLastError]);

+ 2 - 2
Projects/Src/Shared.CompilerInt.pas

@@ -34,11 +34,11 @@ implementation
 uses
 uses
   Windows,
   Windows,
   SysUtils,
   SysUtils,
-  PathFunc, TrustFunc;
+  PathFunc {$IFNDEF DEBUG}, TrustFunc{$ENDIF};
 
 
 initialization
 initialization
   var FileName := AddBackslash(PathExtractPath(ParamStr(0))) + ISCmplrDLL;
   var FileName := AddBackslash(PathExtractPath(ParamStr(0))) + ISCmplrDLL;
-  if TrustedFileExists(FileName) then begin
+  if {$IFNDEF DEBUG} TrustedFileExists(FileName) {$ELSE} True {$ENDIF} then begin
     ISCmplrLibrary := SafeLoadLibrary(PChar(FileName), SEM_NOOPENFILEERRORBOX);
     ISCmplrLibrary := SafeLoadLibrary(PChar(FileName), SEM_NOOPENFILEERRORBOX);
     if ISCmplrLibrary <> 0 then begin
     if ISCmplrLibrary <> 0 then begin
       ISDllCompileScript := GetProcAddress(ISCmplrLibrary, 'ISDllCompileScriptW');
       ISDllCompileScript := GetProcAddress(ISCmplrLibrary, 'ISDllCompileScriptW');