Skip to content

Commit 4d1cccc

Browse files
kgrytekgryte
committed
Remove prequisite and perform manual check to prevent unnecessary archiving
1 parent c84b01c commit 4d1cccc

2 files changed

Lines changed: 18 additions & 7 deletions

File tree

‎tools/make/lib/node/npm.mk‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,32 @@ endif
1616
# Define the version upgrade prerequisite...
1717
ifeq ($(NPM_VERSION), pre-patch)
1818
npm_version_prerequisite := npm-version-pre-patch
19-
endif
19+
else
2020
ifeq ($(NPM_VERSION), patch)
2121
npm_version_prerequisite := npm-version-patch
22-
endif
22+
else
2323
ifeq ($(NPM_VERSION), pre-minor)
2424
npm_version_prerequisite := npm-version-pre-minor
25-
endif
25+
else
2626
ifeq ($(NPM_VERSION), minor)
2727
npm_version_prerequisite := npm-version-minor
28-
endif
28+
else
2929
ifeq ($(NPM_VERSION), pre-major)
3030
npm_version_prerequisite := npm-version-pre-major
31-
endif
31+
else
3232
ifeq ($(NPM_VERSION), major)
3333
npm_version_prerequisite := npm-version-major
34-
endif
34+
else
3535
ifeq ($(NPM_VERSION), pre-release)
3636
npm_version_prerequisite := npm-version-pre-release
37+
else
38+
npm_version_prerequisite :=
39+
endif
40+
endif
41+
endif
42+
endif
43+
endif
44+
endif
3745
endif
3846

3947
# Specify the output build directory when generating an npm gzipped archive:

‎tools/make/lib/stats/npm.mk‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@
55
#
66
# This target computes size (in bytes) of the gzipped archive which would be published to npm.
77

8-
stats-npm-tarball-size: $(NPM_TARBALL)
8+
stats-npm-tarball-size:
9+
$(QUIET) if [[ ! -e $(NPM_TARBALL) ]]; then \
10+
$(MAKE) -f $(this_file) npm-tarball; \
11+
fi
912
$(QUIET) wc -c $(NPM_TARBALL) | awk '{print $$1 OFS "B"}'
1013

1114
.PHONY: stats-npm-tarball-size

0 commit comments

Comments
 (0)