Ver código fonte

Work on build: uncommenting the x64 define in setup.iss, setting Bits to 64 in compile.bat, and then running build.bat now gives you a 64-bit Setup for 64-bit Inno Setup 7, which can be installed side-by-side with 32-bit Inno Setup 7 (and with Inno Setup 6).

Martijn Laan 1 mês atrás
pai
commit
20003299f0
3 arquivos alterados com 68 adições e 6 exclusões
  1. 59 3
      Projects/Projects.groupproj
  2. 5 1
      build-ce.bat
  3. 4 2
      compile.bat

+ 59 - 3
Projects/Projects.groupproj

@@ -129,7 +129,7 @@
         <CallTarget Targets="Compil32:Make;ISCC:Make;ISCmplr:Make;ISPP:Make;Setup:Make;SetupCustomStyle:Make;SetupLdr:Make;ISSigTool:Make;ISHelpGen:Make"/>
     </Target>
     <Import Project="$(BDS)\Bin\CodeGear.Group.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')"/>
-    <ItemGroup Condition="'$(BuildGroup)'=='Release'">
+    <ItemGroup Condition="'$(BuildGroup)'=='Release32'">
         <BuildGroupProject Include="Compil32.dproj">
             <ProjectGuid>{AA47247E-6E7B-4A22-8740-FB9041C2F93B}</ProjectGuid>
             <Configurations>Release</Configurations>
@@ -185,7 +185,63 @@
             <Enabled>True</Enabled>
         </BuildGroupProject>
     </ItemGroup>
-    <ItemGroup Condition="'$(BuildGroup)'=='Debug'">
+    <ItemGroup Condition="'$(BuildGroup)'=='Release64'">
+        <BuildGroupProject Include="Compil32.dproj">
+            <ProjectGuid>{AA47247E-6E7B-4A22-8740-FB9041C2F93B}</ProjectGuid>
+            <Configurations>Release</Configurations>
+            <Platforms>Win64</Platforms>
+            <Enabled>True</Enabled>
+        </BuildGroupProject>
+        <BuildGroupProject Include="ISCmplr.dproj">
+            <ProjectGuid>{25CA0A66-07DC-4224-9252-EBFFA7D81558}</ProjectGuid>
+            <Configurations>Release</Configurations>
+            <Platforms>Win64</Platforms>
+            <Enabled>True</Enabled>
+        </BuildGroupProject>
+        <BuildGroupProject Include="SetupLdr.dproj">
+            <ProjectGuid>{4259E59E-2263-4FE8-8E6C-BFCBC7A6C66D}</ProjectGuid>
+            <Configurations>Release</Configurations>
+            <Platforms>Win32;Win64</Platforms>
+            <Enabled>True</Enabled>
+        </BuildGroupProject>
+        <BuildGroupProject Include="Setup.dproj">
+            <ProjectGuid>{BB7C6F6A-AC62-46BB-A790-0CF4A74B649E}</ProjectGuid>
+            <Configurations>Release</Configurations>
+            <Platforms>Win32;Win64</Platforms>
+            <Enabled>True</Enabled>
+        </BuildGroupProject>
+        <BuildGroupProject Include="ISSigTool.dproj">
+            <ProjectGuid>{484EE7D9-65D0-44DA-B807-9FC874733A64}</ProjectGuid>
+            <Configurations>Release</Configurations>
+            <Platforms>Win64</Platforms>
+            <Enabled>True</Enabled>
+        </BuildGroupProject>
+        <BuildGroupProject Include="ISPP.dproj">
+            <ProjectGuid>{7BEFDB9E-3F9B-4206-BAC1-B332E573D3F8}</ProjectGuid>
+            <Configurations>Release</Configurations>
+            <Platforms>Win64</Platforms>
+            <Enabled>True</Enabled>
+        </BuildGroupProject>
+        <BuildGroupProject Include="SetupCustomStyle.dproj">
+            <ProjectGuid>{F15ECAFB-E2DE-42BA-A3E6-7F9C0F24F560}</ProjectGuid>
+            <Configurations>Release</Configurations>
+            <Platforms>Win32;Win64</Platforms>
+            <Enabled>True</Enabled>
+        </BuildGroupProject>
+        <BuildGroupProject Include="ISCC.dproj">
+            <ProjectGuid>{CB865E8F-FE9C-46FD-90B0-AB3BDBD1C906}</ProjectGuid>
+            <Configurations>Release</Configurations>
+            <Platforms>Win64</Platforms>
+            <Enabled>True</Enabled>
+        </BuildGroupProject>
+        <BuildGroupProject Include="..\ISHelp\ISHelpGen\ISHelpGen.dproj">
+            <ProjectGuid>{058C4E22-A1B3-4C10-9062-05B58D9E9747}</ProjectGuid>
+            <Configurations>Release</Configurations>
+            <Platforms>Win64</Platforms>
+            <Enabled>True</Enabled>
+        </BuildGroupProject>
+    </ItemGroup>
+    <ItemGroup Condition="'$(BuildGroup)'=='Debug32'">
         <BuildGroupProject Include="Compil32.dproj">
             <ProjectGuid>{AA47247E-6E7B-4A22-8740-FB9041C2F93B}</ProjectGuid>
             <Configurations>Debug</Configurations>
@@ -241,7 +297,7 @@
             <Enabled>True</Enabled>
         </BuildGroupProject>
     </ItemGroup>
-    <ItemGroup Condition="'$(BuildGroup)'=='Debug 64'">
+    <ItemGroup Condition="'$(BuildGroup)'=='Debug64'">
         <BuildGroupProject Include="Compil32.dproj">
             <ProjectGuid>{AA47247E-6E7B-4A22-8740-FB9041C2F93B}</ProjectGuid>
             <Configurations>Debug</Configurations>

+ 5 - 1
build-ce.bat

@@ -62,14 +62,16 @@ call :deletefile files\iscc.exe
 call :deletefile files\iscmplr.dll
 call :deletefile files\ispp.dll
 call :deletefile files\setup.e32
+call :deletefile files\setup.e64
 call :deletefile files\setupcustomstyle.e32
+call :deletefile files\setupcustomstyle.e64
 call :deletefile files\setupldr.e32
 call :deletefile files\setupldr.e64
 call :deletefile files\issigtool.exe
 call :deletefile ishelp\ishelpgen\ishelpgen.exe
 
 echo Clearing compilation output done
-echo Now open Projects\Projects.groupproj and build the Release build group
+echo Now open Projects\Projects.groupproj and build the Release32 build group
 echo You can open the Build Groups pane from the Projects tool window
 
 echo - Waiting for files...
@@ -78,7 +80,9 @@ call :waitforfile files\iscc.exe
 call :waitforfile files\iscmplr.dll
 call :waitforfile files\ispp.dll
 call :waitforfile files\setup.e32
+call :waitforfile files\setup.e64
 call :waitforfile files\setupcustomstyle.e32
+call :waitforfile files\setupcustomstyle.e64
 call :waitforfile files\setupldr.e32
 call :waitforfile files\setupldr.e64
 call :waitforfile files\issigtool.exe

+ 4 - 2
compile.bat

@@ -34,19 +34,21 @@ if errorlevel 1 goto failed
 
 set EnvOptionsWarn=false
 
+set Bits=32
+
 if /I "%1"=="ishelpgen" (
   echo - ISHelpGen.exe
   msbuild.exe ..\ISHelp\ISHelpGen\ISHelpGen.dproj /t:Build /p:Config=Release;Platform=Win64 /nologo
 ) else if /I "%1"=="issigtool" (
   echo - ISSigTool.exe
-  msbuild.exe ISSigTool.dproj /t:Build /p:Config=Release;Platform=Win32 /nologo
+  msbuild.exe ISSigTool.dproj /t:Build /p:Config=Release;Platform=Win%Bits% /nologo
 ) else (
   echo - Projects.groupproj - Release build group
   rem This emits warning MSB4056, but that's ok since the build doesn't use COM. Modern MSBuild supports
   rem /noWarn:MSB4056, but the version targeted by Delphi 12.3's rsvars.bat does not. Additionally Delphi's
   rem implementation of build groups does not seem to pass through additional parameters, so even with a
   rem modern MSBuild you cannot suppress the warning. Likewise, using /nologo or /v:q has no effect.
-  msbuild.exe Projects.groupproj /t:Build /p:BuildGroup=Release
+  msbuild.exe Projects.groupproj /t:Build /p:BuildGroup=Release%Bits%
 )
 if errorlevel 1 goto failed