X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ALIROOT%2Faliroot.cxx;h=c41e6dc7ba35f9bab9eb61fab13615c663a32631;hb=6ba68367ab84abc5d9ce6bd06f5e2ffad77ca9dc;hp=4244cceced7480bed445398af867322caad00713;hpb=f8a2545bc5e9a98f973fc00070fcc1347d79fea0;p=u%2Fmrichter%2FAliRoot.git

diff --git a/ALIROOT/aliroot.cxx b/ALIROOT/aliroot.cxx
index 4244cceced7..c41e6dc7ba3 100644
--- a/ALIROOT/aliroot.cxx
+++ b/ALIROOT/aliroot.cxx
@@ -13,27 +13,7 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/*
-$Log$
-Revision 1.8  2001/10/04 15:32:36  hristov
-Instantiation of AliConfig removed
-
-Revision 1.7  2001/05/22 11:39:48  buncic
-Restored proper name for top level AliRoot folder.
-
-Revision 1.6  2001/05/21 17:22:50  buncic
-Fixed problem with missing AliConfig while reading galice.root
-
-Revision 1.5  2001/05/16 14:57:07  alibrary
-New files for folders and Stack
-
-Revision 1.4  2000/12/20 08:39:37  fca
-Support for Cerenkov and process list in Virtual MC
-
-Revision 1.3  1999/09/29 09:24:07  fca
-Introduction of the Copyright and cvs Log
-
-*/
+/* $Id$ */
 
 //////////////////////////////////////////////////////////////////////////
 //                                                                      //
@@ -57,7 +37,8 @@ Introduction of the Copyright and cvs Log
 #include <TRint.h>
 #include <TFile.h>
 #include <AliRun.h>
-#include <AliConfig.h>
+#include "Riostream.h"
+#include "ARVersion.h"
 
 #if defined __linux
 //On linux Fortran wants this, so we give to it!
@@ -65,19 +46,16 @@ int xargv=0;
 int xargc=0;
 #endif
 
+#ifdef FORTRAN_G95
+extern "C" void g95_runtime_start();
+#endif
+
 #if defined WIN32 
   extern "C" int __fastflag=0; 
   extern "C" int _pctype=0; 
   extern "C" int __mb_cur_max=0; 
 #endif 
 
-int gcbank_[4000000];
-
-//Initialise the Root environment
- extern void InitGui();
- VoidFuncPtr_t initfuncs[] = { InitGui, 0 };
- TROOT root("galice","The Alice/ROOT Interface", initfuncs);
-
 //_____________________________________________________________________________
 int main(int argc, char **argv)
 {
@@ -94,13 +72,27 @@ int main(int argc, char **argv)
   // run and event number, the number of vertices, tracks and primary tracks
   // in the event.
   
+  for ( int i = 1; i < argc; ++i ) 
+  {
+    TString argument(argv[i]);
+    
+    if (argument=="--version")
+    {      
+      cout << "aliroot " << ALIROOT_SVN_REVISION << " " << ALIROOT_SVN_BRANCH << endl;
+      return 0;
+    }    
+  }
+  
   // Create new configuration 
   
   new AliRun("gAlice","The ALICE Off-line Simulation Framework");
     
   // Start interactive geant
   
-  TRint *theApp = new TRint("aliroot", &argc, argv, 0, 0);
+  TRint *theApp = new TRint("aliroot", &argc, argv);
+#ifdef FORTRAN_G95
+  g95_runtime_start();
+#endif
   
   // --- Start the event loop ---
   theApp->Run();
@@ -108,4 +100,3 @@ int main(int argc, char **argv)
   return(0);
 }
 
-