diff options
| author | Ton Roosendaal <ton@blender.org> | 2010-11-29 20:23:06 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2010-11-29 20:23:06 +0300 |
| commit | b195cdd14ca16fb66c23d611a8f4b44120bf99a7 (patch) | |
| tree | 1509f0d694ce73c3629249b836d181f95b2cd761 /release | |
| parent | 01169dd63203e0080796c45f464dbcb92d427280 (diff) | |
Makefile fix, the getversion.py was using minor release numbers,
which conflicts how paths work in BLI bundle detection.
Diffstat (limited to 'release')
| -rw-r--r-- | release/Makefile | 2 | ||||
| -rwxr-xr-x | release/getversion.py | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/release/Makefile b/release/Makefile index bef76b349b2..f1440c309e4 100644 --- a/release/Makefile +++ b/release/Makefile @@ -156,7 +156,7 @@ endif 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) diff --git a/release/getversion.py b/release/getversion.py index 4c477229ef9..ee21aa43873 100755 --- a/release/getversion.py +++ b/release/getversion.py @@ -57,10 +57,8 @@ for line in infile.readlines(): 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" |