Skip to content

Commit

Permalink
Bug 734975 - Package a .tar.bz2 file for the XULRunner package on Mac…
Browse files Browse the repository at this point in the history
…, instead of the .pkg.dmg which installs XULRunner to an obsolete system location. r=Mossop
  • Loading branch information
bsmedberg committed Mar 23, 2012
1 parent 10ed2c3 commit 1e14bac
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 171 deletions.
13 changes: 13 additions & 0 deletions xulrunner/README.xulrunner
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
XULRunner is a package which can be used to run applications written in HTML
or XUL. It can also be used to embed the gecko rendering engine into
binary applications.

XULRunner is not a product; it is a tool which can be used to create products.
It is a byproduct of Firefox development and the Mozilla community does not
have a strong commitment to support XULRunner development apart from Firefox
development.

For more information about using XULRunner or how to use this binary package,
see the Mozilla Developer Center article:

https://developer.mozilla.org/en/XULRunner
2 changes: 1 addition & 1 deletion xulrunner/app/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ clean clobber::
rm -rf $(DIST)/$(FRAMEWORK_NAME).framework
endif

README_FILE = $(topsrcdir)/README.txt
README_FILE = $(srcdir)/../README.xulrunner

libs::
$(INSTALL) $(IFLAGS1) $(README_FILE) $(DIST)/bin
Expand Down
11 changes: 3 additions & 8 deletions xulrunner/installer/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,11 @@ NO_PKG_FILES = \
regxpcom* \
$(NULL)

# If we're on mac, we want to make the .pkg first, in the mac/
# directory. Then packager.mk can put it into a DMG
# If we're on mac, we don't want an end-user-facing DMG, we want a .tar.bz2
# which developers then use to package their application.

ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
DIRS += mac
_APPNAME = $(PKG_BASENAME).pkg
_BINPATH = /XUL.framework/Versions/Current
PKG_SKIP_STRIP = 1
MOZ_PKG_SPECIAL = pkg
PKG_DMG_SOURCE = $(STAGEPATH)xulrunner-pkg
MOZ_PKG_FORMAT = BZ2
endif

include $(topsrcdir)/config/rules.mk
Expand Down
12 changes: 0 additions & 12 deletions xulrunner/installer/mac/Description.plist.in

This file was deleted.

41 changes: 0 additions & 41 deletions xulrunner/installer/mac/Info.plist.in

This file was deleted.

109 changes: 0 additions & 109 deletions xulrunner/installer/mac/Makefile.in

This file was deleted.

0 comments on commit 1e14bac

Please sign in to comment.