Bug 1506623 - Group top-level files in make-source-package r=sfink
authorTed Campbell <tcampbell@mozilla.com>
Wed, 21 Nov 2018 00:42:10 +0000
changeset 507317 267ed2613e57719c4d206a0fa4fb2ff61bde88c5
parent 507316 1b98c284c6db191c54fc175f0188142eb173a1af
child 507318 8c1d4bcdd47d3ea7d17e84d01b0e59eaff29b1c9
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 top-level files in make-source-package r=sfink Depends on D11675 Differential Revision: https://phabricator.services.mozilla.com/D11676
js/src/make-source-package.sh
--- a/js/src/make-source-package.sh
+++ b/js/src/make-source-package.sh
@@ -63,45 +63,42 @@ case $cmd in
     fi
 
     echo "Staging source tarball in ${tgtpath}..."
     if [ -d ${tgtpath} ]; then
         echo "WARNING - dist tree ${tgtpath} already exists!"
     fi
     ${MKDIR} -p ${tgtpath}/js/src
 
-    # copy LICENSE
-    cp ${TOPSRCDIR}/LICENSE ${tgtpath}/
+    # Top-level config and build files
+    cp -pPR \
+        ${TOPSRCDIR}/LICENSE \
+        ${TOPSRCDIR}/Makefile.in \
+        ${TOPSRCDIR}/configure.py \
+        ${TOPSRCDIR}/moz.build \
+        ${TOPSRCDIR}/moz.configure \
+        ${TOPSRCDIR}/test.mozbuild \
+        ${tgtpath}/
 
-    cp -pPR ${TOPSRCDIR}/configure.py \
-       ${TOPSRCDIR}/moz.configure \
-       ${TOPSRCDIR}/test.mozbuild \
-       ${tgtpath}/
 
     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 main moz.build and Makefile.in
-    cp -pPR ${TOPSRCDIR}/Makefile.in ${TOPSRCDIR}/moz.build ${tgtpath}/
-
     # copy nspr.
     cp -pPR ${TOPSRCDIR}/nsprpub ${tgtpath}/
 
-    # copy top-level build and config files.
-    cp -p ${TOPSRCDIR}/configure.py ${TOPSRCDIR}/moz.configure ${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