Bug 517765 - Add 'make source-package' support into js/src. r=sstangl

js/src/Makefile.in

@@ -342,12 +342,17 @@ endif
 endif
 
 DIST_GARBAGE = config.cache config.log config.status* \
-   config/autoconf.mk \
-   unallmakefiles $(JS_CONFIG_NAME) js-config.h js-confdefs.h
+   config/autoconf.mk config/emptyvars.mk \
+   unallmakefiles $(JS_CONFIG_NAME) js-config.h js-confdefs.h \
+   backend.mk config/backend.mk devtools/backend.mk editline/backend.mk \
+   gdb/backend.mk jsapi-tests/backend.mk shell/backend.mk tests/backend.mk \
+   backend.RecursiveMakeBackend.built backend.RecursiveMakeBackend.built.pp \
+   devtools/rootAnalysis/Makefile
 
 distclean::
 	cat unallmakefiles | $(XARGS) rm -f
 	$(RM) $(DIST_GARBAGE)
+	rm -rf intl _virtualenv
 
 DEFINES		+= -DEXPORT_JS_API
 
@@ -671,3 +676,30 @@ endif
 #
 # END kludges for the Nitro assembler
 ###############################################
+
+###############################################
+# Generating source package tarballs
+# (only possible when tar is found)
+ifneq (,$(TAR))
+
+source-package:
+	SRCDIR=$(srcdir) \
+	DIST=$(DIST) \
+	MAKE=$(MAKE) \
+	MKDIR=$(MKDIR) \
+	TAR=$(TAR) \
+	MOZJS_MAJOR_VERSION=$(MOZJS_MAJOR_VERSION) \
+	MOZJS_MINOR_VERSION=$(MOZJS_MINOR_VERSION) \
+	MOZJS_PATCH_VERSION=$(MOZJS_PATCH_VERSION) \
+	MOZJS_ALPHA=$(MOZJS_ALPHA) \
+	$(srcdir)/make-source-package.sh
+
+clean::
+	DIST=$(DIST) \
+	MOZJS_MAJOR_VERSION=$(MOZJS_MAJOR_VERSION) \
+	MOZJS_MINOR_VERSION=$(MOZJS_MINOR_VERSION) \
+	MOZJS_PATCH_VERSION=$(MOZJS_PATCH_VERSION) \
+	MOZJS_ALPHA=$(MOZJS_ALPHA) \
+	$(srcdir)/make-source-package.sh clean
+
+endif

js/src/configure.in

@@ -571,6 +571,14 @@ dnl ========================================================
 AC_PROG_INSTALL
 AC_PROG_LN_S
 
+AC_MSG_CHECKING([for tar archiver])
+AC_CHECK_PROGS(TAR, gnutar gtar tar, "")
+if test -z "$TAR"; then
+    AC_MSG_WARN([no tar archiver found in \$PATH])
+fi
+AC_MSG_RESULT([$TAR])
+AC_SUBST(TAR)
+
 if test -z "$TINDERBOX_SKIP_PERL_VERSION_CHECK"; then
 AC_MSG_CHECKING([for minimum required perl version >= $PERL_VERSION])
 _perl_version=`PERL_VERSION=$PERL_VERSION $PERL -e 'print "$]"; if ($] >= $ENV{PERL_VERSION}) { exit(0); } else { exit(1); }' 2>&5`

js/src/make-source-package.sh

@@ -0,0 +1,123 @@
+#!/bin/sh
+# need these environment vars:
+echo "Environment:"
+echo "    MAKE = $MAKE"
+echo "    MKDIR = $MKDIR"
+echo "    TAR = $TAR"
+echo "    DIST = $DIST"
+echo "    SRCDIR = $SRCDIR"
+echo "    MOZJS_MAJOR_VERSION = $MOZJS_MAJOR_VERSION"
+echo "    MOZJS_MINOR_VERSION = $MOZJS_MINOR_VERSION"
+echo "    MOZJS_PATCH_VERSION = $MOZJS_PATCH_VERSION"
+echo "    MOZJS_ALPHA = $MOZJS_ALPHA"
+
+cmd=${1:-build}
+pkg="mozjs-${MOZJS_MAJOR_VERSION}.${MOZJS_MINOR_VERSION}.${MOZJS_PATCH_VERSION:-${MOZJS_ALPHA:-0}}.tar.bz2"
+pkgpath=${pkg%.tar*}
+tgtpath=${DIST}/${pkgpath}
+taropts="-jcf"
+
+case $cmd in
+"clean")
+	echo "Cleaning ${pkg} and ${tgtpath} ..."
+	rm -rf ${pkg} ${tgtpath}
+	;;
+"build")
+	echo "Packaging source tarball ${pkg}..."
+	if [ -d ${tgtpath} ]; then
+		echo "WARNING - dist tree ${tgtpath} already exists!"
+	fi
+	${MKDIR} -p ${tgtpath}/js/src
+
+	# copy the embedded icu
+	${MKDIR} -p ${tgtpath}/intl
+	cp -t ${tgtpath}/intl -dRp ${SRCDIR}/../../intl/icu
+
+	# put in js itself
+	cp -t ${tgtpath} -dRp ${SRCDIR}/../../mfbt
+	cp -t ${tgtpath}/js -dRp ${SRCDIR}/../jsd ${SRCDIR}/../public
+	find ${SRCDIR} -mindepth 1 -maxdepth 1 -not -path ${DIST} -a -not -name ${pkg} \
+		-exec cp -t ${tgtpath}/js/src -dRp {} +
+
+	# distclean if necessary
+	if [ -e ${tgtpath}/js/src/Makefile ]; then
+		${MAKE} -C ${tgtpath}/js/src distclean
+	fi
+
+	# put in the virtualenv and supporting files if it doesnt already exist
+	if [ ! -e ${SRCDIR}/build/virtualenv ]; then
+		cp -t ${tgtpath}/js/src/build -dRp \
+			${SRCDIR}/../../build/virtualenv \
+			${SRCDIR}/../../build/buildconfig.py
+	fi
+	if [ ! -e ${SRCDIR}/python ]; then
+		cp -t ${tgtpath}/js/src -dRp \
+			${SRCDIR}/../../python
+	fi
+	if [ ! -e ${SRCDIR}/testing ]; then
+		${MKDIR} -p ${tgtpath}/js/src/testing
+		cp -t ${tgtpath}/js/src/testing -dRp \
+			${SRCDIR}/../../testing/mozbase
+	fi
+	# end of virtualenv injection
+
+	# remove *.pyc and *.pyo files if any
+	find ${tgtpath} -type f -name "*.pyc" -o -name "*.pyo" |xargs rm -f
+
+	# copy or create INSTALL
+	if [ -e {DIST}/INSTALL ]; then
+		cp -t ${tgtpath} ${DIST}/INSTALL
+	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,
+causing the binaries to be extremely large. It is highly suggested that \`strip\`
+be run over the binaries before deploying them.
+
+Building with default options may be performed as follows:
+  cd js/src
+  ./configure
+  make
+INSTALL_EOF
+	fi
+
+	# copy or create README
+	if [ -e ${DIST}/README ]; then
+		cp -t ${tgtpath} ${DIST}/README
+	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}:
+  http://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
+	if [ -e ${SRCDIR}/../../b2g/LICENSE ]; then
+		cp ${SRCDIR}/../../b2g/LICENSE ${tgtpath}/
+	else
+		cp ${SRCDIR}/../../LICENSE ${tgtpath}/
+	fi
+
+	# copy patches dir, if it currently exists in DIST
+	if [ -d ${DIST}/patches ]; then
+		cp -t ${tgtpath} -dRp ${DIST}/patches
+	elif [ -d ${SRCDIR}/../../patches ]; then
+		cp -t ${tgtpath} -dRp ${SRCDIR}/../../patches
+	fi
+
+	# Roll the tarball
+	${TAR} $taropts ${DIST}/../${pkg} -C ${DIST} ${pkgpath}
+	echo "done."
+	;;
+*)
+	echo "Unrecognized command: $cmd"
+	;;
+esac