From 7dabcca2bbe27ddc01bb700de46fb241b74971c2 Mon Sep 17 00:00:00 2001 From: "kairo%kairo.at" Date: Mon, 4 Jul 2005 18:38:47 +0000 Subject: [PATCH] supplementary fix for bug 292268 (SeaMonkey package naming) to fix windows stub installer (creature orange), p=IanN sr=Neil r+a=bsmedberg git-svn-id: svn://10.0.0.236/trunk@175581 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/xpinstall/packager/windows/Makefile.in | 5 ++++- mozilla/xpinstall/packager/windows/makejs.pl | 2 +- .../packager/windows/mozilla-win32-stub-installer.jst | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mozilla/xpinstall/packager/windows/Makefile.in b/mozilla/xpinstall/packager/windows/Makefile.in index 43eac888546..a3c59496df3 100644 --- a/mozilla/xpinstall/packager/windows/Makefile.in +++ b/mozilla/xpinstall/packager/windows/Makefile.in @@ -60,9 +60,12 @@ ifeq (,$(INSTALLER_URL)) INSTALLER_URL = "http://ftp.mozilla.org/pub/mozilla.org/pub/seamonkey/nightly/latest-trunk/windows-xpi" endif -installer: +installer: $(srcdir)/$(STUB_NAME).jst $(PERL) $(srcdir)/makeall.pl -aurl $(INSTALLER_URL) -objdir $(OBJDIR) \ -instname $(SEA_NAME) -stubname $(STUB_NAME) include $(topsrcdir)/config/rules.mk +$(srcdir)/$(STUB_NAME).jst: mozilla-win32-stub-installer.jst + sed -e "s|seamonkey-win32-stub-installer|$(STUB_NAME)|" $^ > $@ + diff --git a/mozilla/xpinstall/packager/windows/makejs.pl b/mozilla/xpinstall/packager/windows/makejs.pl index b030628e840..4222b784121 100644 --- a/mozilla/xpinstall/packager/windows/makejs.pl +++ b/mozilla/xpinstall/packager/windows/makejs.pl @@ -90,7 +90,7 @@ $greFileVersion = $ENV{WIZ_greFileVersion}; $greUniqueID = $ENV{WIZ_greUniqueID}; # Get the name of the file replacing the .jst extension with a .js extension -@inJstFileSplit = split(/\./,$inJstFile); +@inJstFileSplit = split(/\.jst/,$inJstFile); $outJsFile = $inJstFileSplit[0]; $outJsFile .= ".js"; $outTempFile = $inJstFileSplit[0]; diff --git a/mozilla/xpinstall/packager/windows/mozilla-win32-stub-installer.jst b/mozilla/xpinstall/packager/windows/mozilla-win32-stub-installer.jst index 981d7e2ffbe..42dcd49ecf1 100644 --- a/mozilla/xpinstall/packager/windows/mozilla-win32-stub-installer.jst +++ b/mozilla/xpinstall/packager/windows/mozilla-win32-stub-installer.jst @@ -30,7 +30,7 @@ if(verifyDiskSpace(fDesktop, srDest)) logComment("addFile() returned: " + err); - err = execute("SeaMonkey-win32-stub-installer.exe", "", false); + err = execute("seamonkey-win32-stub-installer.exe", "", false); logComment("execute() returned: " + err); // check return value