diff --git a/.gitignore b/.gitignore index 40b878d..c18ed01 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -node_modules/ \ No newline at end of file +node_modules/ +lib/ \ No newline at end of file diff --git a/.npmignore b/.npmignore new file mode 100644 index 0000000..e69de29 diff --git a/Makefile b/Makefile index f5ce241..fcd8380 100644 --- a/Makefile +++ b/Makefile @@ -2,41 +2,39 @@ SRC = ${npm_package_directories_src} LIB = ${npm_package_directories_lib} JQUERY_SUMODULE_DIR = lib/jquery -JQUERY = ${JQUERY_SUMODULE_DIR}/dist/jquery.js +JQUERY = $(JQUERY_SUMODULE_DIR)/dist/jquery.js NQUERY = ${npm_package_main} -M4_NQUERY = $(basename ${NQUERY}).m4$(suffix ${NQUERY}) +M4_NQUERY = $(basename $(NQUERY)).m4$(suffix $(NQUERY)) .PHONY: build -build: ${NQUERY} +build: $(NQUERY) -#.PHONY: publish -#publish: +.PHONY: publish +publish: clean build mostlyclean -${NQUERY}: ${JQUERY} ${M4_NQUERY} FORCE - m4 --prefix-builtins --include $(dir ${JQUERY}) ${M4_NQUERY} > $@ - ${MAKE} mostlyclean +$(NQUERY): $(JQUERY) $(M4_NQUERY) + m4 --prefix-builtins --include $(dir $(JQUERY)) $(M4_NQUERY) > $@ -${JQUERY}: ${JQUERY_SUMODULE_DIR} - ${MAKE} -C $^ +$(JQUERY): $(JQUERY_SUMODULE_DIR) + $(MAKE) -C $^ -${JQUERY_SUMODULE_DIR}: FORCE +$(JQUERY_SUMODULE_DIR): FORCE git submodule update --init -${LIB}/%.js: ${SRC}/%.coffee +$(LIB)/%.js: $(SRC)/%.coffee coffee --compile --print $< > $@ -.PHONY: test -test: build - mocha +#.PHONY: test +#test: build .PHONY: mostlyclean mostlyclean: - rm -Rf ${JQUERY_SUMODULE_DIR} ${M4_NQUERY} + rm -Rf $(JQUERY_SUMODULE_DIR) $(M4_NQUERY) .PHONY: clean clean: mostlyclean - rm -Rf ${NQUERY} + rm -Rf $(LIB) FORCE: diff --git a/package.json b/package.json index f413a84..d2b4062 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,11 @@ { "author": "Antoine BERNIER ", "name": "nQuery", - "description": "jQuery for node", + "description": "jQuery (also) for node", + "repository": { + "type" : "git", + "url": "http://github.com/abernier/nQuery.git" + }, "version": "0.0.0", "main": "lib/index.js", "directories": { @@ -15,14 +19,10 @@ "xmlhttprequest": "latest" }, "devDependencies": { - "coffee-script": "1.3.x", - "mocha": "1.0.x", - "should": "0.6.x", - "chai": "latest" + "coffee-script": "1.3.x" }, "scripts": { - "test": "make test", - "prepublish": "make test", + "publish": "make publish", "_build": "make build", "_clean": "make clean", "_debug": "make debug"