[csw-devel] SF.net SVN: gar:[5543] csw/mgar/pkg/firefox/branches/firefox3-packaging

[wbonnet at users.sourceforge.net]

Revision: 5543
          http://gar.svn.sourceforge.net/gar/?rev=5543&view=rev
Author:   wbonnet
Date:     2009-07-08 12:20:50 +0000 (Wed, 08 Jul 2009)

Log Message:
-----------
Fix path removal script

Modified Paths:
--------------
    csw/mgar/pkg/firefox/branches/firefox3-packaging/Makefile
    csw/mgar/pkg/firefox/branches/firefox3-packaging/removeBuildPathFromJar.sh

Modified: csw/mgar/pkg/firefox/branches/firefox3-packaging/Makefile
===================================================================
--- csw/mgar/pkg/firefox/branches/firefox3-packaging/Makefile	2009-07-08 10:48:38 UTC (rev 5542)
+++ csw/mgar/pkg/firefox/branches/firefox3-packaging/Makefile	2009-07-08 12:20:50 UTC (rev 5543)
@@ -82,7 +82,7 @@
 
 pre-install:
 	( if [ ! -d $(WORK_INSTALL)/opt/csw/bin ] ; then mkdir -p $(WORK_INSTALL)/opt/csw/bin ; fi )
-	( cd $(WORK_INSTALL)/opt/csw/bin && if [ -L firefox ] ; then rm firefox ; fi  && ln -s ../mozilla/firefox/bin/firefox . )
+	( cd $(WORK_INSTALL)/opt/csw/bin && ln -sf ../mozilla/firefox/bin/firefox . )
 	( mkdir -p $(WORK_INSTALL)/opt/csw/share/pixmaps )
 	( cp $(WORK_BUILD)/other-licenses/branding/firefox/mozicon128.png $(WORK_INSTALL)/opt/csw/share/pixmaps/firefox.png )
 	( mkdir -p $(WORK_INSTALL)/opt/csw/share/applications )
@@ -92,8 +92,6 @@
 
 post-install:
 	( gfind $(WORK_INSTALL)/opt/csw -exec bash -c "file {} | ggrep ELF | ggrep -e 'executable' -e 'dynamic lib' | ggrep 'not stripped' && strip {}"  \; )
-	( mv $(WORK_INSTALL)/opt/csw/mozilla/firefox/bin/firefox-config $(WORK_INSTALL)/opt/csw/mozilla/firefox/bin/firefox-config.temp && gsed -e s\_-L$(WORK_INSTALL)/opt/csw/lib\_\_g  $(WORK_INSTALL)/opt/csw/mozilla/firefox/bin/firefox-config.temp > $(WORK_INSTALL)/opt/csw/mozilla/firefox/bin/firefox-config && rm $(WORK_INSTALL)/opt/csw/mozilla/firefox/bin/firefox-config.temp )
-	( mv $(WORK_INSTALL)/opt/csw/mozilla/firefox/lib/pkgconfig/firefox-nspr.pc $(WORK_INSTALL)/opt/csw/mozilla/firefox/lib/pkgconfig/firefox-nspr.pc.temp && gsed -e s\_-L$(WORK_INSTALL)/opt/csw/lib\_\_g  $(WORK_INSTALL)/opt/csw/mozilla/firefox/lib/pkgconfig/firefox-nspr.pc.temp > $(WORK_INSTALL)/opt/csw/mozilla/firefox/lib/pkgconfig/firefox-nspr.pc && rm $(WORK_INSTALL)/opt/csw/mozilla/firefox/lib/pkgconfig/firefox-nspr.pc.temp )
 	( gfind $(WORK_INSTALL)/opt/csw -name chromelist.txt -exec bash -c " mv {} {}.temp && gsed -e  s\_`pwd`/$(WORK_BUILD)/\_\_g {}.temp > {} && rm {}.temp"  \; )
 	( gfind $(WORK_INSTALL)/opt/csw/mozilla/firefox -name "*.js" -exec bash -c " mv {} {}.temp && gsed -e  s\_`pwd`/$(WORK_BUILD)/\_\_g {}.temp > {} && rm {}.temp"  \; )
 	( gfind $(WORK_INSTALL)/opt/csw/mozilla/firefox -name "*.jar" -exec bash -c "`pwd`/removeBuildPathFromJar.sh {} `pwd` $(WORKDIR) $(DISTNAME)" \; )

Modified: csw/mgar/pkg/firefox/branches/firefox3-packaging/removeBuildPathFromJar.sh
===================================================================
--- csw/mgar/pkg/firefox/branches/firefox3-packaging/removeBuildPathFromJar.sh	2009-07-08 10:48:38 UTC (rev 5542)
+++ csw/mgar/pkg/firefox/branches/firefox3-packaging/removeBuildPathFromJar.sh	2009-07-08 12:20:50 UTC (rev 5543)
@@ -1,4 +1,4 @@
-#!/opt/csw/bin/bash 
+#!/opt/csw/bin/bash -x
 
 if [ -d ~/.tempextractjar ] ; 
 then 
@@ -10,11 +10,11 @@
 export REPLACEDIR=$2/$3/$4
 
 cd ~/.tempextractjar
-jar xvf $1
+jar xvf $BACKUP_OLD_DIR/$1
 
 gfind . -name "*.js" -exec bash -x -c " mv {} {}.temp && gsed -e  s_\$REPLACEDIR\_\_g {}.temp > {} && rm {}.temp"  \; 
 
 rm $1
-jar cvf $1 *
+jar cvf $BACKUP_OLD_DIR/$1 *
 
 cd $BACKUP_OLD_DIR


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.