[cig-commits] r6071 - in long/3D/Gale/trunk/src/Gale: . libGale/src

[walter at geodynamics.org]

Author: walter
Date: 2007-02-23 09:59:31 -0800 (Fri, 23 Feb 2007)
New Revision: 6071

Modified:
   long/3D/Gale/trunk/src/Gale/
   long/3D/Gale/trunk/src/Gale/libGale/src/Init.c
Log:
 r118 at earth:  boo | 2007-02-23 09:58:20 -0800
  r114 at earth (orig r79):  KathleenHumble | 2007-02-22 19:10:27 -0800
  Altering the way the paths to the plugins and
  the xml files are found.
  There is now a global Stg_ObjectList for:
  xmlSearchPaths
  pluginDirectories
  
  Each project will add their LIB_DIR to these lists,
  and these lists will be used to search for (respectively)
  the location of the xml in the build directories,
  and the location of the plugin .so files in the build directories.
  These new global ObjectLists are created/added to in the PROJECT's Init file.
  
  These changes were needed when using the separate_build flag
  on the clusters, so that each separate project can find where all
  the other projects are located.
  
  
 



Property changes on: long/3D/Gale/trunk/src/Gale
___________________________________________________________________
Name: svk:merge
   - 4e4aea6e-fd02-0410-981f-80ab108a5659:/trunk:78
8f887497-cf10-0410-afc2-df8ae19c7fb0:/cig:117
   + 4e4aea6e-fd02-0410-981f-80ab108a5659:/trunk:79
8f887497-cf10-0410-afc2-df8ae19c7fb0:/cig:118

Modified: long/3D/Gale/trunk/src/Gale/libGale/src/Init.c
===================================================================
--- long/3D/Gale/trunk/src/Gale/libGale/src/Init.c	2007-02-23 17:59:29 UTC (rev 6070)
+++ long/3D/Gale/trunk/src/Gale/libGale/src/Init.c	2007-02-23 17:59:31 UTC (rev 6071)
@@ -67,7 +67,9 @@
 	int arg_I;
 	int tmp;
 	Bool useSignalHandler = False;
+	char* directory;
 
+	
 	for ( arg_I = 0; arg_I < *argc; arg_I++ ) {
 		argString = (*argv)[arg_I];
 		/* Leverage from PETSC's no signal flag */
@@ -97,6 +99,17 @@
 	Gale_Info   = Journal_Register( Info_Type,  "Context" );
 	Gale_Error  = Journal_Register( Error_Type, "Context" );
 
+	/* Add the Gale path to the global xml path dictionary */
+	directory = Memory_Alloc_Array( char, 200, "xmlDirectory" ) ;
+	sprintf(directory, "%s%s", LIB_DIR, "/StGermain" );
+	XML_IO_Handler_AddDirectory( "Gale", directory );
+	Memory_Free(directory);
+
+	PluginsManager_AddDirectory( "Gale", LIB_DIR );
+
+	#ifdef GLUCIFER_LIBDIR
+		PluginsManager_AddDirectory( "gLucifer", GLUCIFER_LIBDIR );
+	#endif
 	return True;
 }