[Pkg-javascript-commits] [sockjs-client] 75/434: Few small improvements

[Tonnerre Lombard]

This is an automated email from the git hooks/post-receive script.

tonnerre-guest pushed a commit to branch master
in repository sockjs-client.

commit 289a8f972d16ee6ae61c76a1295dc42b6193e937
Author: Marek Majkowski <majek04 at gmail.com>
Date:   Fri Aug 12 17:27:03 2011 +0100

    Few small improvements
---
 .gitignore   |  4 +---
 Makefile     | 11 +++++++----
 VERSION-GEN  | 22 +++++++++-------------
 package.json |  3 ++-
 4 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/.gitignore b/.gitignore
index e5f8493..d47d2a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,4 @@
 .pidfile.pid
 node_modules
-sockjs.min.js
-sockjs.pretty.js
-sockjs.js
+sockjs*.js
 tests/html/lib/*.js
diff --git a/Makefile b/Makefile
index cbe51ca..c130a7b 100644
--- a/Makefile
+++ b/Makefile
@@ -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'
diff --git a/VERSION-GEN b/VERSION-GEN
index 8369817..1653203 100755
--- a/VERSION-GEN
+++ b/VERSION-GEN
@@ -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"
diff --git a/package.json b/package.json
index daf87e2..9237eb2 100644
--- a/package.json
+++ b/package.json
@@ -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": "*"
         }
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/sockjs-client.git