зеркало из https://github.com/mozilla/pjs.git
Bug 365569: remove workaround from bug 297227, r=mento
This commit is contained in:
Родитель
70cb00420c
Коммит
005f293b22
|
@ -373,9 +373,6 @@ libs repackage:: $(PROGRAM)
|
|||
rm -f $(DIST)/$(APP_NAME).app/Contents/MacOS/$(PROGRAM) $(DIST)/$(APP_NAME).app/Contents/MacOS/mangle $(DIST)/$(APP_NAME).app/Contents/MacOS/shlibsign
|
||||
rsync -aL $(PROGRAM) $(DIST)/$(APP_NAME).app/Contents/MacOS
|
||||
mkdir -p $(DIST)/$(APP_NAME).app/Contents/Plug-Ins
|
||||
# Bug 297227: the next line only exists to repair broken depend builds, it can
|
||||
# go away once that bug has been closed for a while.
|
||||
rm -rf $(DIST)/$(APP_NAME).app/Contents/Plug-Ins/PrintPDE.plugin
|
||||
rsync -a --copy-unsafe-links $(DIST)/package/PrintPDE.plugin $(DIST)/$(APP_NAME).app/Contents/Plug-Ins
|
||||
-cp -L $(DIST)/bin/mangle $(DIST)/bin/shlibsign $(DIST)/$(APP_NAME).app/Contents/MacOS
|
||||
cp -RL $(DIST)/branding/firefox.icns $(DIST)/$(APP_NAME).app/Contents/Resources/firefox.icns
|
||||
|
|
|
@ -79,11 +79,6 @@ export::
|
|||
endif
|
||||
|
||||
libs::
|
||||
# Bug 297227: The next line doesn't need to stay around forever, only
|
||||
# long enough to clean up existing depend builds from when xcodebuild
|
||||
# was being instructed to "install"
|
||||
if test -e build/UninstalledProducts ; then $(MAKE) clean ; rm -rf $(DIST)/package/PrintPDE.plugin ; fi
|
||||
|
||||
$(PBBUILD) $(PROJECT_ARG) -target PrintPDE -buildstyle $(BUILDSTYLE) $(PBBUILD_ARG)
|
||||
mkdir -p $(DIST)/package
|
||||
$(INSTALL) $(XCODE_PRODUCT_DIR)/PrintPDE.plugin $(DIST)/package
|
||||
|
|
|
@ -315,9 +315,6 @@ libs:: $(PROGRAM)
|
|||
rm -f $(DIST)/$(APP_NAME).app/Contents/MacOS/$(PROGRAM)
|
||||
rsync -aL $(PROGRAM) $(DIST)/$(APP_NAME).app/Contents/MacOS
|
||||
mkdir -p $(DIST)/$(APP_NAME).app/Contents/Plug-Ins
|
||||
# Bug 297227: the next line only exists to repair broken depend builds, it can
|
||||
# go away once that bug has been closed for a while.
|
||||
rm -rf $(DIST)/$(APP_NAME).app/Contents/Plug-Ins/PrintPDE.plugin
|
||||
rsync -a --copy-unsafe-links $(DIST)/package/PrintPDE.plugin $(DIST)/$(APP_NAME).app/Contents/Plug-Ins
|
||||
cp -RL $(DIST)/branding/thunderbird.icns $(DIST)/$(APP_NAME).app/Contents/Resources/thunderbird.icns
|
||||
cp -RL $(srcdir)/macbuild/mail-biff-badge.png $(DIST)/$(APP_NAME).app/Contents/Resources/mail-biff-badge.png
|
||||
|
|
|
@ -486,9 +486,6 @@ libs:: $(PROGRAM)
|
|||
rm -f $(DIST)/$(APP_NAME).app/Contents/MacOS/$(PROGRAM)
|
||||
rsync -aL $(PROGRAM) $(DIST)/$(APP_NAME).app/Contents/MacOS
|
||||
mkdir -p $(DIST)/$(APP_NAME).app/Contents/Plug-Ins
|
||||
# Bug 297227: the next line only exists to repair broken depend builds, it can
|
||||
# go away once that bug has been closed for a while.
|
||||
rm -rf $(DIST)/$(APP_NAME).app/Contents/Plug-Ins/PrintPDE.plugin
|
||||
rsync -a --copy-unsafe-links $(DIST)/package/PrintPDE.plugin $(DIST)/$(APP_NAME).app/Contents/Plug-Ins
|
||||
cp -RL $(DIST)/package/mozillaSuite.rsrc $(DIST)/$(APP_NAME).app/Contents/Resources/$(PROGRAM).rsrc
|
||||
echo -n APPLMOZZ > $(DIST)/$(APP_NAME).app/Contents/PkgInfo
|
||||
|
|
Загрузка…
Ссылка в новой задаче