adapt maketheme script for new packaged XPI format, bump theme versions to 2.1b2

diff --git a/EarlyBlue/install.rdf b/EarlyBlue/install.rdf
index 48610be31b026d557b6a19f63bff252abd864f90..03194b4561e0e702d49c35790ec48cc7aebabe3e 100644 (file)
--- a/EarlyBlue/install.rdf
+++ b/EarlyBlue/install.rdf
@@ -5,7 +5,7 @@
 
   <Description about="urn:mozilla:install-manifest">
     <em:id>EarlyBlue@kairo.at</em:id>
-    <em:version>2.1b2pre</em:version>
+    <em:version>2.1b2</em:version>
 
     <!-- SeaMonkey -->
     <em:targetApplication>

diff --git a/LCARStrek/install.rdf b/LCARStrek/install.rdf
index 33403eabda3f820f49940e45fe17ad72365d6c32..68b24b53db6c1a5a343dd6ad30018146c129e2ef 100644 (file)
--- a/LCARStrek/install.rdf
+++ b/LCARStrek/install.rdf
@@ -5,7 +5,7 @@
 
   <Description about="urn:mozilla:install-manifest">
     <em:id>LCARStrek@kairo.at</em:id>
-    <em:version>2.1b2pre</em:version>
+    <em:version>2.1b2</em:version>
 
     <!-- SeaMonkey -->
     <em:targetApplication>

diff --git a/maketheme b/maketheme
index 50cd459e05a46bcd42850c4b1eef86d80ab870f0..4983976d605e7e7d0dd2c25e50169b146562baf5 100755 (executable)
--- a/maketheme
+++ b/maketheme
@@ -32,22 +32,12 @@ if [ -e $WORK_DIR ] ; then
 fi
 mkdir -p $WORK_DIR/chrome
 
-echo copying basic files....
-cp $THEME_DIR/install.rdf $THEME_DIR/icon.png $THEME_DIR/preview.png $WORK_DIR/
-
-echo packing internal jar file...
-cd $THEME_DIR
-SUBDIRS=
-for filename in *; do
-  if [ -d "$filename" ]; then
-    SUBDIRS="$SUBDIRS $filename"
-  fi
-done
-zip -rX0Dq $WORK_DIR/chrome/$THEME_NAME.jar $SUBDIRS
+echo copying theme files...
+cp -a $THEME_DIR/* $WORK_DIR/
 cd $WORK_DIR
 
-echo adjusting manifest...
-sed -e "s/skin \w* $THEME_NAME /\0jar:chrome\/$THEME_NAME.jar\!\//" $THEME_DIR/chrome.manifest > chrome.manifest
+echo removing x-* file not intended for shipping...
+rm -rf x-*
 
 echo creating new xpi file...
 if [ -e $XPI_FILE ] ; then