Merge lp:~danilo/po2xpi/firefox4-support into lp:po2xpi

[Данило Шеган]

Support for Firefox 4.0 XPIs.

Changes only the shell script, we might want to rename it if we want it to be parallel runnable with the one for older Firefox.

[lp:~danilo/po2xpi/firefox4-support]

56. By Данило Шеган on 2011-01-14

Generalize rosetta_xpi_to_sources a bit. It could still be improved.

[Chris Coulson (chrisccoulson)]

review: Approve

=== modified file 'src/process_lp_export'
--- src/process_lp_export	2010-01-21 01:34:00 +0000
+++ src/process_lp_export	2011-01-14 22:51:23 +0000
@@ -66,7 +66,7 @@
 			application=xulrunner-1.9
 		;;
 		firefox)
-			application=firefox-3.0
+			application=firefox-4.0
 		;;
 		xulrunner-*)
 			application=$arg_TRANSLATION_DOMAIN

=== modified file 'src/rosetta_xpi_to_sources'
--- src/rosetta_xpi_to_sources	2010-01-21 01:34:38 +0000
+++ src/rosetta_xpi_to_sources	2011-01-14 22:51:23 +0000
@@ -31,7 +31,8 @@
 	exit 1
 fi
 
-PO2XPI_INSTALL_PATH=/home/asac/mozilla-rosetta/po2xpi/
+dirname=`dirname $0`
+PO2XPI_INSTALL_PATH=`cd $dirname/.. && pwd`
 PO2XPI_INSTALL_DATA_BASE=$PO2XPI_INSTALL_PATH/data/
 PO2XPI_INSTALL_DATA=$PO2XPI_INSTALL_DATA_BASE/8.04
 PO2XPI_DEV_MODE=

=== modified file 'src/runpo2xpi'
--- src/runpo2xpi	2010-01-21 01:37:11 +0000
+++ src/runpo2xpi	2011-01-14 22:51:23 +0000
@@ -212,7 +212,7 @@
 		grep -v $APPLICATION_NAME-$LANGUAGE-chrome.manifest$ | \
 		grep -v chrome.manifest$ | \
 		grep -v \.jar$`; do
-       targetpath=../new/$LANGUAGE.xpi/`echo $notdtdorprop | sed -e 's/^.?xpi\///' | sed -e "s/en-US\.jar/$LANGUAGE.jar/
+       targetpath=../new/$LANGUAGE.xpi/`echo $notdtdorprop | sed -e 's/^.?xpi\///' | sed -e "s/en-US/$LANGUAGE/
 s/en-US/$LANGUAGE/g"`
        echo TAREGETPATH: $targetpath
        if ! test -d `dirname $targetpath`; then
@@ -225,7 +225,7 @@
        _IFS=$IFS
        IFS='
 '
-       targetpath=../new/$LANGUAGE.xpi/`echo $dtdfile | sed -e 's/^.?xpi\///' | sed -e "s/en-US\.jar/$LANGUAGE.jar/
+       targetpath=../new/$LANGUAGE.xpi/`echo $dtdfile | sed -e 's/^.?xpi\///' | sed -e "s/en-US/$LANGUAGE/
 s/en-US/$LANGUAGE/g"`
        for entityline in `grep ENTITY.*%.*SYSTEM $dtdfile`; do
            old_IFS=$IFS
@@ -245,7 +245,7 @@
        done
        IFS=$_IFS
     done
-    $SED "s/en-US\.jar/$APPLICATION_NAME-$LANGUAGE.jar/
+    $SED "s/en-US/$LANGUAGE/
 s/en-US/$LANGUAGE/g" chrome.manifest >../new/chrome.manifest
     $SED "s/en-US/$LANGUAGE/g" install.rdf >../new/install.rdf
     cd ..
@@ -273,17 +273,12 @@
 # argument 1 - APPLICATION_NAME
 jar_up() {
     cd new
-    local JARDIR=`$GREP -m1 "#:" ../$FILENAME | $CUT -d " " -f 2 | $CUT -d '!' -f 1`
-    local JARPATH=`$REVPATH $JARDIR`
-    local DELPATH=`echo $JARDIR | cut -d '/' -f 1`
     local APPLICATION_NAME=$1
 
-    cd "$JARDIR!"
-    $ZIP -9r $JARPATH/$APPLICATION_NAME-$LANGUAGE.jar locale > /dev/null
-    cd $JARPATH
-    $RM -Rf $DELPATH
-    $ZIP -9 $LANGUAGE.xpi chrome.manifest $APPLICATION_NAME-$LANGUAGE.jar install.rdf &>/dev/null
-    $RM chrome.manifest $APPLICATION_NAME-$LANGUAGE.jar install.rdf
+    # Ensure $LANGUAGE.xpi is not in the way even when RM is set to "echo".
+    rm -rf $LANGUAGE.xpi
+    $ZIP -r9 $LANGUAGE.xpi chrome.manifest chrome install.rdf #&>/dev/null
+    $RM -rf chrome.manifest chrome install.rdf
     cd ..
 }