mozilla-devscripts

Merge lp:~jazzva/mozilla-devscripts/lp452422 into lp:~mozillateam/mozilla-devscripts/mozilla-devscripts

  1. lp452422
  2. Merge into mozilla-devscripts
Proposed by Saša Bodiroža
Status: Merged
Merged at revision: not available
Proposed branch: lp:~jazzva/mozilla-devscripts/lp452422
Merge into: lp:~mozillateam/mozilla-devscripts/mozilla-devscripts
Diff against target: 64 lines
3 files modified
debian/changelog (+10/-0)
src/med-xpi-pack (+5/-3)
src/med-xpi-unpack (+1/-1)
To merge this branch: bzr merge lp:~jazzva/mozilla-devscripts/lp452422
Reviewer Review Type Date Requested Status
Alexander Sack (community) Approve
Review via email: mp+13723@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Saša Bodiroža (jazzva) wrote :

Fixes bug #452422.

Revision history for this message
Alexander Sack (asac) wrote :

loooks good from what i can tell. thanks!

wonder if we might also want to fail if there is any .jar next to the .jar! dir ... but i guess not for this bug :).

please commit to branch

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2009-10-07 16:32:40 +0000
3+++ debian/changelog 2009-10-21 18:15:26 +0000
4@@ -1,3 +1,13 @@
5+mozilla-devscripts (0.18) UNRELEASED; urgency=low
6+
7+ * med-xpi-pack:
8+ - Keep track of produced jar files and remove them only after the build
9+ of xpi file (LP: #452422) (Closes: #551065)
10+ * med-xpi-{pack,unpack}:
11+ - Enclose -name parameter with single quotes in find command
12+
13+ -- Sasa Bodiroza <jazzva@gmail.com> Wed, 21 Oct 2009 19:54:49 +0200
14+
15 mozilla-devscripts (0.17) unstable; urgency=low
16
17 * xpi.mk:
18
19=== modified file 'src/med-xpi-pack'
20--- src/med-xpi-pack 2009-09-22 07:53:37 +0000
21+++ src/med-xpi-pack 2009-10-21 18:15:26 +0000
22@@ -62,8 +62,9 @@
23 fi;
24
25 START_DIR=`pwd`;
26+PACK_JAR_PATHS="";
27 cd $INDIR;
28-for JAR_DIR in `find . -type d -name *.jar\!` ; do
29+for JAR_DIR in `find . -type d -name '*.jar\!'` ; do
30 JAR_FILE=`echo $JAR_DIR | sed "s/jar\!$/jar/"`;
31 ABS_JAR_PATH=`cd $JAR_DIR ; pwd`;
32 ABS_JAR_FILE=`echo $ABS_JAR_PATH | sed "s/jar\!$/jar/"`;
33@@ -72,6 +73,7 @@
34 echo "Packing $JAR_FILE";
35 zip -q -r $ABS_JAR_FILE .;
36 cd $ABS_CUR_DIR;
37+ PACK_JAR_PATHS="$ABS_JAR_FILE $PACK_JAR_PATHS";
38 rm -rf $ABS_JAR_PATH;
39 done;
40 echo "Packing $XPIFILE";
41@@ -79,8 +81,8 @@
42 [ -f $START_DIR/$XPIFILE ] && XPIDIR=`dirname $START_DIR/$XPIFILE`
43 ABS_XPIDIR=`cd $XPIDIR; pwd`;
44 echo "Packed XPI file. It is located in $ABS_XPIDIR";
45-for JAR_PATH in `find . -name *.jar` ; do
46- echo "Unpacking $JAR_PATH";
47+for JAR_PATH in $PACK_JAR_PATHS ; do
48+ echo "Unpacking and removing $JAR_PATH";
49 unzip -q $JAR_PATH -d $JAR_PATH!;
50 rm -f $JAR_PATH;
51 done;
52
53=== modified file 'src/med-xpi-unpack'
54--- src/med-xpi-unpack 2009-09-22 07:53:37 +0000
55+++ src/med-xpi-unpack 2009-10-21 18:15:26 +0000
56@@ -66,7 +66,7 @@
57
58 unzip -q $XPIFILE -d $OUTDIR;
59 cd $OUTDIR;
60-for JAR_PATH in `find . -name *.jar` ; do
61+for JAR_PATH in `find . -name '*.jar'` ; do
62 echo "Unpacking $JAR_PATH";
63 unzip -q $JAR_PATH -d $JAR_PATH!;
64 rm -f $JAR_PATH;

Subscribers

People subscribed via source and target branches

to all changes: