[cig-commits] r5789 - in long/3D/Gale/trunk: . src/StGermain src/StGermain/Base/Automation/src src/StGermain/Base/Container/src src/StGermain/Base/Context/src src/StGermain/Base/Extensibility/src src/StGermain/Base/FlattenXML/src src/StGermain/Base/Foundation/src src/StGermain/Base/IO/src src/StGermain/Base/ListPlugins/src src/StGermain/Base/src src/StGermain/Discretisation/Geometry/src src/StGermain/Discretisation/Mesh/src src/StGermain/Discretisation/Shape/src src/StGermain/Discretisation/Swarm/src src/StGermain/Discretisation/Utils/src src/StGermain/Discretisation/src src/StGermain/FD/src src/StGermain/libStGermain/src

walter at geodynamics.org walter at geodynamics.org
Fri Jan 12 16:23:19 PST 2007 

Author: walter
Date: 2007-01-12 16:23:18 -0800 (Fri, 12 Jan 2007)
New Revision: 5789

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/SConstruct
   long/3D/Gale/trunk/src/StGermain/Base/Automation/src/SConscript
   long/3D/Gale/trunk/src/StGermain/Base/Container/src/SConscript
   long/3D/Gale/trunk/src/StGermain/Base/Context/src/SConscript
   long/3D/Gale/trunk/src/StGermain/Base/Extensibility/src/SConscript
   long/3D/Gale/trunk/src/StGermain/Base/FlattenXML/src/SConscript
   long/3D/Gale/trunk/src/StGermain/Base/Foundation/src/SConscript
   long/3D/Gale/trunk/src/StGermain/Base/IO/src/SConscript
   long/3D/Gale/trunk/src/StGermain/Base/ListPlugins/src/SConscript
   long/3D/Gale/trunk/src/StGermain/Base/src/SConscript
   long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/SConscript
   long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/SConscript
   long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/SConscript
   long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/SConscript
   long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/SConscript
   long/3D/Gale/trunk/src/StGermain/Discretisation/src/SConscript
   long/3D/Gale/trunk/src/StGermain/FD/src/SConscript
   long/3D/Gale/trunk/src/StGermain/SConscript
   long/3D/Gale/trunk/src/StGermain/libStGermain/src/SConscript
Log:
 r1419 at earth:  boo | 2007-01-12 16:22:30 -0800
 Include build/include/StGermain only for StGermain proper, not everything, as some files are identical (e.g. Discretisation.h)



Property changes on: long/3D/Gale/trunk
___________________________________________________________________
Name: svk:merge
   - 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1415
   + 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1419

Modified: long/3D/Gale/trunk/SConstruct
===================================================================
--- long/3D/Gale/trunk/SConstruct	2007-01-12 23:46:51 UTC (rev 5788)
+++ long/3D/Gale/trunk/SConstruct	2007-01-13 00:23:18 UTC (rev 5789)
@@ -28,7 +28,6 @@
 env.Append(CCFLAGS=['-g'])
 
 env.Append(CPPPATH=['#/build/include'])
-env.Append(CPPPATH=['#/build/include/StGermain'])
 env.Append(CPPFLAGS=['-DVERSION=\\"CIG\\"','-DHAVE_PETSC'])
 # Export all of the variables 
 Export('env')

Modified: long/3D/Gale/trunk/src/StGermain/Base/Automation/src/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Automation/src/SConscript	2007-01-12 23:46:51 UTC (rev 5788)
+++ long/3D/Gale/trunk/src/StGermain/Base/Automation/src/SConscript	2007-01-13 00:23:18 UTC (rev 5789)
@@ -15,9 +15,9 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA
 
-Import('env','shared_lib_objects','StGermain_static_objects','header_groups')
+Import('StGermain_env','shared_lib_objects','StGermain_static_objects','header_groups')
 
-local_env=env.Copy()
+local_env=StGermain_env.Copy()
 
 header_groups['StGermain/Base/Automation']=["Automation.h",
                                             "CallGraph.h",

Modified: long/3D/Gale/trunk/src/StGermain/Base/Container/src/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Container/src/SConscript	2007-01-12 23:46:51 UTC (rev 5788)
+++ long/3D/Gale/trunk/src/StGermain/Base/Container/src/SConscript	2007-01-13 00:23:18 UTC (rev 5789)
@@ -15,9 +15,9 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA
 
-Import('env','shared_lib_objects','StGermain_static_objects','header_groups')
+Import('StGermain_env','shared_lib_objects','StGermain_static_objects','header_groups')
 
-local_env=env.Copy()
+local_env=StGermain_env.Copy()
 
 header_groups['StGermain/Base/Container']=["Array.h",
                                            "BTree.h",

Modified: long/3D/Gale/trunk/src/StGermain/Base/Context/src/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Context/src/SConscript	2007-01-12 23:46:51 UTC (rev 5788)
+++ long/3D/Gale/trunk/src/StGermain/Base/Context/src/SConscript	2007-01-13 00:23:18 UTC (rev 5789)
@@ -15,9 +15,9 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA
 
-Import('env','shared_lib_objects','StGermain_static_objects','header_groups')
+Import('StGermain_env','shared_lib_objects','StGermain_static_objects','header_groups')
 
-local_env=env.Copy()
+local_env=StGermain_env.Copy()
 local_env.Append(CPPFLAGS=['-DLIB_DIR=\\"'+local_env["lib_dir"]+'\\"'])
 
 header_groups['StGermain/Base/Context']=["AbstractContext.h",

Modified: long/3D/Gale/trunk/src/StGermain/Base/Extensibility/src/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Extensibility/src/SConscript	2007-01-12 23:46:51 UTC (rev 5788)
+++ long/3D/Gale/trunk/src/StGermain/Base/Extensibility/src/SConscript	2007-01-13 00:23:18 UTC (rev 5789)
@@ -15,9 +15,9 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA
 
-Import('env','shared_lib_objects','StGermain_static_objects','header_groups')
+Import('StGermain_env','shared_lib_objects','StGermain_static_objects','header_groups')
 
-local_env=env.Copy()
+local_env=StGermain_env.Copy()
 local_env.Append(CPPFLAGS=['-DMODULE_EXT=\\"' + local_env["SHLIBSUFFIX"][1:] + '\\"'])
 
 header_groups['StGermain/Base/Extensibility']=["ClassHook.h",

Modified: long/3D/Gale/trunk/src/StGermain/Base/FlattenXML/src/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/FlattenXML/src/SConscript	2007-01-12 23:46:51 UTC (rev 5788)
+++ long/3D/Gale/trunk/src/StGermain/Base/FlattenXML/src/SConscript	2007-01-13 00:23:18 UTC (rev 5789)
@@ -15,9 +15,9 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA
 
-Import('env','bin_objects','libs','shared_lib_objects','StGermain_static_objects')
+Import('StGermain_env','bin_objects','libs','shared_lib_objects','StGermain_static_objects')
 
-local_env=env.Copy()
+local_env=StGermain_env.Copy()
 
 FlattenXML=local_env.Program('FlattenXML',
                               ['main.c',libs(shared_lib_objects,

Modified: long/3D/Gale/trunk/src/StGermain/Base/Foundation/src/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Foundation/src/SConscript	2007-01-12 23:46:51 UTC (rev 5788)
+++ long/3D/Gale/trunk/src/StGermain/Base/Foundation/src/SConscript	2007-01-13 00:23:18 UTC (rev 5789)
@@ -15,9 +15,9 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA
 
-Import('env','shared_lib_objects','StGermain_static_objects','header_groups')
+Import('StGermain_env','shared_lib_objects','StGermain_static_objects','header_groups')
 
-local_env=env.Copy()
+local_env=StGermain_env.Copy()
 
 header_groups['StGermain/Base/Foundation']=Split("""Class.h
 CommonRoutines.h

Modified: long/3D/Gale/trunk/src/StGermain/Base/IO/src/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/IO/src/SConscript	2007-01-12 23:46:51 UTC (rev 5788)
+++ long/3D/Gale/trunk/src/StGermain/Base/IO/src/SConscript	2007-01-13 00:23:18 UTC (rev 5789)
@@ -15,9 +15,9 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA
 
-Import('env','shared_lib_objects','StGermain_static_objects','header_groups')
+Import('StGermain_env','shared_lib_objects','StGermain_static_objects','header_groups')
 
-local_env=env.Copy()
+local_env=StGermain_env.Copy()
 local_env.Append(CPPFLAGS=['-DCURR_MODULE_NAME=\\"StGermainBaseIO\\"'])
 
 header_groups['StGermain/Base/IO']=["CFile.h",

Modified: long/3D/Gale/trunk/src/StGermain/Base/ListPlugins/src/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/ListPlugins/src/SConscript	2007-01-12 23:46:51 UTC (rev 5788)
+++ long/3D/Gale/trunk/src/StGermain/Base/ListPlugins/src/SConscript	2007-01-13 00:23:18 UTC (rev 5789)
@@ -15,9 +15,9 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA
 
-Import('env','bin_objects','libs','shared_lib_objects','StGermain_static_objects')
+Import('StGermain_env','bin_objects','libs','shared_lib_objects','StGermain_static_objects')
 
-local_env=env.Copy()
+local_env=StGermain_env.Copy()
 
 ListPlugins=local_env.Program('ListPlugins',
                               ['main.c',libs(shared_lib_objects,

Modified: long/3D/Gale/trunk/src/StGermain/Base/src/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/src/SConscript	2007-01-12 23:46:51 UTC (rev 5788)
+++ long/3D/Gale/trunk/src/StGermain/Base/src/SConscript	2007-01-13 00:23:18 UTC (rev 5789)
@@ -15,9 +15,9 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA
 
-Import('env','shared_lib_objects','StGermain_static_objects','header_groups')
+Import('StGermain_env','shared_lib_objects','StGermain_static_objects','header_groups')
 
-local_env=env.Copy()
+local_env=StGermain_env.Copy()
 
 header_groups['StGermain/Base']=["Base.h",
                                  "Finalise.h",

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/SConscript	2007-01-12 23:46:51 UTC (rev 5788)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/SConscript	2007-01-13 00:23:18 UTC (rev 5789)
@@ -15,9 +15,9 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA
 
-Import('env','shared_lib_objects','StGermain_static_objects','header_groups')
+Import('StGermain_env','shared_lib_objects','StGermain_static_objects','header_groups')
 
-local_env=env.Copy()
+local_env=StGermain_env.Copy()
 local_env.Append(CPPFLAGS=['-DCURR_MODULE_NAME=\\"StGermainDiscretisationGeometry\\"'])
 
 header_groups['StGermain/Discretisation/Geometry']=Split("""BlockGeometry.h

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/SConscript	2007-01-12 23:46:51 UTC (rev 5788)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/SConscript	2007-01-13 00:23:18 UTC (rev 5789)
@@ -15,9 +15,9 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA
 
-Import('env','shared_lib_objects','StGermain_static_objects','header_groups')
+Import('StGermain_env','shared_lib_objects','StGermain_static_objects','header_groups')
 
-local_env=env.Copy()
+local_env=StGermain_env.Copy()
 
 header_groups['StGermain/Discretisation/Mesh']=Split("""
 CartesianGenerator.h

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/SConscript	2007-01-12 23:46:51 UTC (rev 5788)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/SConscript	2007-01-13 00:23:18 UTC (rev 5789)
@@ -15,9 +15,9 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA
 
-Import('env','shared_lib_objects','StGermain_static_objects','header_groups')
+Import('StGermain_env','shared_lib_objects','StGermain_static_objects','header_groups')
 
-local_env=env.Copy()
+local_env=StGermain_env.Copy()
 local_env.Append(CPPFLAGS=['-DCURR_MODULE_NAME=\\"StGermainDiscretisationShape\\"'])
 
 header_groups['StGermain/Discretisation/Shape']=["BelowCosinePlane.h",

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/SConscript	2007-01-12 23:46:51 UTC (rev 5788)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/SConscript	2007-01-13 00:23:18 UTC (rev 5789)
@@ -15,9 +15,9 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA
 
-Import('env','shared_lib_objects','StGermain_static_objects','header_groups')
+Import('StGermain_env','shared_lib_objects','StGermain_static_objects','header_groups')
 
-local_env=env.Copy()
+local_env=StGermain_env.Copy()
 
 header_groups['StGermain/Discretisation/Swarm']=["CellLayout.h",
                                                  "ElementCellLayout.h",

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/SConscript	2007-01-12 23:46:51 UTC (rev 5788)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/SConscript	2007-01-13 00:23:18 UTC (rev 5789)
@@ -15,9 +15,9 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA
 
-Import('env','shared_lib_objects','StGermain_static_objects','header_groups')
+Import('StGermain_env','shared_lib_objects','StGermain_static_objects','header_groups')
 
-local_env=env.Copy()
+local_env=StGermain_env.Copy()
 
 header_groups['StGermain/Discretisation/Utils']=["types.h",
                                                  "AllElementsVC.h",

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/src/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/src/SConscript	2007-01-12 23:46:51 UTC (rev 5788)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/src/SConscript	2007-01-13 00:23:18 UTC (rev 5789)
@@ -15,9 +15,9 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA
 
-Import('env','shared_lib_objects','StGermain_static_objects','header_groups')
+Import('StGermain_env','shared_lib_objects','StGermain_static_objects','header_groups')
 
-local_env=env.Copy()
+local_env=StGermain_env.Copy()
 
 header_groups['StGermain/Discretisation']=["Discretisation.h",
                                            "Finalise.h",

Modified: long/3D/Gale/trunk/src/StGermain/FD/src/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StGermain/FD/src/SConscript	2007-01-12 23:46:51 UTC (rev 5788)
+++ long/3D/Gale/trunk/src/StGermain/FD/src/SConscript	2007-01-13 00:23:18 UTC (rev 5789)
@@ -15,9 +15,9 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA
 
-Import('env','shared_lib_objects','StGermain_static_objects','header_groups')
+Import('StGermain_env','shared_lib_objects','StGermain_static_objects','header_groups')
 
-local_env=env.Copy()
+local_env=StGermain_env.Copy()
 
 header_groups['StGermain/FD']=["types.h",
                                "shortcuts.h",

Modified: long/3D/Gale/trunk/src/StGermain/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StGermain/SConscript	2007-01-12 23:46:51 UTC (rev 5788)
+++ long/3D/Gale/trunk/src/StGermain/SConscript	2007-01-13 00:23:18 UTC (rev 5789)
@@ -15,8 +15,18 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA
 
-Import('make_test_deps')
+Import('make_test_deps','env')
 
+# We create a separate StGermain_env which includes StGermain's
+# include dir.  We can't use this for everyone (StgFEM, PICellerator,
+# etc.) because some of the include files are the same
+# (e.g. Discretisation/Discretisation.h) and the order in which they
+# are searched depends on the platform.
+
+StGermain_env=env.Copy()
+StGermain_env.Append(CPPPATH=["#/build/include/StGermain"])
+Export('StGermain_env')
+
 if not make_test_deps:
     StGermain_static_objects=[]
     Export('StGermain_static_objects')

Modified: long/3D/Gale/trunk/src/StGermain/libStGermain/src/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StGermain/libStGermain/src/SConscript	2007-01-12 23:46:51 UTC (rev 5788)
+++ long/3D/Gale/trunk/src/StGermain/libStGermain/src/SConscript	2007-01-13 00:23:18 UTC (rev 5789)
@@ -15,10 +15,10 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA
 
-Import('env','libStGermain_shared_objects','StGermain_static_objects',
+Import('StGermain_env','libStGermain_shared_objects','StGermain_static_objects',
        'header_groups')
 
-local_env=env.Copy()
+local_env=StGermain_env.Copy()
 
 header_groups['StGermain']=["StGermain.h",
                             "Finalise.h",

More information about the cig-commits mailing list