Bug 1506623 - Group file generation tasks in make-source-package r=sfink
authorTed Campbell <tcampbell@mozilla.com>
Wed, 21 Nov 2018 00:41:29 +0000
changeset 507316 1b98c284c6db191c54fc175f0188142eb173a1af
parent 507315 e6e9d31a3e97b03fb81703be172121d16f3897aa
child 507317 267ed2613e57719c4d206a0fa4fb2ff61bde88c5
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 file generation tasks in make-source-package r=sfink Depends on D11674 Differential Revision: https://phabricator.services.mozilla.com/D11675
js/src/make-source-package.sh
--- a/js/src/make-source-package.sh
+++ b/js/src/make-source-package.sh
@@ -63,16 +63,19 @@ 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}/
+
     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/
@@ -96,22 +99,16 @@ case $cmd in
 
     # 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/
 
-    # generate configure files to avoid build dependency on autoconf-2.13
-    cp -PR ${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
-
     # 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/ \;
@@ -170,17 +167,23 @@ case $cmd in
     ${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/
 
-    # copy or create INSTALL
+    # 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
     if [ -e ${STAGING}/INSTALL ]; then
         cp ${STAGING}/INSTALL ${tgtpath}/
     else
         cat <<INSTALL_EOF >${tgtpath}/INSTALL
 Full build documentation for SpiderMonkey is hosted on MDN:
   https://developer.mozilla.org/en-US/docs/SpiderMonkey/Build_Documentation
 
 Note that the libraries produced by the build system include symbols,
@@ -191,36 +194,33 @@ Building with default options may be per
   cd js/src
   mkdir obj
   cd obj
   ../configure
   make # or mozmake on Windows
 INSTALL_EOF
     fi
 
-    # copy or create README
+    # Copy or create README
     if [ -e ${STAGING}/README ]; then
         cp ${STAGING}/README ${tgtpath}/
     else
         cat <<README_EOF >${tgtpath}/README
 This directory contains SpiderMonkey ${MOZJS_MAJOR_VERSION}.
 
 This release is based on a revision of Mozilla ${MOZJS_MAJOR_VERSION}:
   https://hg.mozilla.org/releases/
 The changes in the patches/ directory were applied.
 
 MDN hosts the latest SpiderMonkey ${MOZJS_MAJOR_VERSION} release notes:
   https://developer.mozilla.org/en-US/docs/SpiderMonkey/${MOZJS_MAJOR_VERSION}
 README_EOF
     fi
 
-    # copy LICENSE
-    cp ${TOPSRCDIR}/LICENSE ${tgtpath}/
-
-    # copy patches dir, if it currently exists in STAGING
+    # Copy patches dir, if it currently exists in STAGING
     if [ -d ${STAGING}/patches ]; then
         cp -pPR ${STAGING}/patches ${tgtpath}/
     elif [ -d ${TOPSRCDIR}/patches ]; then
         cp -pPR ${TOPSRCDIR}/patches ${tgtpath}/
     fi
 
     # Remove *.pyc and *.pyo files if any
     find ${tgtpath} -type f -name "*.pyc" -o -name "*.pyo" | xargs rm -f