[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41951] trunk/blender: exclude addons_contrib/ for release builds.

[Campbell Barton]

Revision: 41951
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41951
Author:   campbellbarton
Date:     2011-11-17 19:43:59 +0000 (Thu, 17 Nov 2011)
Log Message:
-----------
exclude addons_contrib/ for release builds.

Modified Paths:
--------------
    trunk/blender/SConstruct
    trunk/blender/build_files/scons/tools/btools.py
    trunk/blender/source/creator/CMakeLists.txt

Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct	2011-11-17 19:26:50 UTC (rev 41950)
+++ trunk/blender/SConstruct	2011-11-17 19:43:59 UTC (rev 41951)
@@ -70,6 +70,7 @@
 B = Blender
 
 VERSION = btools.VERSION # This is used in creating the local config directories
+VERSION_RELEASE_CYCLE = btools.VERSION_RELEASE_CYCLE
 
 ### globals ###
 platform = sys.platform
@@ -524,6 +525,10 @@
                 if '__pycache__' in dn:  # py3.2 cache dir
                     dn.remove('__pycache__')
 
+                # only for testing builds
+                if VERSION_RELEASE_CYCLE == "release" and "addons_contrib" in dn:
+                    dn.remove('addons_contrib')
+
                 dir = os.path.join(env['BF_INSTALLDIR'], VERSION)
                 dir += os.sep + os.path.basename(scriptpath) + dp[len(scriptpath):]
 

Modified: trunk/blender/build_files/scons/tools/btools.py
===================================================================
--- trunk/blender/build_files/scons/tools/btools.py	2011-11-17 19:26:50 UTC (rev 41950)
+++ trunk/blender/build_files/scons/tools/btools.py	2011-11-17 19:43:59 UTC (rev 41951)
@@ -52,7 +52,7 @@
             else:
                 ver_display = "%s%s" % (ver_base, ver_char)  # assume release
 
-            return ver_base, ver_display
+            return ver_base, ver_display, ver_cycle
 
     raise Exception("%s: missing version string" % fname)
 
@@ -80,7 +80,7 @@
 
 
 # This is used in creating the local config directories
-VERSION, VERSION_DISPLAY = get_version()
+VERSION, VERSION_DISPLAY, VERSION_RELEASE_CYCLE = get_version()
 REVISION = get_revision()
 ENDIAN = checkEndian()
 

Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
--- trunk/blender/source/creator/CMakeLists.txt	2011-11-17 19:26:50 UTC (rev 41950)
+++ trunk/blender/source/creator/CMakeLists.txt	2011-11-17 19:43:59 UTC (rev 41951)
@@ -276,12 +276,23 @@
 
 if(WITH_PYTHON)
 	# install(CODE "message(\"copying blender scripts...\")")
+	
+	# exclude addons_contrib if release
+	if("${BLENDER_VERSION_CYCLE}" STREQUAL "release")
+		set(ADDON_EXCLUDE_CONDITIONAL "addons_contrib/*")
+	else()
+		set(ADDON_EXCLUDE_CONDITIONAL "_addons_contrib/*")  # dummy, wont do anything
+	endif()
+
 	install(
 		DIRECTORY ${CMAKE_SOURCE_DIR}/release/scripts
 		DESTINATION ${TARGETDIR_VER}
 		PATTERN ".svn" EXCLUDE
 		PATTERN "__pycache__" EXCLUDE
+		PATTERN "${ADDON_EXCLUDE_CONDITIONAL}" EXCLUDE
 	)
+	
+	unset(ADDON_EXCLUDE_CONDITIONAL)
 endif()
 
 # localization