Skip to content
Snippets Groups Projects
Commit 090ef0fa authored by toole1's avatar toole1
Browse files

monad 3.1.0 with cc-monad update

git-svn-id: https://subversion.cs.illinois.edu/svn/cs225@7018 6fbd10e7-183d-0410-a318-cb416676e4f2
parent c89c91af
No related branches found
No related tags found
No related merge requests found
......@@ -5,6 +5,24 @@ using namespace util;
int main(int argc, const char * const * argv)
{
bool isCompileOnly = false;
for (int i = 2; i < argc; i++)
if (strcmp(argv[i], "-c") == 0)
isCompileOnly = true;
if (!isCompileOnly) // not really using cc-monad, just linking
{
if (argc < 3)
{
cerr << "cc-monad: usage error" << endl;
exit(1);
}
vector<string> linkargs(argv + 2, argv + argc);
exec(argv[1], linkargs);
exit(0);
}
if (argc < 4)
{
cerr << "cc-monad: usage error" << endl;
......@@ -15,6 +33,7 @@ int main(int argc, const char * const * argv)
vector<string> options;
string outputFile;
bool isNextOutput = false;
for (int32_t i = 2; i < argc; i++)
{
if (strlen(argv[i]) > 0)
......@@ -43,7 +62,12 @@ int main(int argc, const char * const * argv)
}
}
}
if (outputFile == "")
{
outputFile = inputFile.substr(0, inputFile.find_last_of(".")) + ".o";
}
if (inputFile == "")
{
cerr << "cc-monad: usage error" << endl;
exit(1);
......
......@@ -539,9 +539,8 @@ void monad::exec_command(const string & command)
return;
}
#if DEBUG
cout << "Pre-Make Command: " << command << endl;
#endif
if (opts::verbose)
cout << "Pre-Make Command: " << command << endl;
system(command.c_str());
}
......
......@@ -14,9 +14,9 @@ namespace monad_shared
namespace versioninfo
{
const char * official_name = "Monad Autograder";
const char * version_name = "sigzombie";
const Version version_num = Version(3, 0, 6);
const char * date = "24 Apr 2012";
const char * version_name = "Leap Into the Void";
const Version version_num = Version(3, 1, 0);
const char * date = "27 Jun 2012";
}
const char * unit_test_result::pass_string = "~~PASSED~~";
......
......@@ -60,3 +60,5 @@
"I've seen it on Google Maps; I think I know what I'm talking about" ~ Kyle Johnson
"Wat." ~ Chase Geigle
"I've seen many balls. Actually, let's do an example without balls." ~ Jack Toole
"Find your points of interest, compute HOG features, bung them into a classifier, and see what you get." ~ D.A. Forsyth
"You *could* call it an ape, and that an ape, but that would just be phylogenic pettifogging." ~ D.A. Forsyth
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment