nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-07-02 12:02:47 -05:00
Code Issues Projects Releases Wiki Activity

Do the Windows build in a subdirectory windows/build32.

Browse Source 
Uses the BUILDDIR mechanism I added to Makefile.vc in commit
d3db17f3e.

This change is purely internal to Buildscr, and shouldn't affect the
output of a build. It paves the way to have Buildscr run multiple
Windows builds using different compilers, by putting each one in a
different subdirectory so that their outputs don't collide.
This commit is contained in:
Simon Tatham
2017-01-21 14:55:47 +00:00
parent a76de8774b
commit 7ccc105c81
3 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
windows/installer.wxs
View File

@ -92,7 +92,7 @@
<Component Id="PuTTY_Component"
Guid="07ACF511-6DF6-4883-AABA-33BC14901324">
<File Id="PuTTY_File"
Source="putty.exe" KeyPath="yes">
Source="$(var.Builddir)putty.exe" KeyPath="yes">
<Shortcut Id="startmenuPuTTY" Directory="ProgramMenuDir"
WorkingDirectory="INSTALLDIR"
Name="PuTTY" Advertise="no" />
@ -101,7 +101,7 @@
<Component Id="Pageant_Component"
Guid="649F963E-21C4-4755-8CE4-D80598DCEE6D">
<File Id="Pageant_File"
Source="pageant.exe" KeyPath="yes">
Source="$(var.Builddir)pageant.exe" KeyPath="yes">
<Shortcut Id="startmenuPageant" Directory="ProgramMenuDir"
WorkingDirectory="INSTALLDIR"
Name="Pageant" Advertise="no" />
@ -110,7 +110,7 @@
<Component Id="PSFTP_Component"
Guid="3D7B9536-EC0E-4A6A-A3DF-8D285474391A">
<File Id="PSFTP_File"
Source="psftp.exe" KeyPath="yes">
Source="$(var.Builddir)psftp.exe" KeyPath="yes">
<Shortcut Id="startmenuPSFTP" Directory="ProgramMenuDir"
WorkingDirectory="INSTALLDIR"
Name="PSFTP" Advertise="no" />
@ -119,7 +119,7 @@
<Component Id="PuTTYgen_Component"
Guid="4774F6B3-8A07-42A5-9F4D-E7FE6AA78B84">
<File Id="PuTTYgen_File"
Source="puttygen.exe" KeyPath="yes">
Source="$(var.Builddir)puttygen.exe" KeyPath="yes">
<Shortcut Id="startmenuPuTTYgen" Directory="ProgramMenuDir"
WorkingDirectory="INSTALLDIR"
Name="PuTTYgen" Advertise="no" />
@ -128,12 +128,12 @@
<Component Id="Plink_Component"
Guid="7D96F9BB-4154-49D6-86AE-0D8F1379ACBC">
<File Id="Plink_File"
Source="plink.exe" KeyPath="yes" />
Source="$(var.Builddir)plink.exe" KeyPath="yes" />
</Component>
<Component Id="PSCP_Component"
Guid="71519D4A-3ED5-4A46-A7E4-B6E4600A8684">
<File Id="PSCP_File"
Source="pscp.exe" KeyPath="yes" />
Source="$(var.Builddir)pscp.exe" KeyPath="yes" />
</Component>
<Component Id="HelpFile_Component"

12
windows/putty.iss
View File

@ -43,12 +43,12 @@ OutputBaseFilename=installer
; reboot" option, but the developers have no interest in adding one.
; NB: apparently, using long (non-8.3) filenames with restartreplace is a
; bad idea. (Not that we do.)
Source: "putty.exe"; DestDir: "{app}"; Flags: promptifolder replacesameversion restartreplace uninsrestartdelete
Source: "pageant.exe"; DestDir: "{app}"; Flags: promptifolder replacesameversion restartreplace uninsrestartdelete
Source: "puttygen.exe"; DestDir: "{app}"; Flags: promptifolder replacesameversion restartreplace uninsrestartdelete
Source: "pscp.exe"; DestDir: "{app}"; Flags: promptifolder replacesameversion restartreplace uninsrestartdelete
Source: "psftp.exe"; DestDir: "{app}"; Flags: promptifolder replacesameversion restartreplace uninsrestartdelete
Source: "plink.exe"; DestDir: "{app}"; Flags: promptifolder replacesameversion restartreplace uninsrestartdelete
Source: "build32\putty.exe"; DestDir: "{app}"; Flags: promptifolder replacesameversion restartreplace uninsrestartdelete
Source: "build32\pageant.exe"; DestDir: "{app}"; Flags: promptifolder replacesameversion restartreplace uninsrestartdelete
Source: "build32\puttygen.exe"; DestDir: "{app}"; Flags: promptifolder replacesameversion restartreplace uninsrestartdelete
Source: "build32\pscp.exe"; DestDir: "{app}"; Flags: promptifolder replacesameversion restartreplace uninsrestartdelete
Source: "build32\psftp.exe"; DestDir: "{app}"; Flags: promptifolder replacesameversion restartreplace uninsrestartdelete
Source: "build32\plink.exe"; DestDir: "{app}"; Flags: promptifolder replacesameversion restartreplace uninsrestartdelete
Source: "website.url"; DestDir: "{app}"; Flags: restartreplace uninsrestartdelete
Source: "..\doc\putty.chm"; DestDir: "{app}"; Flags: restartreplace uninsrestartdelete
Source: "..\doc\putty.hlp"; DestDir: "{app}"; Flags: restartreplace uninsrestartdelete