Changeset 17307

Timestamp:

10/22/13 21:11:13 (11 years ago)

Author:

tbretz

Message:

Added wrappers for some defines to the MARS namespace to make that available in rootlogon to pipe that through AcLiC as define to ofits.h

Location:

trunk/Mars

Files:

• macros/rootlogon.C (modified) (2 diffs)
• mbase/MAGIC.cc (modified) (1 diff)
• mbase/MAGIC.h (modified) (1 diff)

trunk/Mars/macros/rootlogon.C

@@ -108 +108 @@
 void rootlogon()
 {
+    // This is a workaround to make axis behave as they
+    // are UTC and not local time
+    //    gSystem->Setenv("TZ", "UTC");
+
     cout << endl;
 
@@ -184 +188 @@
     TString lib(gSystem->GetLinkedLibs());
 
-    opt += " -D__MARS__ -DHAVE_ZLIB";
-    opt += " -std=c++0x ";
-
-    dbg += " -D__MARS__ -DHAVE_ZLIB";
-    dbg += " -std=c++0x ";
+    TString add = " -std=c++0x";
+    add += " -D__MARS__";
+    add += " -DHAVE_ZLIB";
+    add += " -DPACKAGE_NAME='\""+MARS::GetPackageName()+"\"'";
+    add += " -DPACKAGE_VERSION='\""+MARS::GetPackageName()+"\"'";
+    add += " -DREVISION='\""+MARS::GetRevision()+"\"'";
+
+    opt += add;
+    dbg += add;
 
     lib += " -lnova -lz";

trunk/Mars/mbase/MAGIC.cc

@@ -69 +69 @@
     return false;
 }
+
+TString MARS::GetPackageName() { return PACKAGE_NAME; }
+TString MARS::GetPackageVersion() { return PACKAGE_VERSION; }
+TString MARS::GetRevision() { return REVISION; }

trunk/Mars/mbase/MAGIC.h

@@ -38 +38 @@
 {
     bool CheckRootVer();
+    TString GetPackageName();
+    TString GetPackageVersion();
+    TString GetRevision();
 }