Move ezOptionParser to third_party directory. Update to latest version.

src/EnergyPlus/main.cc

@@ -12,6 +12,10 @@
 #include <ObjexxFCL/string.functions.hh>
 #include <ObjexxFCL/Time_Date.hh>
 
+// CLI Headers
+#include <../../CLI/ezOptionParser.hpp> // Added by Monika Sharma for CLI
+#include <stdio.h> // Added by Monika Sharma for CLI
+
 // EnergyPlus Headers
 #include <main.hh>
 #include <DataEnvironment.hh>
@@ -29,9 +33,6 @@
 #include <ScheduleManager.hh>
 #include <SimulationManager.hh>
 #include <UtilityRoutines.hh>
-#include <stdio.h> // Added by Monika Sharma for CLI
-#include "ezOptionParser.hpp" // Added by Monika Sharma for CLI
-//#include <Globals.hh>
 
 using namespace ez;
 using namespace std;
@@ -232,8 +233,8 @@ main(int argc, const char * argv[])
     ezOptionParser opt;
 
     opt.overview = "\n*******************************************\nCopyright (C) 2012-2014 Big Ladder Software\nWeb: www.bigladdersoftware.com\n";
-    opt.overview1 = VerString;
-    opt.overview2 = "\n*******************************************\n";
+    opt.overview += VerString;
+    opt.overview += "\n*******************************************\n";
     opt.syntax = "./EnergyPlus -df InputFile.idf -i Energy+.idd -w WeatherFile.epw -o OutFile.csv";
 
     opt.add(
@@ -313,7 +314,6 @@ main(int argc, const char * argv[])
     if(argv[1]==0) cout<<"No arguments provided"<<endl;
 
     std::string usage;
-    std::string version;
 
 	if (opt.isSet("-h")) {
 		opt.getUsage(usage);
@@ -322,8 +322,7 @@ main(int argc, const char * argv[])
 	}
 
     if (opt.isSet("-v")) {
-        opt.getVersion(version);
-		cout << version;
+		cout << VerString;
 		return 1;
     }
 
@@ -334,7 +333,7 @@ main(int argc, const char * argv[])
 
 		opt.getUsage(usage);
 		cout << usage;
-		return 1;
+		return -1;
 	}
 
 /*	if(!opt.gotRequired(badOptions)) {

third_party/CLI/MIT-LICENSE

@@ -0,0 +1,7 @@
+Copyright (C) 2011,2012 Remik Ziemlinski
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

src/EnergyPlus/ezOptionParser.hpp → third_party/CLI/ezOptionParser.hpp

@@ -1328,7 +1328,6 @@ class ezOptionParser {
   inline bool exportFile(const char * filename, bool all=false);
   inline OptionGroup * get(const char * name);
   inline void getUsage(std::string & usage, int width=80, Layout layout=ALIGN);
-  inline void getVersion(std::string & version, int width=80, Layout layout=ALIGN);
   inline void getUsageDescriptions(std::string & usage, int width=80, Layout layout=STAGGER);
   inline bool gotExpected(std::vector<std::string> & badOptions);
   inline bool gotRequired(std::vector<std::string> & badOptions);
@@ -1346,8 +1345,6 @@ class ezOptionParser {
   // General description in human language on what the user's tool does.
   // It's the first section to get printed in the full usage message.
   std::string overview;
-  std::string overview1;
-  std::string overview2;
   // A synopsis of command and options usage to show expected order of input arguments.
   // It's the second section to get printed in the full usage message.
   std::string syntax;
@@ -1781,8 +1778,6 @@ OptionGroup * ezOptionParser::get(const char * name) {
 void ezOptionParser::getUsage(std::string & usage, int width, Layout layout) {
 
   usage.append(overview);
-  usage.append(overview1);
-  usage.append(overview2);
   usage.append("\n\n");
   usage.append("USAGE: ");
   usage.append(syntax);
@@ -1799,14 +1794,6 @@ void ezOptionParser::getUsage(std::string & usage, int width, Layout layout) {
   }
 };
 /* ################################################################### */
-void ezOptionParser::getVersion(std::string & version, int width, Layout layout) {
-
-    version.append(overview);
-    version.append(overview1);
-    version.append(overview2);
-    version.append("\n\n");
-};
-/* ################################################################### */
 // Creates 2 column formatted help descriptions for each option flag.
 void ezOptionParser::getUsageDescriptions(std::string & usage, int width, Layout layout) {
   // Sort each flag list amongst each group.