Changeset 789 for branches/Release12

Timestamp:

12/08/05 14:51:17 (18 years ago)

Author:

mar637

Message:

made makefile darwin compatible; removed uneccessary templates - who knows why

Location:

branches/Release12/src

Files:

• Makefile (modified) (3 diffs)
• SDTemplates.cc (modified) (4 diffs)

branches/Release12/src/Makefile

@@ -1 +1 @@
 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
+CASALIB   := $(CASAROOT)/$(CASAARCH)/lib
+
+
+# the compiler
 ifndef CXX
    CXX      := g++
 endif
+
+# compiler flags
 CXXFLAGS := -O3 -fPIC
-CXXFLAGS += -ansi
-CXXFLAGS += -pedantic -Wno-long-long
+CXXFLAGS += -ansi -pedantic -Wno-long-long
 CXXOPTS := -DAIPS_NO_TEMPLATE_SRC
 
-CFITSIOROOT := /usr/local If aips++ is build with LFS you need to have
+# darwin specific flags
+ifeq "$(CASAARCH)" "darwin"
+   CXXFLAGS := -O2 -DAIPS_DARWIN
+   CXXFLAGS += -ansi -pedantic -Wno-long-long -Wno-long-double
+endif
+
+
+# cfitsio
+CFITSIOROOT := /usr/local
+# If aips++ is build with LFS you need to have
 # libcfitsio with lfs support
-CFITSIOLIB := /usr/local/lib/libcfitsio_lfs.a
-#CFITSIOINC := -I$(CFITSIOROOT)/include/cfitsio
+CFITSIOINC := -I$(CFITSIOROOT)/include
+CFITSIOLIB := $(CFITSIOROOT)/lib/libcfitsio_lfs.a
 #CFITSIOLIB := -L$(CFITSIOROOT) -lcfitsio
 
-
-CASAROOT  := $(word 1, $(AIPSPATH))
-CASAARCH  := $(word 2, $(AIPSPATH))
-CASAINC   := -I$(CASAROOT)/code/include -I$(CASAROOT)/code/casa/wcslib
-CASALIB   := $(CASAROOT)/$(CASAARCH)/lib
-
+#rpfits
+RPFITSROOT := /usr/local
+RPFITSLIB := $(RPFITSROOT)/lib/librpfits.a
 
 # This assumes all casa libs are static only (*.a)
 # if not than there might by symbol resolution errors.
 CASAPPLIB := $(CASALIB)/version.o \
-             -L$(CASALIB) -static \
+             -L$(CASALIB) \
              -latnf -limages -lms -lcomponents -lcoordinates \
              -llattices -lfits -lmeasures -lmeasures_f \
              -ltables -lscimath -lscimath_f -lcasa  \
              $(CASALIB)/libwcs.a \
-              -lrpfits $(CFITSIOLIB) -dy -llapack -lblas -lg2c
+             $(RPFITSLIB) $(CFITSIOLIB) -lg2c -lstdc++
 
+# darwin specific CASA flags
+ifeq "$(CASAARCH)" "darwin"
+   CASAPPLIB += -framework vecLib
+else
+   CASAPPLIB += -llapack -lblas
+endif
+
+# the linker
 LD        := $(CXX)
+
 LDFLAGS   := -shared -Wl$(TARGET) -s
+ifeq "$(CASAARCH)" "darwin"
+   LDFLAGS   := -dynamiclib -single_module
+endif
 
+# python only 2.3 has been tested
 PYVERSION := 2.3
 PYTHONROOT := /usr
@@ -39 +69 @@
 PYTHONLIB := -L$(PYTHONROOT)/lib -lpython$(PYVERSION) 
 
-
+# has to be build with same g++ version as casa
 BOOSTROOT := /usr
 BOOSTLIB  := -L$(BOOSTROOT)/lib -lboost_python
@@ -45 +75 @@
 
 
+# DO NOT MODIFY AFTER THIS
 INCDIRS   := -I. $(CASAINC) $(BOOSTINC) $(PYTHONINC) $(CFITSIOINC)
 LIBS      := $(PYTHONLIB)  $(BOOSTLIB) $(CASAPPLIB)

branches/Release12/src/SDTemplates.cc

@@ -34 +34 @@
 #include <casa/namespace.h>
 #include <casa/Exceptions/Error.cc>
-#include <casa/Exceptions/Error2.cc>
+//#include <casa/Exceptions/Error2.cc>
 #include <casa/Utilities/CountedPtr.cc>
-#include <casa/Utilities/CountedPtr2.cc>
+//#include <casa/Utilities/CountedPtr2.cc>
 
 namespace asap {
@@ -53 +53 @@
 #include <casa/Arrays/Array.cc>
 #include <casa/Arrays/Vector.h>
-#include <casa/Arrays/Vector2.cc>
-#include <casa/Arrays/Vector.cc>
-#include <casa/Utilities/PtrHolder.cc>
 #include <casa/Utilities/BinarySearch.cc>
 #include <coordinates/Coordinates/FrequencyAligner.cc>
 #include <lattices/Lattices/Lattice.h>
 #include <lattices/Lattices/LatticeUtilities.cc>
-#include <scimath/Functionals/CompiledFunction.cc>
-#include <scimath/Functionals/CompiledParam.cc>
-#include <scimath/Mathematics/AutoDiff.h>
-#include <scimath/Mathematics/AutoDiffMath.h>
 #include <scimath/Mathematics/InterpolateArray1D.cc>
 #include <tables/Tables/BaseMappedArrayEngine.cc>
@@ -69 +62 @@
 template void convertArray<Bool, uChar>(Array<Bool> &, Array<uChar> const &);
 template void convertArray<uChar, Bool>(Array<uChar> &, Array<Bool> const &);
-template LogicalArray operator!=<Float>(Array<Float> const &, Float const &);
-template LogicalArray operator==<Float>(Array<Float> const &, Float const &);
-template LogicalArray operator><Float>(Array<Float> const &, Float const &);
-template LogicalArray operator>=<Float>(Array<Float> const &, Float const &);
+
 template Array<Float>& operator/=<Float>(Array<Float>&, MaskedArray<Float> const&);
 template MaskedArray<Float> const& operator*=<Float>(MaskedArray<Float> const&, Float const&);
@@ -90 +80 @@
 template Float sumsquares<Float>(MaskedArray<Float> const&);
 template Float avdev<Float>(MaskedArray<Float> const&);
-template class CompiledFunction<AutoDiff<Float> >;
-template class CompiledParam<AutoDiff<Float> >;
 
-template class Vector<Vector<Int> >;
-template class Vector<Vector<Bool> >;
-template class Vector<Vector<String> >;
-template Vector<Bool>::Vector(const vector<bool> &);
-template Vector<Int>::Vector(const vector<int> &);
-template Vector<Float>::Vector(const vector<float> &);
-template Vector<Double>::Vector(const vector<double> &);
-template void Array<float>::tovector(vector<float> &) const;
-template void Array<Bool>::tovector(vector<bool> &) const;
-template void Array<Double>::tovector(vector<double> &) const;
-template void Array<Int>::tovector(vector<int> &) const;
-template void Array<std::complex<float> >::reference(const Array<std::complex<float> >&);
 template void LatticeUtilities::bin(MaskedArray<float>&, MaskedArray<float> const&, uInt, uInt);
-template class PtrHolder<Lattice<Float> >;
+
 template class FrequencyAligner<Float>;
-template class InterpolateArray1D<Double, Float>;
-template Int binarySearchBrackets<Vector<Double>,Double>(Bool &, Vector<Double> const &, Double const &, uInt, Int);
+
 template class BaseMappedArrayEngine<Float, Float>;