Changeset 19467 for release-kits/shared/windows/wirk.cpp

Timestamp:

2009-05-14T12:03:27+12:00 (15 years ago)

Author:

oranfry

Message:

fixed generalised wirk source

File:

• release-kits/shared/windows/wirk.cpp (modified) (7 diffs)

release-kits/shared/windows/wirk.cpp

@@ -4 +4 @@
 #include <iostream>
 #include <string>
+#include <sstream>
+
+#ifndef XXX
+#define XXX 2
+#endif
 
 using namespace std;
@@ -20 +25 @@
 void show_help() {
 
-    cout << "WirkXXX - Windows Release Kit for GreenstoneXXX" << endl;
+    cout << "Wirk" << XXX << " - Windows Release Kit for Greenstone" << XXX << endl;
     cout << "Helps you to create releases from the Repository" << endl << endl;
 
-    cout << "usage: wirkXXX [args]" << endl;
+    cout << "usage: wirk" << XXX << " [args]" << endl;
     cout << "   -sim" << endl;
     cout << "       simulation only, don't actually do anything" << endl << endl;
@@ -39 +44 @@
     cout << "       execute only the target with the given address, including subtargets" << endl << endl;
 
-    cout << "   -cp" << endl;
-    cout << "       show the classpath being used by wirkXXX" << endl << endl;
-
 }
 
 
 int main(int argc, char** argv ) {
-
-    string classpath, command;
     
     //some checks
     bool ok = true;
     if ( getenv( "JAVA_HOME" ) == NULL ) {
-        cerr << "Please set JAVA_HOME before running wirkXXX" << endl;
+        cerr << "Please set JAVA_HOME before running wirk" << XXX << endl;
         ok = false;
     }
-    if ( getenv( "WIRKXXX_HOME" ) == NULL ) {
-        cerr << "Please set WIRKXXX_HOME before running wirkXXX" << endl;
+
+    stringstream out;
+    out << "WIRK" << XXX << "_HOME";
+    string wirk_home_var;
+    wirk_home_var = out.str();
+
+    if ( getenv( wirk_home_var.c_str() ) == NULL ) {
+        cerr << "Please set " << wirk_home_var << " before running wirk" << XXX << endl;
         ok = false;
     }
@@ -65 +71 @@
     //load environment variables
     string JAVA_HOME = getenv( "JAVA_HOME" );
-    string WIRKXXX_HOME = getenv( "WIRKXXX_HOME" );
-    putenv( ("ANT_HOME=" + WIRKXXX_HOME + "\\core\\ant").c_str() );
+    string WIRK_HOME = getenv( wirk_home_var.c_str() );
+    putenv( ("ANT_HOME=" + WIRK_HOME + "\\core\\ant").c_str() );
     
     //get the pwd
@@ -77 +83 @@
         
     //create the command
-    command = WIRKXXX_HOME + "\\core\\ant\\bin\\ant.bat -f \"" + WIRKXXX_HOME + "\\ant-scripts\\build.xml\" -addressing \"-Dwirk3.home=" + WIRKXXX_HOME + "\"";
+    stringstream command;
+    command << WIRK_HOME << "\\core\\ant\\bin\\ant.bat -f \"" << WIRK_HOME << "\\ant-scripts\\build.xml\" -addressing \"-Dwirk" << XXX << ".home=" << WIRK_HOME << "\"";
 
     //pass on the arguments
     string a;
     bool simMode = false;
-    for ( int i=0; i < argc; i++ ) {
+    for ( int i=1; i < argc; i++ ) {
         a = argv[i];
         
@@ -88 +95 @@
             show_help();
             return 0;
-        } else if ( a.compare("-cp") == 0 || a.compare("--cp") == 0 ) {
-            cout << classpath;
-            return 0;
         } else if ( a.compare("-sim") == 0) {
-            command = command + " " + a;
+            command << " " << a;
             simMode = true;
         } else {
-            command = command + " " + a;
+            command << " " << a;
         }
 
@@ -101 +105 @@
 
     //set the basedir in the command
-    command = command + " \"-Dbasedir=" + pwd + "\"";
+    command << " \"-Dbasedir=" << pwd << "\"";
 
     cout
         << "O-----------------------------------------O" << endl
         << "|                                         |" << endl
-        << "|   WiRKXXX                                 |" << endl
-        << "|   Windows Release Kit for GreenstoneXXX   |" << endl
+        << "|   WiRK" << XXX << "                                 |" << endl
+        << "|   Windows Release Kit for Greenstone" << XXX << "   |" << endl
         << "|                                         |" << endl
         << "O-----------------------------------------O" << endl
         ;
     
+    string final_command = command.str();
     cout << "pwd: " << pwd << endl;
-    cout << "command: " << command << endl;
+    cout << "command: " << final_command << endl;
 
-    system( command.c_str() );
+    system( final_command.c_str() );
     
     return 0;