From 24c086740ef0e3ea8bc14880b66652fd635f2ad8 Mon Sep 17 00:00:00 2001 From: Dave Pacheco Date: Fri, 27 Jul 2012 11:42:39 -0700 Subject: [PATCH] remove jsstyle/jsl submodules; these must now be installed elsewhere. --- .gitmodules | 6 ------ Makefile | 1 - Makefile.deps | 39 --------------------------------------- README.md | 11 +++++++++++ deps/javascriptlint | 1 - deps/jsstyle | 1 - 6 files changed, 11 insertions(+), 48 deletions(-) delete mode 100644 Makefile.deps delete mode 160000 deps/javascriptlint delete mode 160000 deps/jsstyle diff --git a/.gitmodules b/.gitmodules index d775f69..e69de29 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +0,0 @@ -[submodule "deps/javascriptlint"] - path = deps/javascriptlint - url = git://github.com/davepacheco/javascriptlint -[submodule "deps/jsstyle"] - path = deps/jsstyle - url = git://github.com/davepacheco/jsstyle diff --git a/Makefile b/Makefile index 1deeb5f..2d5a53d 100644 --- a/Makefile +++ b/Makefile @@ -19,5 +19,4 @@ JSL_CONF_NODE = jsl.node.conf # Default target is "check" check: -include ./Makefile.deps include ./Makefile.targ diff --git a/Makefile.deps b/Makefile.deps deleted file mode 100644 index 3cebed7..0000000 --- a/Makefile.deps +++ /dev/null @@ -1,39 +0,0 @@ -# -*- mode: makefile -*- -# -# Copyright (c) 2012, Joyent, Inc. All rights reserved. -# -# Makefile.deps: Makefile for including common tools as dependencies -# -# NOTE: This makefile comes from the "eng" repo. It's designed to be dropped -# into other repos as-is without requiring any modifications. If you find -# yourself changing this file, you should instead update the original copy in -# eng.git and then update your repo to use the new version. -# -# This file is separate from Makefile.targ so that teams can choose -# independently whether to use the common targets in Makefile.targ and the -# common tools here. -# - -# -# javascriptlint -# -JSL_EXEC ?= deps/javascriptlint/build/install/jsl -JSL ?= python $(JSL_EXEC) - -$(JSL_EXEC): | deps/javascriptlint/.git - cd deps/javascriptlint && make install - -# -# jsstyle -# -JSSTYLE_EXEC ?= deps/jsstyle/jsstyle -JSSTYLE ?= $(JSSTYLE_EXEC) - -$(JSSTYLE_EXEC): | deps/jsstyle/.git - -# -# restdown -# -RESTDOWN_EXEC ?= deps/restdown/bin/restdown -RESTDOWN ?= python $(RESTDOWN_EXEC) -$(RESTDOWN_EXEC): | deps/restdown/.git diff --git a/README.md b/README.md index 0c3adf6..2f0e69a 100644 --- a/README.md +++ b/README.md @@ -103,3 +103,14 @@ get the object's toString() for the full details: WError: request failed; caused by failed to check "/nonexistent": ENOENT, stat '/nonexistent' + +# Contributing + +Contributions welcome. Code should be "make check" clean. To run "make check", +you'll need these tools: + +* https://github.com/davepacheco/jsstyle +* https://github.com/davepacheco/javascriptlint + +If you're changing something non-trivial or user-facing, you may want to submit +an issue first. diff --git a/deps/javascriptlint b/deps/javascriptlint deleted file mode 160000 index fe4519f..0000000 --- a/deps/javascriptlint +++ /dev/null @@ -1 +0,0 @@ -Subproject commit fe4519f35e7739d9e6708e050a9a22780ac90753 diff --git a/deps/jsstyle b/deps/jsstyle deleted file mode 160000 index da42b50..0000000 --- a/deps/jsstyle +++ /dev/null @@ -1 +0,0 @@ -Subproject commit da42b50ceb12d431437b32efd4c411a8e2fac0c8