Changeset 1899

Timestamp:

08/25/10 16:11:40 (14 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

What Interface Changed: do make at ASAPROOT

Test Programs: List test programs

Put in Release Notes: Yes/No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Makefile is updated to compile pyrap and link it when
build asap.
However, libpyrap is not used at the moment.

Location:

trunk

Files:

• Makefile (modified) (4 diffs)
• external/libpyrap/Makefile (modified) (4 diffs)
• src/Makefile (modified) (3 diffs)

trunk/Makefile

@@ -14 +14 @@
 endif
 ATNFD := external-alma
+PYRAPD := external/libpyrap
 
 #PY := $(wildcard python/*.py)
@@ -29 +30 @@
 module:
         @if ( test -f getsvnrev.sh ) ; then /bin/bash getsvnrev.sh ; fi
+        @cd $(ASAPROOT)/$(PYRAPD); make
         @cd $(ASAPROOT)/$(ATNFD); make
         @cd $(ASAPROOT)/src; make
@@ -47 +49 @@
         @if ( test ! -d $(PREFIX)/share/asap ) ; then mkdir -p $(PREFIX)/share/asap ; fi
         @cp -f share/ipythonrc-asap $(PREFIX)/share/asap/
+        @cd $(ASAPROOT)/$(PYRAPD); make install
         @cd $(ASAPROOT)/$(ATNFD); make install
         @echo "Successfully installed asap module to" $(PYDIR)
@@ -55 +58 @@
         @cd $(ASAPROOT)/$(ATNFD); make realclean
         @cd $(ASAPROOT)/apps; make clean
+        @cd $(ASAPROOT)/$(PYRAPD); make clean
 
 datadist:

trunk/external/libpyrap/Makefile

@@ -16 +16 @@
 CASAROOT := $(word 1, $(CASAPATH))
 CASAARCH := $(word 2, $(CASAPATH))
-ifeq "$(CASAARCH)" "darwin"
-   CASADIST := /opt/casa
-else
-   CASADIST := /usr/lib/casapy
-endif
 
 TARGET := libpyrap.so
@@ -38 +33 @@
 BOOSTLIB := -L$(BOOSTLIBD) -lboost_python
 
-# numpy (use numpy in CASA)
-NUMPYROOT := $(CASADIST)/lib/python2.5/site-packages/numpy
-NUMPYINCD := $(NUMPYROOT)/core/include
-NUMPYLIBD := $(NUMPYROOT)/core/
-NUMPYLIB := #-L$(NUMPYLIBD) -lmultiarray 
-
 # python
 PYTHONROOT := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=PYTHONROOT eval_vars) && echo $$PYTHONROOT)
 PYTHONINCD := $(PYTHONROOT)/include/python2.5
+
+# numpy (use numpy in CASA)
+PYTHONLIBD := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=PYTHONLIBD eval_vars) && echo $$PYTHONLIBD)
+NUMPYROOT := $(PYTHONLIBD)/python2.5/site-packages/numpy
+NUMPYINCD := $(NUMPYROOT)/core/include
 
 # the compiler
@@ -62 +56 @@
 
 # links to external libraries
-LIBS := $(CORELIB) $(BOOSTLIB) $(NUMPYLIB)
+LIBS := $(CORELIB) $(BOOSTLIB)
 
 # include directories
@@ -103 +97 @@
 
 clean:
-        rm -rf $(OBJECTS) $(TARGET)
-        rm -rf $(TESTDIR)/$(TESTMOD) $(TESTDIR)/$(TESTOBJ)
+        rm -f $(OBJECTS) $(TARGET)
+        rm -f $(TESTDIR)/$(TESTMOD) $(TESTDIR)/$(TESTOBJ)
+        rm -f $(INSTDIR)/$(TARGET)
 
 install:

trunk/src/Makefile

@@ -45 +45 @@
 # compiler flags
 CXXFLAGS += -fPIC
+#CXXOPTS += -DHAVE_LIBPYRAP
 
 CFITSIOLIB := -lcfitsio
@@ -54 +55 @@
 G2CLIB := -lgfortran
 
+# pyrap
+PYRAPD := $(ASAPROOT)/external/libpyrap
+PYRAPLIBD := $(PYRAPD)
+PYRAPINCD := $(PYRAPD)/pyrap-0.3.2
+PYRAPLIB := -L$(PYRAPLIBD) -lpyrap
+
 # links to external libraries
-CASAPPLIB := -L$(ASAPROOT)/$(ATNFD) -latnf $(CORELIB) \
+CASAPPLIB := -L$(ASAPROOT)/$(ATNFD) -latnf $(CORELIB) $(PYRAPLIB) \
              -L$(WCSLIBLIBD) $(WCSLIBLIB) \
              -L$(RPFITSLIBD) $(RPFITSLIB) $(CFITSIOLIB) $(G2CLIB) -lstdc++
@@ -76 +83 @@
 
 # DO NOT MODIFY AFTER THIS
-INCDIRS   := -I. $(CASAINC)  -I$(CFITSIOINCD) $(BOOSTINC) -I$(PYTHONINCD) -I$(ASAPROOT)/$(ATNFD)
+INCDIRS   := -I. $(CASAINC)  -I$(CFITSIOINCD) $(BOOSTINC) -I$(PYTHONINCD) -I$(ASAPROOT)/$(ATNFD) -I$(PYRAPINCD)
 LIBS      := $(PYTHONLIB)  $(BOOSTLIB) $(CASAPPLIB)