monad release 2.1.2.3

git-svn-id: https://subversion.cs.illinois.edu/svn/cs225@5785 6fbd10e7-183d-0410-a318-cb416676e4f2

.monadid

 monad identification file
 This file is used for monad directory identification
 Built by toole1 on linux1.ews.illinois.edu
-Build Date: Tue Jan 17 23:36:39 CST 2012
+Build Date: Wed Jan 18 12:25:00 CST 2012

README_config.txt

@@ -17,6 +17,6 @@ main.cpp
 unit_tests.cpp
 [Libraries]
 ; Any external library folders to be present in the same directory as the
-; testing directory. These should be mirrored in [SVN Root]/_public/
+; testing directory. These should be mirrored in [SVN Root]/_shared/
 ; The 'testutil' library in this directory is also available
 EasyBMP

config.ini

 [SVN Root]
 :https://subversion.ews.illinois.edu/svn/sp12-cs225/
 
+[SVN Public Dir]
+:_shared
+
 [Staff SVN]
 :https://subversion.cs.illinois.edu/svn/cs225/
 
+[Staff SVN Dir]
+:_current
+
 [Monad Files]
 Makefile.proxy
 memcheck.h

monad.cpp

@@ -443,21 +443,21 @@ string monad::getFolder(const string & folder, bool link)
 
 	// Check Subversion
 
-	const char * svn_config_name = NULL;
-	const char * svn_subdir      = NULL;
+	string svn_config_name;
+	string svn_config_subdir;
 	if (!opts::staff)
 	{
 		svn_config_name = "SVN Root";
-		svn_subdir = "/_public/";
+		svn_config_subdir = "SVN Public Dir";
 	}
 	else
 	{
 		svn_config_name = "Staff SVN";
-		svn_subdir = "/_current/";
+		svn_config_subdir = "Staff SVN Dir";
 	}
 	if (!config[svn_config_name].empty())
 	{
-		string svndir = config[svn_config_name][0] + svn_subdir + folder;
+		string svndir = config[svn_config_name][0] + "/" + config[svn_config_subdir][0] + "/" + folder;
 
 		// TODO (toole1): Won't work if user needs to type password
 		int svnstatus = exec(/*-1,*/ "svn","co",svndir.c_str());

monad_shared.cpp

@@ -15,8 +15,8 @@ namespace versioninfo
 {
 const char * official_name = "Monad Autograder";
 const char * version_name  = "confession";
-const Version version_num  = Version(2, 1, 2, 2);
-const char * date          = "10 Nov 2011";
+const Version version_num  = Version(2, 1, 2, 3);
+const char * date          = "18 Jan 2012";
 }
 
 const char * unit_test_result::pass_string = "~~PASSED~~";
@@ -28,8 +28,8 @@ void printInfo()
 	     << versioninfo::official_name << endl
 	     << "Version " << versioninfo::version_num << ": " << versioninfo::version_name << endl
 		 << "Released " << versioninfo::date << endl
-	     << "Developed by Jack Toole Spring/Fall 2011" << endl
-	     << "Copyright 2011 Jack Toole" << endl
+	     << "Developed by Jack Toole 2011-2012" << endl
+	     << "Copyright 2011-2012 Jack Toole" << endl
 	     << "Run monad --license to see licensing information" << endl
 		 << endl;
 }