* make sure all contents of bpydata are included in installer and archives

diff --git a/SConstruct b/SConstruct
index 79d45f3c653a5c440e074cdf5a688f120e4dcac2..ce0d45ce8ab2543f40f165fb6aa631c02acee5a3 100644 (file)
--- 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 72c87c5ad3779cd77e5f5438775cc0e8a6dd929e..b6dd8f4c4b43759ea003d308423700e391b99f49 100644 (file)
--- 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]