Spearhead/node-spearhead
Archived
3
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

add 'versioncheck' to 'make check'

Browse Source
This commit is contained in:
Trent Mick 2016-01-10 11:49:06 -08:00
parent 0b10fdb3b3
commit 38bc7c4037
5 changed files with 40 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -39,6 +39,8 @@ test-integration:
clean:: clean::
rm -f triton-*.tgz rm -f triton-*.tgz
check:: versioncheck
# Ensure CHANGES.md and package.json have the same version. # Ensure CHANGES.md and package.json have the same version.
.PHONY: versioncheck .PHONY: versioncheck
versioncheck: versioncheck:

2
package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "triton", "name": "triton",
"description": "Joyent Triton CLI and client (https://www.joyent.com/triton)", "description": "Joyent Triton CLI and client (https://www.joyent.com/triton)",
"version": "3.6.1", "version": "4.0.0",
"author": "Joyent (joyent.com)", "author": "Joyent (joyent.com)",
"dependencies": { "dependencies": {
"assert-plus": "0.2.0", "assert-plus": "0.2.0",

10
tools/mk/Makefile.defs
View File

@ -1,6 +1,14 @@
# -*- mode: makefile -*- # -*- mode: makefile -*-
# #
# Copyright (c) 2012, Joyent, Inc. All rights reserved. # This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
#
# Copyright (c) 2014, Joyent, Inc.
#
# #
# Makefile.defs: common defines. # Makefile.defs: common defines.
# #

12
tools/mk/Makefile.deps
View File

@ -1,6 +1,14 @@
# -*- mode: makefile -*- # -*- mode: makefile -*-
# #
# Copyright (c) 2012, Joyent, Inc. All rights reserved. # This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
#
# Copyright (c) 2014, Joyent, Inc.
#
# #
# Makefile.deps: Makefile for including common tools as dependencies # Makefile.deps: Makefile for including common tools as dependencies
# #
@ -42,3 +50,5 @@ $(JSSTYLE_EXEC): | deps/jsstyle/.git
RESTDOWN_EXEC ?= deps/restdown/bin/restdown RESTDOWN_EXEC ?= deps/restdown/bin/restdown
RESTDOWN ?= python $(RESTDOWN_EXEC) RESTDOWN ?= python $(RESTDOWN_EXEC)
$(RESTDOWN_EXEC): | deps/restdown/.git $(RESTDOWN_EXEC): | deps/restdown/.git
EXTRA_DOC_DEPS ?=

25
tools/mk/Makefile.targ
View File

@ -1,6 +1,14 @@
# -*- mode: makefile -*- # -*- mode: makefile -*-
# #
# Copyright (c) 2012, Joyent, Inc. All rights reserved. # This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
#
# Copyright (c) 2014, Joyent, Inc.
#
# #
# Makefile.targ: common targets. # Makefile.targ: common targets.
# #
@ -81,9 +89,9 @@
# #
# JSSTYLE_FLAGS Additional flags to pass through to jsstyle # JSSTYLE_FLAGS Additional flags to pass through to jsstyle
# #
# RESTDOWN_EXT By default '.restdown' is required for DOC_FILES # RESTDOWN_EXT By default '.md' is required for DOC_FILES (see above).
# (see above). If you want to use, say, '.md' instead, then # If you want to use, say, '.restdown' instead, then set
# set 'RESTDOWN_EXT=.md' in your Makefile. # 'RESTDOWN_EXT=.restdown' in your Makefile.
# #
# #
@ -100,7 +108,7 @@ JSSTYLE ?= jsstyle
MKDIR ?= mkdir -p MKDIR ?= mkdir -p
MV ?= mv MV ?= mv
RESTDOWN_FLAGS ?= RESTDOWN_FLAGS ?=
RESTDOWN_EXT ?= .restdown RESTDOWN_EXT ?= .md
RMTREE ?= rm -rf RMTREE ?= rm -rf
JSL_FLAGS ?= --nologo --nosummary JSL_FLAGS ?= --nologo --nosummary
@ -201,7 +209,7 @@ check-jsstyle: $(JSSTYLE_EXEC)
$(JSSTYLE) $(JSSTYLE_FLAGS) $(JSSTYLE_FILES) $(JSSTYLE) $(JSSTYLE_FLAGS) $(JSSTYLE_FILES)
.PHONY: check .PHONY: check
check: check-jsl check-json $(JSSTYLE_TARGET) check-bash check:: check-jsl check-json $(JSSTYLE_TARGET) check-bash
@echo check ok @echo check ok
.PHONY: clean .PHONY: clean
@ -256,7 +264,7 @@ DOC_MEDIA_FILES_BUILD := $(DOC_MEDIA_FILES:%=$(DOC_BUILD)/media/%)
# to get there. # to get there.
# #
.PHONY: docs .PHONY: docs
docs: \ docs:: \
$(DOC_FILES:%$(RESTDOWN_EXT)=$(DOC_BUILD)/%.html) \ $(DOC_FILES:%$(RESTDOWN_EXT)=$(DOC_BUILD)/%.html) \
$(DOC_FILES:%$(RESTDOWN_EXT)=$(DOC_BUILD)/%.json) \ $(DOC_FILES:%$(RESTDOWN_EXT)=$(DOC_BUILD)/%.json) \
$(DOC_MEDIA_FILES_BUILD) $(DOC_MEDIA_FILES_BUILD)
@ -288,7 +296,8 @@ $(DOC_MEDIA_FILES_BUILD): | $(DOC_MEDIA_DIRS_BUILD)
$(DOC_BUILD)/%: docs/% | $(DOC_BUILD) $(DOC_BUILD)/%: docs/% | $(DOC_BUILD)
$(CP) $< $@ $(CP) $< $@
docs/%.json docs/%.html: docs/%$(RESTDOWN_EXT) | $(DOC_BUILD) $(RESTDOWN_EXEC) docs/%.json docs/%.html: docs/%$(RESTDOWN_EXT) | $(DOC_BUILD) $(RESTDOWN_EXEC) \
$(EXTRA_DOC_DEPS)
$(RESTDOWN) $(RESTDOWN_FLAGS) -m $(DOC_BUILD) $< $(RESTDOWN) $(RESTDOWN_FLAGS) -m $(DOC_BUILD) $<
$(DOC_BUILD): $(DOC_BUILD):