diff options
author | Kevin Koch <kpkoch@mit.edu> | 2008-07-22 20:13:28 +0000 |
---|---|---|
committer | Kevin Koch <kpkoch@mit.edu> | 2008-07-22 20:13:28 +0000 |
commit | f2eb6bdc2c81cbbe86be9254097d79d3241a0a48 (patch) | |
tree | efe69de0e44f49ac4b9a400211fc950a059aa264 | |
parent | dcffe293abc34c79078a317165a15616526e0003 (diff) | |
download | krb5-f2eb6bdc2c81cbbe86be9254097d79d3241a0a48.zip krb5-f2eb6bdc2c81cbbe86be9254097d79d3241a0a48.tar.gz krb5-f2eb6bdc2c81cbbe86be9254097d79d3241a0a48.tar.bz2 |
More changes for 64 bit builds
Add %cpu% substitution; write the file with perl print instead of echo. Echo will substitute %cpu% ;-).
Replicate CopyList Config section into each CopyList.
Add component attribute to all CopyLists.
Change more xxx32xxx to xxx%WL% and xxxi386xxx to xxx%cpu%xxx.
Component: windows
TargetVersion: 1.7
Ticket: 5817 5819
git-svn-id: svn://anonsvn.mit.edu/krb5/branches/kpkoch-ccapi@20569 dc483132-0cff-0310-8789-dd5450dbe970
-rw-r--r-- | src/windows/build/BKWconfig.xml | 33 | ||||
-rw-r--r-- | src/windows/build/bkw.pl | 36 | ||||
-rw-r--r-- | src/windows/build/corebinaryfiles.xml | 136 | ||||
-rw-r--r-- | src/windows/build/sdkfiles.xml | 12 | ||||
-rw-r--r-- | src/windows/installer/nsis/kfw-fixed-tagged.nsi | 136 |
5 files changed, 192 insertions, 161 deletions
diff --git a/src/windows/build/BKWconfig.xml b/src/windows/build/BKWconfig.xml index d5806ec..cb9c7cb 100644 --- a/src/windows/build/BKWconfig.xml +++ b/src/windows/build/BKWconfig.xml @@ -29,7 +29,7 @@ <package def="1" /> <repository def="A" abbr="r" value="skip" options="skip checkout|co export|ex update|up" /> <sign def="0" /> - <verbose def="0" abbr="v" /> + <verbose def="1" abbr="v" /> <vverbose def="0" /> <cpu def="0" value="i386" options="i386 amd64" /> <components def="0" value="base %cpu%" /> @@ -131,7 +131,14 @@ <CommandTemplate value="signtool sign /a /d "MIT Kerberos for Windows" /du "http://web.mit.edu/kerberos" /t TIMESTAMPSERVERGOESHERE %filename%" /> <FilePatterns value="*.exe *.dll *.cpl *.msi" /> </Signing> - </Config> + <DebugArea value="dbg" /> + <ReleaseArea value="rel" /> + <AlwaysTag value="%bldtype%" /> <!-- Pick a string that won't appear in a path. --> + <ArchTag value="%WL%" /> <!-- Pick a string that won't appear in a path. --> + <CpuTag value="%cpu%" /> <!-- Pick a string that won't appear in a path. --> + <DebugTag value="%debug%" /> <!-- Pick a string that won't appear in a path. --> + <ReleaseTag value="%release%" /> <!-- Pick a string that won't appear in a path. --> + </Config> <Zips> <Zip dummy="foo" /> <!-- To force desired XML::Simple behavior --> <!-- Files will be copied into directory <topdir>; <topdir> will appear in the paths of the files. --> @@ -152,16 +159,34 @@ <Include path="corebinaryfiles.xml" /> <!-- Included file is relative to location of bkw.pl. --> </Files> </CopyList> - </Zip> + </Zip> <Zip name="SDK" filename="%filestem%-sdk.zip" topdir="%filestem%-final"> <CopyList> - <Files> + <Config> + <DebugArea value="dbg" /> + <ReleaseArea value="rel" /> + <AlwaysTag value="%bldtype%" /> <!-- Pick a string that won't appear in a path. --> + <ArchTag value="%WL%" /> <!-- Pick a string that won't appear in a path. --> + <CpuTag value="%cpu%" /> <!-- Pick a string that won't appear in a path. --> + <DebugTag value="%debug%" /> <!-- Pick a string that won't appear in a path. --> + <ReleaseTag value="%release%" /> <!-- Pick a string that won't appear in a path. --> + </Config> + <Files> <Include path="sdkfiles.xml" /> <!-- Included file is relative to location of bkw.pl. --> </Files> </CopyList> </Zip> </Zips> <CopyList> <!-- Copied at end of post-package step. --> + <Config> + <DebugArea value="dbg" /> + <ReleaseArea value="rel" /> + <AlwaysTag value="%bldtype%" /> <!-- Pick a string that won't appear in a path. --> + <ArchTag value="%WL%" /> <!-- Pick a string that won't appear in a path. --> + <CpuTag value="%cpu%" /> <!-- Pick a string that won't appear in a path. --> + <DebugTag value="%debug%" /> <!-- Pick a string that won't appear in a path. --> + <ReleaseTag value="%release%" /> <!-- Pick a string that won't appear in a path. --> + </Config> <Files> <File dummy="foo" /> <!-- File from paths are relative to <src/pismere>. --> diff --git a/src/windows/build/bkw.pl b/src/windows/build/bkw.pl index a83a4fe..efe6b45 100644 --- a/src/windows/build/bkw.pl +++ b/src/windows/build/bkw.pl @@ -621,29 +621,35 @@ sub main { ## Make sed script to run on the site-local configuration files: local $tmpfile = "site-local.sed" ; if (-e $tmpfile) {system("del $tmpfile");} + open SEDFILE, ">>$tmpfile"; + # Basic substitutions: local $dblback_wd = $wd; $dblback_wd =~ s/\\/\\\\/g; - !system("echo s/%BUILDDIR%/$dblback_wd/ >> $tmpfile") or die "Fatal -- Couldn't modify $tmpfile."; + print SEDFILE "s/%BUILDDIR%/$dblback_wd/\n" or die "Fatal -- Couldn't modify $tmpfile."; local $dblback_staging = "$wd\\staging"; $dblback_staging =~ s/\\/\\\\/g; - !system("echo s/%TARGETDIR%/$dblback_staging/ >> $tmpfile") or die "Fatal -- Couldn't modify $tmpfile."; + print SEDFILE "s/%TARGETDIR%/$dblback_staging/\n" or die "Fatal -- Couldn't modify $tmpfile."; local $dblback_sample = "$wd\\staging\\sample"; $dblback_sample =~ s/\\/\\\\/g; $ArchTag = $prepackage->{CopyList}->{Config}->{ArchTag}->{value}; $ArchFragment = ($odr->{cpu}->{value} =~ /386/) ? "32" : "64"; - - !system("echo s/%CONFIGDIR-WIX%/$dblback_sample/ >> $tmpfile") or die "Fatal -- Couldn't modify $tmpfile."; - !system("echo s/%CONFIGDIR-NSI%/$dblback_staging/ >> $tmpfile") or die "Fatal -- Couldn't modify $tmpfile."; - !system("echo s/%VERSION_MAJOR%/$config->{Versions}->{'VER_PROD_MAJOR_STR'}/ >> $tmpfile") or die "Fatal -- Couldn't modify $tmpfile."; - !system("echo s/%VERSION_MINOR%/$config->{Versions}->{'VER_PROD_MINOR_STR'}/ >> $tmpfile") or die "Fatal -- Couldn't modify $tmpfile."; - !system("echo s/%VERSION_PATCH%/$config->{Versions}->{'VER_PROD_REV_STR'}/ >> $tmpfile") or die "Fatal -- Couldn't modify $tmpfile."; - !system("echo s/$ArchTag/$ArchFragment/ >> $tmpfile") or die "Fatal -- Couldn't modify $tmpfile."; + $CpuTag = $prepackage->{CopyList}->{Config}->{CpuTag}->{value}; + $CpuFragment = ($odr->{cpu}->{value} =~ /386/) ? "i386" : "AMD64"; + + print SEDFILE "s/%CONFIGDIR-WIX%/$dblback_sample/\n" or die "Fatal -- Couldn't modify $tmpfile."; + print SEDFILE "s/%CONFIGDIR-NSI%/$dblback_staging/\n" or die "Fatal -- Couldn't modify $tmpfile."; + print SEDFILE "s/%VERSION_MAJOR%/$config->{Versions}->{'VER_PROD_MAJOR_STR'}/\n" or die "Fatal -- Couldn't modify $tmpfile."; + print SEDFILE "s/%VERSION_MINOR%/$config->{Versions}->{'VER_PROD_MINOR_STR'}/\n" or die "Fatal -- Couldn't modify $tmpfile."; + print SEDFILE "s/%VERSION_PATCH%/$config->{Versions}->{'VER_PROD_REV_STR'}/\n" or die "Fatal -- Couldn't modify $tmpfile."; + print SEDFILE "s/$ArchTag/$ArchFragment/\n" or die "Fatal -- Couldn't modify $tmpfile."; + print SEDFILE "s/$CpuTag/$CpuFragment/\n" or die "Fatal -- Couldn't modify $tmpfile."; # Strip out some defines so they can be replaced: [used for site-local.nsi] - !system("echo /\^!define\.\*RELEASE\.\*\$/d >> $tmpfile") or die "Fatal -- Couldn't modify $tmpfile."; - !system("echo /\^!define\.\*DEBUG\.\*\$/d >> $tmpfile") or die "Fatal -- Couldn't modify $tmpfile."; - !system("echo /\^!define\.\*BETA\.\*\$/d >> $tmpfile") or die "Fatal -- Couldn't modify $tmpfile."; + print SEDFILE "/\^!define\.\*RELEASE\.\*\$/d\n" or die "Fatal -- Couldn't modify $tmpfile."; + print SEDFILE "/\^!define\.\*DEBUG\.\*\$/d\n" or die "Fatal -- Couldn't modify $tmpfile."; + print SEDFILE "/\^!define\.\*BETA\.\*\$/d\n" or die "Fatal -- Couldn't modify $tmpfile."; + close SEDFILE; # Run the script on site-local.wxi: !system("sed -f $tmpfile site-local-tagged.wxi > $wd\\buildwix\\site-local.wxi") or die "Fatal -- Couldn't modify site-local.wxi."; @@ -668,12 +674,12 @@ sub main { ## Run the script on nsi-includes-tagged.nsi: !system("sed -f ..\\wix\\$tmpfile nsi-includes-tagged.nsi > $wd\\buildnsi\\nsi-includes.nsi") or die "Fatal -- Couldn't modify nsi-includes.nsi."; - ## Run the script on kfw-fixed-tagged.nsi: - print "KPK -- work on kfw-fixed-tagged.nsi in ".`cd`."\n"; + ## Run the script on kfw-fixed-tagged.nsi: + print "KPK -- work on kfw-fixed-tagged.nsi in ".`cd`."\n" if ($verbose); + !system("sed -f ..\\wix\\$tmpfile kfw-fixed-tagged.nsi > kfw-fixed.nsi") or die "Fatal -- Couldn't modify kfw_fixed.nsi."; !system("sed -f ..\\wix\\$tmpfile kfw-fixed-tagged.nsi > $wd\\buildnsi\\kfw-fixed.nsi") or die "Fatal -- Couldn't modify kfw_fixed.nsi."; !system("rm ..\\wix\\$tmpfile") or die "Fatal -- Couldn't remove $tmpfile."; - ##-- Transform -tagged files: ##-- ----------------------------------------------------------------------------- diff --git a/src/windows/build/corebinaryfiles.xml b/src/windows/build/corebinaryfiles.xml index c7b6151..f643876 100644 --- a/src/windows/build/corebinaryfiles.xml +++ b/src/windows/build/corebinaryfiles.xml @@ -5,74 +5,74 @@ <File dummy="foo" /> <!-- Forces XML::Simple behavior --> <!-- Without this, XML::Simple does not make an anonymous array and I can't figure out how to iterate over it. --> - <File name="netidmgr_userdoc.pdf" from="staging\doc" to="doc" /> - <File name="leash_userdoc.pdf" from="staging\doc" to="doc" /> - <File name="relnotes.html" from="doc\kerberos" to="doc" /> + <File name="netidmgr_userdoc.pdf" from="staging\doc" to="doc" component="base" /> + <File name="leash_userdoc.pdf" from="staging\doc" to="doc" component="base" /> + <File name="relnotes.html" from="doc\kerberos" to="doc" component="base" /> - <File name="comerr32.dll" from="staging\bin\%cpu%" to="\bin\%cpu%\" /> - <File name="comerr32.pdb" from="staging\bin\%cpu%" to="\bin\%cpu%\" /> - <File name="gss-client.exe" from="staging\bin\%cpu%" to="\bin\%cpu%\" /> - <File name="gss-client.pdb" from="staging\bin\%cpu%" to="\bin\%cpu%\" /> - <File name="gss-server.exe" from="staging\bin\%cpu%" to="\bin\%cpu%\" /> - <File name="gss-server.pdb" from="staging\bin\%cpu%" to="\bin\%cpu%\" /> - <File name="gss.exe" from="staging\bin\%cpu%" to="\bin\%cpu%\" /> - <File name="gss.pdb" from="staging\bin\%cpu%" to="\bin\%cpu%\" /> - <File name="gssapi32.dll" from="staging\bin\%cpu%" to="\bin\%cpu%\" /> - <File name="gssapi32.pdb" from="staging\bin\%cpu%" to="\bin\%cpu%\" /> - <File name="k524init.exe" from="staging\bin\%cpu%" to="\bin\%cpu%\" /> - <File name="k524init.pdb" from="staging\bin\%cpu%" to="\bin\%cpu%\" /> - <File name="k5sprt32.dll" from="staging\bin\%cpu%" to="\bin\%cpu%\" /> - <File name="k5sprt32.pdb" from="staging\bin\%cpu%" to="\bin\%cpu%\" /> - <File name="kcpytkt.exe" from="staging\bin\%cpu%" to="\bin\%cpu%\" /> - <File name="kcpytkt.pdb" from="staging\bin\%cpu%" to="\bin\%cpu%\" /> - <File name="kdeltkt.exe" from="staging\bin\%cpu%" to="\bin\%cpu%\" /> - <File name="kdeltkt.pdb" from="staging\bin\%cpu%" to="\bin\%cpu%\" /> - <File name="kdestroy.exe" from="staging\bin\%cpu%" to="\bin\%cpu%\" /> - <File name="kdestroy.pdb" from="staging\bin\%cpu%" to="\bin\%cpu%\" /> - <File name="kfwcpcc.exe" from="staging\bin\%cpu%" to="\bin\%cpu%\" /> - <File name="kfwcpcc.pdb" from="staging\bin\%cpu%" to="\bin\%cpu%\" /> - <File name="kfwlogon.dll" from="staging\bin\%cpu%" to="\bin\%cpu%\" /> - <File name="kfwlogon.pdb" from="staging\bin\%cpu%" to="\bin\%cpu%\" /> - <File name="kinit.exe" from="staging\bin\%cpu%" to="\bin\%cpu%\" /> - <File name="kinit.pdb" from="staging\bin\%cpu%" to="\bin\%cpu%\" /> - <File name="klist.exe" from="staging\bin\%cpu%" to="\bin\%cpu%\" /> - <File name="klist.pdb" from="staging\bin\%cpu%" to="\bin\%cpu%\" /> - <File name="kpasswd.exe" from="staging\bin\%cpu%" to="\bin\%cpu%\" /> - <File name="kpasswd.pdb" from="staging\bin\%cpu%" to="\bin\%cpu%\" /> - <File name="krb524.dll" from="staging\bin\%cpu%" to="\bin\%cpu%\" /> - <File name="krb524.pdb" from="staging\bin\%cpu%" to="\bin\%cpu%\" /> - <File name="krb5cred.dll" from="staging\bin\%cpu%" to="\bin\%cpu%\" /> - <File name="krb5cred.pdb" from="staging\bin\%cpu%" to="\bin\%cpu%\" /> - <File name="krb5cred_en_us.dll" from="staging\bin\%cpu%" to="\bin\%cpu%\" /> - <File name="krb5_32.dll" from="staging\bin\%cpu%" to="\bin\%cpu%\" /> - <File name="krb5_32.pdb" from="staging\bin\%cpu%" to="\bin\%cpu%\" /> - <File name="krbcc32.dll" from="staging\bin\%cpu%" to="\bin\%cpu%\" /> - <File name="krbcc32.pdb" from="staging\bin\%cpu%" to="\bin\%cpu%\" /> - <File name="krbcc32s.exe" from="staging\bin\%cpu%" to="\bin\%cpu%\" /> - <File name="krbcc32s.pdb" from="staging\bin\%cpu%" to="\bin\%cpu%\" /> - <File name="kvno.exe" from="staging\bin\%cpu%" to="\bin\%cpu%\" /> - <File name="kvno.pdb" from="staging\bin\%cpu%" to="\bin\%cpu%\" /> - <File name="leash32.chm" from="staging\bin\%cpu%" to="\bin\%cpu%\" /> - <File name="leash32.exe" from="staging\bin\%cpu%" to="\bin\%cpu%\" /> - <File name="leash32.pdb" from="staging\bin\%cpu%" to="\bin\%cpu%\" /> - <File name="leashw32.dll" from="staging\bin\%cpu%" to="\bin\%cpu%\" /> - <File name="leashw32.pdb" from="staging\bin\%cpu%" to="\bin\%cpu%\" /> - <File name="mit2ms.exe" from="staging\bin\%cpu%" to="\bin\%cpu%\" /> - <File name="mit2ms.pdb" from="staging\bin\%cpu%" to="\bin\%cpu%\" /> - <File name="ms2mit.exe" from="staging\bin\%cpu%" to="\bin\%cpu%\" /> - <File name="ms2mit.pdb" from="staging\bin\%cpu%" to="\bin\%cpu%\" /> - <File name="netidmgr.chm" from="staging\bin\%cpu%" to="\bin\%cpu%\" /> - <File name="netidmgr.exe" from="staging\bin\%cpu%" to="\bin\%cpu%\" /> - <File name="netidmgr.pdb" from="staging\bin\%cpu%" to="\bin\%cpu%\" /> - <File name="nidmgr32.dll" from="staging\bin\%cpu%" to="\bin\%cpu%\" /> - <File name="nidmgr32.pdb" from="staging\bin\%cpu%" to="\bin\%cpu%\" /> - <File name="wshelp32.dll" from="staging\bin\%cpu%" to="\bin\%cpu%\" /> - <File name="wshelp32.pdb" from="staging\bin\%cpu%" to="\bin\%cpu%\" /> - <File name="xpprof32.dll" from="staging\bin\%cpu%" to="\bin\%cpu%\" /> - <File name="xpprof32.pdb" from="staging\bin\%cpu%" to="\bin\%cpu%\" /> + <File name="comerr%WL%.dll" from="staging\bin\%cpu%" to="\bin\%cpu%\" component="base" /> + <File name="comerr%WL%.pdb" from="staging\bin\%cpu%" to="\bin\%cpu%\" component="base" /> + <File name="gss-client.exe" from="staging\bin\%cpu%" to="\bin\%cpu%\" component="base" /> + <File name="gss-client.pdb" from="staging\bin\%cpu%" to="\bin\%cpu%\" component="base" /> + <File name="gss-server.exe" from="staging\bin\%cpu%" to="\bin\%cpu%\" component="base" /> + <File name="gss-server.pdb" from="staging\bin\%cpu%" to="\bin\%cpu%\" component="base" /> + <File name="gss.exe" from="staging\bin\%cpu%" to="\bin\%cpu%\" component="base" /> + <File name="gss.pdb" from="staging\bin\%cpu%" to="\bin\%cpu%\" component="base" /> + <File name="gssapi32.dll" from="staging\bin\%cpu%" to="\bin\%cpu%\" component="base" /> + <File name="gssapi32.pdb" from="staging\bin\%cpu%" to="\bin\%cpu%\" component="base" /> + <File name="k524init.exe" from="staging\bin\%cpu%" to="\bin\%cpu%\" component="base" /> + <File name="k524init.pdb" from="staging\bin\%cpu%" to="\bin\%cpu%\" component="base" /> + <File name="k5sprt%WL%.dll" from="staging\bin\%cpu%" to="\bin\%cpu%\" component="base" /> + <File name="k5sprt%WL%.pdb" from="staging\bin\%cpu%" to="\bin\%cpu%\" component="base" /> + <File name="kcpytkt.exe" from="staging\bin\%cpu%" to="\bin\%cpu%\" component="base" /> + <File name="kcpytkt.pdb" from="staging\bin\%cpu%" to="\bin\%cpu%\" component="base" /> + <File name="kdeltkt.exe" from="staging\bin\%cpu%" to="\bin\%cpu%\" component="base" /> + <File name="kdeltkt.pdb" from="staging\bin\%cpu%" to="\bin\%cpu%\" component="base" /> + <File name="kdestroy.exe" from="staging\bin\%cpu%" to="\bin\%cpu%\" component="base" /> + <File name="kdestroy.pdb" from="staging\bin\%cpu%" to="\bin\%cpu%\" component="base" /> + <File name="kfwcpcc.exe" from="staging\bin\%cpu%" to="\bin\%cpu%\" component="base" /> + <File name="kfwcpcc.pdb" from="staging\bin\%cpu%" to="\bin\%cpu%\" component="base" /> + <File name="kfwlogon.dll" from="staging\bin\%cpu%" to="\bin\%cpu%\" component="base" /> + <File name="kfwlogon.pdb" from="staging\bin\%cpu%" to="\bin\%cpu%\" component="base" /> + <File name="kinit.exe" from="staging\bin\%cpu%" to="\bin\%cpu%\" component="base" /> + <File name="kinit.pdb" from="staging\bin\%cpu%" to="\bin\%cpu%\" component="base" /> + <File name="klist.exe" from="staging\bin\%cpu%" to="\bin\%cpu%\" component="base" /> + <File name="klist.pdb" from="staging\bin\%cpu%" to="\bin\%cpu%\" component="base" /> + <File name="kpasswd.exe" from="staging\bin\%cpu%" to="\bin\%cpu%\" component="base" /> + <File name="kpasswd.pdb" from="staging\bin\%cpu%" to="\bin\%cpu%\" component="base" /> + <File name="krb524.dll" from="staging\bin\%cpu%" to="\bin\%cpu%\" component="base" /> + <File name="krb524.pdb" from="staging\bin\%cpu%" to="\bin\%cpu%\" component="base" /> + <File name="krb5cred.dll" from="staging\bin\%cpu%" to="\bin\%cpu%\" component="base" /> + <File name="krb5cred.pdb" from="staging\bin\%cpu%" to="\bin\%cpu%\" component="base" /> + <File name="krb5cred_en_us.dll" from="staging\bin\%cpu%" to="\bin\%cpu%\" component="base" /> + <File name="krb5_32.dll" from="staging\bin\%cpu%" to="\bin\%cpu%\" component="base" /> + <File name="krb5_32.pdb" from="staging\bin\%cpu%" to="\bin\%cpu%\" component="base" /> + <File name="krbcc32.dll" from="staging\bin\%cpu%" to="\bin\%cpu%\" component="base" /> + <File name="krbcc32.pdb" from="staging\bin\%cpu%" to="\bin\%cpu%\" component="base" /> + <File name="krbcc32s.exe" from="staging\bin\%cpu%" to="\bin\%cpu%\" component="base" /> + <File name="krbcc32s.pdb" from="staging\bin\%cpu%" to="\bin\%cpu%\" component="base" /> + <File name="kvno.exe" from="staging\bin\%cpu%" to="\bin\%cpu%\" component="base" /> + <File name="kvno.pdb" from="staging\bin\%cpu%" to="\bin\%cpu%\" component="base" /> + <File name="leash32.chm" from="staging\bin\%cpu%" to="\bin\%cpu%\" component="base" /> + <File name="leash32.exe" from="staging\bin\%cpu%" to="\bin\%cpu%\" component="base" /> + <File name="leash32.pdb" from="staging\bin\%cpu%" to="\bin\%cpu%\" component="base" /> + <File name="leashw32.dll" from="staging\bin\%cpu%" to="\bin\%cpu%\" component="base" /> + <File name="leashw32.pdb" from="staging\bin\%cpu%" to="\bin\%cpu%\" component="base" /> + <File name="mit2ms.exe" from="staging\bin\%cpu%" to="\bin\%cpu%\" component="base" /> + <File name="mit2ms.pdb" from="staging\bin\%cpu%" to="\bin\%cpu%\" component="base" /> + <File name="ms2mit.exe" from="staging\bin\%cpu%" to="\bin\%cpu%\" component="base" /> + <File name="ms2mit.pdb" from="staging\bin\%cpu%" to="\bin\%cpu%\" component="base" /> + <File name="netidmgr.chm" from="staging\bin\%cpu%" to="\bin\%cpu%\" component="base" /> + <File name="netidmgr.exe" from="staging\bin\%cpu%" to="\bin\%cpu%\" component="base" /> + <File name="netidmgr.pdb" from="staging\bin\%cpu%" to="\bin\%cpu%\" component="base" /> + <File name="nidmgr32.dll" from="staging\bin\%cpu%" to="\bin\%cpu%\" component="base" /> + <File name="nidmgr32.pdb" from="staging\bin\%cpu%" to="\bin\%cpu%\" component="base" /> + <File name="wshelp32.dll" from="staging\bin\%cpu%" to="\bin\%cpu%\" component="base" /> + <File name="wshelp32.pdb" from="staging\bin\%cpu%" to="\bin\%cpu%\" component="base" /> + <File name="xpprof32.dll" from="staging\bin\%cpu%" to="\bin\%cpu%\" component="base" /> + <File name="xpprof32.pdb" from="staging\bin\%cpu%" to="\bin\%cpu%\" component="base" /> - <File name="netidmgr.exe" from="staging\bin\%cpu%\w2k" to="\bin\%cpu%\w2k" /> - <File name="netidmgr.pdb" from="staging\bin\%cpu%\w2k" to="\bin\%cpu%\w2k" /> - <File name="nidmgr32.dll" from="staging\bin\%cpu%\w2k" to="\bin\%cpu%\w2k" /> - <File name="nidmgr32.pdb" from="staging\bin\%cpu%\w2k" to="\bin\%cpu%\w2k" /> + <File name="netidmgr.exe" from="staging\bin\%cpu%\w2k" to="\bin\%cpu%\w2k" component="base" /> + <File name="netidmgr.pdb" from="staging\bin\%cpu%\w2k" to="\bin\%cpu%\w2k" component="base" /> + <File name="nidmgr32.dll" from="staging\bin\%cpu%\w2k" to="\bin\%cpu%\w2k" component="base" /> + <File name="nidmgr32.pdb" from="staging\bin\%cpu%\w2k" to="\bin\%cpu%\w2k" component="base" /> </Files>
\ No newline at end of file diff --git a/src/windows/build/sdkfiles.xml b/src/windows/build/sdkfiles.xml index fd0a93e..83f7a99 100644 --- a/src/windows/build/sdkfiles.xml +++ b/src/windows/build/sdkfiles.xml @@ -6,18 +6,18 @@ <File dummy="foo" /> <!-- Forces XML::Simple behavior --> <!-- Without this, XML::Simple does not make an anonymous array and I can't figure out how to iterate over it. --> - <File name="relnotes.html" from="doc\kerberos" to="doc" /> - <File name="msi-deployment-guide.txt" from="athena\auth\krb5\src\windows\installer\wix\" to="\doc" /> + <File name="relnotes.html" from="doc\kerberos" to="doc" component="base" /> + <File name="msi-deployment-guide.txt" from="athena\auth\krb5\src\windows\installer\wix\" to="\doc" component="base" /> - <File name="*.*" from="staging\inc" to="inc" /> + <File name="*.*" from="staging\inc" to="inc" component="base" /> <!-- loadfuncs.c is deliberately here. Otherwise, *.h would work. --> - <File name="*.*" from="staging\install\nsis" to="install\nsis\" /> + <File name="*.*" from="staging\install\nsis" to="install\nsis\" component="base" /> <!-- We'll clean up the exes in the target directory in a later step. --> - <File name="*.*" from="staging\install\wix" to="install\wix\" /> + <File name="*.*" from="staging\install\wix" to="install\wix\" component="base" /> <!-- We'll clean up the msi in the target directory in a later step. --> - <File name="*.lib" from="staging\lib\%cpu%" to="lib\%cpu%\" /> + <File name="*.lib" from="staging\lib\%cpu%" to="lib\%cpu%\" component="base" /> </Files>
\ No newline at end of file diff --git a/src/windows/installer/nsis/kfw-fixed-tagged.nsi b/src/windows/installer/nsis/kfw-fixed-tagged.nsi index e508dfe..aecaa69 100644 --- a/src/windows/installer/nsis/kfw-fixed-tagged.nsi +++ b/src/windows/installer/nsis/kfw-fixed-tagged.nsi @@ -73,10 +73,10 @@ VIAddVersionKey "PrivateBuild" "Checked/Debug" !define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language"
;Where are the files?
- !define KFW_BIN_DIR "${KFW_TARGETDIR}\bin\i386"
+ !define KFW_BIN_DIR "${KFW_TARGETDIR}\bin\%cpu%"
!define KFW_DOC_DIR "${KFW_TARGETDIR}\doc"
!define KFW_INC_DIR "${KFW_TARGETDIR}\inc"
- !define KFW_LIB_DIR "${KFW_TARGETDIR}\lib\i386"
+ !define KFW_LIB_DIR "${KFW_TARGETDIR}\lib\%cpu%"
!define KFW_SAMPLE_DIR "${KFW_TARGETDIR}\sample"
!define KFW_INSTALL_DIR "${KFW_TARGETDIR}\install"
!define SYSTEMDIR "$%SystemRoot%\System32"
@@ -189,7 +189,7 @@ Section "KfW Client" secClient File /oname=$R0 "Killer.exe"
nsExec::Exec '$R0 netidmgr.exe'
nsExec::Exec '$R0 leash32.exe'
- nsExec::Exec '$R0 krbcc32s.exe'
+ nsExec::Exec '$R0 krbcc%WL%s.exe'
nsExec::Exec '$R0 k95.exe'
nsExec::Exec '$R0 k95g.exe'
nsExec::Exec '$R0 krb5.exe'
@@ -200,42 +200,42 @@ Section "KfW Client" secClient ; Do client components
SetOutPath "$INSTDIR\bin"
- !insertmacro ReplaceDLL "${KFW_BIN_DIR}\comerr%WL%.dll" "$INSTDIR\bin\comerr%WL%.dll" "$INSTDIR"
- !insertmacro ReplaceDLL "${KFW_BIN_DIR}\gss.exe" "$INSTDIR\bin\gss.exe" "$INSTDIR"
- !insertmacro ReplaceDLL "${KFW_BIN_DIR}\gss-client.exe" "$INSTDIR\bin\gss-client.exe" "$INSTDIR"
- !insertmacro ReplaceDLL "${KFW_BIN_DIR}\gss-server.exe" "$INSTDIR\bin\gss-server.exe" "$INSTDIR"
- !insertmacro ReplaceDLL "${KFW_BIN_DIR}\gssapi32.dll" "$INSTDIR\bin\gssapi32.dll" "$INSTDIR"
- !insertmacro ReplaceDLL "${KFW_BIN_DIR}\k524init.exe" "$INSTDIR\bin\k524init.exe" "$INSTDIR"
- !insertmacro ReplaceDLL "${KFW_BIN_DIR}\kdestroy.exe" "$INSTDIR\bin\kdestroy.exe" "$INSTDIR"
- !insertmacro ReplaceDLL "${KFW_BIN_DIR}\kinit.exe" "$INSTDIR\bin\kinit.exe" "$INSTDIR"
- !insertmacro ReplaceDLL "${KFW_BIN_DIR}\klist.exe" "$INSTDIR\bin\klist.exe" "$INSTDIR"
- !insertmacro ReplaceDLL "${KFW_BIN_DIR}\kpasswd.exe" "$INSTDIR\bin\kpasswd.exe" "$INSTDIR"
- !insertmacro ReplaceDLL "${KFW_BIN_DIR}\kvno.exe" "$INSTDIR\bin\kvno.exe" "$INSTDIR"
- !insertmacro ReplaceDLL "${KFW_BIN_DIR}\krb5_32.dll" "$INSTDIR\bin\krb5_32.dll" "$INSTDIR"
- !insertmacro ReplaceDLL "${KFW_BIN_DIR}\k5sprt32.dll" "$INSTDIR\bin\k5sprt32.dll" "$INSTDIR"
- !insertmacro ReplaceDLL "${KFW_BIN_DIR}\krb524.dll" "$INSTDIR\bin\krb524.dll" "$INSTDIR"
- !insertmacro ReplaceDLL "${KFW_BIN_DIR}\krbcc32.dll" "$INSTDIR\bin\krbcc32.dll" "$INSTDIR"
- !insertmacro ReplaceDLL "${KFW_BIN_DIR}\krbcc32s.exe" "$INSTDIR\bin\krbcc32s.exe" "$INSTDIR"
- !insertmacro ReplaceDLL "${KFW_BIN_DIR}\netidmgr.chm" "$INSTDIR\bin\netidmgr.chm" "$INSTDIR"
- !insertmacro ReplaceDLL "${KFW_BIN_DIR}\krb5cred.dll" "$INSTDIR\bin\krb5cred.dll" "$INSTDIR"
- !insertmacro ReplaceDLL "${KFW_BIN_DIR}\krb5cred_en_us.dll" "$INSTDIR\bin\krb5cred_en_us.dll" "$INSTDIR"
- !insertmacro ReplaceDLL "${KFW_BIN_DIR}\leashw32.dll" "$INSTDIR\bin\leashw32.dll" "$INSTDIR"
- !insertmacro ReplaceDLL "${KFW_BIN_DIR}\ms2mit.exe" "$INSTDIR\bin\ms2mit.exe" "$INSTDIR"
- !insertmacro ReplaceDLL "${KFW_BIN_DIR}\mit2ms.exe" "$INSTDIR\bin\mit2ms.exe" "$INSTDIR"
- !insertmacro ReplaceDLL "${KFW_BIN_DIR}\kcpytkt.exe" "$INSTDIR\bin\kcpytkt.exe" "$INSTDIR"
- !insertmacro ReplaceDLL "${KFW_BIN_DIR}\kdeltkt.exe" "$INSTDIR\bin\kdeltkt.exe" "$INSTDIR"
- !insertmacro ReplaceDLL "${KFW_BIN_DIR}\wshelp32.dll" "$INSTDIR\bin\wshelp32.dll" "$INSTDIR"
- !insertmacro ReplaceDLL "${KFW_BIN_DIR}\xpprof32.dll" "$INSTDIR\bin\xpprof32.dll" "$INSTDIR"
+ !insertmacro ReplaceDLL "${KFW_BIN_DIR}\comerr%WL%.dll" "$INSTDIR\bin\comerr%WL%.dll" "$INSTDIR"
+ !insertmacro ReplaceDLL "${KFW_BIN_DIR}\gss.exe" "$INSTDIR\bin\gss.exe" "$INSTDIR"
+ !insertmacro ReplaceDLL "${KFW_BIN_DIR}\gss-client.exe" "$INSTDIR\bin\gss-client.exe" "$INSTDIR"
+ !insertmacro ReplaceDLL "${KFW_BIN_DIR}\gss-server.exe" "$INSTDIR\bin\gss-server.exe" "$INSTDIR"
+ !insertmacro ReplaceDLL "${KFW_BIN_DIR}\gssapi%WL%.dll" "$INSTDIR\bin\gssapi%WL%.dll" "$INSTDIR"
+ !insertmacro ReplaceDLL "${KFW_BIN_DIR}\k524init.exe" "$INSTDIR\bin\k524init.exe" "$INSTDIR"
+ !insertmacro ReplaceDLL "${KFW_BIN_DIR}\kdestroy.exe" "$INSTDIR\bin\kdestroy.exe" "$INSTDIR"
+ !insertmacro ReplaceDLL "${KFW_BIN_DIR}\kinit.exe" "$INSTDIR\bin\kinit.exe" "$INSTDIR"
+ !insertmacro ReplaceDLL "${KFW_BIN_DIR}\klist.exe" "$INSTDIR\bin\klist.exe" "$INSTDIR"
+ !insertmacro ReplaceDLL "${KFW_BIN_DIR}\kpasswd.exe" "$INSTDIR\bin\kpasswd.exe" "$INSTDIR"
+ !insertmacro ReplaceDLL "${KFW_BIN_DIR}\kvno.exe" "$INSTDIR\bin\kvno.exe" "$INSTDIR"
+ !insertmacro ReplaceDLL "${KFW_BIN_DIR}\krb5_%WL%.dll" "$INSTDIR\bin\krb5_%WL%.dll" "$INSTDIR"
+ !insertmacro ReplaceDLL "${KFW_BIN_DIR}\k5sprt%WL%.dll" "$INSTDIR\bin\k5sprt%WL%.dll" "$INSTDIR"
+ !insertmacro ReplaceDLL "${KFW_BIN_DIR}\krb524.dll" "$INSTDIR\bin\krb524.dll" "$INSTDIR"
+ !insertmacro ReplaceDLL "${KFW_BIN_DIR}\krbcc%WL%.dll" "$INSTDIR\bin\krbcc%WL%.dll" "$INSTDIR"
+ !insertmacro ReplaceDLL "${KFW_BIN_DIR}\krbcc%WL%s.exe" "$INSTDIR\bin\krbcc%WL%s.exe" "$INSTDIR"
+ !insertmacro ReplaceDLL "${KFW_BIN_DIR}\netidmgr.chm" "$INSTDIR\bin\netidmgr.chm" "$INSTDIR"
+ !insertmacro ReplaceDLL "${KFW_BIN_DIR}\krb5cred.dll" "$INSTDIR\bin\krb5cred.dll" "$INSTDIR"
+ !insertmacro ReplaceDLL "${KFW_BIN_DIR}\krb5cred_en_us.dll" "$INSTDIR\bin\krb5cred_en_us.dll" "$INSTDIR"
+ !insertmacro ReplaceDLL "${KFW_BIN_DIR}\leashw%WL%.dll" "$INSTDIR\bin\leashw%WL%.dll" "$INSTDIR"
+ !insertmacro ReplaceDLL "${KFW_BIN_DIR}\ms2mit.exe" "$INSTDIR\bin\ms2mit.exe" "$INSTDIR"
+ !insertmacro ReplaceDLL "${KFW_BIN_DIR}\mit2ms.exe" "$INSTDIR\bin\mit2ms.exe" "$INSTDIR"
+ !insertmacro ReplaceDLL "${KFW_BIN_DIR}\kcpytkt.exe" "$INSTDIR\bin\kcpytkt.exe" "$INSTDIR"
+ !insertmacro ReplaceDLL "${KFW_BIN_DIR}\kdeltkt.exe" "$INSTDIR\bin\kdeltkt.exe" "$INSTDIR"
+ !insertmacro ReplaceDLL "${KFW_BIN_DIR}\wshelp%WL%.dll" "$INSTDIR\bin\wshelp%WL%.dll" "$INSTDIR"
+ !insertmacro ReplaceDLL "${KFW_BIN_DIR}\xpprof%WL%.dll" "$INSTDIR\bin\xpprof%WL%.dll" "$INSTDIR"
Call GetWindowsVersion
Pop $R0
StrCmp $R0 "2000" nid_inst2000
!insertmacro ReplaceDLL "${KFW_BIN_DIR}\netidmgr.exe" "$INSTDIR\bin\netidmgr.exe" "$INSTDIR"
- !insertmacro ReplaceDLL "${KFW_BIN_DIR}\nidmgr32.dll" "$INSTDIR\bin\nidmgr32.dll" "$INSTDIR"
+ !insertmacro ReplaceDLL "${KFW_BIN_DIR}\nidmgr%WL%.dll" "$INSTDIR\bin\nidmgr%WL%.dll" "$INSTDIR"
goto nid_done
nid_inst2000:
!insertmacro ReplaceDLL "${KFW_BIN_DIR}\W2K\netidmgr.exe" "$INSTDIR\bin\netidmgr.exe" "$INSTDIR"
- !insertmacro ReplaceDLL "${KFW_BIN_DIR}\W2K\nidmgr32.dll" "$INSTDIR\bin\nidmgr32.dll" "$INSTDIR"
+ !insertmacro ReplaceDLL "${KFW_BIN_DIR}\W2K\nidmgr%WL%.dll" "$INSTDIR\bin\nidmgr%WL%.dll" "$INSTDIR"
nid_done:
!ifdef DEBUG
@@ -295,11 +295,11 @@ nid_done: !ENDIF
!ENDIF
!ELSE
-!IFDEF CL_1400
- GetTempFileName $R0
- File /oname=$R0 '${REDISTDIR}\vcredist_x86.exe'
- nsExec::Exec '$R0'
-!ELSE
+;!IFDEF CL_1400
+; GetTempFileName $R0
+; File /oname=$R0 '${REDISTDIR}\vcredist_x86.exe'
+; nsExec::Exec '$R0'
+;!ELSE
!IFDEF CL_1310
!insertmacro ReplaceDLL "${SYSTEMDIR}\mfc71.dll" "$INSTDIR\bin\mfc71.dll" "$INSTDIR"
!insertmacro ReplaceDLL "${SYSTEMDIR}\msvcr71.dll" "$INSTDIR\bin\msvcr71.dll" "$INSTDIR"
@@ -333,7 +333,7 @@ nid_done: !insertmacro ReplaceDLL "${SYSTEMDIR}\msvcrt.dll" "$INSTDIR\bin\msvcrt.dll" "$INSTDIR"
!ENDIF
!ENDIF
-!ENDIF
+;!ENDIF
!ENDIF
!insertmacro ReplaceDLL "${SYSTEMDIR}\psapi.dll" "$INSTDIR\bin\psapi.dll" "$INSTDIR"
@@ -427,7 +427,7 @@ nostart: checkconflicts:
Call GetSystemPath
- Push "krb5_32.dll"
+ Push "krb5_%WL%.dll"
Call SearchPath
Pop $R0
StrCmp $R0 "" addpath
@@ -484,40 +484,40 @@ SectionEnd Section "Debug Symbols" secDebug
SetOutPath "$INSTDIR\bin"
- File "${KFW_BIN_DIR}\comerr32.pdb"
+ File "${KFW_BIN_DIR}\comerr%WL%.pdb"
File "${KFW_BIN_DIR}\gss.pdb"
File "${KFW_BIN_DIR}\gss-client.pdb"
File "${KFW_BIN_DIR}\gss-server.pdb"
- File "${KFW_BIN_DIR}\gssapi32.pdb"
+ File "${KFW_BIN_DIR}\gssapi%WL%.pdb"
File "${KFW_BIN_DIR}\k524init.pdb"
File "${KFW_BIN_DIR}\kdestroy.pdb"
File "${KFW_BIN_DIR}\kinit.pdb"
File "${KFW_BIN_DIR}\klist.pdb"
File "${KFW_BIN_DIR}\kpasswd.pdb"
File "${KFW_BIN_DIR}\kvno.pdb"
- File "${KFW_BIN_DIR}\krb5_32.pdb"
- File "${KFW_BIN_DIR}\k5sprt32.pdb"
+ File "${KFW_BIN_DIR}\krb5_%WL%.pdb"
+ File "${KFW_BIN_DIR}\k5sprt%WL%.pdb"
File "${KFW_BIN_DIR}\krb524.pdb"
- File "${KFW_BIN_DIR}\krbcc32.pdb"
- File "${KFW_BIN_DIR}\krbcc32s.pdb"
- File "${KFW_BIN_DIR}\leashw32.pdb"
+ File "${KFW_BIN_DIR}\krbcc%WL%.pdb"
+ File "${KFW_BIN_DIR}\krbcc%WL%s.pdb"
+ File "${KFW_BIN_DIR}\leashw%WL%.pdb"
File "${KFW_BIN_DIR}\krb5cred.pdb"
File "${KFW_BIN_DIR}\ms2mit.pdb"
File "${KFW_BIN_DIR}\mit2ms.pdb"
File "${KFW_BIN_DIR}\kcpytkt.pdb"
File "${KFW_BIN_DIR}\kdeltkt.pdb"
- File "${KFW_BIN_DIR}\wshelp32.pdb"
- File "${KFW_BIN_DIR}\xpprof32.pdb"
+ File "${KFW_BIN_DIR}\wshelp%WL%.pdb"
+ File "${KFW_BIN_DIR}\xpprof%WL%.pdb"
Call GetWindowsVersion
Pop $R0
StrCmp $R0 "2000" nidpdb_inst2000
File "${KFW_BIN_DIR}\netidmgr.pdb"
- File "${KFW_BIN_DIR}\nidmgr32.pdb"
+ File "${KFW_BIN_DIR}\nidmgr%WL%.pdb"
goto nidpdb_done
nidpdb_inst2000:
File "${KFW_BIN_DIR}\W2K\netidmgr.pdb"
- File "${KFW_BIN_DIR}\W2K\nidmgr32.pdb"
+ File "${KFW_BIN_DIR}\W2K\nidmgr%WL%.pdb"
nidpdb_done:
!IFDEF DEBUG
@@ -585,7 +585,7 @@ Section "KfW SDK" secSDK SetOutPath "$INSTDIR\inc\wshelper"
File /r "${KFW_INC_DIR}\wshelper\*"
- SetOutPath "$INSTDIR\lib\i386"
+ SetOutPath "$INSTDIR\lib\%cpu%"
File /r "${KFW_LIB_DIR}\*"
SetOutPath "$INSTDIR\install"
@@ -1145,7 +1145,7 @@ StartRemove: GetTempFileName $R0
File /oname=$R0 "Killer.exe"
nsExec::Exec '$R0 netidmgr.exe'
- nsExec::Exec '$R0 krbcc32s.exe'
+ nsExec::Exec '$R0 krbcc%WL%s.exe'
Push "$INSTDIR\bin"
Call un.RemoveFromSystemPath
@@ -1155,7 +1155,7 @@ StartRemove: Delete "$INSTDIR\doc\netidmgr_userdoc.pdf"
Delete "$INSTDIR\doc\netiddev.chm"
- Delete /REBOOTOK "$INSTDIR\bin\comerr32.dll"
+ Delete /REBOOTOK "$INSTDIR\bin\comerr%WL%.dll"
Delete /REBOOTOK "$INSTDIR\bin\gss.exe"
Delete /REBOOTOK "$INSTDIR\bin\gss-client.exe"
Delete /REBOOTOK "$INSTDIR\bin\gss-server.exe"
@@ -1166,27 +1166,27 @@ StartRemove: Delete /REBOOTOK "$INSTDIR\bin\klist.exe"
Delete /REBOOTOK "$INSTDIR\bin\kpasswd.exe"
Delete /REBOOTOK "$INSTDIR\bin\kvno.exe"
- Delete /REBOOTOK "$INSTDIR\bin\krb5_32.dll"
- Delete /REBOOTOK "$INSTDIR\bin\k5sprt32.dll"
+ Delete /REBOOTOK "$INSTDIR\bin\krb5_%WL%.dll"
+ Delete /REBOOTOK "$INSTDIR\bin\k5sprt%WL%.dll"
Delete /REBOOTOK "$INSTDIR\bin\krb524.dll"
- Delete /REBOOTOK "$INSTDIR\bin\krbcc32.dll"
- Delete /REBOOTOK "$INSTDIR\bin\krbcc32s.exe"
+ Delete /REBOOTOK "$INSTDIR\bin\krbcc%WL%.dll"
+ Delete /REBOOTOK "$INSTDIR\bin\krbcc%WL%s.exe"
Delete /REBOOTOK "$INSTDIR\bin\netidmgr.exe"
Delete /REBOOTOK "$INSTDIR\bin\netidmgr.chm"
- Delete /REBOOTOK "$INSTDIR\bin\nidmgr32.dll"
+ Delete /REBOOTOK "$INSTDIR\bin\nidmgr%WL%.dll"
Delete /REBOOTOK "$INSTDIR\bin\krb5cred.dll"
Delete /REBOOTOK "$INSTDIR\bin\krb5cred_en_us.dll"
- Delete /REBOOTOK "$INSTDIR\bin\leashw32.dll"
+ Delete /REBOOTOK "$INSTDIR\bin\leashw%WL%.dll"
Delete /REBOOTOK "$INSTDIR\bin\ms2mit.exe"
Delete /REBOOTOK "$INSTDIR\bin\mit2ms.exe"
Delete /REBOOTOK "$INSTDIR\bin\kcpytkt.exe"
Delete /REBOOTOK "$INSTDIR\bin\kdeltkt.exe"
- Delete /REBOOTOK "$INSTDIR\bin\wshelp32.dll"
- Delete /REBOOTOK "$INSTDIR\bin\xpprof32.dll"
+ Delete /REBOOTOK "$INSTDIR\bin\wshelp%WL%.dll"
+ Delete /REBOOTOK "$INSTDIR\bin\xpprof%WL%.dll"
Delete /REBOOTOK "$SYSDIR\bin\kfwlogon.dll"
Delete /REBOOTOK "$SYSDIR\bin\kfwcpcc.exe"
- Delete /REBOOTOK "$INSTDIR\bin\comerr32.pdb"
+ Delete /REBOOTOK "$INSTDIR\bin\comerr%WL%.pdb"
Delete /REBOOTOK "$INSTDIR\bin\gss.pdb"
Delete /REBOOTOK "$INSTDIR\bin\gss-client.pdb"
Delete /REBOOTOK "$INSTDIR\bin\gss-server.pdb"
@@ -1198,20 +1198,20 @@ StartRemove: Delete /REBOOTOK "$INSTDIR\bin\kpasswd.pdb"
Delete /REBOOTOK "$INSTDIR\bin\kvno.pdb"
Delete /REBOOTOK "$INSTDIR\bin\krb5_32.pdb"
- Delete /REBOOTOK "$INSTDIR\bin\k5sprt32.pdb"
+ Delete /REBOOTOK "$INSTDIR\bin\k5sprt%WL%.pdb"
Delete /REBOOTOK "$INSTDIR\bin\krb524.pdb"
- Delete /REBOOTOK "$INSTDIR\bin\krbcc32.pdb"
- Delete /REBOOTOK "$INSTDIR\bin\krbcc32s.pdb"
+ Delete /REBOOTOK "$INSTDIR\bin\krbcc%WL%.pdb"
+ Delete /REBOOTOK "$INSTDIR\bin\krbcc%WL%s.pdb"
Delete /REBOOTOK "$INSTDIR\bin\netidmgr.pdb"
- Delete /REBOOTOK "$INSTDIR\bin\nidmgr32.pdb"
+ Delete /REBOOTOK "$INSTDIR\bin\nidmgr%WL%.pdb"
Delete /REBOOTOK "$INSTDIR\bin\krb5cred.pdb"
- Delete /REBOOTOK "$INSTDIR\bin\leashw32.pdb"
+ Delete /REBOOTOK "$INSTDIR\bin\leashw%WL%.pdb"
Delete /REBOOTOK "$INSTDIR\bin\ms2mit.pdb"
Delete /REBOOTOK "$INSTDIR\bin\mit2ms.pdb"
Delete /REBOOTOK "$INSTDIR\bin\kcpytkt.pdb"
Delete /REBOOTOK "$INSTDIR\bin\kdeltkt.pdb"
- Delete /REBOOTOK "$INSTDIR\bin\wshelp32.pdb"
- Delete /REBOOTOK "$INSTDIR\bin\xpprof32.pdb"
+ Delete /REBOOTOK "$INSTDIR\bin\wshelp%WL%.pdb"
+ Delete /REBOOTOK "$INSTDIR\bin\xpprof%WL%.pdb"
Delete /REBOOTOK "$SYSDIR\bin\kfwlogon.pdb"
Delete /REBOOTOK "$SYSDIR\bin\kfwcpcc.pdb"
|