Refactor recipes for generating and analyzing npm tarballs

kgryte · kgryte · commit 4acb029ea95e · 2017-09-23T17:14:01.000-07:00
diff --git a/tools/make/common.mk b/tools/make/common.mk
@@ -147,6 +147,9 @@ NODE ?= node
 # Define the command for `npm`:
 NPM ?= npm
 
+# Define the command for generating an npm gzipped archive:
+NPM_PACK ?= npm pack
+
 # Define the command for `julia`:
 JULIA ?= julia
 
@@ -159,6 +162,9 @@ R ?= r
 # Define the command for running R script files:
 RSCRIPT ?= Rscript
 
+# Define the command for getting the current project version:
+CURRENT_PROJECT_VERSION ?= $(NODE) -e "console.log( require( '$(ROOT_DIR)/package.json' ).version )"
+
 
 # COMPILERS #
 
diff --git a/tools/make/lib/node/npm.mk b/tools/make/lib/node/npm.mk
@@ -36,9 +36,37 @@ ifeq ($(NPM_VERSION), pre-release)
 	npm_version_prerequisite := npm-version-pre-release
 endif
 
+# Specify the output build directory when generating an npm gzipped archive:
+NPM_TARBALL_BUILD_OUT := $(BUILD_DIR)/npm
+
+# Specify the gzipped archive basename:
+npm_tarball_basename := "stdlib-stdlib-$(shell $(CURRENT_PROJECT_VERSION)).tgz"
+
+# Specify the output npm gzipped archive:
+npm_tarball := $(NPM_TARBALL_BUILD_OUT)/$(npm_tarball_basename)
+
 
 # TARGETS #
 
+# Generate an npm tarball.
+#
+# This target generates an npm gzipped archive.
+
+$(npm_tarball):
+	$(QUIET) $(MKDIR_RECURSIVE) $(NPM_TARBALL_BUILD_OUT)
+	$(QUIET) $(NPM_PACK) $(ROOT_DIR) >/dev/null
+	$(QUIET) mv $(ROOT_DIR)/$(npm_tarball_basename) $@
+
+
+# Generate an npm tarball.
+#
+# This target generates an npm gzipped archive.
+
+npm-tarball: $(npm_tarball)
+
+.PHONY: npm-tarball
+
+
 # Run pre-version tasks.
 #
 # This target runs tasks which should be completed before incrementing the project version.
@@ -144,10 +172,22 @@ npm-post-version:
 	$(QUIET) echo ''
 	$(QUIET) echo 'Incremented version and committed changes.'
 	$(QUIET) echo ''
+	$(QUIET) echo "Tarball size: $(shell $(MAKE) -f $(this_file) stats-npm-tarball-size)"
+	$(QUIET) echo ''
 	$(QUIET) echo 'If okay to publish, run:'
 	$(QUIET) echo ''
 	$(QUIET) echo '  $$ make npm-publish'
 	$(QUIET) echo "  $$ git push origin $(shell $(GIT_BRANCH)) && git push origin --tags"
 	$(QUIET) echo ''
 
 .PHONY: npm-post-version
+
+
+# Remove npm tarball(s).
+#
+# This target removes npm gzipped archives.
+
+clean-npm-tarball:
+	$(QUIET) -rm -f $(NPM_TARBALL_BUILD_OUT)/*.tgz
+
+.PHONY: clean-npm-tarball
diff --git a/tools/make/lib/stats/npm.mk b/tools/make/lib/stats/npm.mk
@@ -1,37 +1,11 @@
 
-# VARIABLES #
-
-# Specify the output build directory when generating an npm gzipped archive.
-stats_npm_tarball_build_out := $(BUILD_DIR)/npm
-
-# Get the current package version:
-stats_npm_tarball_pkg_version := $(shell $(NODE) -e "console.log( require( '$(ROOT_DIR)/package.json' ).version )")
-
-# Specify the gzipped archive basename:
-stats_npm_tarball_basename := "stdlib-stdlib-$(stats_npm_tarball_pkg_version).tgz"
-
-# Specify the output npm gzipped archive:
-stats_npm_tarball := $(stats_npm_tarball_build_out)/$(stats_npm_tarball_basename)
-
-
 # TARGETS #
 
-# Generate npm tarball.
-#
-# This target generates an npm gzipped archive.
-
-$(stats_npm_tarball):
-	$(QUIET) $(DELETE) $(DELETE_FLAGS) $(stats_npm_tarball_build_out)
-	$(QUIET) $(MKDIR_RECURSIVE) $(BUILD_DIR)/npm
-	$(QUIET) $(NPM) pack $(ROOT_DIR) >/dev/null
-	$(QUIET) mv $(ROOT_DIR)/$(stats_npm_tarball_basename) $@
-
-
 # Compute npm archive size.
 #
-# This target computes size of the gzipped archive which would be published to npm.
+# This target computes size (in bytes) of the gzipped archive which would be published to npm.
 
-stats-npm-tarball-size: $(stats_npm_tarball)
-	$(QUIET) wc -c $(stats_npm_tarball) | awk '{print $$1 OFS "B"}'
+stats-npm-tarball-size: npm-tarball
+	$(QUIET) wc -c $(npm_tarball) | awk '{print $$1 OFS "B"}'
 
 .PHONY: stats-npm-tarball-size
