forked from bartvdbraak/blender
This commit prepares for 2.34:
* LarstiQ patched SConstruct to have it name tarballs and zips better for 'scons release' * bump version numbers to 234 * added splash.jpg and datatoc'ed version * add release notes People can now do still some final tests. Can you feel the heat?
This commit is contained in:
parent
0e4cfa3fcf
commit
924cd728e2
32
SConstruct
32
SConstruct
@ -1,3 +1,4 @@
|
|||||||
|
#!/usr/bin/env python
|
||||||
import string
|
import string
|
||||||
import os
|
import os
|
||||||
import time
|
import time
|
||||||
@ -7,6 +8,7 @@ import SCons.Script
|
|||||||
|
|
||||||
appname = ''
|
appname = ''
|
||||||
playername = ''
|
playername = ''
|
||||||
|
config_guess = ''
|
||||||
|
|
||||||
if hex(sys.hexversion) < 0x2030000:
|
if hex(sys.hexversion) < 0x2030000:
|
||||||
print ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"
|
print ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"
|
||||||
@ -19,6 +21,10 @@ if hex(sys.hexversion) < 0x2030000:
|
|||||||
if sys.platform != 'win32':
|
if sys.platform != 'win32':
|
||||||
sys.stdout = os.popen("tee build.log", "w")
|
sys.stdout = os.popen("tee build.log", "w")
|
||||||
sys.stderr = sys.stdout
|
sys.stderr = sys.stdout
|
||||||
|
# guess at the platform, used to maintain the tarball naming scheme
|
||||||
|
config_guess = os.popen("SRCHOME=source/ source/tools/guess/guessconfig").read()[:-1]
|
||||||
|
else:
|
||||||
|
config_guess = "windows"
|
||||||
|
|
||||||
if sys.platform == 'darwin':
|
if sys.platform == 'darwin':
|
||||||
appname = 'blender'
|
appname = 'blender'
|
||||||
@ -56,8 +62,8 @@ if os.path.isdir (root_build_dir) == 0:
|
|||||||
config_file = ARGUMENTS.get('CONFIG', 'config.opts')
|
config_file = ARGUMENTS.get('CONFIG', 'config.opts')
|
||||||
|
|
||||||
# Blender version.
|
# Blender version.
|
||||||
version='2.33a'
|
version='2.34'
|
||||||
shortversion = '233a' # for wininst target -> nsis installer creation
|
shortversion = '234' # for wininst target -> nsis installer creation
|
||||||
|
|
||||||
sdl_env = Environment ()
|
sdl_env = Environment ()
|
||||||
freetype_env = Environment ()
|
freetype_env = Environment ()
|
||||||
@ -1157,6 +1163,8 @@ def preparedist():
|
|||||||
|
|
||||||
try:
|
try:
|
||||||
import shutil
|
import shutil
|
||||||
|
import time
|
||||||
|
import stat
|
||||||
except:
|
except:
|
||||||
print "no shutil available"
|
print "no shutil available"
|
||||||
print "make sure you use python 2.3"
|
print "make sure you use python 2.3"
|
||||||
@ -1223,7 +1231,6 @@ def preparedist():
|
|||||||
|
|
||||||
if cleanCVS()==0:
|
if cleanCVS()==0:
|
||||||
return 0
|
return 0
|
||||||
|
|
||||||
return 1
|
return 1
|
||||||
|
|
||||||
def finalisedist(zipname):
|
def finalisedist(zipname):
|
||||||
@ -1239,7 +1246,7 @@ def finalisedist(zipname):
|
|||||||
print
|
print
|
||||||
return 0
|
return 0
|
||||||
|
|
||||||
shutil.copy("dist/" + zipname, zipname)
|
#shutil.copy("dist/" + zipname, zipname)
|
||||||
#shutil.rmtree("dist")
|
#shutil.rmtree("dist")
|
||||||
|
|
||||||
return 1
|
return 1
|
||||||
@ -1348,6 +1355,7 @@ def zipit(env, target, source):
|
|||||||
print
|
print
|
||||||
return
|
return
|
||||||
|
|
||||||
|
import shutil
|
||||||
import glob
|
import glob
|
||||||
import time
|
import time
|
||||||
|
|
||||||
@ -1362,8 +1370,6 @@ def zipit(env, target, source):
|
|||||||
print "check output for error"
|
print "check output for error"
|
||||||
return
|
return
|
||||||
|
|
||||||
os.chdir(startdir + "/dist")
|
|
||||||
|
|
||||||
if sys.platform == 'win32':
|
if sys.platform == 'win32':
|
||||||
zipext += ".zip"
|
zipext += ".zip"
|
||||||
pf = "windows"
|
pf = "windows"
|
||||||
@ -1371,7 +1377,16 @@ def zipit(env, target, source):
|
|||||||
zipext += ".tar.gz"
|
zipext += ".tar.gz"
|
||||||
pf = "linux"
|
pf = "linux"
|
||||||
|
|
||||||
zipname = "bf_blender_" + pf+ "_" + today + zipext
|
if user_options_dict['BUILD_BINARY'] == 'release':
|
||||||
|
blendname = "blender-" + version + "-" + config_guess
|
||||||
|
else:
|
||||||
|
blendname = "bf_blender_" + pf + "_" + today
|
||||||
|
|
||||||
|
zipname = blendname + zipext
|
||||||
|
|
||||||
|
if os.path.isdir(blendname):
|
||||||
|
shutil.rmtree(blendname)
|
||||||
|
shutil.move(startdir + os.sep + "dist", blendname)
|
||||||
|
|
||||||
print
|
print
|
||||||
if sys.platform == 'win32':
|
if sys.platform == 'win32':
|
||||||
@ -1385,7 +1400,7 @@ def zipit(env, target, source):
|
|||||||
else:
|
else:
|
||||||
thezip = tarfile.open(zipname, 'w:gz')
|
thezip = tarfile.open(zipname, 'w:gz')
|
||||||
|
|
||||||
for root, dirs, files in os.walk(".", topdown=False):
|
for root, dirs, files in os.walk(blendname, topdown=False):
|
||||||
for name in files:
|
for name in files:
|
||||||
if name in [zipname]:
|
if name in [zipname]:
|
||||||
print "skipping self"
|
print "skipping self"
|
||||||
@ -1397,6 +1412,7 @@ def zipit(env, target, source):
|
|||||||
thezip.close()
|
thezip.close()
|
||||||
|
|
||||||
os.chdir(startdir)
|
os.chdir(startdir)
|
||||||
|
shutil.move(blendname, startdir + os.sep + "dist")
|
||||||
|
|
||||||
if finalisedist(zipname)==0:
|
if finalisedist(zipname)==0:
|
||||||
print "encountered an error in finalisedist"
|
print "encountered an error in finalisedist"
|
||||||
|
@ -1 +1 @@
|
|||||||
2.33a
|
2.34
|
||||||
|
@ -42,7 +42,7 @@ extern "C" {
|
|||||||
|
|
||||||
struct ListBase;
|
struct ListBase;
|
||||||
|
|
||||||
#define BLENDER_VERSION 233
|
#define BLENDER_VERSION 234
|
||||||
|
|
||||||
int BKE_read_file(char *dir, void *type_r);
|
int BKE_read_file(char *dir, void *type_r);
|
||||||
int BKE_read_file_from_memory(char* filebuf, int filelength, void *type_r);
|
int BKE_read_file_from_memory(char* filebuf, int filelength, void *type_r);
|
||||||
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user