Bug 1506623 - Group spidermonkey source in make-source-package r=sfink
authorTed Campbell <tcampbell@mozilla.com>
Thu, 22 Nov 2018 14:52:38 +0000
changeset 507320 c998e2069db41bf95a28ac15488534930920b1f7
parent 507319 911e7557bf36f0e150d69cbfa6463010c43f2dc3
child 507321 0e93acc09952e559958991399bba7c11571343b4
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 spidermonkey source in make-source-package r=sfink Differential Revision: https://phabricator.services.mozilla.com/D11681
js/src/make-source-package.sh
--- a/js/src/make-source-package.sh
+++ b/js/src/make-source-package.sh
@@ -61,17 +61,18 @@ case $cmd in
         echo "error: found js/src/Makefile. Please clean before packaging." >&2
         exit 1
     fi
 
     echo "Staging source tarball in ${tgtpath}..."
     if [ -d ${tgtpath} ]; then
         echo "WARNING - dist tree ${tgtpath} already exists!"
     fi
-    ${MKDIR} -p ${tgtpath}/js/src
+
+    ${MKDIR} -p ${tgtpath}
 
     # Top-level config and build files
     cp -pPR \
         ${TOPSRCDIR}/LICENSE \
         ${TOPSRCDIR}/Makefile.in \
         ${TOPSRCDIR}/configure.py \
         ${TOPSRCDIR}/moz.build \
         ${TOPSRCDIR}/moz.configure \
@@ -167,25 +168,30 @@ case $cmd in
 
     ${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/
+    # SpiderMonkey itself
 
-    # 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/
+    ${MKDIR} -p ${tgtpath}/js/src
+    cp -pPR \
+        ${TOPSRCDIR}/js/app.mozbuild \
+        ${TOPSRCDIR}/js/ffi.configure \
+        ${TOPSRCDIR}/js/moz.configure \
+        ${tgtpath}/js/
+    cp -pPR \
+        ${TOPSRCDIR}/js/examples \
+        ${TOPSRCDIR}/js/public \
+        ${TOPSRCDIR}/js/rust \
+        ${tgtpath}/js/
+
     find ${TOPSRCDIR}/js/src -mindepth 1 -maxdepth 1 -not -path ${STAGING} -a -not -name ${pkg} \
         -exec cp -pPR {} ${tgtpath}/js/src/ \;
 
 
     # 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 \