Changeset 1455 for branches/alma

Timestamp:

12/12/08 12:07:23 (16 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: No

Ready to Release: Yes

Interface Changes: No

What Interface Changed:

Test Programs:

Put in Release Notes: No

Description: This committion is on behalf of Takeshi.

Updated environmental variable and library pathes in Makefiles
for CASA+CASACore software.
Changed include files in Template.cpp for CASA+CASACore software.

Location:

branches/alma

Files:

• Makefile (modified) (2 diffs)
• src/Makefile (modified) (4 diffs)
• src/Templates.cpp (modified) (2 diffs)

branches/alma/Makefile

@@ +1 @@
+### Notice: 
+###    This Makefile assumes CASA+CASACore enviroment. 
+###    For who wants to build ASAP with older CASA without CASACore 
+###    environment, replace $(CASAPATH) with $(AIPSPATH). 
 PREFIX := /opt/casa/darwin
 #PREFIX := /export/home/minor/casa/active/linux_gnu
@@ -12 +16 @@
 BINS := bin/asap
 
-CASAROOT  := $(word 1, $(AIPSPATH))
-PLATFORM  := $(word 2, $(AIPSPATH))
+CASAROOT  := $(word 1, $(CASAPATH))
+PLATFORM  := $(word 2, $(CASAPATH))
 DISTDIR   := asap_$(PLATFORM)
 

branches/alma/src/Makefile

@@ +1 @@
+### Notice: 
+###    This Makefile assumes CASA+CASACore enviroment. 
+###    For who wants to build ASAP with older CASA without CASACore, 
+###    1. Replace $(CASAPATH) with $(AIPSPATH). 
+###    2. CASAINC should be 
+###        '-I$(CASAROOT)/code/include -I$(CASAROOT)/code/casa'
+###    3. Replase library names in G2CARCH '-lcasa_*' with '-l*'.
+###    4. Comment-IN the definition of 'CXXOPTS'. 
 TARGET   := /tmp/_asap.so
 
 # the casa environment AIPSPATH has to be defined
-CASAROOT  := $(word 1, $(AIPSPATH))
-CASAARCH  := $(word 2, $(AIPSPATH))
-CASAINC   := -I$(CASAROOT)/code/include -I$(CASAROOT)/code/casa
+CASAROOT  := $(word 1, $(CASAPATH))
+CASAARCH  := $(word 2, $(CASAPATH))
+CASAINC   := -I$(CASAROOT)/code/include -I$(CASAROOT)/$(CASAARCH)/include/casacore -I$(CASAROOT)/$(CASAARCH)/include
 CASALIB   := $(CASAROOT)/$(CASAARCH)/lib
 
@@ -16 +24 @@
 CXXFLAGS := -fPIC -O3 -g
 CXXFLAGS += -ansi -Wno-long-long -Wall
-CXXOPTS := -DAIPS_NO_TEMPLATE_SRC
+#CXXOPTS := -DAIPS_NO_TEMPLATE_SRC
 
 # darwin specific flags
@@ -38 +46 @@
 G2CARCH := $(G2CROOT)/lib/gcc/i386-apple-darwin8.7.1/4.2.0/libgcc.a
 G2CARCH := $(G2CROOT)/lib/gcc/powerpc-apple-darwin8.7.0/4.2.0/libgcc.a
+G2CARCH := $(G2CROOT)/lib/gcc/i386-redhat-linux/4.1.0/libgcc.a
 #G2CLIB := $(G2CROOT)/lib/libgfortran.a
 G2CLIB := -lg2c
@@ -44 +53 @@
 # if not than there might by symbol resolution errors.
 CASAPPLIB := -L$(CASALIB) \
-             -latnf -limages -lms -lcomponents -lcoordinates \
-             -llattices -lfits -lmeasures -lmeasures_f \
-             -ltables -lscimath -lscimath_f -lcasa  \
+             -latnf -lcasa_images -lcasa_ms -lcasa_components -lcasa_coordinates \
+             -lcasa_lattices -lcasa_fits -lcasa_measures -lcasa_measures_f \
+             -lcasa_tables -lcasa_scimath -lcasa_scimath_f -lcasa_casa  \
              $(CASALIB)/libwcs.a \
              $(RPFITSLIB) $(CFITSIOLIB) $(G2CLIB) -lstdc++

branches/alma/src/Templates.cpp

@@ -33 +33 @@
 #include <casa/aips.h>
 #include <casa/namespace.h>
-#include <casa/Exceptions/Error.cc>
-#include <casa/Utilities/CountedPtr.cc>
+#include <casa/Exceptions/Error.h>
+#include <casa/Utilities/CountedPtr.h>
 
 template class casa::CountedConstPtr<asap::Scantable>;
@@ -45 +45 @@
 template class casa::SimpleCountedPtr<asap::STPol>;
 
-#include <casa/Arrays/ArrayLogical.cc>
-#include <casa/Arrays/ArrayMath.cc>
-#include <casa/Arrays/MaskArrMath.cc>
-#include <casa/Arrays/MaskedArray.cc>
+#include <casa/Arrays/ArrayLogical.h>
+#include <casa/Arrays/ArrayMath.h>
+#include <casa/Arrays/MaskArrMath.h>
+#include <casa/Arrays/MaskedArray.h>
 #include <casa/Arrays/Array.h>
-#include <casa/Arrays/Array.cc>
 #include <casa/Arrays/Vector.h>
-#include <casa/Utilities/BinarySearch.cc>
-#include <coordinates/Coordinates/FrequencyAligner.cc>
+#include <casa/Utilities/BinarySearch.h>
+#include <coordinates/Coordinates/FrequencyAligner.h>
 #include <lattices/Lattices/Lattice.h>
-#include <lattices/Lattices/LatticeUtilities.cc>
-#include <scimath/Mathematics/InterpolateArray1D.cc>
-#include <tables/Tables/BaseMappedArrayEngine.cc>
+#include <lattices/Lattices/LatticeUtilities.h>
+#include <scimath/Mathematics/InterpolateArray1D.h>
+#include <tables/Tables/BaseMappedArrayEngine.h>
 #include <tables/Tables/TableVector.h>
-#include <tables/Tables/TVec.cc>
-#include <tables/Tables/TableVector.cc>
-#include <tables/Tables/TVecScaCol.cc>
-#include <tables/Tables/TVecTemp.cc>
+#include <tables/Tables/TVec.h>
+#include <tables/Tables/TVecScaCol.h>
+#include <tables/Tables/TVecTemp.h>
 //#include <tables/Tables/TVecMath.h>