Bug 1058101 - Flatten dom/src/ into parent directory. r=mccr8
authorBirunthan Mohanathas <birunthan@mohanathas.com>
Sat, 30 Aug 2014 21:43:46 -0700
changeset 224382 d82866049064281ea1e5b2831cc37e1f48ea6d1d
parent 224381 f69cb38a847a6a47c9916bbe096489f996f2188d
child 224383 499e35dfdaced1705b9a52f41ebf37e2a0bfd367
push id3979
push userraliiev@mozilla.com
push dateMon, 13 Oct 2014 16:35:44 +0000
treeherdermozilla-beta@30f2cc610691 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmccr8
bugs1058101
milestone34.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
Bug 1058101 - Flatten dom/src/ into parent directory. r=mccr8
CLOBBER
dom/jar.mn
dom/moz.build
dom/res/hiddenWindow.html
dom/src/jar.mn
dom/src/moz.build
dom/src/res/hiddenWindow.html
--- a/CLOBBER
+++ b/CLOBBER
@@ -17,9 +17,9 @@
 #
 # Modifying this file will now automatically clobber the buildbot machines \o/
 #
 
 # Are you updating CLOBBER because you think it's needed for your WebIDL
 # changes to stick? As of bug 928195, this shouldn't be necessary! Please
 # don't change CLOBBER for WebIDL changes any more.
 
-Skia update needs a CLOBBER on all platforms.
+dom/ flattening might need a CLOBBER.
rename from dom/src/jar.mn
rename to dom/jar.mn
--- a/dom/moz.build
+++ b/dom/moz.build
@@ -1,14 +1,16 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # 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/.
 
+JAR_MANIFESTS += ['jar.mn']
+
 interfaces = [
     'base',
     'canvas',
     'core',
     'html',
     'events',
     'devicestorage',
     'settings',
@@ -66,17 +68,16 @@ DIRS += [
     'notification',
     'offline',
     'power',
     'push',
     'quota',
     'settings',
     'storage',
     'mobilemessage',
-    'src',
     'time',
     'locales',
     'network',
     'permission',
     'plugins/base',
     'plugins/ipc',
     'indexedDB',
     'system',
rename from dom/src/res/hiddenWindow.html
rename to dom/res/hiddenWindow.html
deleted file mode 100644
--- a/dom/src/moz.build
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# 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/.
-
-JAR_MANIFESTS += ['jar.mn']