pull up r19302 from trunk

 r19302@cathode-dark-space:  kpkoch | 2007-03-28 15:56:48 -0400
 Target_Version: 1.6.1
 Ticket: 5490
 Tags: pullup

 Add %BUILDDIR% for nsi-includes.nsi, which was missed the first time around.

ticket: 5490

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-6@19357 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/windows/build/bkw.pl b/src/windows/build/bkw.pl
index 8279879a63a6ced54f904512e248b916b9b50da8..1593f134ff9b186c8a971e45e8383fbb8ce278ce 100644 (file)
--- a/src/windows/build/bkw.pl
+++ b/src/windows/build/bkw.pl
@@ -457,42 +457,48 @@ sub main {
                local $tmpfile  = "site-local.sed" ;\r
                system("del $tmpfile");\r
                # Basic substitutions:\r
+               local $dblback_wd                       = $wd;\r
+               $dblback_wd                                             =~ s/\\/\\\\/g;\r
+               !system("echo s/%BUILDDIR%/$dblback_wd/ >> $tmpfile")                                                   or die "Fatal -- Couldn't modify $tmpfile.";    \r
                local $dblback_staging  = "$wd\\staging";\r
-               $dblback_staging                        =~ s/\\/\\\\/g;\r
-               !system("echo s/%TARGETDIR%/$dblback_staging/ >> $tmpfile")             or die "Fatal -- Couldn't modify $tmpfile.";    \r
+               $dblback_staging                                =~ s/\\/\\\\/g;\r
+               !system("echo s/%TARGETDIR%/$dblback_staging/ >> $tmpfile")                             or die "Fatal -- Couldn't modify $tmpfile.";    \r
                local $dblback_sample   = "$wd\\staging\\sample";\r
-               $dblback_sample                 =~ s/\\/\\\\/g;\r
+               $dblback_sample                         =~ s/\\/\\\\/g;\r
                !system("echo s/%CONFIGDIR-WIX%/$dblback_sample/ >> $tmpfile")          or die "Fatal -- Couldn't modify $tmpfile.";    \r
                !system("echo s/%CONFIGDIR-NSI%/$dblback_staging/ >> $tmpfile")         or die "Fatal -- Couldn't modify $tmpfile.";    \r
                !system("echo s/%VERSION_MAJOR%/$config->{Versions}->{'VER_PROD_MAJOR_STR'}/ >> $tmpfile")              or die "Fatal -- Couldn't modify $tmpfile.";    \r
                !system("echo s/%VERSION_MINOR%/$config->{Versions}->{'VER_PROD_MINOR_STR'}/ >> $tmpfile")              or die "Fatal -- Couldn't modify $tmpfile.";    \r
                !system("echo s/%VERSION_PATCH%/$config->{Versions}->{'VER_PROD_REV_STR'}/ >> $tmpfile")                        or die "Fatal -- Couldn't modify $tmpfile.";    \r
                # Strip out some defines so they can be replaced:  [used for site-local.nsi]\r
-               !system("echo /\^!define\.\*RELEASE\.\*\$/d >> $tmpfile")                                                               or die "Fatal -- Couldn't modify $tmpfile.";    \r
-               !system("echo /\^!define\.\*DEBUG\.\*\$/d >> $tmpfile")                                                         or die "Fatal -- Couldn't modify $tmpfile.";    \r
-               !system("echo /\^!define\.\*BETA\.\*\$/d >> $tmpfile")                                                                  or die "Fatal -- Couldn't modify $tmpfile.";    \r
+               !system("echo /\^!define\.\*RELEASE\.\*\$/d >> $tmpfile")                                                       or die "Fatal -- Couldn't modify $tmpfile.";    \r
+               !system("echo /\^!define\.\*DEBUG\.\*\$/d >> $tmpfile")                                                 or die "Fatal -- Couldn't modify $tmpfile.";    \r
+               !system("echo /\^!define\.\*BETA\.\*\$/d >> $tmpfile")                                                          or die "Fatal -- Couldn't modify $tmpfile.";    \r
 \r
                # Run the script on site-local.wxi:\r
-               !system("sed -f $tmpfile site-local-tagged.wxi > site-local.wxi")                                               or die "Fatal -- Couldn't modify site-local.wxi.";\r
+               !system("sed -f $tmpfile site-local-tagged.wxi > site-local.wxi")                                       or die "Fatal -- Couldn't modify site-local.wxi.";\r
 \r
                # Now update site-local.nsi:\r
                chdir "..\\nsis";\r
                print "Info -- chdir to ".`cd`."\n"                                                                             if ($verbose);\r
                local $tmpfile  = "site-local.sed" ;\r
-               !system("sed -f ..\\wix\\$tmpfile site-local-tagged.nsi > b.tmp")                                       or die "Fatal -- Couldn't modify site-local.wxi.";\r
+               !system("sed -f ..\\wix\\$tmpfile site-local-tagged.nsi > b.tmp")                               or die "Fatal -- Couldn't modify site-local.wxi.";\r
                # Add DEBUG or RELEASE:\r
                if ($switches[0]->{debug}->{value}) {                           ## debug build\r
-                       !system("echo !define DEBUG >> b.tmp")                                                                                                                  or die "Fatal -- Couldn't modify b.tmp.";       \r
+                       !system("echo !define DEBUG >> b.tmp")                                                                                                          or die "Fatal -- Couldn't modify b.tmp.";       \r
                        }\r
                else {                                                                                                                                          ## release build\r
-                       !system("echo !define RELEASE >> b.tmp")                                                                                                                        or die "Fatal -- Couldn't modify b.tmp.";       \r
-                       !system("echo !define NO_DEBUG >> b.tmp")                                                                                                       or die "Fatal -- Couldn't modify b.tmp.";       \r
+                       !system("echo !define RELEASE >> b.tmp")                                                                                                                or die "Fatal -- Couldn't modify b.tmp.";       \r
+                       !system("echo !define NO_DEBUG >> b.tmp")                                                                                               or die "Fatal -- Couldn't modify b.tmp.";       \r
                        }\r
                # Add BETA if present:\r
                if ( exists $config->{Versions}->{'BETA_STR'}) {\r
                        !system("echo !define BETA $config->{Versions}->{'BETA_STR'} >> b.tmp") or die "Fatal -- Couldn't modify b.tmp.";       \r
                        }\r
-               !system("mv -f b.tmp site-local.nsi")                                                                                                                                           or die "Fatal -- Couldn't replace site-local.nsi.";\r
+               !system("mv -f b.tmp site-local.nsi")                                                                                                                                   or die "Fatal -- Couldn't replace site-local.nsi.";\r
+\r
+               # Run the script on nsi-includes-tagged.nsi:\r
+               !system("sed -f ..\\wix\\$tmpfile nsi-includes-tagged.nsi > nsi-includes.nsi")          or die "Fatal -- Couldn't modify nsi-includes.nsi.";\r
 \r
                if ($verbose) {print "Info -- ***   End prepackage.\n";}\r
                \r

diff --git a/src/windows/build/copyfiles.xml b/src/windows/build/copyfiles.xml
index 3c8fbf1bf932a3aa38c7c3ecd7ddcb8c5b645b59..1071c5180566421ec983110db47da59b34c78bda 100644 (file)
--- a/src/windows/build/copyfiles.xml
+++ b/src/windows/build/copyfiles.xml
@@ -184,6 +184,7 @@
                <File name="killer.cpp" from="auth\krb5\src\windows\installer\nsis\"    to="\install\nsis" />\r
                <File name="licenses.rtf"       from="auth\krb5\src\windows\installer\nsis\"    to="\install\nsis" />\r
                <File name="site-local-tagged.nsi"      from="auth\krb5\src\windows\installer\nsis\"    to="\install\nsis" />\r
+               <File name="nsi-includes-tagged.nsi"    from="auth\krb5\src\windows\installer\nsis\"    to="\install\nsis" />\r
                <File name="utils.nsi"  from="auth\krb5\src\windows\installer\nsis\"    to="\install\nsis" />\r
                <File name="msi-deployment-guide.txt"   from="auth\krb5\src\windows\installer\wix\"     to="\install\wix" />\r
                <File name="config.wxi" from="auth\krb5\src\windows\installer\wix\"     to="\install\wix" />\r

diff --git a/src/windows/installer/nsis/nsi-includes-tagged.nsi b/src/windows/installer/nsis/nsi-includes-tagged.nsi
new file mode 100644 (file)
index 0000000..acf77c0
--- /dev/null
+++ b/src/windows/installer/nsis/nsi-includes-tagged.nsi
@@ -0,0 +1,8 @@
+!define KFW_TARGETDIR %BUILDDIR%\target\r
+!define KFW_EXTRADIR "%BUILDDIR%\target"\r
+!define KFW_VERSION %VERSION_MAJOR%.%VERSION_MINOR%\r
+!define KFW_MAJORVERSION %VERSION_MAJOR%\r
+!define KFW_MINORVERSION %VERSION_MINOR%\r
+!define KFW_PATCHLEVEL %VERSION_PATCH%\r
+!define CL_1310\r
+\r

diff --git a/src/windows/installer/nsis/nsi-includes.nsi b/src/windows/installer/nsis/nsi-includes.nsi
deleted file mode 100644 (file)
index 667cb8d..0000000
--- 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
-