1
0
Fork 0

Makefile will now write version file on dist

protolib
Mike Gerwitz 2014-06-08 01:57:25 -04:00
parent 0f2eb10f83
commit 869e0cbfc5
2 changed files with 11 additions and 7 deletions

View File

@ -44,7 +44,7 @@ MKDIR_P = @MKDIR_P@
# see README # see README
SUBDIRS = doc SUBDIRS = doc
EXTRA_DIST = AUTHORS NEWS ChangeLog README.md README.hacking README.traits \ EXTRA_DIST = AUTHORS NEWS ChangeLog README.md README.hacking README.traits \
lib test index.js package.json \ lib test index.js package.json version \
$(path_combine_output) $(path_combine_output_full) \ $(path_combine_output) $(path_combine_output_full) \
$(path_browser_test) $(path_combine_output_min) \ $(path_browser_test) $(path_combine_output_min) \
$(path_combine_output_full_min) \ $(path_combine_output_full_min) \
@ -52,7 +52,7 @@ EXTRA_DIST = AUTHORS NEWS ChangeLog README.md README.hacking README.traits \
tools/signchk tools/browser-test.html tools/combine-order.js \ tools/signchk tools/browser-test.html tools/combine-order.js \
tools/combine-test.tpl tools/combine.tpl tools/externs-global.js \ tools/combine-test.tpl tools/combine.tpl tools/externs-global.js \
tools/externs.js tools/license-min.tpl tools/license.tpl \ tools/externs.js tools/license-min.tpl tools/license.tpl \
tools/linechk-ignores tools/linechk-ignores tools/vergen
.PHONY: mkbuild combine min doc check test test-suite perf FORCE .PHONY: mkbuild combine min doc check test test-suite perf FORCE
@ -140,19 +140,23 @@ else
endif endif
# generate the familiar files that automake normally checks for # generate the familiar files that automake normally checks for
dist-hook: AUTHORS NEWS ChangeLog dist-hook: AUTHORS NEWS ChangeLog version
cp $? $(distdir) cp $? $(distdir)
AUTHORS: FORCE AUTHORS: FORCE
$(path_tools)/gitlog-to-authors > AUTHORS $(path_tools)/gitlog-to-authors > $@
NEWS: FORCE NEWS: FORCE
$(path_tools)/gitlog-to-news $(path_tools)/news-ignore > NEWS $(path_tools)/gitlog-to-news $(path_tools)/news-ignore > $@
ChangeLog: FORCE ChangeLog: FORCE
$(path_tools)/gitlog-to-changelog \ $(path_tools)/gitlog-to-changelog \
--strip-cherry-pick \ --strip-cherry-pick \
--format=%s \ --format=%s \
-- \ -- \
--no-merges \ --no-merges \
> ChangeLog > $@
# we *only* want this in a distribution, otherwise the version number will
# never change!
version:
$(path_tools)/vergen > $@
clean-local: clean-local:
-rm -rf "$(path_build)" -rm -rf "$(path_build)"

View File

@ -20,7 +20,7 @@
## ##
# for distributions # for distributions
if [ -f version ]; then if [ -s version ]; then
cat version cat version
exit exit
fi fi