mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 934070 - Stop copying dist/bin under dist/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS in */app/Makefile.in. r=ted
Consequently, revert changeset 92bea49b46b4 (bug 914560).
This commit is contained in:
Mike Hommey
parent
d2778baa7e
commit
ebd64d4dbd
@ -113,7 +113,7 @@ AB_CD = $(MOZ_UI_LOCALE)
|
||||
|
||||
AB := $(firstword $(subst -, ,$(AB_CD)))
|
||||
|
||||
clean clobber repackage::
|
||||
clean clobber::
|
||||
rm -rf $(DIST)/$(APP_NAME).app
|
||||
|
||||
ifdef LIBXUL_SDK
|
||||
@ -128,19 +128,16 @@ libs-preqs = \
|
||||
$(NULL)
|
||||
|
||||
.PHONY: repackage
|
||||
tools repackage:: $(libs-preqs)
|
||||
libs:: $(libs-preqs)
|
||||
rsync -a --exclude "*.in" $(srcdir)/macbuild/Contents $(DIST)/$(APP_NAME).app --exclude English.lproj
|
||||
rsync -a --exclude "*.in" $(srcdir)/macbuild/Contents/Resources/English.lproj/ $(DIST)/$(APP_NAME).app/Contents/Resources/$(AB).lproj
|
||||
sed -e "s/%MOZ_APP_VERSION%/$(MOZ_APP_VERSION)/" -e "s/%MOZ_APP_NAME%/$(MOZ_APP_NAME)/" -e "s/%APP_VERSION%/$(APP_VERSION)/" -e "s/%APP_NAME%/$(APP_NAME)/" -e "s/%APP_BINARY%/$(APP_BINARY)/" $(srcdir)/macbuild/Contents/Info.plist.in > $(DIST)/$(APP_NAME).app/Contents/Info.plist
|
||||
sed -e "s/%APP_VERSION%/$(APP_VERSION)/" -e "s/%APP_NAME%/$(APP_NAME)/" $(srcdir)/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in | iconv -f UTF-8 -t UTF-16 > $(DIST)/$(APP_NAME).app/Contents/Resources/$(AB).lproj/InfoPlist.strings
|
||||
rsync -a $(DIST)/bin/ $(DIST)/$(APP_NAME).app/Contents/$(APPFILES)
|
||||
$(RM) $(DIST)/$(APP_NAME).app/Contents/$(APPFILES)/mangle $(DIST)/$(APP_NAME).app/Contents/$(APPFILES)/shlibsign
|
||||
rm -rf $(DIST)/$(APP_NAME).app/Contents/$(APPFILES)
|
||||
ln -s $(abspath $(DIST)/bin) $(DIST)/$(APP_NAME).app/Contents/$(APPFILES)
|
||||
ifdef LIBXUL_SDK
|
||||
cp $(LIBXUL_DIST)/bin/xulrunner$(BIN_SUFFIX) $(DIST)/$(APP_NAME).app/Contents/MacOS/$(APP_BINARY)
|
||||
rsync -a --exclude nsinstall --copy-unsafe-links $(LIBXUL_DIST)/XUL.framework $(DIST)/$(APP_NAME).app/Contents/Frameworks
|
||||
else
|
||||
$(RM) $(DIST)/$(APP_NAME).app/Contents/MacOS/$(PROGRAM)
|
||||
rsync -aL $(PROGRAM) $(DIST)/$(APP_NAME).app/Contents/MacOS
|
||||
endif
|
||||
cp -RL $(srcdir)/b2g.icns $(DIST)/$(APP_NAME).app/Contents/Resources/$(MOZ_APP_NAME).icns
|
||||
printf "APPLMOZB" > $(DIST)/$(APP_NAME).app/Contents/PkgInfo
|
||||
|
||||
@ -162,7 +162,7 @@ AB_CD = $(MOZ_UI_LOCALE)
|
||||
|
||||
AB := $(firstword $(subst -, ,$(AB_CD)))
|
||||
|
||||
clean clobber repackage::
|
||||
clean clobber::
|
||||
$(RM) -r $(dist_dest)
|
||||
|
||||
ifdef LIBXUL_SDK
|
||||
@ -173,17 +173,19 @@ endif
|
||||
|
||||
MAC_BUNDLE_VERSION = $(shell $(PYTHON) $(srcdir)/macversion.py --version=$(MOZ_APP_VERSION) --buildid=$(DEPTH)/config/buildid)
|
||||
|
||||
.PHONY: repackage
|
||||
tools repackage:: $(PROGRAM)
|
||||
libs:: $(PROGRAM)
|
||||
$(MKDIR) -p $(dist_dest)/Contents/MacOS
|
||||
$(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/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/%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 $(DIST)/bin/ $(dist_dest)/Contents/$(APPFILES)
|
||||
rm -rf $(dist_dest)/Contents/$(APPFILES)
|
||||
ln -s $(abspath $(DIST)/bin) $(dist_dest)/Contents/$(APPFILES)
|
||||
ifdef LIBXUL_SDK
|
||||
$(RM) $(dist_dest)/Contents/MacOS/$(PROGRAM)
|
||||
rsync -aL $(PROGRAM) $(dist_dest)/Contents/MacOS
|
||||
endif
|
||||
cp -RL $(DIST)/branding/firefox.icns $(dist_dest)/Contents/Resources/firefox.icns
|
||||
cp -RL $(DIST)/branding/document.icns $(dist_dest)/Contents/Resources/document.icns
|
||||
printf APPLMOZB > $(dist_dest)/Contents/PkgInfo
|
||||
|
||||
@ -1373,7 +1373,7 @@ PP_TARGETS += DIST_CHROME_FILES
|
||||
endif
|
||||
|
||||
ifneq ($(XPI_PKGNAME),)
|
||||
tools realchrome::
|
||||
libs realchrome::
|
||||
ifdef STRIP_XPI
|
||||
ifndef MOZ_DEBUG
|
||||
@echo "Stripping $(XPI_PKGNAME) package directory..."
|
||||
@ -1412,7 +1412,7 @@ ifndef XPI_NAME
|
||||
$(error XPI_NAME must be set for INSTALL_EXTENSION_ID)
|
||||
endif
|
||||
|
||||
tools::
|
||||
libs::
|
||||
$(RM) -r "$(DIST)/bin$(DIST_SUBDIR:%=/%)/extensions/$(INSTALL_EXTENSION_ID)"
|
||||
$(NSINSTALL) -D "$(DIST)/bin$(DIST_SUBDIR:%=/%)/extensions/$(INSTALL_EXTENSION_ID)"
|
||||
$(call copy_dir,$(FINAL_TARGET),$(DIST)/bin$(DIST_SUBDIR:%=/%)/extensions/$(INSTALL_EXTENSION_ID))
|
||||
|
||||
@ -1373,7 +1373,7 @@ PP_TARGETS += DIST_CHROME_FILES
|
||||
endif
|
||||
|
||||
ifneq ($(XPI_PKGNAME),)
|
||||
tools realchrome::
|
||||
libs realchrome::
|
||||
ifdef STRIP_XPI
|
||||
ifndef MOZ_DEBUG
|
||||
@echo "Stripping $(XPI_PKGNAME) package directory..."
|
||||
@ -1412,7 +1412,7 @@ ifndef XPI_NAME
|
||||
$(error XPI_NAME must be set for INSTALL_EXTENSION_ID)
|
||||
endif
|
||||
|
||||
tools::
|
||||
libs::
|
||||
$(RM) -r "$(DIST)/bin$(DIST_SUBDIR:%=/%)/extensions/$(INSTALL_EXTENSION_ID)"
|
||||
$(NSINSTALL) -D "$(DIST)/bin$(DIST_SUBDIR:%=/%)/extensions/$(INSTALL_EXTENSION_ID)"
|
||||
$(call copy_dir,$(FINAL_TARGET),$(DIST)/bin$(DIST_SUBDIR:%=/%)/extensions/$(INSTALL_EXTENSION_ID))
|
||||
|
||||
@ -30,9 +30,6 @@ ifneq ($(OS_ARCH),WINNT)
|
||||
ifdef COMPILE_ENVIRONMENT
|
||||
check gtest::
|
||||
$(MAKE) -C $(DEPTH)/toolkit/library gtestxul
|
||||
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
|
||||
$(MAKE) -C $(DEPTH)/browser/app repackage
|
||||
endif
|
||||
$(PYTHON) $(topsrcdir)/testing/gtest/rungtests.py --xre-path=$(DIST)/bin --symbols-path=$(DIST)/crashreporter-symbols $(DIST)/bin/$(MOZ_APP_NAME)$(BIN_SUFFIX)
|
||||
endif
|
||||
endif
|
||||
|
||||
@ -132,10 +132,11 @@ FRAMEWORK_DIR = \
|
||||
$(FRAMEWORK_DIR)/Resources:
|
||||
$(NSINSTALL) -D $@
|
||||
|
||||
tools:: $(PROGRAM) $(FRAMEWORK_DIR)/Resources
|
||||
libs:: $(PROGRAM) $(FRAMEWORK_DIR)/Resources
|
||||
$(NSINSTALL) $(srcdir)/macbuild/InfoPlist.strings $(FRAMEWORK_DIR)/Resources
|
||||
sed -e "s/APP_VERSION/$(APP_VERSION)/" $(srcdir)/macbuild/Info.plist.in > $(FRAMEWORK_DIR)/Info.plist
|
||||
rsync -av $(DIST)/bin/ $(FRAMEWORK_DIR) --exclude mangle --exclude shlibsign
|
||||
rm -rf $(FRAMEWORK_DIR)
|
||||
ln -s $(abspath $(DIST)/bin) $(FRAMEWORK_DIR)
|
||||
rm -f $(DIST)/$(FRAMEWORK_NAME).framework/Versions/Current \
|
||||
$(DIST)/$(FRAMEWORK_NAME).framework/libxpcom.dylib \
|
||||
$(DIST)/$(FRAMEWORK_NAME).framework/XUL \
|
||||
|
||||
Loading…
Reference in New Issue
Block a user