Bug 1506623 - Group additional libraries in make-source-package r=sfink
authorTed Campbell <tcampbell@mozilla.com>
Wed, 21 Nov 2018 00:42:32 +0000
changeset 507318 8c1d4bcdd47d3ea7d17e84d01b0e59eaff29b1c9
parent 507317 267ed2613e57719c4d206a0fa4fb2ff61bde88c5
child 507319 911e7557bf36f0e150d69cbfa6463010c43f2dc3
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 additional libraries in make-source-package r=sfink Depends on D11676 Differential Revision: https://phabricator.services.mozilla.com/D11677
js/src/make-source-package.sh
--- a/js/src/make-source-package.sh
+++ b/js/src/make-source-package.sh
@@ -73,41 +73,73 @@ case $cmd in
         ${TOPSRCDIR}/LICENSE \
         ${TOPSRCDIR}/Makefile.in \
         ${TOPSRCDIR}/configure.py \
         ${TOPSRCDIR}/moz.build \
         ${TOPSRCDIR}/moz.configure \
         ${TOPSRCDIR}/test.mozbuild \
         ${tgtpath}/
 
+    # Additional libraries (optionally) used by SpiderMonkey
+    cp -pPR \
+        ${TOPSRCDIR}/mfbt \
+        ${TOPSRCDIR}/nsprpub \
+        ${tgtpath}/
+
+    ${MKDIR} -p ${tgtpath}/intl
+    cp -pPR \
+        ${TOPSRCDIR}/intl/icu \
+        ${tgtpath}/intl/
+
+    ${MKDIR} -p ${tgtpath}/memory
+    cp -pPR \
+        ${TOPSRCDIR}/memory/moz.build \
+        ${TOPSRCDIR}/memory/build \
+        ${TOPSRCDIR}/memory/fallible \
+        ${TOPSRCDIR}/memory/mozalloc \
+        ${tgtpath}/memory/
+
+    ${MKDIR} -p ${tgtpath}/modules
+    cp -pPR \
+        ${TOPSRCDIR}/modules/fdlibm \
+        ${TOPSRCDIR}/modules/zlib \
+        ${tgtpath}/modules/
+
+    ${MKDIR} -p ${tgtpath}/mozglue
+    cp -pPR \
+        ${TOPSRCDIR}/mozglue/build \
+        ${TOPSRCDIR}/mozglue/misc \
+        ${TOPSRCDIR}/mozglue/moz.build \
+        ${tgtpath}/mozglue/
+
+    ${MKDIR} -p ${tgtpath}/tools/fuzzing
+    cp -pPR \
+        ${TOPSRCDIR}/tools/fuzzing/moz.build \
+        ${TOPSRCDIR}/tools/fuzzing/interface \
+        ${TOPSRCDIR}/tools/fuzzing/registry \
+        ${TOPSRCDIR}/tools/fuzzing/libfuzzer \
+        ${tgtpath}/tools/fuzzing/
+
 
     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 the embedded icu
-    ${MKDIR} -p ${tgtpath}/intl
-    cp -pPR ${TOPSRCDIR}/intl/icu ${tgtpath}/intl/
-
-    # copy nspr.
-    cp -pPR ${TOPSRCDIR}/nsprpub ${tgtpath}/
-
     # 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 -pPR ${TOPSRCDIR}/mfbt ${tgtpath}/
     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 \
@@ -123,56 +155,29 @@ case $cmd in
     ${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}/modules
-    cp -pPR \
-       ${TOPSRCDIR}/modules/fdlibm \
-       ${tgtpath}/modules/
-    cp -pPR \
-        ${TOPSRCDIR}/modules/zlib \
-        ${tgtpath}/modules/
     ${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/
-    ${MKDIR} -p ${tgtpath}/mozglue
-    cp -pPR \
-        ${TOPSRCDIR}/mozglue/build \
-        ${TOPSRCDIR}/mozglue/misc \
-        ${TOPSRCDIR}/mozglue/moz.build \
-        ${tgtpath}/mozglue/
-    ${MKDIR} -p ${tgtpath}/memory
-    cp -pPR \
-        ${TOPSRCDIR}/memory/moz.build \
-        ${TOPSRCDIR}/memory/build \
-        ${TOPSRCDIR}/memory/fallible \
-        ${TOPSRCDIR}/memory/mozalloc \
-        ${tgtpath}/memory/
-    ${MKDIR} -p ${tgtpath}/tools/fuzzing
-    cp -pPR \
-        ${TOPSRCDIR}/tools/fuzzing/moz.build \
-        ${TOPSRCDIR}/tools/fuzzing/interface \
-        ${TOPSRCDIR}/tools/fuzzing/registry \
-        ${TOPSRCDIR}/tools/fuzzing/libfuzzer \
-        ${tgtpath}/tools/fuzzing/
 
     # 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