Bug 784841 - Part 18ι: Convert /tools; r=ted
authorGregory Szorc <gps@mozilla.com>
Mon, 25 Feb 2013 13:20:01 -0800
changeset 123255 0e42b9f6b7d3d978949935164a9e7424c6d418ae
parent 123254 02d62b51156a8bf35ef15930c05641d135899cf8
child 123256 251aa9072a17d027dfa8fc20f934dc18026a865c
push idunknown
push userunknown
push dateunknown
reviewersted
bugs784841
milestone22.0a1
Bug 784841 - Part 18ι: Convert /tools; r=ted
moz.build
tools/codesighs/moz.build
tools/jprof/Makefile.in
tools/jprof/moz.build
tools/jprof/stub/moz.build
tools/profiler/moz.build
tools/trace-malloc/lib/moz.build
tools/trace-malloc/moz.build
tools/update-packaging/Makefile.in
tools/update-packaging/app.mozbuild
tools/update-packaging/build.mk
tools/update-packaging/moz.build
--- a/moz.build
+++ b/moz.build
@@ -1,13 +1,15 @@
 # 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/.
 
+CONFIGURE_SUBST_FILES += ['tools/update-packaging/Makefile']
+
 add_tier_dir('base', ['config', 'build', 'probes', 'mfbt', 'python'])
 
 if not CONFIG['LIBXUL_SDK']:
     if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gonk'):
         add_tier_dir('base', ['other-licenses/android'])
 
     if CONFIG['MOZ_MEMORY']:
         add_tier_dir('base', ['memory'])
new file mode 100644
--- /dev/null
+++ b/tools/codesighs/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/.
+
--- a/tools/jprof/Makefile.in
+++ b/tools/jprof/Makefile.in
@@ -3,17 +3,16 @@
 # 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		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-DIRS		= stub
 
 include $(DEPTH)/config/autoconf.mk
 
 PROGRAM = jprof
 
 CPPSRCS = \
 	bfd.cpp    \
 	coff.cpp   \
new file mode 100644
--- /dev/null
+++ b/tools/jprof/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 += ['stub']
new file mode 100644
--- /dev/null
+++ b/tools/jprof/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/tools/profiler/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/tools/trace-malloc/lib/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/tools/trace-malloc/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/.
+
--- a/tools/update-packaging/Makefile.in
+++ b/tools/update-packaging/Makefile.in
@@ -6,16 +6,18 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+STANDALONE_MAKEFILE := 1
+
 # input location for the build, usually $(DIST)
 # set this to $(DIST)/l10n-stage per override for L10n builds
 PACKAGE_BASE_DIR	= $(DIST)
 
 # Default output location for update archive
 STAGE_DIR	= $(DIST)/$(PKG_UPDATE_PATH)
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
new file mode 100644
--- /dev/null
+++ b/tools/update-packaging/app.mozbuild
@@ -0,0 +1,10 @@
+# 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/.
+
+add_tier_dir('app', [
+    'modules/libbz2',
+    'modules/libmar',
+    'other-licenses/bsdiff',
+])
deleted file mode 100644
--- a/tools/update-packaging/build.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-# 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/.
-
-TIERS += app
-
-tier_app_dirs += \
-	modules/libbz2 \
-	modules/libmar \
-	other-licenses/bsdiff \
-	$(NULL)
new file mode 100644
--- /dev/null
+++ b/tools/update-packaging/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/.
+