author | Benjamin Smedberg <benjamin@smedbergs.us> |
Tue, 20 Jul 2010 17:57:02 -0400 | |
changeset 47989 | f4e545ef44dce7abdaecbeb9df686d802f5446c9 |
parent 47988 | 2a32e764c0cad22a629d3e528c07044740b08c92 |
child 47990 | 961f253985a4388008700a6a6fde80f4e17c0b4b |
child 47993 | 472acbffdcaa47626ab21d63769880c4c3c1623c |
push id | 14521 |
push user | bsmedberg@mozilla.com |
push date | Tue, 20 Jul 2010 21:58:16 +0000 |
treeherder | mozilla-central@f4e545ef44dc [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | johnath |
bugs | 557225, 578751 |
milestone | 2.0b2pre |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/ipc/app/Makefile.in +++ b/ipc/app/Makefile.in @@ -108,28 +108,19 @@ ifeq ($(OS_ARCH),WINNT) # Set it to 256k. See bug 127069. # ifndef GNU_CC LDFLAGS += /HEAP:0x40000 endif endif ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) -# Create an app bundle -MOZ_FIX_LINK_PATHS+=-Wl,-headerpad_max_install_names -# We need to fix the install names for the Gecko libraries we're linked to. -# They're all @loader_path/libfoo.dylib, but this binary lives in a bundle -# underneath that. -paren=\( -LIST_INSTALL_NAMES=$(shell otool -L $(PROGRAM) | grep "@loader_path" | tr -s '\t ' ' ' | cut -f1 -d$(paren) | xargs echo) -FIX_INSTALL_NAMES=$(foreach l,$(LIST_INSTALL_NAMES),-change "$l" "$(subst @loader_path,@loader_path/../../..,$l)") libs:: $(NSINSTALL) -D $(DIST)/bin/$(PROGRAM).app rsync -a -C --exclude "*.in" $(srcdir)/macbuild/Contents $(DIST)/bin/$(PROGRAM).app sed -e "s/%PROGRAM%/$(PROGRAM)/" $(srcdir)/macbuild/Contents/Info.plist.in > $(DIST)/bin/$(PROGRAM).app/Contents/Info.plist sed -e "s/%APP_NAME%/$(MOZ_APP_DISPLAYNAME)/" $(srcdir)/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in | \ iconv -f UTF-8 -t UTF-16 > $(DIST)/bin/$(PROGRAM).app/Contents/Resources/English.lproj/InfoPlist.strings $(NSINSTALL) -D $(DIST)/bin/$(PROGRAM).app/Contents/MacOS - install_name_tool $(FIX_INSTALL_NAMES) $(PROGRAM) $(NSINSTALL) $(PROGRAM) $(DIST)/bin/$(PROGRAM).app/Contents/MacOS rm -f $(DIST)/bin/$(PROGRAM) endif