Feodor2
/
Mypal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support spaces in Mac app name.

master
Fedor 2019-09-05 20:04:37 +03:00
parent 0c4242dd71
commit ad27116564
12 changed files with 74 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
application/basilisk/app/Makefile.in
View File

@ -68,22 +68,22 @@ MAC_BUNDLE_VERSION = $(shell $(PYTHON) $(srcdir)/macversion.py --version=$(MOZ_A
.PHONY: repackage .PHONY: repackage
tools repackage:: $(DIST)/bin/$(MOZ_APP_NAME) tools repackage:: $(DIST)/bin/$(MOZ_APP_NAME)
$(MKDIR) -p $(dist_dest)/Contents/MacOS $(MKDIR) -p '$(dist_dest)/Contents/MacOS'
$(MKDIR) -p $(dist_dest)/$(LPROJ) $(MKDIR) -p '$(dist_dest)/$(LPROJ)'
rsync -a --exclude '*.in' $(srcdir)/macbuild/Contents $(dist_dest) --exclude English.lproj rsync -a --exclude '*.in' $(srcdir)/macbuild/Contents '$(dist_dest)' --exclude English.lproj
rsync -a --exclude '*.in' $(srcdir)/macbuild/Contents/Resources/English.lproj/ $(dist_dest)/$(LPROJ) rsync -a --exclude '*.in' $(srcdir)/macbuild/Contents/Resources/English.lproj/ '$(dist_dest)/$(LPROJ)'
sed -e 's/%APP_VERSION%/$(MOZ_APP_VERSION)/' -e 's/%MAC_APP_NAME%/$(MAC_APP_NAME)/' -e 's/%MOZ_MACBUNDLE_ID%/$(MOZ_MACBUNDLE_ID)/' -e 's/%MAC_BUNDLE_VERSION%/$(MAC_BUNDLE_VERSION)/' $(srcdir)/macbuild/Contents/Info.plist.in > $(dist_dest)/Contents/Info.plist sed -e 's/%APP_VERSION%/$(MOZ_APP_VERSION)/' -e 's/%MAC_APP_NAME%/$(MAC_APP_NAME)/' -e 's/%MOZ_MACBUNDLE_ID%/$(MOZ_MACBUNDLE_ID)/' -e 's/%MAC_BUNDLE_VERSION%/$(MAC_BUNDLE_VERSION)/' $(srcdir)/macbuild/Contents/Info.plist.in > '$(dist_dest)/Contents/Info.plist'
sed -e 's/%MAC_APP_NAME%/$(MAC_APP_NAME)/' $(srcdir)/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in | iconv -f UTF-8 -t UTF-16 > $(dist_dest)/$(LPROJ)/InfoPlist.strings sed -e 's/%MAC_APP_NAME%/$(MAC_APP_NAME)/' $(srcdir)/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in | iconv -f UTF-8 -t UTF-16 > '$(dist_dest)/$(LPROJ)/InfoPlist.strings'
rsync -a --exclude-from='$(srcdir)/macbuild/Contents/MacOS-files.in' $(DIST)/bin/ $(dist_dest)/Contents/Resources rsync -a --exclude-from='$(srcdir)/macbuild/Contents/MacOS-files.in' $(DIST)/bin/ '$(dist_dest)/Contents/Resources'
rsync -a --include-from='$(srcdir)/macbuild/Contents/MacOS-files.in' --exclude '*' $(DIST)/bin/ $(dist_dest)/Contents/MacOS rsync -a --include-from='$(srcdir)/macbuild/Contents/MacOS-files.in' --exclude '*' $(DIST)/bin/ '$(dist_dest)/Contents/MacOS'
$(RM) $(dist_dest)/Contents/MacOS/$(MOZ_APP_NAME) $(RM) '$(dist_dest)/Contents/MacOS/$(MOZ_APP_NAME)'
rsync -aL $(DIST)/bin/$(MOZ_APP_NAME) $(dist_dest)/Contents/MacOS rsync -aL $(DIST)/bin/$(MOZ_APP_NAME) '$(dist_dest)/Contents/MacOS'
cp -RL $(DIST)/branding/firefox.icns $(dist_dest)/Contents/Resources/firefox.icns cp -RL $(DIST)/branding/firefox.icns '$(dist_dest)/Contents/Resources/firefox.icns'
cp -RL $(DIST)/branding/document.icns $(dist_dest)/Contents/Resources/document.icns cp -RL $(DIST)/branding/document.icns '$(dist_dest)/Contents/Resources/document.icns'
ifdef MOZ_UPDATER ifdef MOZ_UPDATER
$(MKDIR) -p $(dist_dest)/Contents/Library/LaunchServices $(MKDIR) -p '$(dist_dest)/Contents/Library/LaunchServices'
mv -f $(dist_dest)/Contents/MacOS/updater.app/Contents/MacOS/org.mozilla.updater $(dist_dest)/Contents/Library/LaunchServices mv -f '$(dist_dest)/Contents/MacOS/updater.app/Contents/MacOS/org.mozilla.updater' '$(dist_dest)/Contents/Library/LaunchServices'
ln -s ../../../../Library/LaunchServices/org.mozilla.updater $(dist_dest)/Contents/MacOS/updater.app/Contents/MacOS/org.mozilla.updater ln -s ../../../../Library/LaunchServices/org.mozilla.updater '$(dist_dest)/Contents/MacOS/updater.app/Contents/MacOS/org.mozilla.updater'
endif endif
printf APPLMOZB > $(dist_dest)/Contents/PkgInfo printf APPLMOZB > '$(dist_dest)/Contents/PkgInfo'
endif endif

8
application/basilisk/installer/Makefile.in
View File

@ -102,19 +102,19 @@ include $(topsrcdir)/toolkit/mozapps/installer/packager.mk
ifeq (bundle, $(MOZ_FS_LAYOUT)) ifeq (bundle, $(MOZ_FS_LAYOUT))
BINPATH = $(_BINPATH) BINPATH = $(_BINPATH)
DEFINES += -DAPPNAME=$(_APPNAME) DEFINES += -DAPPNAME='$(_APPNAME)'
else else
# Every other platform just winds up in dist/bin # Every other platform just winds up in dist/bin
BINPATH = bin BINPATH = bin
endif endif
DEFINES += -DBINPATH=$(BINPATH) DEFINES += -DBINPATH='$(BINPATH)'
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
RESPATH = $(_APPNAME)/Contents/Resources RESPATH = $(_APPNAME)/Contents/Resources
else else
RESPATH = $(BINPATH) RESPATH = $(BINPATH)
endif endif
DEFINES += -DRESPATH=$(RESPATH) DEFINES += -DRESPATH='$(RESPATH)'
LPROJ_ROOT = $(firstword $(subst -, ,$(AB_CD))) LPROJ_ROOT = $(firstword $(subst -, ,$(AB_CD)))
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
@ -167,7 +167,7 @@ FINDPATH=bin
endif endif
package-compare:: package-compare::
cd $(DIST); find $(PKGCOMP_FIND_OPTS) $(FINDPATH) -type f | sort > bin-list.txt cd $(DIST); find $(PKGCOMP_FIND_OPTS) '$(FINDPATH)' -type f | sort > bin-list.txt
$(call py_action,preprocessor,$(DEFINES) $(ACDEFINES) $(MOZ_PKG_MANIFEST)) | grep '^$(BINPATH)' | sed -e 's/^\///' | sort > $(DIST)/pack-list.txt $(call py_action,preprocessor,$(DEFINES) $(ACDEFINES) $(MOZ_PKG_MANIFEST)) | grep '^$(BINPATH)' | sed -e 's/^\///' | sort > $(DIST)/pack-list.txt
-diff -u $(DIST)/pack-list.txt $(DIST)/bin-list.txt -diff -u $(DIST)/pack-list.txt $(DIST)/bin-list.txt
rm -f $(DIST)/pack-list.txt $(DIST)/bin-list.txt rm -f $(DIST)/pack-list.txt $(DIST)/bin-list.txt

4
application/basilisk/locales/Makefile.in
View File

@ -170,10 +170,10 @@ endif
ident: ident:
@printf 'fx_revision ' @printf 'fx_revision '
@$(PYTHON) $(topsrcdir)/config/printconfigsetting.py \ @$(PYTHON) $(topsrcdir)/config/printconfigsetting.py \
$(STAGEDIST)/application.ini App SourceStamp '$(STAGEDIST)'/application.ini App SourceStamp
@printf 'buildid ' @printf 'buildid '
@$(PYTHON) $(topsrcdir)/config/printconfigsetting.py \ @$(PYTHON) $(topsrcdir)/config/printconfigsetting.py \
$(STAGEDIST)/application.ini App BuildID '$(STAGEDIST)'/application.ini App BuildID
merge-%: merge-%:
ifdef LOCALE_MERGEDIR ifdef LOCALE_MERGEDIR

28
application/palemoon/app/Makefile.in
View File

@ -74,26 +74,26 @@ MAC_BUNDLE_VERSION = $(shell $(PYTHON) $(srcdir)/macversion.py --version=$(MOZ_A
.PHONY: repackage .PHONY: repackage
tools repackage:: $(PROGRAM) tools repackage:: $(PROGRAM)
$(MKDIR) -p $(dist_dest)/Contents/MacOS $(MKDIR) -p '$(dist_dest)/Contents/MacOS'
$(MKDIR) -p $(dist_dest)/Contents/Resources/$(AB).lproj $(MKDIR) -p '$(dist_dest)/Contents/Resources/$(AB).lproj'
rsync -a --exclude '*.in' $(srcdir)/macbuild/Contents $(dist_dest) --exclude English.lproj rsync -a --exclude '*.in' $(srcdir)/macbuild/Contents '$(dist_dest)' --exclude English.lproj
rsync -a --exclude '*.in' $(srcdir)/macbuild/Contents/Resources/English.lproj/ $(dist_dest)/Contents/Resources/$(AB).lproj rsync -a --exclude '*.in' $(srcdir)/macbuild/Contents/Resources/English.lproj/ '$(dist_dest)/Contents/Resources/$(AB).lproj'
sed -e 's/%APP_VERSION%/$(MOZ_APP_VERSION)/' -e 's/%MAC_APP_NAME%/$(MAC_APP_NAME)/' -e 's/%MOZ_MACBUNDLE_ID%/$(MOZ_MACBUNDLE_ID)/' -e 's/%MAC_BUNDLE_VERSION%/$(MAC_BUNDLE_VERSION)/' $(srcdir)/macbuild/Contents/Info.plist.in > $(dist_dest)/Contents/Info.plist sed -e 's/%APP_VERSION%/$(MOZ_APP_VERSION)/' -e 's/%MAC_APP_NAME%/$(MAC_APP_NAME)/' -e 's/%MOZ_MACBUNDLE_ID%/$(MOZ_MACBUNDLE_ID)/' -e 's/%MAC_BUNDLE_VERSION%/$(MAC_BUNDLE_VERSION)/' $(srcdir)/macbuild/Contents/Info.plist.in > '$(dist_dest)/Contents/Info.plist'
sed -e 's/%MAC_APP_NAME%/$(MAC_APP_NAME)/' $(srcdir)/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in | iconv -f UTF-8 -t UTF-16 > $(dist_dest)/Contents/Resources/$(AB).lproj/InfoPlist.strings sed -e 's/%MAC_APP_NAME%/$(MAC_APP_NAME)/' $(srcdir)/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in | iconv -f UTF-8 -t UTF-16 > '$(dist_dest)/Contents/Resources/$(AB).lproj/InfoPlist.strings'
rsync -a --exclude-from='$(srcdir)/macbuild/Contents/MacOS-files.in' $(DIST)/bin/ $(dist_dest)/Contents/Resources rsync -a --exclude-from='$(srcdir)/macbuild/Contents/MacOS-files.in' $(DIST)/bin/ '$(dist_dest)/Contents/Resources'
rsync -a --include-from='$(srcdir)/macbuild/Contents/MacOS-files.in' --exclude '*' $(DIST)/bin/ $(dist_dest)/Contents/MacOS rsync -a --include-from='$(srcdir)/macbuild/Contents/MacOS-files.in' --exclude '*' $(DIST)/bin/ '$(dist_dest)/Contents/MacOS'
$(RM) $(dist_dest)/Contents/MacOS/$(PROGRAM) $(RM) '$(dist_dest)/Contents/MacOS/$(PROGRAM)'
rsync -aL $(PROGRAM) $(dist_dest)/Contents/MacOS rsync -aL $(PROGRAM) '$(dist_dest)/Contents/MacOS'
cp -RL $(DIST)/branding/firefox.icns $(dist_dest)/Contents/Resources/firefox.icns cp -RL $(DIST)/branding/firefox.icns '$(dist_dest)/Contents/Resources/firefox.icns'
cp -RL $(DIST)/branding/document.icns $(dist_dest)/Contents/Resources/document.icns cp -RL $(DIST)/branding/document.icns '$(dist_dest)/Contents/Resources/document.icns'
printf APPLMOZB > $(dist_dest)/Contents/PkgInfo printf APPLMOZB > '$(dist_dest)/Contents/PkgInfo'
endif endif
ifdef LIBXUL_SDK #{ ifdef LIBXUL_SDK #{
ifndef SKIP_COPY_XULRUNNER #{ ifndef SKIP_COPY_XULRUNNER #{
libs:: libs::
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) #{ ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) #{
rsync -a --copy-unsafe-links $(LIBXUL_DIST)/XUL.framework $(dist_dest)/Contents/Frameworks rsync -a --copy-unsafe-links $(LIBXUL_DIST)/XUL.framework '$(dist_dest)/Contents/Frameworks'
else else
$(NSINSTALL) -D $(DIST)/bin/xulrunner $(NSINSTALL) -D $(DIST)/bin/xulrunner
(cd $(LIBXUL_SDK)/bin && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DIST)/bin/xulrunner && tar -xf -) (cd $(LIBXUL_SDK)/bin && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DIST)/bin/xulrunner && tar -xf -)

8
application/palemoon/installer/Makefile.in
View File

@ -116,19 +116,19 @@ include $(topsrcdir)/toolkit/mozapps/installer/packager.mk
ifeq (bundle, $(MOZ_FS_LAYOUT)) ifeq (bundle, $(MOZ_FS_LAYOUT))
BINPATH = $(_BINPATH) BINPATH = $(_BINPATH)
DEFINES += -DAPPNAME=$(_APPNAME) DEFINES += -DAPPNAME='$(_APPNAME)'
else else
# Every other platform just winds up in dist/bin # Every other platform just winds up in dist/bin
BINPATH = bin BINPATH = bin
endif endif
DEFINES += -DBINPATH=$(BINPATH) DEFINES += -DBINPATH='$(BINPATH)'
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
RESPATH = $(_APPNAME)/Contents/Resources RESPATH = $(_APPNAME)/Contents/Resources
else else
RESPATH = $(BINPATH) RESPATH = $(BINPATH)
endif endif
DEFINES += -DRESPATH=$(RESPATH) DEFINES += -DRESPATH='$(RESPATH)'
AB = $(firstword $(subst -, ,$(AB_CD))) AB = $(firstword $(subst -, ,$(AB_CD)))
DEFINES += -DAB=$(AB) DEFINES += -DAB=$(AB)
@ -176,7 +176,7 @@ endif
package-compare:: $(MOZ_PKG_MANIFEST) package-compare:: $(MOZ_PKG_MANIFEST)
ifdef MOZ_PKG_MANIFEST_P ifdef MOZ_PKG_MANIFEST_P
cd $(DIST); find $(PKGCOMP_FIND_OPTS) $(FINDPATH) -type f | sort > bin-list.txt cd $(DIST); find $(PKGCOMP_FIND_OPTS) '$(FINDPATH)' -type f | sort > bin-list.txt
grep '^$(BINPATH)' $(MOZ_PKG_MANIFEST) | sed -e 's/^\///' | sort > $(DIST)/pack-list.txt grep '^$(BINPATH)' $(MOZ_PKG_MANIFEST) | sed -e 's/^\///' | sort > $(DIST)/pack-list.txt
-diff -u $(DIST)/pack-list.txt $(DIST)/bin-list.txt -diff -u $(DIST)/pack-list.txt $(DIST)/bin-list.txt
rm -f $(DIST)/pack-list.txt $(DIST)/bin-list.txt rm -f $(DIST)/pack-list.txt $(DIST)/bin-list.txt

4
application/palemoon/locales/Makefile.in
View File

@ -198,10 +198,10 @@ endif
ident: ident:
@printf "fx_revision " @printf "fx_revision "
@$(PYTHON) $(topsrcdir)/config/printconfigsetting.py \ @$(PYTHON) $(topsrcdir)/config/printconfigsetting.py \
$(STAGEDIST)/application.ini App SourceStamp '$(STAGEDIST)'/application.ini App SourceStamp
@printf "buildid " @printf "buildid "
@$(PYTHON) $(topsrcdir)/config/printconfigsetting.py \ @$(PYTHON) $(topsrcdir)/config/printconfigsetting.py \
$(STAGEDIST)/application.ini App BuildID '$(STAGEDIST)'/application.ini App BuildID
merge-%: merge-%:
ifdef LOCALE_MERGEDIR ifdef LOCALE_MERGEDIR

6
old-configure.in
View File

@ -5184,13 +5184,13 @@ MOZ_ARG_WITH_STRING(macbundlename-prefix,
Prefix for MOZ_MACBUNDLE_NAME], Prefix for MOZ_MACBUNDLE_NAME],
[ MOZ_MACBUNDLE_NAME_PREFIX="$withval"]) [ MOZ_MACBUNDLE_NAME_PREFIX="$withval"])
MOZ_MACBUNDLE_NAME=`echo $MOZ_APP_DISPLAYNAME | tr -d ' '` MOZ_MACBUNDLE_NAME=$MOZ_APP_DISPLAYNAME
if test "$MOZ_MACBUNDLE_NAME_PREFIX"; then if test "$MOZ_MACBUNDLE_NAME_PREFIX"; then
MOZ_MACBUNDLE_NAME="${MOZ_MACBUNDLE_NAME_PREFIX}${MOZ_MACBUNDLE_NAME}" MOZ_MACBUNDLE_NAME="${MOZ_MACBUNDLE_NAME_PREFIX} ${MOZ_MACBUNDLE_NAME}"
fi fi
if test "$MOZ_DEBUG"; then if test "$MOZ_DEBUG"; then
MOZ_MACBUNDLE_NAME=${MOZ_MACBUNDLE_NAME}Debug.app MOZ_MACBUNDLE_NAME="${MOZ_MACBUNDLE_NAME}Debug.app"
else else
MOZ_MACBUNDLE_NAME=${MOZ_MACBUNDLE_NAME}.app MOZ_MACBUNDLE_NAME=${MOZ_MACBUNDLE_NAME}.app
fi fi

8
toolkit/locales/l10n.mk
View File

@ -112,13 +112,13 @@ repackage-zip: UNPACKAGE='$(ZIP_IN)'
repackage-zip: libs-$(AB_CD) repackage-zip: libs-$(AB_CD)
# call a hook for apps to put their uninstall helper.exe into the package # call a hook for apps to put their uninstall helper.exe into the package
$(UNINSTALLER_PACKAGE_HOOK) $(UNINSTALLER_PACKAGE_HOOK)
$(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/l10n-repack.py $(STAGEDIST) $(DIST)/xpi-stage/locale-$(AB_CD) \ $(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/l10n-repack.py '$(STAGEDIST)' $(DIST)/xpi-stage/locale-$(AB_CD) \
$(MOZ_PKG_EXTRAL10N) \ $(MOZ_PKG_EXTRAL10N) \
$(if $(filter omni,$(MOZ_PACKAGER_FORMAT)),$(if $(NON_OMNIJAR_FILES),--non-resource $(NON_OMNIJAR_FILES))) $(if $(filter omni,$(MOZ_PACKAGER_FORMAT)),$(if $(NON_OMNIJAR_FILES),--non-resource $(NON_OMNIJAR_FILES)))
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
ifneq (en,$(LPROJ_ROOT)) ifneq (en,$(LPROJ_ROOT))
mv $(STAGEDIST)/en.lproj $(STAGEDIST)/$(LPROJ_ROOT).lproj mv '$(STAGEDIST)'/en.lproj '$(STAGEDIST)'/$(LPROJ_ROOT).lproj
endif endif
endif endif
@ -133,7 +133,7 @@ endif
# packaging done, undo l10n stuff # packaging done, undo l10n stuff
ifneq (en,$(LPROJ_ROOT)) ifneq (en,$(LPROJ_ROOT))
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
mv $(STAGEDIST)/$(LPROJ_ROOT).lproj $(STAGEDIST)/en.lproj mv '$(STAGEDIST)'/$(LPROJ_ROOT).lproj '$(STAGEDIST)'/en.lproj
endif endif
endif endif
$(NSINSTALL) -D $(DIST)/$(PKG_PATH) $(NSINSTALL) -D $(DIST)/$(PKG_PATH)
@ -197,7 +197,7 @@ endif
generate-snippet-%: generate-snippet-%:
$(PYTHON) $(MOZILLA_DIR)/tools/update-packaging/generatesnippet.py \ $(PYTHON) $(MOZILLA_DIR)/tools/update-packaging/generatesnippet.py \
--mar-path=$(ABS_DIST)/update \ --mar-path=$(ABS_DIST)/update \
--application-ini-file=$(STAGEDIST)/application.ini \ --application-ini-file='$(STAGEDIST)'/application.ini \
--locale=$* \ --locale=$* \
--product=$(MOZ_PKG_APPNAME) \ --product=$(MOZ_PKG_APPNAME) \
--platform=$(MOZ_PKG_PLATFORM) \ --platform=$(MOZ_PKG_PLATFORM) \

2
toolkit/mozapps/installer/packager.mk
View File

@ -52,7 +52,7 @@ stage-package: $(MOZ_PKG_MANIFEST) $(MOZ_PKG_MANIFEST_DEPS)
$(if $(OPTIMIZEJARS),--optimizejars) \ $(if $(OPTIMIZEJARS),--optimizejars) \
$(if $(DISABLE_JAR_COMPRESSION),--disable-compression) \ $(if $(DISABLE_JAR_COMPRESSION),--disable-compression) \
$(addprefix --unify ,$(UNIFY_DIST)) \ $(addprefix --unify ,$(UNIFY_DIST)) \
$(MOZ_PKG_MANIFEST) $(DIST) $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(if $(MOZ_PKG_MANIFEST),,$(_BINPATH)) \ $(MOZ_PKG_MANIFEST) '$(DIST)' '$(DIST)'/$(STAGEPATH)$(MOZ_PKG_DIR)$(if $(MOZ_PKG_MANIFEST),,$(_BINPATH)) \
$(if $(filter omni,$(MOZ_PACKAGER_FORMAT)),$(if $(NON_OMNIJAR_FILES),--non-resource $(NON_OMNIJAR_FILES))) $(if $(filter omni,$(MOZ_PACKAGER_FORMAT)),$(if $(NON_OMNIJAR_FILES),--non-resource $(NON_OMNIJAR_FILES)))
$(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/find-dupes.py $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR) $(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/find-dupes.py $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)
ifdef MOZ_PACKAGE_JSSHELL ifdef MOZ_PACKAGE_JSSHELL

8
toolkit/mozapps/installer/upload-files.mk
View File

@ -286,18 +286,18 @@ endif
ifdef MOZ_SIGN_PREPARED_PACKAGE_CMD ifdef MOZ_SIGN_PREPARED_PACKAGE_CMD
ifeq (Darwin, $(OS_ARCH)) ifeq (Darwin, $(OS_ARCH))
MAKE_PACKAGE = $(or $(call MAKE_SIGN_EME_VOUCHER,$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/$(MOZ_CHILD_PROCESS_NAME).app/Contents/MacOS,$(STAGEPATH)$(MOZ_PKG_DIR)$(_RESPATH)),true) \ MAKE_PACKAGE = $(or $(call MAKE_SIGN_EME_VOUCHER,$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/$(MOZ_CHILD_PROCESS_NAME).app/Contents/MacOS,$(STAGEPATH)$(MOZ_PKG_DIR)$(_RESPATH)),true) \
&& (cd $(STAGEPATH)$(MOZ_PKG_DIR)$(_RESPATH) && $(CREATE_PRECOMPLETE_CMD)) \ && (cd '$(STAGEPATH)$(MOZ_PKG_DIR)$(_RESPATH)' && $(CREATE_PRECOMPLETE_CMD)) \
&& cd ./$(PKG_DMG_SOURCE) && $(MOZ_SIGN_PREPARED_PACKAGE_CMD) $(MOZ_MACBUNDLE_NAME) \ && cd ./$(PKG_DMG_SOURCE) && $(MOZ_SIGN_PREPARED_PACKAGE_CMD) '$(MOZ_MACBUNDLE_NAME)' \
&& cd $(PACKAGE_BASE_DIR) && $(INNER_MAKE_PACKAGE) && cd $(PACKAGE_BASE_DIR) && $(INNER_MAKE_PACKAGE)
else else
MAKE_PACKAGE = $(MOZ_SIGN_PREPARED_PACKAGE_CMD) $(MOZ_PKG_DIR) \ MAKE_PACKAGE = $(MOZ_SIGN_PREPARED_PACKAGE_CMD) $(MOZ_PKG_DIR) \
&& $(or $(call MAKE_SIGN_EME_VOUCHER,$(STAGEPATH)$(MOZ_PKG_DIR)),true) \ && $(or $(call MAKE_SIGN_EME_VOUCHER,$(STAGEPATH)$(MOZ_PKG_DIR)),true) \
&& (cd $(STAGEPATH)$(MOZ_PKG_DIR)$(_RESPATH) && $(CREATE_PRECOMPLETE_CMD)) \ && (cd '$(STAGEPATH)$(MOZ_PKG_DIR)$(_RESPATH)' && $(CREATE_PRECOMPLETE_CMD)) \
&& $(INNER_MAKE_PACKAGE) && $(INNER_MAKE_PACKAGE)
endif #Darwin endif #Darwin
else else
MAKE_PACKAGE = (cd $(STAGEPATH)$(MOZ_PKG_DIR)$(_RESPATH) && $(CREATE_PRECOMPLETE_CMD)) && $(INNER_MAKE_PACKAGE) MAKE_PACKAGE = (cd '$(STAGEPATH)$(MOZ_PKG_DIR)$(_RESPATH)' && $(CREATE_PRECOMPLETE_CMD)) && $(INNER_MAKE_PACKAGE)
endif endif
ifdef MOZ_SIGN_PACKAGE_CMD ifdef MOZ_SIGN_PACKAGE_CMD

32
tools/update-packaging/common.sh
View File

@ -60,15 +60,15 @@ make_add_instruction() {
# before performing this add instruction. # before performing this add instruction.
testdir=$(echo "$f" | sed 's/\(.*distribution\/extensions\/[^\/]*\)\/.*/\1/') testdir=$(echo "$f" | sed 's/\(.*distribution\/extensions\/[^\/]*\)\/.*/\1/')
notice " add-if \"$testdir\" \"$f\"" notice " add-if \"$testdir\" \"$f\""
echo "add-if \"$testdir\" \"$f\"" >> $filev2 echo "add-if \"$testdir\" \"$f\"" >> "$filev2"
if [ ! $filev3 = "" ]; then if [ ! $filev3 = "" ]; then
echo "add-if \"$testdir\" \"$f\"" >> $filev3 echo "add-if \"$testdir\" \"$f\"" >> "$filev3"
fi fi
else else
notice " add \"$f\"$forced" notice " add \"$f\"$forced"
echo "add \"$f\"" >> $filev2 echo "add \"$f\"" >> "$filev2"
if [ ! $filev3 = "" ]; then if [ ! "$filev3" = "" ]; then
echo "add \"$f\"" >> $filev3 echo "add \"$f\"" >> "$filev3"
fi fi
fi fi
} }
@ -100,7 +100,7 @@ make_add_if_not_instruction() {
filev3="$2" filev3="$2"
notice " add-if-not \"$f\" \"$f\"" notice " add-if-not \"$f\" \"$f\""
echo "add-if-not \"$f\" \"$f\"" >> $filev3 echo "add-if-not \"$f\" \"$f\"" >> "$filev3"
} }
make_patch_instruction() { make_patch_instruction() {
@ -114,12 +114,12 @@ make_patch_instruction() {
# before performing this add instruction. # before performing this add instruction.
testdir=$(echo "$f" | sed 's/\(.*distribution\/extensions\/[^\/]*\)\/.*/\1/') testdir=$(echo "$f" | sed 's/\(.*distribution\/extensions\/[^\/]*\)\/.*/\1/')
notice " patch-if \"$testdir\" \"$f.patch\" \"$f\"" notice " patch-if \"$testdir\" \"$f.patch\" \"$f\""
echo "patch-if \"$testdir\" \"$f.patch\" \"$f\"" >> $filev2 echo "patch-if \"$testdir\" \"$f.patch\" \"$f\"" >> "$filev2"
echo "patch-if \"$testdir\" \"$f.patch\" \"$f\"" >> $filev3 echo "patch-if \"$testdir\" \"$f.patch\" \"$f\"" >> "$filev3"
else else
notice " patch \"$f.patch\" \"$f\"" notice " patch \"$f.patch\" \"$f\""
echo "patch \"$f.patch\" \"$f\"" >> $filev2 echo "patch \"$f.patch\" \"$f\"" >> "$filev2"
echo "patch \"$f.patch\" \"$f\"" >> $filev3 echo "patch \"$f.patch\" \"$f\"" >> "$filev3"
fi fi
} }
@ -148,18 +148,18 @@ append_remove_instructions() {
if [ ! $(echo "$f" | grep -c '^#') = 1 ]; then if [ ! $(echo "$f" | grep -c '^#') = 1 ]; then
if [ $(echo "$f" | grep -c '\/$') = 1 ]; then if [ $(echo "$f" | grep -c '\/$') = 1 ]; then
notice " rmdir \"$f\"" notice " rmdir \"$f\""
echo "rmdir \"$f\"" >> $filev2 echo "rmdir \"$f\"" >> "$filev2"
echo "rmdir \"$f\"" >> $filev3 echo "rmdir \"$f\"" >> "$filev3"
elif [ $(echo "$f" | grep -c '\/\*$') = 1 ]; then elif [ $(echo "$f" | grep -c '\/\*$') = 1 ]; then
# Remove the * # Remove the *
f=$(echo "$f" | sed -e 's:\*$::') f=$(echo "$f" | sed -e 's:\*$::')
notice " rmrfdir \"$f\"" notice " rmrfdir \"$f\""
echo "rmrfdir \"$f\"" >> $filev2 echo "rmrfdir \"$f\"" >> "$filev2"
echo "rmrfdir \"$f\"" >> $filev3 echo "rmrfdir \"$f\"" >> "$filev3"
else else
notice " remove \"$f\"" notice " remove \"$f\""
echo "remove \"$f\"" >> $filev2 echo "remove \"$f\"" >> "$filev2"
echo "remove \"$f\"" >> $filev3 echo "remove \"$f\"" >> "$filev3"
fi fi
fi fi
fi fi

8
tools/update-packaging/make_full_update.sh
View File

@ -67,13 +67,13 @@ list_files files
popd popd
# Add the type of update to the beginning of the update manifests. # Add the type of update to the beginning of the update manifests.
> $updatemanifestv2 > "$updatemanifestv2"
> $updatemanifestv3 > "$updatemanifestv3"
notice "" notice ""
notice "Adding type instruction to update manifests" notice "Adding type instruction to update manifests"
notice " type complete" notice " type complete"
echo "type \"complete\"" >> $updatemanifestv2 echo "type \"complete\"" >> "$updatemanifestv2"
echo "type \"complete\"" >> $updatemanifestv3 echo "type \"complete\"" >> "$updatemanifestv3"
notice "" notice ""
notice "Adding file add instructions to update manifests" notice "Adding file add instructions to update manifests"