wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

bug 442484 - packager.mk doesn't work correctly with non-default topsrcdir, r=ted

Browse Source
This commit is contained in:
Robert Kaiser 2008-07-06 22:30:32 +02:00
parent e1c0b7d628
commit 5954a9c126
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,7 +38,7 @@
# #
# ***** END LICENSE BLOCK ***** # ***** END LICENSE BLOCK *****
include $(topsrcdir)/toolkit/mozapps/installer/package-name.mk include $(MOZILLA_DIR)/toolkit/mozapps/installer/package-name.mk
# This is how we create the Unix binary packages we release to the public. # This is how we create the Unix binary packages we release to the public.
# Currently the only format is tar.gz (TGZ), but it should be fairly easy # Currently the only format is tar.gz (TGZ), but it should be fairly easy
@ -137,14 +137,14 @@ endif
ifneq (,$(MOZ_PKG_MAC_EXTRA)) ifneq (,$(MOZ_PKG_MAC_EXTRA))
PKG_DMG_FLAGS += $(MOZ_PKG_MAC_EXTRA) PKG_DMG_FLAGS += $(MOZ_PKG_MAC_EXTRA)
endif endif
_ABS_TOPSRCDIR = $(shell cd $(topsrcdir) && pwd) _ABS_MOZSRCDIR = $(shell cd $(MOZILLA_DIR) && pwd)
ifdef UNIVERSAL_BINARY ifdef UNIVERSAL_BINARY
STAGEPATH = universal/ STAGEPATH = universal/
endif endif
ifndef PKG_DMG_SOURCE ifndef PKG_DMG_SOURCE
PKG_DMG_SOURCE = $(STAGEPATH)$(MOZ_PKG_APPNAME) PKG_DMG_SOURCE = $(STAGEPATH)$(MOZ_PKG_APPNAME)
endif endif
MAKE_PACKAGE = $(_ABS_TOPSRCDIR)/build/package/mac_osx/pkg-dmg \ MAKE_PACKAGE = $(_ABS_MOZSRCDIR)/build/package/mac_osx/pkg-dmg \
--source "$(PKG_DMG_SOURCE)" --target "$(PACKAGE)" \ --source "$(PKG_DMG_SOURCE)" --target "$(PACKAGE)" \
--volname "$(MOZ_APP_DISPLAYNAME)" $(PKG_DMG_FLAGS) --volname "$(MOZ_APP_DISPLAYNAME)" $(PKG_DMG_FLAGS)
UNMAKE_PACKAGE = \ UNMAKE_PACKAGE = \
@ -196,7 +196,7 @@ else
ifeq ($(OS_ARCH),OS2) ifeq ($(OS_ARCH),OS2)
# uppercase extension to get the correct output file from shlibsign # uppercase extension to get the correct output file from shlibsign
NSS_DLL_SUFFIX = .DLL NSS_DLL_SUFFIX = .DLL
SIGN_CMD = $(topsrcdir)/toolkit/mozapps/installer/os2/sign.cmd $(DIST) SIGN_CMD = $(MOZILLA_DIR)/toolkit/mozapps/installer/os2/sign.cmd $(DIST)
else else
SIGN_CMD = $(RUN_TEST_PROGRAM) $(DIST)/bin/shlibsign -v -i SIGN_CMD = $(RUN_TEST_PROGRAM) $(DIST)/bin/shlibsign -v -i
endif endif
@ -268,7 +268,7 @@ ifdef MOZ_PKG_REMOVALS
MOZ_PKG_REMOVALS_GEN = removed-files MOZ_PKG_REMOVALS_GEN = removed-files
$(MOZ_PKG_REMOVALS_GEN): $(MOZ_PKG_REMOVALS) Makefile Makefile.in $(MOZ_PKG_REMOVALS_GEN): $(MOZ_PKG_REMOVALS) Makefile Makefile.in
$(PYTHON) $(topsrcdir)/config/Preprocessor.py -Fsubstitution $(DEFINES) $(ACDEFINES) $(MOZ_PKG_REMOVALS) > $(MOZ_PKG_REMOVALS_GEN) $(PYTHON) $(MOZILLA_DIR)/config/Preprocessor.py -Fsubstitution $(DEFINES) $(ACDEFINES) $(MOZ_PKG_REMOVALS) > $(MOZ_PKG_REMOVALS_GEN)
endif endif
GARBAGE += $(DIST)/$(PACKAGE) $(PACKAGE) GARBAGE += $(DIST)/$(PACKAGE) $(PACKAGE)
@ -281,7 +281,7 @@ STRIP_FLAGS = -g
PLATFORM_EXCLUDE_LIST = ! -name "*.stub" ! -name "$(MOZ_PKG_APPNAME)-bin" PLATFORM_EXCLUDE_LIST = ! -name "*.stub" ! -name "$(MOZ_PKG_APPNAME)-bin"
endif endif
ifeq ($(OS_ARCH),OS2) ifeq ($(OS_ARCH),OS2)
STRIP = $(topsrcdir)/toolkit/mozapps/installer/os2/strip.cmd STRIP = $(MOZILLA_DIR)/toolkit/mozapps/installer/os2/strip.cmd
STRIP_FLAGS = STRIP_FLAGS =
PLATFORM_EXCLUDE_LIST = ! -name "*.ico" PLATFORM_EXCLUDE_LIST = ! -name "*.ico"
endif endif
@ -304,7 +304,7 @@ PKG_ARG = , "$(pkg)"
# Define packager macro to work around make 3.81 backslash issue (bug #339933) # Define packager macro to work around make 3.81 backslash issue (bug #339933)
define PACKAGER_COPY define PACKAGER_COPY
$(PERL) -I$(topsrcdir)/xpinstall/packager -e 'use Packager; \ $(PERL) -I$(MOZILLA_DIR)/xpinstall/packager -e 'use Packager; \
Packager::Copy($1,$2,$3,$4,$5,$6,$7);' Packager::Copy($1,$2,$3,$4,$5,$6,$7);'
endef endef
@ -332,7 +332,7 @@ ifdef MOZ_OPTIONAL_PKG_LIST
"$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1 \ "$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1 \
$(foreach pkg,$(MOZ_OPTIONAL_PKG_LIST),$(PKG_ARG)) ) $(foreach pkg,$(MOZ_OPTIONAL_PKG_LIST),$(PKG_ARG)) )
endif endif
$(PERL) $(topsrcdir)/xpinstall/packager/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DEPTH)/installer-stage/nonlocalized/components -v -x "$(XPIDL_LINK)" $(PERL) $(MOZILLA_DIR)/xpinstall/packager/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DEPTH)/installer-stage/nonlocalized/components -v -x "$(XPIDL_LINK)"
stage-package: $(MOZ_PKG_MANIFEST) $(MOZ_PKG_REMOVALS_GEN) stage-package: $(MOZ_PKG_MANIFEST) $(MOZ_PKG_REMOVALS_GEN)
@rm -rf $(DIST)/$(MOZ_PKG_APPNAME) $(DIST)/$(PKG_BASENAME).tar $(DIST)/$(PKG_BASENAME).dmg $@ $(EXCLUDE_LIST) @rm -rf $(DIST)/$(MOZ_PKG_APPNAME) $(DIST)/$(PKG_BASENAME).tar $(DIST)/$(PKG_BASENAME).dmg $@ $(EXCLUDE_LIST)
@ -345,7 +345,7 @@ ifdef MOZ_PKG_MANIFEST
$(call PACKAGER_COPY, "$(DIST)",\ $(call PACKAGER_COPY, "$(DIST)",\
"$(DIST)/$(MOZ_PKG_APPNAME)", \ "$(DIST)/$(MOZ_PKG_APPNAME)", \
"$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1) "$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1)
$(PERL) $(topsrcdir)/xpinstall/packager/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DIST)/$(MOZ_PKG_APPNAME)/components -v -x "$(XPIDL_LINK)" $(PERL) $(MOZILLA_DIR)/xpinstall/packager/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DIST)/$(MOZ_PKG_APPNAME)/components -v -x "$(XPIDL_LINK)"
else # !MOZ_PKG_MANIFEST else # !MOZ_PKG_MANIFEST
ifeq ($(MOZ_PKG_FORMAT),DMG) ifeq ($(MOZ_PKG_FORMAT),DMG)
# If UNIVERSAL_BINARY, the package will be made from an already-prepared # If UNIVERSAL_BINARY, the package will be made from an already-prepared