[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19667] branches/blender2.5/blender/ release: Slight improvements in release creation.

[gsr b3d]

Revision: 19667
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19667
Author:   gsrb3d
Date:     2009-04-11 21:04:59 +0200 (Sat, 11 Apr 2009)

Log Message:
-----------
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.

Modified Paths:
--------------
    branches/blender2.5/blender/release/Makefile
    branches/blender2.5/blender/release/getversion.py

Modified: branches/blender2.5/blender/release/Makefile
===================================================================
--- branches/blender2.5/blender/release/Makefile	2009-04-11 16:17:39 UTC (rev 19666)
+++ branches/blender2.5/blender/release/Makefile	2009-04-11 19:04:59 UTC (rev 19667)
@@ -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 @@
 	@$(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)
 

Modified: branches/blender2.5/blender/release/getversion.py
===================================================================
--- branches/blender2.5/blender/release/getversion.py	2009-04-11 16:17:39 UTC (rev 19666)
+++ branches/blender2.5/blender/release/getversion.py	2009-04-11 19:04:59 UTC (rev 19667)
@@ -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 @@
 
 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"