Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Letwory <nathan@letworyinteractive.com>2004-08-02 15:02:14 +0400
committerNathan Letwory <nathan@letworyinteractive.com>2004-08-02 15:02:14 +0400
commitd3a9eae00dfe7939d0692cda3aa14d57eb89b1aa (patch)
tree4e671e1a781c9039dd9d7dd5f6a41810ee7d9eca
parent4b495e5e7bb19e55a610bba9a15811b4a5d03e68 (diff)
* make sure all contents of bpydata are included in installer and archives
-rw-r--r--SConstruct13
-rw-r--r--release/windows/installer/00.sconsblender.nsi2
2 files changed, 13 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct
index 79d45f3c653..ce0d45ce8ab 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1201,6 +1201,7 @@ def preparedist():
os.makedirs("dist/.blender/bpydata")
shutil.copy("release/bpydata/readme.txt", "dist/.blender/bpydata/readme.txt")
+ shutil.copy("release/bpydata/KUlang.txt", "dist/.blender/bpydata/KUlang.txt")
os.chdir("release")
shutil.copytree("scripts/", "../dist/.blender/scripts")
@@ -1239,7 +1240,7 @@ def finalisedist(zipname):
return 0
shutil.copy("dist/" + zipname, zipname)
- shutil.rmtree("dist")
+ #shutil.rmtree("dist")
return 1
@@ -1511,6 +1512,16 @@ def donsis(env, target, source):
scriptstring += "\n\n"
nsis_cnt = string.replace(nsis_cnt, "[SCRIPTCONTS]", scriptstring)
+ # do bpycontents
+ bpydatalist = []
+ bpydatadir = os.listdir(startdir + "\\dist\\.blender\\bpydata")
+ for bpydataitem in bpydatadir:
+ if os.path.isdir(startdir + "\\dist\\.blender\\bpydata\\" + bpydataitem) == 0:
+ bpydatalist.append("File " + startdir + "\\dist\\.blender\\bpydata\\" + bpydataitem)
+ bpydatastring = string.join(bpydatalist, "\n ")
+ bpydatastring += "\n\n"
+ nsis_cnt = string.replace(nsis_cnt, "[BPYCONTS]", bpydatastring)
+
# do dotblender
dotblendlist = []
dotblenddir = os.listdir(startdir+"\\dist\\.blender")
diff --git a/release/windows/installer/00.sconsblender.nsi b/release/windows/installer/00.sconsblender.nsi
index 72c87c5ad37..b6dd8f4c4b4 100644
--- a/release/windows/installer/00.sconsblender.nsi
+++ b/release/windows/installer/00.sconsblender.nsi
@@ -245,7 +245,7 @@ Section "Blender-VERSION (required)" SecCopyUI
SetOutPath $BLENDERHOME\.blender\scripts
[SCRIPTCONTS]
SetOutPath $BLENDERHOME\.blender\bpydata
- File DISTDIR\.blender\bpydata\readme.txt
+ [BPYCONTS]
; Language files
[LANGUAGECONTS]