bug 801418 - use perl to avoid sed cmd-line errors generated by MOZ_POST_STAGING_COMMAND during 'make package' for mobile. r=mwu
authorJonathan Kew <jkew@mozilla.com>
Wed, 17 Oct 2012 09:48:14 +0100
changeset 110651 cb4344e9d62837d50d27ff5c1c868b2a5a14cb3a
parent 110650 48aff95d2d299395ad2bb439075b234efa97e14f
child 110652 af26f70eb73eb23ec83f421b7b3f832c507061bc
push id93
push usernmatsakis@mozilla.com
push dateWed, 31 Oct 2012 21:26:57 +0000
reviewersmwu
bugs801418
milestone19.0a1
bug 801418 - use perl to avoid sed cmd-line errors generated by MOZ_POST_STAGING_COMMAND during 'make package' for mobile. r=mwu
mobile/android/installer/Makefile.in
mobile/xul/installer/Makefile.in
--- a/mobile/android/installer/Makefile.in
+++ b/mobile/android/installer/Makefile.in
@@ -43,17 +43,17 @@ DEFINES += -DJAREXT=$(JAREXT)
 
 include $(topsrcdir)/ipc/app/defs.mk
 DEFINES += -DMOZ_CHILD_PROCESS_NAME=$(MOZ_CHILD_PROCESS_NAME)
 
 ifdef MOZ_PKG_MANIFEST_P
 MOZ_PKG_MANIFEST = package-manifest
 endif
 
-MOZ_POST_STAGING_CMD = find chrome -type f -name *.properties -exec sed -i '/^\#/d' {} \;
+MOZ_POST_STAGING_CMD = find chrome -type f -name *.properties -exec $(PERL) -n -i -e 'print unless /^\#/' {} \;
 
 include $(topsrcdir)/toolkit/mozapps/installer/packager.mk
 
 ifeq (bundle, $(MOZ_FS_LAYOUT))
 BINPATH = $(_BINPATH)
 DEFINES += -DAPPNAME=$(_APPNAME)
 else
 # Every other platform just winds up in dist/bin
--- a/mobile/xul/installer/Makefile.in
+++ b/mobile/xul/installer/Makefile.in
@@ -43,17 +43,17 @@ DEFINES += -DJAREXT=$(JAREXT)
 
 include $(topsrcdir)/ipc/app/defs.mk
 DEFINES += -DMOZ_CHILD_PROCESS_NAME=$(MOZ_CHILD_PROCESS_NAME)
 
 ifdef MOZ_PKG_MANIFEST_P
 MOZ_PKG_MANIFEST = package-manifest
 endif
 
-MOZ_POST_STAGING_CMD = find chrome -type f -name *.properties -exec sed -i '/^\#/d' {} \;
+MOZ_POST_STAGING_CMD = find chrome -type f -name *.properties -exec $(PERL) -n -i -e 'print unless /^\#/' {} \;
 
 include $(topsrcdir)/toolkit/mozapps/installer/packager.mk
 
 ifeq (bundle, $(MOZ_FS_LAYOUT))
 BINPATH = $(_BINPATH)
 DEFINES += -DAPPNAME=$(_APPNAME)
 else
 # Every other platform just winds up in dist/bin