]>
Commit | Line | Data |
---|---|---|
d97ddc70 JB |
1 | --- mozilla/browser/app/Makefile.in 2008-06-22 22:54:03.000000000 +0200 |
2 | +++ mozilla/browser/app/Makefile.in 2008-06-23 10:34:59.000000000 +0200 | |
3 | @@ -397,7 +397,7 @@ | |
96ef4151 JB |
4 | 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 |
5 | rsync -a $(DIST)/bin/ $(dist_dest)/Contents/$(APPFILES) | |
d97ddc70 | 6 | ifdef LIBXUL_SDK |
96ef4151 JB |
7 | - cp $(LIBXUL_DIST)/bin/$(XR_STUB_NAME) $(dist_dest)/Contents/MacOS/firefox |
8 | + cp $(LIBXUL_DIST)/bin/$(XR_STUB_NAME) $(dist_dest)/Contents/MacOS/$(MOZ_APP_NAME) | |
d97ddc70 JB |
9 | else |
10 | rm -f $(DIST)/$(APP_NAME).app/Contents/MacOS/$(PROGRAM) | |
11 | rsync -aL $(PROGRAM) $(DIST)/$(APP_NAME).app/Contents/MacOS | |
12 | @@ -359,7 +359,7 @@ | |
13 | else | |
14 | ifdef LIBXUL_SDK | |
15 | libs:: | |
16 | - cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/firefox$(BIN_SUFFIX) | |
17 | + cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/$(MOZ_APP_NAME)$(BIN_SUFFIX) | |
65fa693b | 18 | endif |
65fa693b | 19 | endif |
d97ddc70 JB |
20 | |
21 | @@ -433,7 +433,7 @@ | |
96ef4151 | 22 | rsync -a --copy-unsafe-links $(LIBXUL_DIST)/XUL.framework $(dist_dest)/Contents/Frameworks |
d97ddc70 JB |
23 | else |
24 | $(NSINSTALL) -D $(DIST)/bin/xulrunner | |
25 | - (cd $(LIBXUL_SDK)/bin && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DIST)/bin/xulrunner && tar -xf -) | |
26 | + cp -rfRp $(LIBXUL_SDK)/bin $(DIST)/bin/xulrunner | |
96ef4151 JB |
27 | endif #} cocoa |
28 | endif #} SKIP_COPY_XULRUNNER | |
29 | endif #} LIBXUL_SDK | |
0fca8d8d JB |
30 | --- mozilla/toolkit/mozapps/installer/packager.mk.orig 2011-03-19 00:34:12.000000000 +0100 |
31 | +++ mozilla/toolkit/mozapps/installer/packager.mk 2011-03-22 23:53:43.877485659 +0100 | |
96ef4151 | 32 | @@ -708,41 +708,41 @@ |
0fca8d8d JB |
33 | endif |
34 | ||
96ef4151 JB |
35 | stage-package: $(MOZ_PKG_MANIFEST) $(MOZ_PKG_REMOVALS_GEN) |
36 | - @rm -rf $(DIST)/$(PKG_PATH)$(PKG_BASENAME).tar $(DIST)/$(PKG_PATH)$(PKG_BASENAME).dmg $@ $(EXCLUDE_LIST) | |
37 | + @rm -rf $(DIST)/$(PKG_PATH)$(PKG_BASENAME).tar $(DIST)/$(PKG_PATH)$(PKG_BASENAME).dmg $@ $(EXCLUDE_LIST) | |
38 | ifndef MOZ_FAST_PACKAGE | |
39 | - @rm -rf $(DIST)/$(MOZ_PKG_DIR) | |
40 | + @rm -rf $(DESTDIR)/$(MOZ_PKG_DIR) | |
41 | endif | |
0fca8d8d JB |
42 | # NOTE: this must be a tar now that dist links into the tree so that we |
43 | # do not strip the binaries actually in the tree. | |
44 | @echo "Creating package directory..." | |
96ef4151 JB |
45 | - if ! test -d $(DIST)/$(MOZ_PKG_DIR) ; then \ |
46 | - mkdir $(DIST)/$(MOZ_PKG_DIR); \ | |
47 | + if ! test -d $(DESTDIR)/$(MOZ_PKG_DIR) ; then \ | |
48 | + mkdir -p $(DESTDIR)/$(MOZ_PKG_DIR); \ | |
49 | fi | |
0fca8d8d JB |
50 | ifndef UNIVERSAL_BINARY |
51 | # If UNIVERSAL_BINARY, the package will be made from an already-prepared | |
52 | # STAGEPATH | |
53 | ifdef MOZ_PKG_MANIFEST | |
96ef4151 | 54 | ifndef MOZ_FAST_PACKAGE |
0fca8d8d | 55 | $(RM) -rf $(DIST)/xpt $(DIST)/manifests |
96ef4151 | 56 | endif |
0fca8d8d JB |
57 | $(call PACKAGER_COPY, "$(call core_abspath,$(DIST))",\ |
58 | - "$(call core_abspath,$(DIST)/$(MOZ_PKG_DIR))", \ | |
59 | + "$(call core_abspath,$(DESTDIR)/$(MOZ_PKG_DIR))", \ | |
60 | "$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1) | |
4ac83cfe JB |
61 | - $(PERL) $(MOZILLA_DIR)/toolkit/mozapps/installer/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/components -v -x "$(XPIDL_LINK)" |
62 | + $(PERL) $(MOZILLA_DIR)/toolkit/mozapps/installer/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/components -v -x "$(XPIDL_LINK)" | |
0fca8d8d JB |
63 | $(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/link-manifests.py \ |
64 | - $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/components/components.manifest \ | |
65 | + $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/components/components.manifest \ | |
66 | $(patsubst %,$(DIST)/manifests/%/components,$(MOZ_NONLOCALIZED_PKG_LIST)) | |
67 | $(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/link-manifests.py \ | |
68 | - $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome/nonlocalized.manifest \ | |
69 | + $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome/nonlocalized.manifest \ | |
70 | $(patsubst %,$(DIST)/manifests/%/chrome,$(MOZ_NONLOCALIZED_PKG_LIST)) | |
71 | $(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/link-manifests.py \ | |
72 | - $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome/localized.manifest \ | |
73 | + $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome/localized.manifest \ | |
74 | $(patsubst %,$(DIST)/manifests/%/chrome,$(MOZ_LOCALIZED_PKG_LIST)) | |
96ef4151 JB |
75 | ifdef MOZ_WEBAPP_RUNTIME |
76 | - mv $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome/$(AB_CD).manifest $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome/localized.manifest | |
77 | - sed 's/$(AB_CD)/localized/' $(DIST)/bin/webapprt/chrome.manifest > $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome.manifest | |
78 | + mv $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome/$(AB_CD).manifest $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome/localized.manifest | |
79 | + sed 's/$(AB_CD)/localized/' $(DIST)/bin/webapprt/chrome.manifest > $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome.manifest | |
80 | endif | |
0fca8d8d JB |
81 | - printf "manifest components/interfaces.manifest\nmanifest components/components.manifest\nmanifest chrome/nonlocalized.manifest\nmanifest chrome/localized.manifest\n" > $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome.manifest |
82 | + printf "manifest components/interfaces.manifest\nmanifest components/components.manifest\nmanifest chrome/nonlocalized.manifest\nmanifest chrome/localized.manifest\n" > $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome.manifest | |
83 | else # !MOZ_PKG_MANIFEST | |
96ef4151 | 84 | ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) |
0fca8d8d | 85 | ifndef STAGE_SDK |
4ac83cfe | 86 | @@ -741,10 +741,10 @@ |
0fca8d8d JB |
87 | @$(NSINSTALL) -D $(DIST)/xpt |
88 | @($(XPIDL_LINK) $(DIST)/xpt/$(MOZ_PKG_APPNAME).xpt $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components/*.xpt && rm -f $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components/*.xpt && cp $(DIST)/xpt/$(MOZ_PKG_APPNAME).xpt $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components && printf "interfaces $(MOZ_PKG_APPNAME).xpt\n" >$(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components/interfaces.manifest) || echo No *.xpt files found in: $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components/. Continuing... | |
89 | else | |
90 | - @cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR); tar -xf -) | |
91 | + cp -rfLp $(DIST)/bin/* $(DESTDIR)$(MOZ_PKG_DIR) | |
92 | endif | |
93 | else | |
94 | - @cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR); tar -xf -) | |
95 | + cp -rfLp $(DIST)/bin/* $(DESTDIR)$(MOZ_PKG_DIR) | |
96 | @echo "Linking XPT files..." | |
97 | @rm -rf $(DIST)/xpt | |
98 | @$(NSINSTALL) -D $(DIST)/xpt | |
4ac83cfe | 99 | @@ -830,7 +830,7 @@ |
0fca8d8d JB |
100 | cd $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH) && $(PACK_OMNIJAR) |
101 | endif | |
102 | $(NSINSTALL) -D $(DESTDIR)$(installdir) | |
96ef4151 JB |
103 | - (cd $(DIST)/$(MOZ_PKG_DIR) && tar --exclude=precomplete $(TAR_CREATE_FLAGS) - .) | \ |
104 | + (cd $(DESTDIR)/$(MOZ_PKG_DIR) && tar --exclude=precomplete $(TAR_CREATE_FLAGS) - .) | \ | |
0fca8d8d JB |
105 | (cd $(DESTDIR)$(installdir) && tar -xf -) |
106 | $(NSINSTALL) -D $(DESTDIR)$(bindir) | |
107 | $(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME) |