Bug 1428303 - Move SeaMonkey suite/build to components/ r=frg
authorIan Neal <iann_cvs@blueyonder.co.uk>
Sun, 04 Mar 2018 13:24:25 +0000
changeset 31211 6cf4a2d1662a4fd5911f358045bdcfcfaeb47085
parent 31210 3ecaf3dfcd5644226f11cb534a1e8f1386471b61
child 31212 0bd5e22ff5bc48ea230ce6d242e98ebad521dee2
push id383
push userclokep@gmail.com
push dateMon, 07 May 2018 21:52:48 +0000
reviewersfrg
bugs1428303
Bug 1428303 - Move SeaMonkey suite/build to components/ r=frg
suite/build/Makefile.in
suite/build/moz.build
suite/build/nsSuiteCID.h
suite/build/nsSuiteModule.cpp
suite/components/build/Makefile.in
suite/components/build/moz.build
suite/components/build/nsSuiteCID.h
suite/components/build/nsSuiteModule.cpp
suite/components/moz.build
suite/moz.build
rename from suite/build/Makefile.in
rename to suite/components/build/Makefile.in
rename from suite/build/moz.build
rename to suite/components/build/moz.build
--- a/suite/build/moz.build
+++ b/suite/components/build/moz.build
@@ -10,12 +10,12 @@ EXPORTS += [
 SOURCES += [
     'nsSuiteModule.cpp',
 ]
 
 Library('suite')
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
-    '../components/feeds',
-    '../components/profile',
-    '../components/shell',
+    '../feeds',
+    '../profile',
+    '../shell',
 ]
rename from suite/build/nsSuiteCID.h
rename to suite/components/build/nsSuiteCID.h
rename from suite/build/nsSuiteModule.cpp
rename to suite/components/build/nsSuiteModule.cpp
--- a/suite/components/moz.build
+++ b/suite/components/moz.build
@@ -3,8 +3,13 @@
 # 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 += [
     'feeds',
     'profile',
     'shell',
 ]
+
+# build is always last as it adds the local includes from the other components.
+DIRS += [
+    'build',
+]
--- a/suite/moz.build
+++ b/suite/moz.build
@@ -22,11 +22,10 @@ DIRS += [
 if CONFIG['MAKENSISU']:
     DIRS += ['installer/windows']
 
 if CONFIG['MOZ_BUNDLED_FONTS']:
     DIRS += ['/%s/browser/fonts' % CONFIG['mozreltopsrcdir']]
 
 # app is always last as it packages up the built files on mac.
 DIRS += [
-    'build',
     'app',
 ]