Skip to content

Commit

Permalink
ticket: 5521
Browse files Browse the repository at this point in the history 
pull up r19472 from trunk

 r19472@cathode-dark-space:  kpkoch | 2007-04-14 14:06:26 -0400
 Target_Version: 1.6.1
 Ticket: 5521
 Tags: pullup
 
 Leave built installers in their temp areas and change final copy step to copy them into <out> from their new location.  Delay cleaning up the temp areas until after that copy.



git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-6@19503 dc483132-0cff-0310-8789-dd5450dbe970
  • Loading branch information
tlyu committed Apr 18, 2007
1 parent d226251 commit 70bf23d
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 18 deletions.
16 changes: 8 additions & 8 deletions src/windows/build/BKWconfig.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<SVNURL def="A" value="svn.mit.edu" /> <!-- NB: No protocol or slashes!! -->
<username def="0" value="" /> <!-- Needed for svn/plink. Override from command line -->

<!-- Environment variables: -->>
<!-- Environment variables: -->
<KH_RELEASE def="1" env="1" value="OFFICIAL" options="OFFICIAL PRERELEASE PRIVATE" />
<NODEBUG def="1" env="1" /> <!-- Interacts with /DEBUG -->
</Config>
Expand Down Expand Up @@ -164,16 +164,16 @@
</Prunes>
</Zip>
</Zips>
<CopyList> <!-- Copied at end of post-package step. -->
<CopyList> <!-- Copied at end of post-package step. -->
<Files>
<File dummy="foo" />
<!-- File from paths are relative to <src>/pismere. -->
<!-- File to paths are relative to <out>. -->
<!-- File from paths are relative to <src/pismere>. -->
<!-- File to paths are relative to <out>. -->
<File name="msi-deployment-guide.txt" from="staging\install\wix\" to="" />
<File name="netidmgr_userdoc.pdf" from="staging\doc" to="." />
<File name="kfw.msi" from="staging\install\wix\" to="" newname="%filestem%.msi" />
<File name="MITKerberosForWindows%-DEBUG%.exe" from="staging\install\nsis" to="" newname="%filestem%%-DEBUG%.exe" />
<File name="relnotes.html" from="staging\doc" to="." />
<File name="netidmgr_userdoc.pdf" from="staging\doc" to="" />
<File name="kfw.msi" from="buildwix" to="" newname="%filestem%.msi" />
<File name="MITKerberosForWindows%-DEBUG%.exe" from="buildnsi" to="" newname="%filestem%%-DEBUG%.exe" />
<File name="relnotes.html" from="staging\doc" to="" />
</Files>
</CopyList>
</PostPackage>
Expand Down
19 changes: 9 additions & 10 deletions src/windows/build/bkw.pl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ sub main {
# Test the unix find command:
if (! exists $odr->{unixfind}->{value}) {
$odr->{unixfind}->{value} = "C:\\tools\\cygwin\\bin";
}
}
local $unixfind = $odr->{unixfind}->{value};

local $savedPATH = $ENV{PATH};
Expand Down Expand Up @@ -629,23 +629,22 @@ sub main {
!system("rename killer.exe Killer.exe") or die "Error -- Couldn't rename killer.exe";
!system("makensis kfw.nsi") or die "Error -- executable installer build failed.";

chdir("$wd") or die "Fatal -- Couldn't cd to $wd";
# Begin packaging extra items:
chdir($wd) or die "Fatal -- Couldn't cd to $wd";
print "Info -- chdir to ".`cd`."\n" if ($verbose);
!system("xcopy /s $wd\\buildwix\\*.msi $wd\\staging\\install\\wix") or die "Fatal -- Couldn't copy $wd\\buildwix\\*.msi.";
!system("del $wd\\buildnsi\\killer.exe") or die "Fatal -- Couldn't clean $wd\\buildnsi\\killer.exe.";
!system("xcopy /s $wd\\buildnsi\\*.exe $wd\\staging\\install\\nsis") or die "Fatal -- Couldn't copy $wd\\buildnsi\\install\\nsis\\*.exe.";
!system("rm -rf $wd\\buildwix") or die "Fatal -- Couldn't remove $wd\\buildwix.";
!system("rm -rf $wd\\buildnsi") or die "Fatal -- Couldn't remove $wd\\buildnsi.";

# Begin packaging extra items:
zipXML($config->{Stages}->{PostPackage}, $config); ## Make zips.

$config->{Stages}->{PostPackage}->{CopyList}->{Config} = $config->{Stages}->{PostPackage}->{Config}; ## Use the post package config.
$config->{Stages}->{PostPackage}->{CopyList}->{Config}->{From}->{root} = "$src\\pismere";
$config->{Stages}->{PostPackage}->{CopyList}->{Config}->{To}->{root} = "$out";
$config->{Stages}->{PostPackage}->{CopyList}->{Config}->{To}->{root} = $out;
copyFiles($config->{Stages}->{PostPackage}->{CopyList}, $config); ## Copy any files

print "Info -- chdir to ".`cd`."\n" if ($verbose);
!system("rm -rf $wd\\buildwix") or die "Fatal -- Couldn't remove $wd\\buildwix.";
!system("rm -rf $wd\\buildnsi") or die "Fatal -- Couldn't remove $wd\\buildnsi.";

chdir($out) or die "Fatal -- Couldn't cd to $out";
print "Info -- chdir to ".`cd`."\n" if ($verbose);
if ($odr->{sign}->{def}) {
signFiles($config->{Stages}->{PostPackage}->{Config}->{Signing}, $config);
}
Expand Down

0 comments on commit 70bf23d

Please sign in to comment.