[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52194] trunk/blender: buildsystem cleanup : remove duplicate source & includes for scons,

[Campbell Barton]

Revision: 52194
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52194
Author:   campbellbarton
Date:     2012-11-14 01:41:24 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
buildsystem cleanup: remove duplicate source & includes for scons,
add a check for duplicates in BlenderLib()m, if 0'd now.

Modified Paths:
--------------
    trunk/blender/build_files/scons/tools/Blender.py
    trunk/blender/source/blender/editors/space_sequencer/SConscript
    trunk/blender/source/blender/gpu/SConscript
    trunk/blender/source/blender/imbuf/intern/dds/SConscript
    trunk/blender/source/gameengine/Converter/SConscript
    trunk/blender/source/gameengine/GamePlayer/common/SConscript
    trunk/blender/source/gameengine/GamePlayer/ghost/SConscript
    trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript

Modified: trunk/blender/build_files/scons/tools/Blender.py
===================================================================
--- trunk/blender/build_files/scons/tools/Blender.py	2012-11-14 00:06:12 UTC (rev 52193)
+++ trunk/blender/build_files/scons/tools/Blender.py	2012-11-14 01:41:24 UTC (rev 52194)
@@ -790,6 +790,20 @@
 
     def BlenderLib(self=None, libname=None, sources=None, includes=[], defines=[], libtype='common', priority = 100, compileflags=None, cc_compileflags=None, cxx_compileflags=None, cc_compilerchange=None, cxx_compilerchange=None):
         global vcp
+        
+        # sanity check
+        # run once in a while to check we dont have duplicates
+        if 0:
+            for name, dirs in (("source", sources), ("include", includes)):
+                files_clean = [os.path.normpath(f) for f in dirs]
+                files_clean_set = set(files_clean)
+                if len(files_clean) != len(files_clean_set):
+                    for f in sorted(files_clean_set):
+                        if f != '.' and files_clean.count(f) > 1:
+                            raise Exception("Found duplicate %s %r" % (name, f))
+            del name, dirs, files_clean, files_clean_set, f
+        # end sanity check
+
         if not self or not libname or not sources:
             print bc.FAIL+'Cannot continue. Missing argument for BuildBlenderLib '+libname+bc.ENDC
             self.Exit()

Modified: trunk/blender/source/blender/editors/space_sequencer/SConscript
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/SConscript	2012-11-14 00:06:12 UTC (rev 52193)
+++ trunk/blender/source/blender/editors/space_sequencer/SConscript	2012-11-14 01:41:24 UTC (rev 52194)
@@ -3,7 +3,7 @@
 
 sources = env.Glob('*.c')
 
-incs = '../include ../../blenlib ../../blenkernel ../../blenfont ../../makesdna ../../imbuf'
+incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
 incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
 incs += ' ../../makesrna ../../blenloader ../../blenfont'
 incs += ' #/intern/audaspace/intern'

Modified: trunk/blender/source/blender/gpu/SConscript
===================================================================
--- trunk/blender/source/blender/gpu/SConscript	2012-11-14 00:06:12 UTC (rev 52193)
+++ trunk/blender/source/blender/gpu/SConscript	2012-11-14 01:41:24 UTC (rev 52194)
@@ -27,7 +27,6 @@
 	os.path.join(env['DATA_SOURCES'], "gpu_shader_vertex.glsl.c"),
 	os.path.join(env['DATA_SOURCES'], "gpu_shader_sep_gaussian_blur_frag.glsl.c"),
 	os.path.join(env['DATA_SOURCES'], "gpu_shader_sep_gaussian_blur_vert.glsl.c"),
-	os.path.join(env['DATA_SOURCES'], "gpu_shader_material.glsl.c"),
 	os.path.join(env['DATA_SOURCES'], "gpu_shader_vsm_store_frag.glsl.c"),
 	os.path.join(env['DATA_SOURCES'], "gpu_shader_vsm_store_vert.glsl.c"),
 	))

Modified: trunk/blender/source/blender/imbuf/intern/dds/SConscript
===================================================================
--- trunk/blender/source/blender/imbuf/intern/dds/SConscript	2012-11-14 00:06:12 UTC (rev 52193)
+++ trunk/blender/source/blender/imbuf/intern/dds/SConscript	2012-11-14 01:41:24 UTC (rev 52194)
@@ -3,16 +3,17 @@
 
 source_files = ['dds_api.cpp', 'DirectDrawSurface.cpp', 'Stream.cpp', 'BlockDXT.cpp', 'ColorBlock.cpp', 'Image.cpp', 'FlipDXT.cpp']
 
-incs = ['.',
-    '../../',
+incs = [
+    '.',
+    '..',
     '../..',
-    '..',
     '../../../makesdna',
     '../../../blenkernel',
     '../../../blenlib',
     'intern/include',
     '#/intern/guardedalloc',
-    '#/intern/utfconv']
+    '#/intern/utfconv'
+    ]
 
 
 defs = ['WITH_DDS']

Modified: trunk/blender/source/gameengine/Converter/SConscript
===================================================================
--- trunk/blender/source/gameengine/Converter/SConscript	2012-11-14 00:06:12 UTC (rev 52193)
+++ trunk/blender/source/gameengine/Converter/SConscript	2012-11-14 01:41:24 UTC (rev 52194)
@@ -11,7 +11,7 @@
 incs += ' #intern/moto/include #source/gameengine/Ketsji #source/gameengine/Ketsji/KXNetwork'
 incs += ' #source/blender/blenlib #source/blender/blenkernel #source/blender'
 incs += ' #source/blender/editors/include #source/blender/makesdna #source/gameengine/Rasterizer'
-incs += ' #source/gameengine/Rasterizer/RAS_OpenGLRasterizer #source/gameengine/GameLogic'
+incs += ' #source/gameengine/GameLogic'
 incs += ' #source/gameengine/Expressions #source/gameengine/Network #source/gameengine/SceneGraph'
 incs += ' #source/gameengine/Physics/common #source/gameengine/Physics/Bullet'
 incs += ' #source/gameengine/Physics/Dummy'

Modified: trunk/blender/source/gameengine/GamePlayer/common/SConscript
===================================================================
--- trunk/blender/source/gameengine/GamePlayer/common/SConscript	2012-11-14 00:06:12 UTC (rev 52193)
+++ trunk/blender/source/gameengine/GamePlayer/common/SConscript	2012-11-14 01:41:24 UTC (rev 52194)
@@ -31,7 +31,6 @@
         '#source/blender',
         '#source/blender/include',
         '#source/blender/makesdna',
-        '#source/gameengine/BlenderRoutines',
         '#source/gameengine/Rasterizer',
         '#source/gameengine/GameLogic',
         '#source/gameengine/Expressions',

Modified: trunk/blender/source/gameengine/GamePlayer/ghost/SConscript
===================================================================
--- trunk/blender/source/gameengine/GamePlayer/ghost/SConscript	2012-11-14 00:06:12 UTC (rev 52193)
+++ trunk/blender/source/gameengine/GamePlayer/ghost/SConscript	2012-11-14 01:41:24 UTC (rev 52194)
@@ -26,7 +26,6 @@
         '#source/blender/include',
         '#source/blender/makesdna',
         '#source/blender/makesrna',
-        '#source/gameengine/BlenderRoutines',
         '#source/gameengine/Rasterizer',
         '#source/gameengine/GameLogic',
         '#source/gameengine/Expressions',

Modified: trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
===================================================================
--- trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript	2012-11-14 00:06:12 UTC (rev 52193)
+++ trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript	2012-11-14 01:41:24 UTC (rev 52194)
@@ -8,7 +8,7 @@
 incs = '. #intern/string #intern/moto/include #source/gameengine/Rasterizer #source/gameengine/BlenderRoutines '
 incs += ' #intern/container #source/blender/gpu #extern/glew/include ' + env['BF_OPENGL_INC']
 incs += ' #source/blender/gameengine/Ketsji #source/gameengine/SceneGraph #source/blender/makesdna #source/blender/blenkernel'
-incs += ' #intern/guardedalloc #source/blender/blenlib #source/gameengine/BlenderRoutines'
+incs += ' #intern/guardedalloc #source/blender/blenlib'
 
 if env['WITH_BF_CXX_GUARDEDALLOC']:
     defs.append('WITH_CXX_GUARDEDALLOC')