| author | Gregory Szorc <gps@mozilla.com> |
| Mon, 25 Feb 2013 13:20:39 -0800 | |
| changeset 133659 | 0dd558c975f03e20e5704133facd2af6c4bf1eea |
| parent 133658 | 873935822ede9eb1ec96610fe3b707e63e7c9b21 |
| child 133660 | 9efbdb63ecbeb3c9775921b249ffc9051d22cb18 |
| push id | 2452 |
| push user | lsblakk@mozilla.com |
| push date | Mon, 13 May 2013 16:59:38 +0000 |
| treeherder | mozilla-beta@d4b152d29d8d [default view] [failures only] |
| perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
| reviewers | ted |
| bugs | 784841 |
| milestone | 22.0a1 |
| 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/xulrunner/Makefile.in +++ b/xulrunner/Makefile.in @@ -5,24 +5,9 @@ DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -PARALLEL_DIRS = \ - app \ - setup \ - stub \ - examples \ - $(NULL) - -ifdef MAKENSISU -DIRS += installer/windows -endif - -ifeq ($(OS_ARCH),WINNT) -PARALLEL_DIRS += tools/redit -endif - include $(topsrcdir)/config/rules.mk
new file mode 100644 --- /dev/null +++ b/xulrunner/app.mozbuild @@ -0,0 +1,16 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +app_libxul_dirs = [] +include('/toolkit/toolkit.mozbuild') + +if CONFIG['MOZ_EXTENSIONS']: + add_tier_dir('app', 'extensions') + +if CONFIG['OS_ARCH'] == 'WINNT' and (CONFIG['ENABLE_TESTS'] or + CONFIG['MOZILLA_OFFICIAL']): + add_tier_dir('app', 'embedding/tests/winEmbed') + +add_tier_dir('app', 'xulrunner')
--- a/xulrunner/app/Makefile.in +++ b/xulrunner/app/Makefile.in @@ -5,18 +5,16 @@ DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = profile - PREF_JS_EXPORTS = $(srcdir)/xulrunner.js GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/,xulrunner.js) DEFINES += -DAB_CD=$(AB_CD) PROGRAM = xulrunner$(BIN_SUFFIX) DEFINES += -DXULRUNNER_PROGNAME=\"xulrunner\"
new file mode 100644 --- /dev/null +++ b/xulrunner/app/moz.build @@ -0,0 +1,6 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +DIRS += ['profile']
--- a/xulrunner/app/profile/Makefile.in +++ b/xulrunner/app/profile/Makefile.in @@ -5,18 +5,16 @@ DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = chrome - include $(topsrcdir)/config/rules.mk FILES := \ localstore.rdf \ $(NULL) libs:: $(FILES) $(INSTALL) $^ $(DIST)/bin/defaults/profile
new file mode 100644 --- /dev/null +++ b/xulrunner/app/profile/chrome/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +
new file mode 100644 --- /dev/null +++ b/xulrunner/app/profile/moz.build @@ -0,0 +1,6 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +DIRS += ['chrome']
--- a/xulrunner/build.mk +++ b/xulrunner/build.mk @@ -1,29 +1,12 @@ # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -include $(topsrcdir)/toolkit/toolkit-tiers.mk - -TIERS += app - -ifdef MOZ_EXTENSIONS -tier_app_dirs += extensions -endif - -# winEmbed -ifeq ($(OS_ARCH),WINNT) -ifneq (,$(ENABLE_TESTS)$(MOZILLA_OFFICIAL)) -tier_app_dirs += embedding/tests/winEmbed -endif -endif - -tier_app_dirs += xulrunner - installer: @echo "XULRunner doesn't have an installer yet." package: @$(MAKE) -C xulrunner/installer install: @$(MAKE) -C xulrunner/installer install
--- a/xulrunner/examples/Makefile.in +++ b/xulrunner/examples/Makefile.in @@ -5,11 +5,9 @@ DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = simple - include $(topsrcdir)/config/rules.mk
new file mode 100644 --- /dev/null +++ b/xulrunner/examples/moz.build @@ -0,0 +1,6 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +DIRS += ['simple']
--- a/xulrunner/examples/simple/Makefile.in +++ b/xulrunner/examples/simple/Makefile.in @@ -8,18 +8,16 @@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MODULE = simple XPI_NAME = simple -DIRS = components - PREF_JS_EXPORTS = $(srcdir)/simple-prefs.js DIST_FILES = application.ini ifneq (,$(filter windows,$(MOZ_WIDGET_TOOLKIT))) ICONS = icons/simple.ico endif include $(topsrcdir)/config/rules.mk
--- a/xulrunner/examples/simple/components/Makefile.in +++ b/xulrunner/examples/simple/components/Makefile.in @@ -5,11 +5,9 @@ DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = public src - include $(topsrcdir)/config/rules.mk
new file mode 100644 --- /dev/null +++ b/xulrunner/examples/simple/components/moz.build @@ -0,0 +1,6 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +DIRS += ['public', 'src']
new file mode 100644 --- /dev/null +++ b/xulrunner/examples/simple/components/public/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +
new file mode 100644 --- /dev/null +++ b/xulrunner/examples/simple/components/src/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +
new file mode 100644 --- /dev/null +++ b/xulrunner/examples/simple/moz.build @@ -0,0 +1,6 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +DIRS += ['components']
new file mode 100644 --- /dev/null +++ b/xulrunner/installer/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +
new file mode 100644 --- /dev/null +++ b/xulrunner/installer/windows/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +
new file mode 100644 --- /dev/null +++ b/xulrunner/moz.build @@ -0,0 +1,17 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +PARALLEL_DIRS += [ + 'app', + 'setup', + 'stub', + 'examples', +] + +if CONFIG['MAKENSISU']: + DIRS += ['installer/windows'] + +if CONFIG['OS_ARCH'] == 'WINNT': + PARALLEL_DIRS += ['tools/redit']
new file mode 100644 --- /dev/null +++ b/xulrunner/setup/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +
new file mode 100644 --- /dev/null +++ b/xulrunner/stub/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +
new file mode 100644 --- /dev/null +++ b/xulrunner/tools/redit/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +