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.
This commit is contained in:
Guillermo S. Romero
2009-04-11 19:04:59 +00:00
parent 3f98b7ac35
commit e0d794b31e
2 changed files with 15 additions and 7 deletions

View File

@@ -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)

View File

@@ -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"