Skip to content

Commit

Permalink
Change location of modelinterface which used to be in the old
Browse files Browse the repository at this point in the history
gcam-data-system.  We've now moved it to output
  • Loading branch information
pralitp committed Jun 5, 2018
1 parent bd83ec2 commit 9dad50b
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 1 deletion.
3 changes: 3 additions & 0 deletions .gitmodules
Expand Up @@ -2,3 +2,6 @@
path = cvs/objects/climate/source/hector
url = https://github.com/JGCRI/hector.git
branch = gcam-integration
[submodule "output/modelinterface/modelinterface"]
path = output/modelinterface/modelinterface
url = https://github.com/JGCRI/modelinterface.git
2 changes: 1 addition & 1 deletion cvs/objects/reporting/source/xml_db_outputter.cpp
Expand Up @@ -324,7 +324,7 @@ auto_ptr<XMLDBOutputter::JNIContainer> XMLDBOutputter::createContainer( const bo
// will need to use a custom class loader that will do the expansion prior to
// loading any classes.
const string classpath = "-Djava.class.path=XMLDBDriver.jar" + string( PATH_SEPARATOR ) + string( JARS_LIB )
+ string( PATH_SEPARATOR ) + "../input/gcam-data-system/_common/ModelInterface/src/ModelInterface.jar";
+ string( PATH_SEPARATOR ) + "../output/modelinterface/ModelInterface.jar";
options[ 0 ].optionString = const_cast<char*>( classpath.c_str() );
options[ 1 ].optionString = const_cast<char*>( "-Djava.system.class.loader=WildcardExpandingClassLoader" );
vmArgs.version = JNI_VERSION_1_6;
Expand Down
2 changes: 2 additions & 0 deletions output/modelinterface/.gitignore
@@ -0,0 +1,2 @@
*.class
jars
Binary file added output/modelinterface/ModelInterface.jar
Binary file not shown.
1 change: 1 addition & 0 deletions output/modelinterface/modelinterface
Submodule modelinterface added at 512fd6

0 comments on commit 9dad50b

Please sign in to comment.