Permalink
Browse files

Few small improvements

  • Loading branch information...
1 parent b77f063 commit 289a8f972d16ee6ae61c76a1295dc42b6193e937 @majek majek committed Aug 12, 2011
Showing with 19 additions and 21 deletions.
  1. +1 −3 .gitignore
  2. +7 −4 Makefile
  3. +9 −13 VERSION-GEN
  4. +2 −1 package.json
View
@@ -1,6 +1,4 @@
.pidfile.pid
node_modules
-sockjs.min.js
-sockjs.pretty.js
-sockjs.js
+sockjs*.js
tests/html/lib/*.js
View
@@ -1,4 +1,4 @@
-.PHONY: all build tests test
+.PHONY: all build tests test serve clean
all: sockjs.js
@@ -42,7 +42,10 @@ serve:
sleep 0.1; \
done
-# To release do:
+clean:
+ rm -f sockjs*.js tests/html/lib/*.js
+
+# To release:
# 1) commit everything you need
# 2) amend 'version' file
# 3) run 'make tag', and git push/git push --tag as suggested
@@ -53,8 +56,8 @@ VER:=$(shell ./VERSION-GEN)
.PHONY: tag upload
tag:
- git tag -d v$(RVER) || true
- git commit version -m "Release $(RVER)"
+ -git tag -d v$(RVER)
+ git commit $(TAG_OPTS) version -m "Release $(RVER)"
git tag -a v$(RVER) -m "Release $(RVER)"
@echo ' [*] Now run'
@echo 'git push; git push --tag'
View
@@ -3,19 +3,15 @@
LF='
'
-VN=$(cat version)
-
-if VN=$(git describe --match "v[0-9]*" --abbrev=4 HEAD 2>/dev/null) &&
- case "$VN" in
- *$LF*) (exit 1) ;;
- v[0-9]*)
- git update-index -q --refresh
- test -z "$(git diff-index --name-only HEAD --)" ||
- VN="$VN-dirty" ;;
- esac
-then
- VN=$(echo "$VN" | sed -e 's/-/./g');
-fi
+VN=$(git describe --match "v[0-9]*" --abbrev=4 HEAD 2>/dev/null)
+case "$VN" in
+ *$LF*) (exit 1) ;;
+v[0-9]*)
+ git update-index -q --refresh
+ test -z "$(git diff-index --name-only HEAD --)" ||
+ VN="$VN-dirty" ;;
+esac
+VN=$(echo "$VN" | sed -e 's/-/./g');
VN=$(expr "$VN" : v*'\(.*\)')
echo "$VN"
View
@@ -5,6 +5,7 @@
"uglify-js": "1.0.6",
"coffee-script": "1.1.1",
"optparse": "1.0.1",
- "compress": "0.1.9"
+ "compress": "0.1.9",
+ "sockjs": "*"
}
}

0 comments on commit 289a8f9

Please sign in to comment.