Slight improvements in release creation.

Version string is compatible with all previous releases, but report
subversion if not 0.
Keep distribution dir so you can run from there without needed of unpack,
and make messages and cmds be in sync.

diff --git a/release/Makefile b/release/Makefile
index 79258f0376742457ad8e5a9bf6d74ff0b9c08779..b2066d0e8d6457b9c067cbf84ad752e2233d44a9 100644 (file)
--- a/release/Makefile
+++ b/release/Makefile
@@ -1,4 +1,5 @@
-#
+# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*-
+# vim: tabstop=8
 # $Id$
 #
 # ***** BEGIN GPL LICENSE BLOCK *****
@@ -200,16 +201,16 @@ pkg: install
        @$(COMPRESS) $(COMPRESSFLAGS) $(NAN_OBJDIR)/$(VERSION)/$(BLENDNAME)$(EXT1)
     endif
        @#echo "****> Clean up temporary distribution directory"
-       @rm -fr $(DISTDIR)
+       @#rm -fr $(DISTDIR)
        @echo "****> $(NAN_OBJDIR)/$(VERSION)/$(BLENDNAME)$(EXT1)$(EXT2) is ready"
 
 version: FORCE
        @echo "*---> Create $(BLENDNAME) package"
 
 makedirs: FORCE
-       @#echo "****> Create package directory $(VERSION) if necessary"
+       @echo "****> Create package directory $(VERSION) if necessary"
        @[ -d $(NAN_OBJDIR)/$(VERSION) ] || mkdir $(NAN_OBJDIR)/$(VERSION)
-       @#echo "****> Prepare temporary distribution directory"
+       @echo "****> Remove and recreate temporary distribution directory"
        @rm -fr $(DISTDIR)
        @mkdir $(DISTDIR)
 

diff --git a/release/getversion.py b/release/getversion.py
index a64a6189b6fc21688e5aee8a1ccd0e4625f89274..fd52129bf4a2d59922186f2d0c1b95024b922876 100755 (executable)
--- a/release/getversion.py
+++ b/release/getversion.py
@@ -1,4 +1,7 @@
 #!/usr/bin/env python
+# -*- mode: python; tab-width: 4; indent-tabs-mode: t; -*-
+# vim: tabstop=4
+# $Id#
 # ***** BEGIN GPL LICENSE BLOCK *****
 #
 # This program is free software; you can redistribute it and/or
@@ -18,9 +21,9 @@
 # The Original Code is Copyright (C) 2008 by the Blender Foundation
 # All rights reserved.
 #
-# The Original Code is: all of this file.
+# The Original Code is: see repository.
 #
-# Contributor(s): none yet.
+# Contributor(s): see repository.
 #
 import sys, os, re
 
@@ -49,7 +52,11 @@ for line in infile.readlines():
 
 infile.close()
 
+# Major was changed to float, but minor is still a string
 if minor and major:
-       print str(major)+"."+minor
+       if minor == "0":
+               print "%.2f" % major
+       else:
+               print "%.2f.%s" % (major, minor)
 else:
        print "unknownversion"