Release v33

Author: gvvaughan

GNUmakefile

@@ -48,14 +48,12 @@ define unpack-distcheck-release
 endef
 
 check-in-release: distcheck
-	current_branch=`$(GIT) symbolic-ref HEAD`; \
 	{ $(GIT) checkout -b release 2>/dev/null || $(GIT) checkout release; } && \
 	{ $(GIT) pull origin release || true; } && \
 	$(unpack-distcheck-release) && \
 	$(GIT) add . && \
 	$(GIT) commit -a -m "Release v$(VERSION)" && \
-	$(GIT) tag -f -a -m "Full source release tag" release-v$(VERSION); \
-	$(GIT) checkout `echo "$$current_branch" | sed 's,.*/,,g'`
+	$(GIT) tag -f -a -m "Full source release tag" release-v$(VERSION)
 
 
 ## To test the release process without publishing upstream, use:
@@ -67,6 +65,7 @@ WOGER_ENV = LUA_INIT= LUA_PATH='$(abs_srcdir)/?-git-1.rockspec'
 WOGER_OUT = $(WOGER_ENV) $(LUA) -l$(PACKAGE) -e
 
 release: rockspecs
+	current_branch=`$(GIT) symbolic-ref HEAD`; \
 	$(MAKE) tag-release && \
 	$(MAKE) check-in-release && \
 	$(GIT_PUBLISH) push && $(GIT_PUBLISH) push --tags && \
@@ -79,5 +78,6 @@ release: rockspecs
 	  notes=release-notes-$(VERSION) \
 	  home="`$(WOGER_OUT) 'print (description.homepage)'`" \
 	  description="`$(WOGER_OUT) 'print (description.summary)'`"
+	$(GIT) checkout `echo "$$current_branch" | sed 's,.*/,,g'`
 
 endif

stdlib-33-1.rockspec

@@ -1,25 +1,25 @@
-version = "33-1"
-source = {
-  url = "git://github.com/rrthomas/lua-stdlib.git",
-  branch = "release-v33",
-}
-dependencies = {
-  "lua >= 5.1",
-}
-package = "stdlib"
 build = {
-  install_command = "make install",
   type = "command",
   copy_directories = {
   },
   build_command = "LUA=$(LUA) CPPFLAGS=-I$(LUA_INCDIR) ./configure --prefix=$(PREFIX) --libdir=$(LIBDIR) --datadir=$(LUADIR) && make clean && make",
+  install_command = "make install",
+}
+source = {
+  branch = "release-v33",
+  url = "git://github.com/rrthomas/lua-stdlib.git",
+}
+version = "33-1"
+package = "stdlib"
+dependencies = {
+  "lua >= 5.1",
 }
 description = {
-  license = "MIT/X11",
   summary = "General Lua libraries",
   detailed = "    stdlib is a library of modules for common programming tasks,\
     including list, table and functional operations, regexps, objects,\
     pickling, pretty-printing and getopt.\
  ",
+  license = "MIT/X11",
   homepage = "http://github.com/rrthomas/lua-stdlib/",
 }

stdlib-git-1.rockspec

@@ -1,24 +1,24 @@
-version = "git-1"
-source = {
-  url = "git://github.com/rrthomas/lua-stdlib.git",
-}
-dependencies = {
-  "lua >= 5.1",
-}
+package = "stdlib"
 build = {
   type = "command",
-  install_command = "make install",
   build_command = "autoreconf -i && LUA=$(LUA) CPPFLAGS=-I$(LUA_INCDIR) ./configure --prefix=$(PREFIX) --libdir=$(LIBDIR) --datadir=$(LUADIR) && make clean && make",
+  install_command = "make install",
   copy_directories = {
   },
 }
+version = "git-1"
+source = {
+  url = "git://github.com/rrthomas/lua-stdlib.git",
+}
 description = {
-  license = "MIT/X11",
-  homepage = "http://github.com/rrthomas/lua-stdlib/",
-  summary = "General Lua libraries",
   detailed = "    stdlib is a library of modules for common programming tasks,\
     including list, table and functional operations, regexps, objects,\
     pickling, pretty-printing and getopt.\
  ",
+  homepage = "http://github.com/rrthomas/lua-stdlib/",
+  license = "MIT/X11",
+  summary = "General Lua libraries",
+}
+dependencies = {
+  "lua >= 5.1",
 }
-package = "stdlib"