Bug 1506623 - Group cleanup tasks in make-source-package r=sfink
authorTed Campbell <tcampbell@mozilla.com>
Wed, 21 Nov 2018 00:40:46 +0000
changeset 507315 e6e9d31a3e97b03fb81703be172121d16f3897aa
parent 507314 2e3d4fe746c9b0fd97648fc2b8b149c4d32f55f1
child 507316 1b98c284c6db191c54fc175f0188142eb173a1af
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 cleanup tasks in make-source-package r=sfink Depends on D11673 Differential Revision: https://phabricator.services.mozilla.com/D11674
js/src/make-source-package.sh
--- a/js/src/make-source-package.sh
+++ b/js/src/make-source-package.sh
@@ -170,23 +170,16 @@ 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/
 
-    # remove *.pyc and *.pyo files if any
-    find ${tgtpath} -type f -name "*.pyc" -o -name "*.pyo" |xargs rm -f
-
-    # Remove non-JS Cargo.toml files (for example, the invalid Cargo.toml files
-    # used for some testing).
-    find ${tgtpath} -type f -name Cargo.toml | grep -v js | xargs rm -f
-
     # 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
 
@@ -224,16 +217,23 @@ README_EOF
 
     # 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
+
+    # Remove non-JS Cargo.toml files (for example, the invalid Cargo.toml files
+    # used for some testing).
+    find ${tgtpath} -type f -name Cargo.toml | grep -v js | xargs rm -f
+
     # Roll the tarball
     echo "Packaging source tarball at ${pkgpath}..."
     ${TAR} $taropts ${pkgpath} -C ${STAGING} ${version}
     ;;
 *)
     echo "Unrecognized command: $cmd"
     ;;
 esac