Changeset 1341 in Sophya for trunk/SophyaProg/PrgUtil/runcxx.cc

Timestamp:

Nov 21, 2000, 5:05:55 PM (25 years ago)

Author:

ansari

Message:

Amelioration runcxx.cc - Reza 21/11/2000

File:

• trunk/SophyaProg/PrgUtil/runcxx.cc (modified) (7 diffs)

trunk/SophyaProg/PrgUtil/runcxx.cc

@@ -23 +23 @@
 static void Usage(bool fgerr);
 static int  GetInput(string & codeflnm);
-static int  FillCxxFile(string & codeflnm, string & cxxfile);
+static int  FillCxxFile(string & codeflnm, string & cxxfile, 
+                        vector<string> & inc1, vector<string> & inc2);
 
 /* --Fonction-- */
@@ -35 +36 @@
   cout << "   Usage: runcxx [-compopt CompileOptions] [-linkopt LinkOptions] \n"
        << "                 [-tmpdir TmpDirectory] [-f C++CodeFileName] \n"
+       << "                 [-inc includefile] [-inc includefile ...] \n"
+       << "                 [-import modulename] [-import modulename ...] \n"
        << "                 [-uarg UserArg1 UserArg2 ...] \n"
-       << "   if no file name is specified, read from standard input \n" << endl;
+       << "   if no file name is specified, read from standard input \n" 
+       << "   modulenames: SkyMap, Samba, SkyT, FitsIOServer, LinAlg, IFFTW \n"
+       << endl;
+
   exit(0);
 }
@@ -59 +65 @@
 
   vector<string> uarg;
+  vector<string> inc1;
+  vector<string> inc2;
   
   cout << " runcxx: Decoding command line options ... " << endl;
@@ -82 +90 @@
       codefile = arg[k];
     }
+    else if (strcmp(arg[k], "-inc") == 0) {
+      if (k == narg-1) Usage(true);
+      k++; inc2.push_back(arg[k]);
+    }
+    else if (strcmp(arg[k], "-import") == 0) {
+      if (k == narg-1) Usage(true);
+      k++; 
+      if (strcmp(arg[k], "SkyMap"))  inc1.push_back("skymap.h");
+      else if (strcmp(arg[k], "Samba"))  inc1.push_back("samba.h");
+      else if (strcmp(arg[k], "SkyT"))  inc1.push_back("skyt.h");
+      else if (strcmp(arg[k], "FitsIOServer"))  inc1.push_back("fitsautoreader.h");
+      else if (strcmp(arg[k], "LinAlg"))  inc1.push_back("intflapack.h");
+      else if (strcmp(arg[k], "IFFTW"))  inc1.push_back("fftwserver.h");
+    }
+
     else if (strcmp(arg[k], "-uarg") == 0) {
       if (k == narg-1) Usage(true);
@@ -115 +138 @@
     if (rc == 0) {
       flnm = tmpdir + "acxxrun.cc";
-      rc = FillCxxFile(codefile, flnm);
+      rc = FillCxxFile(codefile, flnm, inc1, inc2);
     }
 
@@ -196 +219 @@
 
 /* --Fonction-- */
-int  FillCxxFile(string & code, string & cxxfile)
+int  FillCxxFile(string & code, string & cxxfile, 
+                 vector<string>& inc1, vector<string>& inc2)
 {
   ofstream os(cxxfile.c_str(),ios::out); 
@@ -226 +250 @@
     <<"#include \"array.h\" \n"
     <<"#include \"histats.h\" \n"
-    <<"#include \"skymap.h\" \n"
-    <<"#include \"samba.h\" \n"
-    <<"#include \"skyt.h\" \n"
     <<endl;
+  
+  int ki;
+  for(ki=0; ki<inc1.size(); ki++)
+    os << "#include \"" << inc1[ki] << "\" \n" ;
+  os << endl;
+  for(ki=0; ki<inc2.size(); ki++)
+    os << "#include \"" << inc2[ki] << "\" \n" ;
+  os << endl;
+
+  os<<"//---- function for Adding and displaying Objects  " << endl;
+  os<<"//---- compatibility with piapp cxxexecutor  " << endl;
+  os<<"void Keep_Object(AnyDataObj & obj, string const & nom) \n{ \n" 
+    <<"  POutPersist pos(nom); \n"
+    <<"  pos.PutObject(obj); \n"
+    <<"} \n" << endl;
+
+  os<<"//---- Objects and variables saving"<<endl
+    <<"#define KeepObj(obj) Keep_Object(obj, #obj);"<<endl
+    <<endl;
+
+  os<<"//---- Displaying objects and command execution"<<endl;
+  os<<"#define DisplayObj(obj, att) " 
+    <<" cout << \"DisplayObj() available only in piapp \" << endl; " << endl;
+  os<<"#define ExecuteCommand(cmd) "
+    <<" cout << \"ExecuteCommand() available only in piapp \" << endl; " << endl;
+
 
   os << "extern \"C\" { \n"