author | Joey Armstrong <jarmstrong@mozilla.com> |
Mon, 02 Apr 2012 13:06:06 -0400 | |
changeset 90971 | 9c293bf4df910e9e0087529c25c96ff01b2e2c8d |
parent 89670 | e94edfdb1f5bd5c29dc54cfb83768f9c84f3f4de |
child 90972 | 0fe55a35369ff75edf47ecedb4d88a94036750f2 |
push id | 22404 |
push user | coop@mozilla.com |
push date | Wed, 04 Apr 2012 18:06:17 +0000 |
treeherder | mozilla-central@c598b7b202e7 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | khuey |
bugs | 680246 |
milestone | 14.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
|
allmakefiles.sh | file | annotate | diff | comparison | revisions | |
config/Makefile.in | file | annotate | diff | comparison | revisions | |
config/rules.mk | file | annotate | diff | comparison | revisions | |
js/src/config/rules.mk | file | annotate | diff | comparison | revisions |
--- a/allmakefiles.sh +++ b/allmakefiles.sh @@ -1,45 +1,13 @@ #! /bin/sh # -# ***** 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 mozilla.org code. -# -# The Initial Developer of the Original Code is -# Netscape Communications Corporation. -# Portions created by the Initial Developer are Copyright (C) 1999 -# the Initial Developer. All Rights Reserved. -# -# Contributor(s): -# -# 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 ***** +# 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/. # allmakefiles.sh - List of all makefiles. # Appends the list of makefiles to the variable, MAKEFILES. # There is no need to rerun autoconf after adding makefiles. # You only need to run configure. # Turn on exit on error set -o errexit @@ -120,16 +88,17 @@ if [ "$COMPILER_DEPEND" = "" -a "$MOZ_NA add_makefiles " config/mkdepend/Makefile " fi if [ "$ENABLE_TESTS" ]; then add_makefiles " build/autoconf/test/Makefile + config/tests/makefiles/autodeps/Makefile " if [ ! "$LIBXUL_SDK" ]; then add_makefiles " mozglue/tests/Makefile " fi if [ "$_MSC_VER" -a "$OS_TEST" != "x86_64" ]; then add_makefiles "
--- a/config/Makefile.in +++ b/config/Makefile.in @@ -1,46 +1,13 @@ -# -# ***** 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 mozilla.org code. +# -*- Makefile -*- # -# The Initial Developer of the Original Code is -# Netscape Communications Corporation. -# Portions created by the Initial Developer are Copyright (C) 1998 -# the Initial Developer. All Rights Reserved. -# -# Contributor(s): -# Robert Ginda <rginda@netscape.com> -# John Taylor <jtaylor@netscape.com> -# -# Alternatively, the contents of this file may be used under the terms of -# either of 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 ***** +# 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/. DEPTH = .. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk @@ -185,23 +152,29 @@ PYUNITS := \ unit-nsinstall.py \ unit-printprereleasesuffix.py \ unit-JarMaker.py \ unit-buildlist.py \ unit-expandlibs.py \ unit-writemozinfo.py \ $(NULL) -check:: check-python-modules check-jar-mn +check::\ + check-python-modules check-jar-mn\ + check-makefiles\ + $(NULL) check-python-modules:: @$(EXIT_ON_ERROR) \ for test in $(PYUNITS); do \ $(PYTHON) $(srcdir)/tests/$$test ; \ done check-jar-mn:: $(MAKE) -C tests/src-simple check-jar $(MAKE) -C tests/src-simple check-flat $(MAKE) -C tests/src-simple check-flat USE_EXTENSION_MANIFEST=1 ifneq (,$(filter-out WINNT OS2,$(OS_ARCH))) $(MAKE) -C tests/src-simple check-symlink endif + +check-makefiles: + $(MAKE) -C tests/makefiles/autodeps check
--- a/config/rules.mk +++ b/config/rules.mk @@ -1,50 +1,15 @@ # -*- makefile -*- # vim:set ts=8 sw=8 sts=8 noet: # -# ***** 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 mozilla.org code. -# -# The Initial Developer of the Original Code is -# Netscape Communications Corporation. -# Portions created by the Initial Developer are Copyright (C) 1998 -# the Initial Developer. All Rights Reserved. +# 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/. # -# Contributor(s): -# Chase Phillips <chase@mozilla.org> -# Benjamin Smedberg <benjamin@smedbergs.us> -# Jeff Walden <jwalden+code@mit.edu> -# Joey Armstrong <joey@mozilla.com> -# -# Alternatively, the contents of this file may be used under the terms of -# either of 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 ***** ifndef topsrcdir $(error topsrcdir was not set)) endif ifndef MOZILLA_DIR MOZILLA_DIR = $(topsrcdir) endif @@ -2028,8 +1993,18 @@ FREEZE_VARIABLES = \ CHECK_FROZEN_VARIABLES = $(foreach var,$(FREEZE_VARIABLES), \ $(if $(subst $($(var)_FROZEN),,'$($(var))'),$(error Makefile variable '$(var)' changed value after including rules.mk. Was $($(var)_FROZEN), now $($(var)).))) libs export libs:: $(CHECK_FROZEN_VARIABLES) default all:: if test -d $(DIST)/bin ; then touch $(DIST)/bin/.purgecaches ; fi + + +############################################################################# +# Derived targets and dependencies + +include $(topsrcdir)/config/makefiles/autotargets.mk +ifneq ($(NULL),$(AUTO_DEPS)) + default all libs tools export:: $(AUTO_DEPS) +endif +
--- a/js/src/config/rules.mk +++ b/js/src/config/rules.mk @@ -1,50 +1,15 @@ # -*- makefile -*- # vim:set ts=8 sw=8 sts=8 noet: # -# ***** 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 mozilla.org code. -# -# The Initial Developer of the Original Code is -# Netscape Communications Corporation. -# Portions created by the Initial Developer are Copyright (C) 1998 -# the Initial Developer. All Rights Reserved. +# 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/. # -# Contributor(s): -# Chase Phillips <chase@mozilla.org> -# Benjamin Smedberg <benjamin@smedbergs.us> -# Jeff Walden <jwalden+code@mit.edu> -# Joey Armstrong <joey@mozilla.com> -# -# Alternatively, the contents of this file may be used under the terms of -# either of 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 ***** ifndef topsrcdir $(error topsrcdir was not set)) endif ifndef MOZILLA_DIR MOZILLA_DIR = $(topsrcdir) endif @@ -2028,8 +1993,18 @@ FREEZE_VARIABLES = \ CHECK_FROZEN_VARIABLES = $(foreach var,$(FREEZE_VARIABLES), \ $(if $(subst $($(var)_FROZEN),,'$($(var))'),$(error Makefile variable '$(var)' changed value after including rules.mk. Was $($(var)_FROZEN), now $($(var)).))) libs export libs:: $(CHECK_FROZEN_VARIABLES) default all:: if test -d $(DIST)/bin ; then touch $(DIST)/bin/.purgecaches ; fi + + +############################################################################# +# Derived targets and dependencies + +include $(topsrcdir)/config/makefiles/autotargets.mk +ifneq ($(NULL),$(AUTO_DEPS)) + default all libs tools export:: $(AUTO_DEPS) +endif +