diff --git a/xulrunner/README.xulrunner b/xulrunner/README.xulrunner new file mode 100644 index 00000000000000..424b7a61507735 --- /dev/null +++ b/xulrunner/README.xulrunner @@ -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 diff --git a/xulrunner/app/Makefile.in b/xulrunner/app/Makefile.in index d6efcbb38931d9..b4c259c4fc51b5 100644 --- a/xulrunner/app/Makefile.in +++ b/xulrunner/app/Makefile.in @@ -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 diff --git a/xulrunner/installer/Makefile.in b/xulrunner/installer/Makefile.in index 4ff48803327f63..647bf6d80a2089 100644 --- a/xulrunner/installer/Makefile.in +++ b/xulrunner/installer/Makefile.in @@ -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 diff --git a/xulrunner/installer/mac/Description.plist.in b/xulrunner/installer/mac/Description.plist.in deleted file mode 100644 index 3a82f3f72c23e2..00000000000000 --- a/xulrunner/installer/mac/Description.plist.in +++ /dev/null @@ -1,12 +0,0 @@ - - -#filter substitution - - - - - - IFPkgDescriptionTitle - Mozilla XULRunner @MOZ_APP_VERSION@ - - diff --git a/xulrunner/installer/mac/Info.plist.in b/xulrunner/installer/mac/Info.plist.in deleted file mode 100644 index 7d9bb587e8e0b0..00000000000000 --- a/xulrunner/installer/mac/Info.plist.in +++ /dev/null @@ -1,41 +0,0 @@ - - -#filter substitution - - - - - - CFBundleIdentifier - org.mozilla.xulrunner - - CFBundleName - Mozilla XULRunner - - CFBundleShortVersionString - @MOZ_APP_VERSION@ - - IFPkgFlagAuthorizationAction - RootAuthorization - - IFPkgFlagDefaultLocation - /Library/Frameworks - - IFPkgFlagFollowLinks - - - IFPkgFormatVersion - 0.10000000149011612 - - LSMinimumSystemVersion - 10.5 - - LSMinimumSystemVersionByArchitecture - - i386 - 10.5.0 - x86_64 - 10.6.0 - - - diff --git a/xulrunner/installer/mac/Makefile.in b/xulrunner/installer/mac/Makefile.in deleted file mode 100644 index b9dfe41b0c1c7a..00000000000000 --- a/xulrunner/installer/mac/Makefile.in +++ /dev/null @@ -1,109 +0,0 @@ -# ***** BEGIN LICENSE BLOCK ***** -# Version: MPL 1.1/GPL 2.0/LGPL 2.1 -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# The Original Code is the Mozilla Browser code. -# -# The Initial Developer of the Original Code is -# IBM Corporation. -# Portions created by the Initial Developer are Copyright (C) 2004 -# the Initial Developer. All Rights Reserved. -# -# Contributor(s): -# Brian Ryner -# Benjamin Smedberg -# Darin Fisher -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 2 or later (the "GPL"), or -# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -# in which case the provisions of the GPL or the LGPL are applicable instead -# of those above. If you wish to allow use of your version of this file only -# under the terms of either the GPL or the LGPL, and not to allow others to -# use your version of this file under the terms of the MPL, indicate your -# decision by deleting the provisions above and replace them with the notice -# and other provisions required by the GPL or the LGPL. If you do not delete -# the provisions above, a recipient may use your version of this file under -# the terms of any one of the MPL, the GPL or the LGPL. -# -# ***** END LICENSE BLOCK ***** - -DEPTH = ../../.. -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - -DEFINES += -DMOZ_APP_VERSION=$(MOZ_APP_VERSION) - -NO_PKG_FILES = \ - xulrunner-config \ - regchrome* \ - regxpcom* \ - xpcshell* \ - xpidl* \ - xpt_dump* \ - xpt_link* \ - $(NULL) - -include $(topsrcdir)/config/rules.mk - -libs:: stage-package - -%.plist: %.plist.in - $(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) $< > $@ - -PACKAGER_NO_LIBS=1 -_APPNAME = XUL.framework -_BINPATH = /$(_APPNAME)/Versions/Current - -include $(topsrcdir)/toolkit/mozapps/installer/packager.mk - -_ABS_OBJDIR := $(shell pwd) -_ABS_DIST := $(shell cd $(DIST) && pwd) - -# Syntax "chown_root " -# Should be equivalent to "chown -R root:admin " -CHOWN_ROOT ?= $(error CHOWN_ROOT must be set to a setuid script.) - -# Syntax "chown_revert " -# Should be equivalent to "chown -R " -CHOWN_REVERT ?= $(error CHOWN_REVERT must be set to a setuid script.) - -# Do the real work here: we take $(DIST)/XUL.framework and make it into an -# installer .pkg bundle. The xulrunner/installer makefile will then pack the -# installer into a DMG. -libs:: Info.plist Description.plist - $(RM) -rf resource-stage - mkdir resource-stage - $(RM) -rf $(DIST)/$(STAGEPATH)xulrunner-pkg - mkdir $(DIST)/$(STAGEPATH)xulrunner-pkg - chmod -R a+rX,u+w,go-w,-s,-t $(DIST)/$(STAGEPATH)$(MOZ_PKG_APPNAME) -# For some unknown reason, PackageMaker requires absolute paths to everything. -# For other poor reasons, PackageMaker returns an exit code of "1" if the -# version string has any letters in it (e.g. 1.9a1). - unset NEXT_ROOT; \ - $(CHOWN_ROOT) $(DIST)/$(STAGEPATH)$(MOZ_PKG_APPNAME) && \ - /Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker -build -v \ - -p $(_ABS_DIST)/$(STAGEPATH)xulrunner-pkg/$(PKG_BASENAME).pkg \ - -f $(_ABS_DIST)/$(STAGEPATH)$(MOZ_PKG_APPNAME) \ - -r $(_ABS_OBJDIR)/resource-stage \ - -i $(_ABS_OBJDIR)/Info.plist \ - -d $(_ABS_OBJDIR)/Description.plist > packagemaker.log; \ - SAVED=$$?; \ - if [ "$$SAVED" == "1" -a \ - `grep -c 'was completed with the following non-fatal errors' < packagemaker.log` -gt 0 ]; then \ - SAVED=0; \ - fi; \ - $(CHOWN_REVERT) $(DIST)/$(STAGEPATH)$(MOZ_PKG_APPNAME); \ - exit $$SAVED