[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33381] trunk/blender/release: Makefile fix, the getversion.py was using minor release numbers,

[Ton Roosendaal]

Revision: 33381
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33381
Author:   ton
Date:     2010-11-29 18:23:06 +0100 (Mon, 29 Nov 2010)

Log Message:
-----------
Makefile fix, the getversion.py was using minor release numbers,
which conflicts how paths work in BLI bundle detection.

Modified Paths:
--------------
    trunk/blender/release/Makefile
    trunk/blender/release/getversion.py

Modified: trunk/blender/release/Makefile
===================================================================
--- trunk/blender/release/Makefile	2010-11-29 17:10:46 UTC (rev 33380)
+++ trunk/blender/release/Makefile	2010-11-29 17:23:06 UTC (rev 33381)
@@ -156,7 +156,7 @@
     ifeq ($(OS),darwin)
 	@echo "----> Copy python modules"
 	@mkdir $(CONFDIR)/python/
-	@unzip -q $(LCGDIR)/release/python.zip -d $(CONFDIR)/python/	
+	@unzip -q $(LCGDIR)/release/python_ppc.zip -d $(CONFDIR)/python/	
     endif
 
     ifeq ($(OS),darwin)

Modified: trunk/blender/release/getversion.py
===================================================================
--- trunk/blender/release/getversion.py	2010-11-29 17:10:46 UTC (rev 33380)
+++ trunk/blender/release/getversion.py	2010-11-29 17:23:06 UTC (rev 33381)
@@ -57,10 +57,8 @@
 infile.close()
 
 # Major was changed to float, but minor is still a string
-if minor and major:
-    if minor == "0":
-        print "%.2f" % major
-    else:
-        print "%.2f.%s" % (major, minor)
+# Note: removed returning minor, this messes up with install path code in BLI module
+if major:
+    print "%.2f" % major
 else:
     print "unknownversion"