[cig-commits] r4269 - in mc/3D/CitcomS/trunk: . bin visual
visual/OpenDXMacro
leif at geodynamics.org
leif at geodynamics.org
Thu Aug 10 18:55:07 PDT 2006
Author: leif
Date: 2006-08-10 18:55:07 -0700 (Thu, 10 Aug 2006)
New Revision: 4269
Added:
mc/3D/CitcomS/trunk/visual/OpenDXMacro/Makefile.am
Modified:
mc/3D/CitcomS/trunk/bin/Makefile.am
mc/3D/CitcomS/trunk/bin/citcoms.in
mc/3D/CitcomS/trunk/configure.ac
mc/3D/CitcomS/trunk/visual/Makefile.am
mc/3D/CitcomS/trunk/visual/OpenDXMacro/
Log:
Build OpenDX macros in-place during 'make'. Remove
'citcoms' script during 'uninstall'. Also, partial
fixes for MPICH2... one still needs to add
-DMPICH_SKIP_MPICXX to CPPFLAGS, however; see issue14.
Modified: mc/3D/CitcomS/trunk/bin/Makefile.am
===================================================================
--- mc/3D/CitcomS/trunk/bin/Makefile.am 2006-08-10 20:48:43 UTC (rev 4268)
+++ mc/3D/CitcomS/trunk/bin/Makefile.am 2006-08-11 01:55:07 UTC (rev 4269)
@@ -25,22 +25,25 @@
# $Id$
bin_PROGRAMS = CitcomSFull CitcomSRegional
-noinst_SCRIPTS =
+bin_SCRIPTS =
+abs_top_srcdir = @abs_top_srcdir@
+abs_builddir = @abs_builddir@
+
if COND_PYRE
-noinst_SCRIPTS += citcoms
+bin_SCRIPTS += citcoms
if COND_EMBEDDING
bin_PROGRAMS += pycitcoms
INTERPRETER = $(bindir)/pycitcoms
- noinstINTERPRETER = $$here/pycitcoms
- noinstPYTHONPATH = $$top_srcdir
+ noinstINTERPRETER = $(abs_builddir)/pycitcoms
+ noinstPYTHONPATH = $(abs_top_srcdir)
libCitcomS = $(top_builddir)/lib/libCitcomS.a
else
INTERPRETER = $(PYTHON)
noinstINTERPRETER = $(PYTHON)
- noinstPYTHONPATH = $$top_srcdir:$$top_srcdir/module/.libs:$$top_srcdir/module/Exchanger/.libs
+ noinstPYTHONPATH = $(abs_top_srcdir):$(abs_top_srcdir)/module/.libs:$(abs_top_srcdir)/module/Exchanger/.libs
libCitcomS = $(top_builddir)/lib/libCitcomS.la
endif
@@ -73,22 +76,24 @@
endif
# citcoms (top-level Python script)
+do_build = sed -e s%[@]INTERPRETER[@]%$(noinstINTERPRETER)%g -e s%[@]PYTHONPATH[@]%$(noinstPYTHONPATH)%g
+do_install = sed -e s%[@]INTERPRETER[@]%$(INTERPRETER)%g -e s%[@]PYTHONPATH[@]%$(PYTHONPATH)%g
citcoms: $(srcdir)/citcoms.in Makefile
- here=`pwd`; \
- top_srcdir=`cd $(top_srcdir) && pwd`; \
- sed \
- -e "s|[@]INTERPRETER[@]|$(noinstINTERPRETER)|g" \
- -e "s|[@]PYTHONPATH[@]|$(noinstPYTHONPATH)|g" \
- < $(srcdir)/citcoms.in > $@ || (rm -f $@ && exit 1)
+ $(do_build) < $(srcdir)/citcoms.in > $@ || (rm -f $@ && exit 1)
chmod +x $@
-install-exec-hook:
- here=`pwd`; \
- sed \
- -e "s|[@]INTERPRETER[@]|$(INTERPRETER)|g" \
- -e "s|[@]PYTHONPATH[@]|$(PYTHONPATH)|g" \
- < $(srcdir)/citcoms.in > $(DESTDIR)$(bindir)/citcoms || (rm -f $@ && exit 1)
- chmod +x $(DESTDIR)$(bindir)/citcoms
-CLEANFILES = $(noinst_SCRIPTS)
+install-binSCRIPTS: $(bin_SCRIPTS)
+ @$(NORMAL_INSTALL)
+ test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+ @list='$(bin_SCRIPTS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ if test -f $$d$$p; then \
+ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+ echo " $(do_install) '$$d$$p.in' > '$(DESTDIR)$(bindir)/$$f'"; \
+ $(do_install) "$$d$$p.in" > "$(DESTDIR)$(bindir)/$$f"; \
+ echo " chmod +x '$(DESTDIR)$(bindir)/$$f'"; \
+ chmod +x "$(DESTDIR)$(bindir)/$$f"; \
+ else :; fi; \
+ done
EXTRA_DIST = citcoms.in
# pycitcoms (libCitcomS + CitcomSLibmodule + libExchanger +
Modified: mc/3D/CitcomS/trunk/bin/citcoms.in
===================================================================
--- mc/3D/CitcomS/trunk/bin/citcoms.in 2006-08-10 20:48:43 UTC (rev 4268)
+++ mc/3D/CitcomS/trunk/bin/citcoms.in 2006-08-11 01:55:07 UTC (rev 4269)
@@ -29,11 +29,12 @@
# re-create the PYTHONPATH at 'configure' time
-import sys
+import os.path, sys
path = '@PYTHONPATH@'.split(':')
path.reverse()
for directory in path:
if directory:
+ directory = os.path.abspath(directory)
sys.path.insert(1, directory)
from PyxMPI import MPI_Init, MPI_Finalize
Modified: mc/3D/CitcomS/trunk/configure.ac
===================================================================
--- mc/3D/CitcomS/trunk/configure.ac 2006-08-10 20:48:43 UTC (rev 4268)
+++ mc/3D/CitcomS/trunk/configure.ac 2006-08-11 01:55:07 UTC (rev 4269)
@@ -65,7 +65,10 @@
CIT_PYTHON_SYSCONFIG
AC_PATH_PROG([MPIRUN], [mpirun])
if test -z "$MPIRUN"; then
- AC_MSG_ERROR([program 'mpirun' not found])
+ AC_PATH_PROG([MPIRUN], [mpiexec])
+ if test -z "$MPIRUN"; then
+ AC_MSG_ERROR([program 'mpirun' not found])
+ fi
fi
AC_PATH_PROG([BSUB], [bsub])
AC_PATH_PROG([QSUB], [qsub])
@@ -80,6 +83,9 @@
else
if $MPIRUN --help 2>&1 | grep machinefile >/dev/null; then
LAUNCHER="mpich"
+ elif $MPIRUN --invalid 2>&1 | grep softness >/dev/null; then
+ # MPICH2
+ LAUNCHER="mpich"
else
LAUNCHER="lam-mpi"
fi
@@ -184,7 +190,8 @@
module/Makefile
module/Exchanger/Makefile
tests/Makefile
- visual/Makefile])
+ visual/Makefile
+ visual/OpenDXMacro/Makefile])
if test "$want_pyre" = yes; then
AC_CONFIG_SUBDIRS([pythia-0.8 Exchanger])
Modified: mc/3D/CitcomS/trunk/visual/Makefile.am
===================================================================
--- mc/3D/CitcomS/trunk/visual/Makefile.am 2006-08-10 20:48:43 UTC (rev 4268)
+++ mc/3D/CitcomS/trunk/visual/Makefile.am 2006-08-11 01:55:07 UTC (rev 4269)
@@ -23,6 +23,14 @@
# $Id$
+SUBDIRS = OpenDXMacro
+
+SUFFIXES = .net.in .net
+
+visualdir = $(pkgdatadir)/visual
+dxmacrodir = $(visualdir)/OpenDXMacro
+abs_builddir = @abs_builddir@
+
dist_bin_SCRIPTS = \
autocombine.py \
batchcombine.py \
@@ -42,15 +50,7 @@
pasteCitcomData.sh \
zslice.py
-visualdir = $(pkgdatadir)/visual
-dxmacrodir = $(visualdir)/OpenDXMacro
nobase_dist_visual_DATA = \
- OpenDXMacro/RTFtoXYZ2D.net \
- OpenDXMacro/RTFtoXYZ.net \
- OpenDXMacro/ScaledGlyphs.net \
- OpenDXMacro/ShowSphere.net \
- OpenDXMacro/VelocityRTFtoXYZ2D.net \
- OpenDXMacro/VelocityRTFtoXYZ.net \
samples/fulltest.cap0.0 \
samples/fulltest.cap0.0.general \
samples/fulltest.cap1.0 \
@@ -85,55 +85,31 @@
visFull.net \
visRegional.net \
visRegionalSurface.net
-nodist_dxmacro_DATA = \
- CitcomSFullImport.net \
- CitcomSImport.net \
- CitcomSSurfaceHeatflux.net \
- CitcomSSurfaceImport.net \
- CitcomSSurfaceTopo.net \
- CitcomSSurfaceVelocity.net \
- CitcomSTemperature.net \
- CitcomSVelocity.net \
- CitcomSViscosity.net
-do_subst = sed \
- -e 's|[@]dxmacrodir[@]|$(dxmacrodir)|g'
-visFull.net: $(srcdir)/visFull.net.in
- $(do_subst) < $(srcdir)/visFull.net.in > $@ || (rm -f $@ && exit 1)
-visRegional.net: $(srcdir)/visRegional.net.in
- $(do_subst) < $(srcdir)/visRegional.net.in > $@ || (rm -f $@ && exit 1)
-visRegionalSurface.net: $(srcdir)/visRegionalSurface.net.in
- $(do_subst) < $(srcdir)/visRegionalSurface.net.in > $@ || (rm -f $@ && exit 1)
-CitcomSFullImport.net: $(srcdir)/OpenDXMacro/CitcomSFullImport.net.in
- $(do_subst) < $(srcdir)/OpenDXMacro/CitcomSFullImport.net.in > $@ || (rm -f $@ && exit 1)
-CitcomSImport.net: $(srcdir)/OpenDXMacro/CitcomSImport.net.in
- $(do_subst) < $(srcdir)/OpenDXMacro/CitcomSImport.net.in > $@ || (rm -f $@ && exit 1)
-CitcomSSurfaceHeatflux.net: $(srcdir)/OpenDXMacro/CitcomSSurfaceHeatflux.net.in
- $(do_subst) < $(srcdir)/OpenDXMacro/CitcomSSurfaceHeatflux.net.in > $@ || (rm -f $@ && exit 1)
-CitcomSSurfaceImport.net: $(srcdir)/OpenDXMacro/CitcomSSurfaceImport.net.in
- $(do_subst) < $(srcdir)/OpenDXMacro/CitcomSSurfaceImport.net.in > $@ || (rm -f $@ && exit 1)
-CitcomSSurfaceTopo.net: $(srcdir)/OpenDXMacro/CitcomSSurfaceTopo.net.in
- $(do_subst) < $(srcdir)/OpenDXMacro/CitcomSSurfaceTopo.net.in > $@ || (rm -f $@ && exit 1)
-CitcomSSurfaceVelocity.net: $(srcdir)/OpenDXMacro/CitcomSSurfaceVelocity.net.in
- $(do_subst) < $(srcdir)/OpenDXMacro/CitcomSSurfaceVelocity.net.in > $@ || (rm -f $@ && exit 1)
-CitcomSTemperature.net: $(srcdir)/OpenDXMacro/CitcomSTemperature.net.in
- $(do_subst) < $(srcdir)/OpenDXMacro/CitcomSTemperature.net.in > $@ || (rm -f $@ && exit 1)
-CitcomSVelocity.net: $(srcdir)/OpenDXMacro/CitcomSVelocity.net.in
- $(do_subst) < $(srcdir)/OpenDXMacro/CitcomSVelocity.net.in > $@ || (rm -f $@ && exit 1)
-CitcomSViscosity.net: $(srcdir)/OpenDXMacro/CitcomSViscosity.net.in
- $(do_subst) < $(srcdir)/OpenDXMacro/CitcomSViscosity.net.in > $@ || (rm -f $@ && exit 1)
-CLEANFILES = $(nodist_visual_DATA) $(nodist_dxmacro_DATA)
-EXTRA_DIST = \
- OpenDXMacro/CitcomSFullImport.net.in \
- OpenDXMacro/CitcomSImport.net.in \
- OpenDXMacro/CitcomSSurfaceHeatflux.net.in \
- OpenDXMacro/CitcomSSurfaceImport.net.in \
- OpenDXMacro/CitcomSSurfaceTopo.net.in \
- OpenDXMacro/CitcomSSurfaceVelocity.net.in \
- OpenDXMacro/CitcomSTemperature.net.in \
- OpenDXMacro/CitcomSVelocity.net.in \
- OpenDXMacro/CitcomSViscosity.net.in \
+
+visual_templates = \
visFull.net.in \
visRegional.net.in \
visRegionalSurface.net.in
+do_build = sed -e s:[@]dxmacrodir[@]:$(abs_builddir):g
+do_install = sed -e s:[@]dxmacrodir[@]:$(dxmacrodir):g
+
+.net.in.net:
+ $(do_build) $< > $@ || (rm -f $@ && exit 1)
+
+install-nodist_visualDATA: $(nodist_visual_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(visualdir)" || $(mkdir_p) "$(DESTDIR)$(visualdir)"
+ @list='$(nodist_visual_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(do_install) '$$d$$p.in' > '$(DESTDIR)$(visualdir)/$$f'"; \
+ $(do_install) "$$d$$p.in" > "$(DESTDIR)$(visualdir)/$$f"; \
+ echo " chmod 644 '$(DESTDIR)$(visualdir)/$$f'"; \
+ chmod 644 "$(DESTDIR)$(visualdir)/$$f"; \
+ done
+
+CLEANFILES = $(nodist_visual_DATA)
+EXTRA_DIST = $(visual_templates)
+
## end of Makefile.am
Property changes on: mc/3D/CitcomS/trunk/visual/OpenDXMacro
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Added: mc/3D/CitcomS/trunk/visual/OpenDXMacro/Makefile.am
===================================================================
--- mc/3D/CitcomS/trunk/visual/OpenDXMacro/Makefile.am 2006-08-10 20:48:43 UTC (rev 4268)
+++ mc/3D/CitcomS/trunk/visual/OpenDXMacro/Makefile.am 2006-08-11 01:55:07 UTC (rev 4269)
@@ -0,0 +1,83 @@
+## Process this file with automake to produce Makefile.in
+##
+##<LicenseText>
+##
+## CitcomS.py by Eh Tan, Eun-seo Choi, and Pururav Thoutireddy.
+## Copyright (C) 2002-2005, California Institute of Technology.
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
+##</LicenseText>
+
+# $Id$
+
+SUFFIXES = .net.in .net
+
+visualdir = $(pkgdatadir)/visual
+dxmacrodir = $(visualdir)/OpenDXMacro
+abs_builddir = @abs_builddir@
+
+dist_dxmacro_DATA = \
+ RTFtoXYZ2D.net \
+ RTFtoXYZ.net \
+ ScaledGlyphs.net \
+ ShowSphere.net \
+ VelocityRTFtoXYZ2D.net \
+ VelocityRTFtoXYZ.net
+
+nodist_dxmacro_DATA = \
+ CitcomSFullImport.net \
+ CitcomSImport.net \
+ CitcomSSurfaceHeatflux.net \
+ CitcomSSurfaceImport.net \
+ CitcomSSurfaceTopo.net \
+ CitcomSSurfaceVelocity.net \
+ CitcomSTemperature.net \
+ CitcomSVelocity.net \
+ CitcomSViscosity.net
+
+dxmacro_templates = \
+ CitcomSFullImport.net.in \
+ CitcomSImport.net.in \
+ CitcomSSurfaceHeatflux.net.in \
+ CitcomSSurfaceImport.net.in \
+ CitcomSSurfaceTopo.net.in \
+ CitcomSSurfaceVelocity.net.in \
+ CitcomSTemperature.net.in \
+ CitcomSVelocity.net.in \
+ CitcomSViscosity.net.in
+
+do_build = sed -e s:[@]dxmacrodir[@]:$(abs_builddir):g
+do_install = sed -e s:[@]dxmacrodir[@]:$(dxmacrodir):g
+
+.net.in.net:
+ $(do_build) $< > $@ || (rm -f $@ && exit 1)
+
+install-nodist_dxmacroDATA: $(nodist_dxmacro_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(dxmacrodir)" || $(mkdir_p) "$(DESTDIR)$(dxmacrodir)"
+ @list='$(nodist_dxmacro_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(do_install) '$$d$$p.in' '$(DESTDIR)$(dxmacrodir)/$$f'"; \
+ $(do_install) "$$d$$p.in" > "$(DESTDIR)$(dxmacrodir)/$$f"; \
+ echo " chmod 644 '$(DESTDIR)$(dxmacrodir)/$$f'"; \
+ chmod 644 "$(DESTDIR)$(dxmacrodir)/$$f"; \
+ done
+
+CLEANFILES = $(nodist_dxmacro_DATA)
+EXTRA_DIST = $(dxmacro_templates)
+
+## end of Makefile.am
Property changes on: mc/3D/CitcomS/trunk/visual/OpenDXMacro/Makefile.am
___________________________________________________________________
Name: svn:keywords
+ Id
More information about the cig-commits
mailing list