From 3c8cfc9cbb737a238da3fb65e6673ec2ab973751 Mon Sep 17 00:00:00 2001 From: "allan%beaufour.dk" Date: Tue, 15 Mar 2005 09:12:57 +0000 Subject: [PATCH] Fix xpi packaging, so version is taken from Makefile.in and make clean removes temporaries. Bug 285418, r=aaronr git-svn-id: svn://10.0.0.236/trunk@170692 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/extensions/xforms/package/Makefile.in | 3 +++ mozilla/extensions/xforms/package/xforms.jst | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mozilla/extensions/xforms/package/Makefile.in b/mozilla/extensions/xforms/package/Makefile.in index 6c310319a48..1c11b1e971e 100755 --- a/mozilla/extensions/xforms/package/Makefile.in +++ b/mozilla/extensions/xforms/package/Makefile.in @@ -58,6 +58,9 @@ PACKAGE_FILE = packages-unix endif endif +GARBAGE += xforms.js xforms.template +GARBAGE_DIRS += stage + PACKAGE_VERSION = 0.1 xpi: diff --git a/mozilla/extensions/xforms/package/xforms.jst b/mozilla/extensions/xforms/package/xforms.jst index 87c290027de..031da501380 100755 --- a/mozilla/extensions/xforms/package/xforms.jst +++ b/mozilla/extensions/xforms/package/xforms.jst @@ -1,4 +1,4 @@ -var err = initInstall("Mozilla XForms", "XForms", "0.1"); +var err = initInstall("Mozilla XForms", "XForms", "$Version$"); logComment("initInstall: " + err); var fProgram = getFolder("Program"); @@ -7,9 +7,9 @@ var srComponents = $SpaceRequired$:components; if (verifyDiskSpace(fProgram, srChrome + srComponents)) { - err = addDirectory("", "0.1", "components", fProgram, "components", true); + err = addDirectory("", "$Version$", "components", fProgram, "components", true); logComment("addDirectory components: " + err); - err = addDirectory("", "0.1", "chrome", fProgram, "chrome", true); + err = addDirectory("", "$Version$", "chrome", fProgram, "chrome", true); logComment("addDirectory chrome: " + err); registerChrome(PACKAGE | DELAYED_CHROME, getFolder("Chrome", "xforms.jar"),