From 970e11485e8bba5b43aaf2947547f10f2cb1ee13 Mon Sep 17 00:00:00 2001 From: Kevin Koch Date: Wed, 28 Mar 2007 19:56:48 +0000 Subject: Add %BUILDDIR% for nsi-includes.nsi, which was missed the first time around Target_Version: 1.6.1 Ticket: 5490 Tags: pullup git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19302 dc483132-0cff-0310-8789-dd5450dbe970 --- src/windows/build/bkw.pl | 30 +++++++++++++--------- src/windows/build/copyfiles.xml | 1 + src/windows/installer/nsis/nsi-includes-tagged.nsi | 8 ++++++ src/windows/installer/nsis/nsi-includes.nsi | 8 ------ 4 files changed, 27 insertions(+), 20 deletions(-) create mode 100644 src/windows/installer/nsis/nsi-includes-tagged.nsi delete mode 100644 src/windows/installer/nsis/nsi-includes.nsi diff --git a/src/windows/build/bkw.pl b/src/windows/build/bkw.pl index 8279879a63..1593f134ff 100644 --- a/src/windows/build/bkw.pl +++ b/src/windows/build/bkw.pl @@ -457,42 +457,48 @@ sub main { local $tmpfile = "site-local.sed" ; system("del $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."; local $dblback_staging = "$wd\\staging"; - $dblback_staging =~ s/\\/\\\\/g; - !system("echo s/%TARGETDIR%/$dblback_staging/ >> $tmpfile") or die "Fatal -- Couldn't modify $tmpfile."; + $dblback_staging =~ s/\\/\\\\/g; + !system("echo s/%TARGETDIR%/$dblback_staging/ >> $tmpfile") or die "Fatal -- Couldn't modify $tmpfile."; local $dblback_sample = "$wd\\staging\\sample"; - $dblback_sample =~ s/\\/\\\\/g; + $dblback_sample =~ s/\\/\\\\/g; !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."; # 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."; + !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."; # Run the script on site-local.wxi: - !system("sed -f $tmpfile site-local-tagged.wxi > site-local.wxi") or die "Fatal -- Couldn't modify site-local.wxi."; + !system("sed -f $tmpfile site-local-tagged.wxi > site-local.wxi") or die "Fatal -- Couldn't modify site-local.wxi."; # Now update site-local.nsi: chdir "..\\nsis"; print "Info -- chdir to ".`cd`."\n" if ($verbose); local $tmpfile = "site-local.sed" ; - !system("sed -f ..\\wix\\$tmpfile site-local-tagged.nsi > b.tmp") or die "Fatal -- Couldn't modify site-local.wxi."; + !system("sed -f ..\\wix\\$tmpfile site-local-tagged.nsi > b.tmp") or die "Fatal -- Couldn't modify site-local.wxi."; # Add DEBUG or RELEASE: if ($switches[0]->{debug}->{value}) { ## debug build - !system("echo !define DEBUG >> b.tmp") or die "Fatal -- Couldn't modify b.tmp."; + !system("echo !define DEBUG >> b.tmp") or die "Fatal -- Couldn't modify b.tmp."; } else { ## release build - !system("echo !define RELEASE >> b.tmp") or die "Fatal -- Couldn't modify b.tmp."; - !system("echo !define NO_DEBUG >> b.tmp") or die "Fatal -- Couldn't modify b.tmp."; + !system("echo !define RELEASE >> b.tmp") or die "Fatal -- Couldn't modify b.tmp."; + !system("echo !define NO_DEBUG >> b.tmp") or die "Fatal -- Couldn't modify b.tmp."; } # Add BETA if present: if ( exists $config->{Versions}->{'BETA_STR'}) { !system("echo !define BETA $config->{Versions}->{'BETA_STR'} >> b.tmp") or die "Fatal -- Couldn't modify b.tmp."; } - !system("mv -f b.tmp site-local.nsi") or die "Fatal -- Couldn't replace site-local.nsi."; + !system("mv -f b.tmp site-local.nsi") or die "Fatal -- Couldn't replace site-local.nsi."; + + # Run the script on nsi-includes-tagged.nsi: + !system("sed -f ..\\wix\\$tmpfile nsi-includes-tagged.nsi > nsi-includes.nsi") or die "Fatal -- Couldn't modify nsi-includes.nsi."; if ($verbose) {print "Info -- *** End prepackage.\n";} diff --git a/src/windows/build/copyfiles.xml b/src/windows/build/copyfiles.xml index 3c8fbf1bf9..1071c51805 100644 --- a/src/windows/build/copyfiles.xml +++ b/src/windows/build/copyfiles.xml @@ -184,6 +184,7 @@ + diff --git a/src/windows/installer/nsis/nsi-includes-tagged.nsi b/src/windows/installer/nsis/nsi-includes-tagged.nsi new file mode 100644 index 0000000000..acf77c0b56 --- /dev/null +++ b/src/windows/installer/nsis/nsi-includes-tagged.nsi @@ -0,0 +1,8 @@ +!define KFW_TARGETDIR %BUILDDIR%\target +!define KFW_EXTRADIR "%BUILDDIR%\target" +!define KFW_VERSION %VERSION_MAJOR%.%VERSION_MINOR% +!define KFW_MAJORVERSION %VERSION_MAJOR% +!define KFW_MINORVERSION %VERSION_MINOR% +!define KFW_PATCHLEVEL %VERSION_PATCH% +!define CL_1310 + diff --git a/src/windows/installer/nsis/nsi-includes.nsi b/src/windows/installer/nsis/nsi-includes.nsi deleted file mode 100644 index 667cb8d471..0000000000 --- a/src/windows/installer/nsis/nsi-includes.nsi +++ /dev/null @@ -1,8 +0,0 @@ -!define KFW_TARGETDIR c:\projects\autobuild\pismere\target -!define KFW_EXTRADIR "c:\projects\autobuild\pismere\target" -!define KFW_VERSION 3.2 -!define KFW_MAJORVERSION 3 -!define KFW_MINORVERSION 2 -!define KFW_PATCHLEVEL 0000 -!define CL_1310 - -- cgit