Bug 1506623 - Group config dependencies in make-source-package r=sfink
authorTed Campbell <tcampbell@mozilla.com>
Thu, 22 Nov 2018 02:31:20 +0000
changeset 507319 911e7557bf36f0e150d69cbfa6463010c43f2dc3
parent 507318 8c1d4bcdd47d3ea7d17e84d01b0e59eaff29b1c9
child 507320 c998e2069db41bf95a28ac15488534930920b1f7
push id1905
push userffxbld-merge
push dateMon, 21 Jan 2019 12:33:13 +0000
treeherdermozilla-release@c2fca1944d8c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssfink
bugs1506623
milestone65.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 1506623 - Group config dependencies in make-source-package r=sfink Differential Revision: https://phabricator.services.mozilla.com/D11678
js/src/make-source-package.sh
--- a/js/src/make-source-package.sh
+++ b/js/src/make-source-package.sh
@@ -114,70 +114,81 @@ case $cmd in
     cp -pPR \
         ${TOPSRCDIR}/tools/fuzzing/moz.build \
         ${TOPSRCDIR}/tools/fuzzing/interface \
         ${TOPSRCDIR}/tools/fuzzing/registry \
         ${TOPSRCDIR}/tools/fuzzing/libfuzzer \
         ${tgtpath}/tools/fuzzing/
 
 
+    # Build system and dependencies
+    cp -pPR \
+        ${TOPSRCDIR}/build \
+        ${TOPSRCDIR}/config \
+        ${TOPSRCDIR}/python \
+        ${tgtpath}/
+
+    ${MKDIR} -p ${tgtpath}/.cargo
+    cp -pPR \
+        ${TOPSRCDIR}/.cargo/config.in \
+        ${tgtpath}/.cargo/
+
+    ${MKDIR} -p ${tgtpath}/third_party
+    cp -pPR \
+        ${TOPSRCDIR}/third_party/python \
+        ${TOPSRCDIR}/third_party/rust \
+        ${tgtpath}/third_party/
+
+    ${MKDIR} -p ${tgtpath}/dom/bindings
+    cp -pPR \
+        ${TOPSRCDIR}/dom/bindings/mozwebidlcodegen \
+        ${tgtpath}/dom/bindings/
+
+    ${MKDIR} -p ${tgtpath}/layout/tools/reftest
+    cp -pPR \
+        ${TOPSRCDIR}/layout/tools/reftest/reftest \
+        ${tgtpath}/layout/tools/reftest/
+
+    ${MKDIR} -p ${tgtpath}/testing
+    cp -pPR \
+        ${TOPSRCDIR}/testing/mozbase \
+        ${tgtpath}/testing/
+
+    ${MKDIR} -p ${tgtpath}/taskcluster/taskgraph
+    cp -pPR \
+        ${TOPSRCDIR}/taskcluster/moz.build \
+        ${tgtpath}/taskcluster/
+    cp -pPR \
+        ${TOPSRCDIR}/taskcluster/taskgraph/test \
+        ${tgtpath}/taskcluster/taskgraph/
+
+    ${MKDIR} -p ${tgtpath}/toolkit/crashreporter/tools
+    cp -pPR \
+        ${TOPSRCDIR}/toolkit/crashreporter/tools/symbolstore.py \
+        ${tgtpath}/toolkit/crashreporter/tools/
+
+    ${MKDIR} -p ${tgtpath}/toolkit/mozapps/installer
+    cp -pPR \
+        ${TOPSRCDIR}/toolkit/mozapps/installer/package-name.mk \
+        ${TOPSRCDIR}/toolkit/mozapps/installer/upload-files.mk \
+        ${tgtpath}/toolkit/mozapps/installer/
+
+
     cp -pPR ${TOPSRCDIR}/js/app.mozbuild ${tgtpath}/js/
     cp -pPR ${TOPSRCDIR}/js/moz.configure ${tgtpath}/js/
     cp -pPR ${TOPSRCDIR}/js/ffi.configure ${tgtpath}/js/
 
-    ${MKDIR} -p ${tgtpath}/taskcluster/taskgraph
-    cp -pPR ${TOPSRCDIR}/taskcluster/moz.build ${tgtpath}/taskcluster/
-    cp -pPR ${TOPSRCDIR}/taskcluster/taskgraph/test ${tgtpath}/taskcluster/taskgraph/
-
-    # copy build and config directory.
-    cp -pPR ${TOPSRCDIR}/build ${TOPSRCDIR}/config ${tgtpath}/
-
-    # copy cargo config
-    ${MKDIR} -p ${tgtpath}/.cargo
-    cp -pPR ${TOPSRCDIR}/.cargo/config.in ${tgtpath}/.cargo/
-
     # put in js itself
     cp -p ${TOPSRCDIR}/js/moz.configure ${tgtpath}/js/
     cp -pPR ${TOPSRCDIR}/js/public ${tgtpath}/js/
     cp -pPR ${TOPSRCDIR}/js/rust ${tgtpath}/js/
     cp -pPR ${TOPSRCDIR}/js/examples ${tgtpath}/js/
     find ${TOPSRCDIR}/js/src -mindepth 1 -maxdepth 1 -not -path ${STAGING} -a -not -name ${pkg} \
         -exec cp -pPR {} ${tgtpath}/js/src/ \;
 
-    cp -pPR \
-        ${TOPSRCDIR}/python \
-        ${tgtpath}/
-    ${MKDIR} -p ${tgtpath}/third_party
-    cp -pPR \
-        ${TOPSRCDIR}/third_party/python \
-        ${tgtpath}/third_party/
-    cp -pPR \
-        ${TOPSRCDIR}/third_party/rust \
-        ${tgtpath}/third_party/
-    ${MKDIR} -p ${tgtpath}/dom/bindings
-    cp -pPR \
-        ${TOPSRCDIR}/dom/bindings/mozwebidlcodegen \
-        ${tgtpath}/dom/bindings/
-    ${MKDIR} -p ${tgtpath}/testing
-    cp -pPR \
-        ${TOPSRCDIR}/testing/mozbase \
-        ${tgtpath}/testing/
-    ${MKDIR} -p ${tgtpath}/layout/tools/reftest
-    cp -pPR \
-        ${TOPSRCDIR}/layout/tools/reftest/reftest \
-        ${tgtpath}/layout/tools/reftest/
-    ${MKDIR} -p ${tgtpath}/toolkit/mozapps/installer
-    cp -pPR \
-        ${TOPSRCDIR}/toolkit/mozapps/installer/package-name.mk \
-        ${TOPSRCDIR}/toolkit/mozapps/installer/upload-files.mk \
-        ${tgtpath}/toolkit/mozapps/installer/
-    ${MKDIR} -p ${tgtpath}/toolkit/crashreporter/tools
-    cp -pPR \
-        ${TOPSRCDIR}/toolkit/crashreporter/tools/symbolstore.py \
-        ${tgtpath}/toolkit/crashreporter/tools/
 
     # Generate configure files to avoid build dependency on autoconf-2.13
     cp -pPR ${TOPSRCDIR}/js/src/configure.in ${tgtpath}/js/src/configure
     chmod a+x ${tgtpath}/js/src/configure
     ${AUTOCONF} --localdir=${TOPSRCDIR}/js/src \
         ${TOPSRCDIR}/js/src/old-configure.in >${tgtpath}/js/src/old-configure
 
     # Copy or create INSTALL