[MOAB-dev] r1130 - in MOAB/trunk: . tools/iMesh tools/iMesh/SIDL tools/iMesh/SIDL/bserver tools/iMesh/SIDL/mserver
tautges at mcs.anl.gov
tautges at mcs.anl.gov
Sun Jun 24 18:03:48 CDT 2007
Author: tautges
Date: 2007-06-24 18:03:47 -0500 (Sun, 24 Jun 2007)
New Revision: 1130
Added:
MOAB/trunk/tools/iMesh/SIDL/Makefile.am
MOAB/trunk/tools/iMesh/SIDL/iMesh-SIDL-Defs.inc.in
MOAB/trunk/tools/iMesh/iBase_FCDefs.h.in
Removed:
MOAB/trunk/tools/iMesh/SIDL/Makefile
MOAB/trunk/tools/iMesh/SIDL/iBase-Defs.inc
MOAB/trunk/tools/iMesh/SIDL/iMesh-Defs.inc
MOAB/trunk/tools/iMesh/iMesh_FCDefs.h.in
Modified:
MOAB/trunk/configure.in
MOAB/trunk/tools/iMesh/Makefile.am
MOAB/trunk/tools/iMesh/SIDL/bserver/
MOAB/trunk/tools/iMesh/SIDL/bserver/iBase_Error_Impl.cc
MOAB/trunk/tools/iMesh/SIDL/bserver/iBase_Error_Impl.hh
MOAB/trunk/tools/iMesh/SIDL/mserver/
MOAB/trunk/tools/iMesh/SIDL/mserver/iBase_Error_Impl.cc
MOAB/trunk/tools/iMesh/SIDL/mserver/iBase_Error_Impl.hh
MOAB/trunk/tools/iMesh/SIDL/mserver/iMesh_SIDL_MeshSidl_Impl.cc
MOAB/trunk/tools/iMesh/SIDL/mserver/iMesh_SIDL_MeshSidl_Impl.hh
MOAB/trunk/tools/iMesh/iBase.h
MOAB/trunk/tools/iMesh/iBase_f.h
MOAB/trunk/tools/iMesh/iMesh-Defs.inc.in
MOAB/trunk/tools/iMesh/iMesh_f.h
MOAB/trunk/tools/iMesh/iMesh_protos.h
Log:
Various changes to bring iMesh/SIDL implementation under configure control.
Now you can configure with "--with-babel=" option, and it will build the
SIDL-based interface too. SIDL include files are installed into
<moab_include_dir>/SIDL, because there are so many of them.
Specific changes:
tools/iMesh/iMesh_f.h, iBase_f.h: moving iBase_ stuff to iMesh/iBase_f.h
tools/iMesh/iMesh-Defs.inc.in: changing IMESH to iMesh in make variables;
changing make variable names to conform with Carl's; removing vestigal
SIDL stuff
tools/iMesh/iMesh_protos.h: changing iMesh_FCDefs.h to iBase_FCDefs.h;
removing iMesh_free function
tools/iMesh/Makefile.am: adding back testc_cbind; changing iMesh_FCDefs.h and
IMESH to iMesh; adding subdir named SIDL
tools/iMesh/iBase.h: adding iBase_Instance (needed by iRel)
Added: tools/iMesh/SIDL/[iMesh-SIDL-Defs.inc.in, Makefile.am], to bring
SIDL implementation under autotools control
tools/iMesh/iBase_f.h: added #define's for typedef names
configure.in: changed iMesh_FCDefs.h to iBase_FCDefs.h; added files in
tools/iMesh/SIDL to be autogenerated
Modified: MOAB/trunk/configure.in
===================================================================
--- MOAB/trunk/configure.in 2007-06-24 18:38:09 UTC (rev 1129)
+++ MOAB/trunk/configure.in 2007-06-24 23:03:47 UTC (rev 1130)
@@ -704,7 +704,7 @@
AC_ARG_VAR([FC], [FORTRAN compiler command])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_HEADERS([MBEntityHandle.h])
-AC_CONFIG_HEADERS([tools/iMesh/iMesh_FCDefs.h])
+AC_CONFIG_HEADERS([tools/iMesh/iBase_FCDefs.h])
AC_CONFIG_FILES([Makefile
moab.make
testdir.h
@@ -718,6 +718,8 @@
tools/hexmodops/Makefile
tools/iMesh/Makefile
tools/iMesh/iMesh-Defs.inc
+ tools/iMesh/SIDL/iMesh-SIDL-Defs.inc
+ tools/iMesh/SIDL/Makefile
tools/mbperf/Makefile
tools/mbchaco/Makefile
tools/mbzoltan/Config.moab
Modified: MOAB/trunk/tools/iMesh/Makefile.am
===================================================================
--- MOAB/trunk/tools/iMesh/Makefile.am 2007-06-24 18:38:09 UTC (rev 1129)
+++ MOAB/trunk/tools/iMesh/Makefile.am 2007-06-24 23:03:47 UTC (rev 1130)
@@ -5,7 +5,7 @@
DEFS += $(DEFINES)
# stuff for c test program
-#bin_PROGRAMS = testc_cbind
+bin_PROGRAMS = testc_cbind
testc_cbind_SOURCES = testc_cbind.c
LDADD = libiMesh.la $(top_builddir)/libMOAB.la
@@ -19,7 +19,7 @@
iMesh_protos.h \
iBase.h \
iBase_f.h \
- iMesh_FCDefs.h
+ iBase_FCDefs.h
lib_LTLIBRARIES = libiMesh.la
@@ -41,5 +41,13 @@
# directory until we're doing the install.
install-data-hook:
echo "MOAB_LIBDIR=${libdir}" >> $(DESTDIR)$(cfgdir)/iMesh-Defs.inc
- echo "IMESH_LIBDIR=${libdir}" >> $(DESTDIR)$(cfgdir)/iMesh-Defs.inc
- echo "IMESH_INCLUDEDIR=${includedir}" >> $(DESTDIR)$(cfgdir)/iMesh-Defs.inc
+ echo "iMesh_LIBDIR=${libdir}" >> $(DESTDIR)$(cfgdir)/iMesh-Defs.inc
+ echo "iMesh_INCLUDEDIR=${includedir}" >> $(DESTDIR)$(cfgdir)/iMesh-Defs.inc
+
+if USE_BABEL
+ babel_DIR = SIDL
+else
+ babel_DIR =
+endif
+
+SUBDIRS = $(babel_DIR)
Deleted: MOAB/trunk/tools/iMesh/SIDL/Makefile
===================================================================
--- MOAB/trunk/tools/iMesh/SIDL/Makefile 2007-06-24 18:38:09 UTC (rev 1129)
+++ MOAB/trunk/tools/iMesh/SIDL/Makefile 2007-06-24 23:03:47 UTC (rev 1130)
@@ -1,194 +0,0 @@
-#
-# Copyright 2006 Sandia Corporation. Under the terms of Contract
-# DE-AC04-94AL85000 with Sandia Coroporation, the U.S. Government
-# retains certain rights in this software.
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-#
-VPATH = mserver bserver Cclient F77client
-vpath = mserver bserver Cclient F77client
-
-include iMesh-Defs.inc
-
-default: all
-
-######## include make.Linux
-CXX = g++-4.2
-CXX_FLAGS_REQ = -fpic
-CXX_FLAGS_DBG = -g -Wall
-CXX_FLAGS_OPT = -O
-
-CC = gcc-4.2
-CC_FLAGS_REQ = -fpic
-CC_FLAGS_DBG = -g -Wall
-CC_FLAGS_OPT = -O
-
-FC = gfortran-4.2
-#FC = /usr/apps/pgi/3.3/linux86/bin/pgf77
-FC_FLAGS_REQ =
-FC_FLAGS_DBG = -g
-FC_FLAGS_OPT = -O
-
-MKDEP = gcc -E -Wp,-MM
-
-LD = $(CXX)
-LD_FLAGS_PIC = -fpic -shared
-LD_FLAGS_REQ =
-LD_FLAGS_DBG = -g
-LD_FLAGS_OPT = -O
-
-ARCHIVER = ar cr
-
-
-INCPATH = -I. ${iMesh_SIDL_SERVER_INCLUDES}
-
-
-CXX_FLAGS = $(CXX_FLAGS_REQ) $(CXX_FLAGS_DBG) $(INCPATH) ${iMesh_SIDL_CCLIENT_INCLUDES}
-CC_FLAGS = $(CC_FLAGS_REQ) $(CC_FLAGS_DBG) $(INCPATH) ${iMesh_SIDL_CCLIENT_INCLUDES}
-FC_FLAGS = $(FC_FLAGS_REQ) $(FC_FLAGS_DBG) $(INCPATH)
-LD_FLAGS = $(LD_FLAGS_REQ) $(LD_FLAGS_DBG) $(INCPATH)
-#LD_FLAGS = $(LD_FLAGS_REQ) $(LD_FLAGS_OPT) $(INCPATH)
-###########################################################
-
-include mserver/babel.make
-FACTORY_IMPL_HDRS :=
-FACTORY_IMPL_SRCS :=
-FACTORY_GEN_IOR_HDRS :=
-FACTORY_GEN_IOR_SRCS :=
-FACTORY_GEN_STUB_HDRS :=
-FACTORY_GEN_STUB_SRCS :=
-FACTORY_GEN_SKEL_SRCS :=
-FACTORY_GEN_HDRS := $(FACTORY_GEN_IOR_HDRS) $(FACTORY_GEN_STUB_HDRS)
-FACTORY_GEN_SRCS := $(FACTORY_GEN_IOR_SRCS) $(FACTORY_GEN_STUB_SRCS) $(FACTORY_GEN_SKEL_SRCS)
-FACTORY_OFILES := $(subst .cc,.o,$(FACTORY_GEN_SRCS) $(FACTORY_IMPL_SRCS))
-FACTORY_OFILES := $(subst .c,.o, $(FACTORY_OFILES))
-
-SERVER_IMPL_HDRS := $(filter-out iBase_Error_Impl.hh $(FACTORY_IMPL_HDRS),$(IMPLHDRS))
-SERVER_IMPL_SRCS := $(filter-out iBase_Error_Impl.cc $(FACTORY_IMPL_SRCS),$(IMPLSRCS))
-SERVER_GEN_IOR_HDRS := $(filter-out iBase_Error_IOR.h $(FACTORY_GEN_IOR_HDRS),$(IORHDRS))
-SERVER_GEN_IOR_SRCS := $(filter-out iBase_Error_IOR.c $(FACTORY_GEN_IOR_SRCS),$(IORSRCS))
-SERVER_GEN_STUB_HDRS := $(filter-out iBase_Error.hh $(FACTORY_GEN_STUB_HDRS),$(STUBHDRS))
-SERVER_GEN_STUB_SRCS := $(filter-out iBase_Error.cc $(FACTORY_GEN_STUB_SRCS),$(STUBSRCS))
-SERVER_GEN_SKEL_SRCS := $(filter-out iBase_Error_Skel.cc $(FACTORY_GEN_SKEL_SRCS),$(SKELSRCS))
-SERVER_GEN_HDRS := $(SERVER_GEN_IOR_HDRS) $(SERVER_GEN_STUB_HDRS)
-SERVER_GEN_SRCS := $(SERVER_GEN_IOR_SRCS) $(SERVER_GEN_STUB_SRCS) $(SERVER_GEN_SKEL_SRCS)
-SERVER_OFILES := $(subst .cc,.o,$(SERVER_GEN_SRCS) $(SERVER_IMPL_SRCS))
-SERVER_OFILES := $(subst .c,.o, $(SERVER_OFILES))
-
-SERVER_IMPL_OFILES =
-
-
--include Cclient/babel.make
-CCLIENT_GEN_HDRS := $(IORHDRS) $(STUBHDRS)
-CCLIENT_GEN_SRCS := $(STUBSRCS)
-CCLIENT_OFILES := $(subst .cc,.o,$(CCLIENT_GEN_SRCS))
-CCLIENT_OFILES := $(subst .c,.o, $(CCLIENT_OFILES))
-
--include F77client/babel.make
-F77CLIENT_GEN_HDRS := $(IORHDRS) $(STUBHDRS)
-F77CLIENT_GEN_SRCS := $(STUBSRCS)
-F77CLIENT_OFILES := $(subst .cc,.o,$(F77CLIENT_GEN_SRCS))
-F77CLIENT_OFILES := $(subst .c,.o, $(F77CLIENT_OFILES))
-
-all: testcxx
-# testc_cbind
-
-settings:
- @echo "FACTORY_OFILES = $(FACTORY_OFILES)"
- @echo "SERVER_OFILES = $(SERVER_OFILES)"
-
-#============= iBase =============
-include bserver/babel.make
-BSERVER_IMPL_HDRS := $(IMPLHDRS)
-BSERVER_IMPL_SRCS := $(IMPLSRCS)
-BSERVER_GEN_HDRS := $(IORHDRS) $(STUBHDRS)
-BSERVER_GEN_SRCS := $(IORSRCS) $(SKELSRCS) $(STUBSRCS)
-BSERVER_OFILES := $(subst .cc,.o,$(BSERVER_GEN_SRCS) $(BSERVER_IMPL_SRCS))
-BSERVER_OFILES := $(subst .c,.o, $(BSERVER_OFILES))
-
-repo/.btimestamp: iBase.sidl
- -rm -rf repo
- $(BABEL) -tXML -o repo iBase.sidl
- touch $@
-
-bserver/babel.make: repo/.btimestamp iBase.sidl
- -rm -f $@
- $(BABEL) -sC++ -o bserver iBase.sidl
-
-${iBase_DIR}/libiBaseserver.so: bserver/babel.make ${BSERVER_OFILES}
- $(LD) $(LD_FLAGS) $(LD_FLAGS_PIC) -o $@ ${BSERVER_OFILES}
-
-${iBase_DIR}/libiBaseserver.a: bserver/babel.make ${BSERVER_OFILES}
- $(ARCHIVER) $@ ${BSERVER_OFILES}
-
-#============= iBase =============
-
-repo/.mtimestamp: iMesh.sidl
- $(BABEL) -tXML -o repo -Rrepo iMesh.sidl
- touch $@
-
-mserver/babel.make: repo/.mtimestamp repo/.btimestamp iMesh_SIDL.sidl iMesh.sidl
- -rm -f $@
- $(BABEL) -R"repo" -sC++ -o mserver iMesh_SIDL.sidl
-
-Cclient: repo/.mtimestamp repo/.mtimestamp iMesh_SIDL.sidl
- -rm -rf Cclient
- $(BABEL) -R"repo" -cC -o Cclient iMesh_SIDL.sidl
-
-F77client: repo/.mtimestamp repo/.btimestamp iMesh_SIDL.sidl
- -rm -rf F77client
- $(BABEL) -R"repo" -cF77 -o F77client iMesh_SIDL.sidl
-
-${iMesh_DIR}/libiMesh.a: ${SERVER_IMPL_OFILES}
- $(ARCHIVER) $@ ${SERVER_IMPL_OFILES}
-
-${iMesh_DIR}/libiMeshserver.so: mserver/babel.make ${SERVER_OFILES} ${iBase_SIDL_SERVER_FILES}
- $(LD) $(LD_FLAGS) $(LD_FLAGS_PIC) -o $@ ${SERVER_OFILES} ${iMesh_SIDL_SERVER_LIBS}
-
-libiMeshCclient.so: Cclient ${CCLIENT_OFILES}
- $(LD) $(LD_FLAGS) $(LD_FLAGS_PIC) -o $@ ${CCLIENT_OFILES}
-
-libiMeshF77client.so: F77client ${F77CLIENT_OFILES}
- $(LD) $(LD_FLAGS) $(LD_FLAGS_PIC) -o $@ ${F77CLIENT_OFILES}
-
-Cclient/babel.make: Cclient
-
-F77client/babel.make: F77client
-
-testcxx: ${iMesh_SIDL_SERVER_FILES} ${iBase_SIDL_SERVER_FILES} testcxx.o
- $(LD) ${LD_FLAGS} -o $@ testcxx.o -Wl,-rpath,. -L. ${iMesh_SIDL_SERVER_LIBS}
-testc: libiMeshCclient.so ${iMesh_SIDL_SERVER_FILES} ${iMesh_SIDL_CCLIENT_FILES} testc.o
- $(LD) -o $@ testc.o -Wl,-rpath,. -L. ${iMesh_SIDL_CCLIENT_LIBS} \
- ${iMesh_SIDL_SERVER_LIBS}
-
-clean:
- -rm -f *.o *.so testc testcxx *~ core.*
-
-clean_all: clean
- -rm -rf F77client Cclient repo
- cd mserver; rm -f ${SERVER_GEN_HDRS} ${SERVER_GEN_SRCS}
-
-depend:
- ${MKDEP} -DIS_BUILDING_MB ${INCPATH} testc.c testcxx.cpp > make.dependencies
-
-
-%.o : %.cxx
- $(CXX) $(CXX_FLAGS) -o $@ -c $<
-
-%.o : %.cpp
- $(CXX) $(CXX_FLAGS) -o $@ -c $<
-
-%.o : %.cc
- $(CXX) $(CXX_FLAGS) -o $@ -c $<
-
-%.o : %.c
- $(CC) $(CC_FLAGS) -o $@ -c $<
-
-%.o : %.f
- $(FC) $(FC_FLAGS) -o $@ -c $<
-
-#include make.dependencies
Added: MOAB/trunk/tools/iMesh/SIDL/Makefile.am
===================================================================
--- MOAB/trunk/tools/iMesh/SIDL/Makefile.am (rev 0)
+++ MOAB/trunk/tools/iMesh/SIDL/Makefile.am 2007-06-24 23:03:47 UTC (rev 1130)
@@ -0,0 +1,146 @@
+include @abs_srcdir@/iMesh-SIDL-Defs.inc
+
+include mserver/babel.make
+SERVER_HDRS := iBase_ArrTag_IOR.h iBase_CreationStatus_IOR.h iBase_EntSet_IOR.h \
+ iBase_EntTag_IOR.h iBase_EntityType_IOR.h iBase_ErrorActions_IOR.h \
+ iBase_ErrorType_IOR.h iBase_IOR.h iBase_SetBoolOps_IOR.h \
+ iBase_SetRelation_IOR.h iBase_SetTag_IOR.h iBase_StorageOrder_IOR.h \
+ iBase_TagValueType_IOR.h iBase_Tag_IOR.h iMesh_AdjacencyInfo_IOR.h \
+ iMesh_ArrMod_IOR.h iMesh_Arr_IOR.h iMesh_EntityTopology_IOR.h \
+ iMesh_Entity_IOR.h iMesh_IOR.h iMesh_Mesh_IOR.h iMesh_Modify_IOR.h \
+ iMesh_SIDL_IOR.h iMesh_SIDL_MeshSidl_IOR.h \
+ iBase.hh iBase_ArrTag.hh iBase_CreationStatus.hh iBase_EntSet.hh \
+ iBase_EntTag.hh iBase_EntityType.hh iBase_ErrorActions.hh \
+ iBase_ErrorType.hh iBase_SetBoolOps.hh iBase_SetRelation.hh iBase_SetTag.hh \
+ iBase_StorageOrder.hh iBase_Tag.hh iBase_TagValueType.hh iMesh.hh \
+ iMesh_AdjacencyInfo.hh iMesh_Arr.hh iMesh_ArrMod.hh iMesh_Entity.hh \
+ iMesh_EntityTopology.hh iMesh_Mesh.hh iMesh_Modify.hh iMesh_SIDL.hh \
+ iMesh_SIDL_MeshSidl.hh sidl.hh sidl_BaseClass.hh sidl_BaseException.hh \
+ sidl_BaseInterface.hh sidl_ClassInfo.hh sidl_ClassInfoI.hh sidl_DFinder.hh \
+ sidl_DLL.hh sidl_Finder.hh sidl_InvViolation.hh sidl_Loader.hh \
+ sidl_PostViolation.hh sidl_PreViolation.hh sidl_Resolve.hh \
+ sidl_SIDLException.hh sidl_Scope.hh sidl_io.hh sidl_io_Deserializer.hh \
+ sidl_io_IOException.hh sidl_io_Serializeable.hh sidl_io_Serializer.hh \
+ sidl_rmi.hh sidl_rmi_ConnectRegistry.hh sidl_rmi_InstanceHandle.hh \
+ sidl_rmi_InstanceRegistry.hh sidl_rmi_Invocation.hh \
+ sidl_rmi_NetworkException.hh sidl_rmi_ProtocolFactory.hh \
+ sidl_rmi_Response.hh iMesh_SIDL_MeshSidl_Impl.hh iBase_Error_Impl.hh \
+ iBase_Error_IOR.h iBase_Error.hh
+SERVER_SRCS = iMesh_SIDL_MeshSidl_IOR.c \
+ iBase_ArrTag.cc iBase_EntSet.cc iBase_EntTag.cc \
+ iBase_SetBoolOps.cc iBase_SetRelation.cc iBase_SetTag.cc iBase_Tag.cc \
+ iMesh_Arr.cc iMesh_ArrMod.cc iMesh_Entity.cc iMesh_Mesh.cc iMesh_Modify.cc \
+ iMesh_SIDL_MeshSidl.cc sidl_BaseClass.cc sidl_BaseException.cc \
+ sidl_BaseInterface.cc sidl_ClassInfo.cc sidl_ClassInfoI.cc sidl_DFinder.cc \
+ sidl_DLL.cc sidl_Finder.cc sidl_InvViolation.cc sidl_Loader.cc \
+ sidl_PostViolation.cc sidl_PreViolation.cc sidl_SIDLException.cc \
+ sidl_io_Deserializer.cc sidl_io_IOException.cc sidl_io_Serializeable.cc \
+ sidl_io_Serializer.cc sidl_rmi_ConnectRegistry.cc \
+ sidl_rmi_InstanceHandle.cc sidl_rmi_InstanceRegistry.cc \
+ sidl_rmi_Invocation.cc sidl_rmi_NetworkException.cc \
+ sidl_rmi_ProtocolFactory.cc sidl_rmi_Response.cc iMesh_SIDL_MeshSidl_Skel.cc \
+ iMesh_SIDL_MeshSidl_Impl.cc iBase_Error_Impl.cc iBase_Error_IOR.c \
+ iBase_Error_Skel.cc iBase_Error.cc
+SERVER_OFILES = iMesh_SIDL_MeshSidl_IOR.o \
+ iBase_ArrTag.o iBase_EntSet.o iBase_EntTag.o \
+ iBase_SetBoolOps.o iBase_SetRelation.o iBase_SetTag.o iBase_Tag.o \
+ iMesh_Arr.o iMesh_ArrMod.o iMesh_Entity.o iMesh_Mesh.o iMesh_Modify.o \
+ iMesh_SIDL_MeshSidl.o sidl_BaseClass.o sidl_BaseException.o \
+ sidl_BaseInterface.o sidl_ClassInfo.o sidl_ClassInfoI.o sidl_DFinder.o \
+ sidl_DLL.o sidl_Finder.o sidl_InvViolation.o sidl_Loader.o \
+ sidl_PostViolation.o sidl_PreViolation.o sidl_SIDLException.o \
+ sidl_io_Deserializer.o sidl_io_IOException.o sidl_io_Serializeable.o \
+ sidl_io_Serializer.o sidl_rmi_ConnectRegistry.o \
+ sidl_rmi_InstanceHandle.o sidl_rmi_InstanceRegistry.o \
+ sidl_rmi_Invocation.o sidl_rmi_NetworkException.o \
+ sidl_rmi_ProtocolFactory.o sidl_rmi_Response.o iMesh_SIDL_MeshSidl_Skel.o \
+ iMesh_SIDL_MeshSidl_Impl.o iBase_Error_Impl.o iBase_Error_IOR.o \
+ iBase_Error_Skel.o iBase_Error.o
+
+
+all: testcxx
+# testc_cbind
+
+settings:
+ @echo "FACTORY_OFILES = $(FACTORY_OFILES)"
+ @echo "SERVER_OFILES = $(SERVER_OFILES)"
+
+#============= iBase =============
+repo/.btimestamp: iBase.sidl
+ -rm -rf repo
+ @BABEL_DIR@/bin/babel -tXML -o repo iBase.sidl
+ touch $@
+
+bserver/babel.make: repo/.btimestamp iBase.sidl
+ -rm -f $@
+ @BABEL_DIR@/bin/babel -sC++ -o bserver iBase.sidl
+
+#============= iBase =============
+
+repo/.mtimestamp: iMesh.sidl
+ @BABEL_DIR@/bin/babel -tXML -o repo -Rrepo iMesh.sidl
+ touch $@
+
+mserver/babel.make: repo/.mtimestamp repo/.btimestamp iMesh_SIDL.sidl iMesh.sidl
+ -rm -f $@
+ @BABEL_DIR@/bin/babel -R"repo" -sC++ -o mserver iMesh_SIDL.sidl
+
+Cclient: repo/.mtimestamp repo/.mtimestamp iMesh_SIDL.sidl
+ -rm -rf Cclient
+ @BABEL_DIR@/bin/babel -R"repo" -cC -o Cclient iMesh_SIDL.sidl
+
+F77client: repo/.mtimestamp repo/.btimestamp iMesh_SIDL.sidl
+ -rm -rf F77client
+ @BABEL_DIR@/bin/babel -R"repo" -cF77 -o F77client iMesh_SIDL.sidl
+
+${iMesh_DIR}/libiMeshserver.so: mserver/babel.make ${SERVER_OFILES}
+ $(LD) $(LD_FLAGS) $(LD_FLAGS_PIC) -o $@ ${SERVER_OFILES}
+
+libiMeshCclient.so: Cclient ${CCLIENT_OFILES}
+ $(LD) $(LD_FLAGS) $(LD_FLAGS_PIC) -o $@ ${CCLIENT_OFILES}
+
+libiMeshF77client.so: F77client ${F77CLIENT_OFILES}
+ $(LD) $(LD_FLAGS) $(LD_FLAGS_PIC) -o $@ ${F77CLIENT_OFILES}
+
+Cclient/babel.make: Cclient
+
+F77client/babel.make: F77client
+
+testcxx: ${iMesh_SIDL_FILES} testcxx.o
+ $(LD) ${LD_FLAGS} -o $@ testcxx.o -Wl,-rpath,. -L. ${iMesh_SIDL_LIBS}
+
+clean:
+ -rm -f *.o *.so testc testcxx *~ core.*
+
+clean_all: clean
+ -rm -rf F77client Cclient repo
+ cd mserver; rm -f ${SERVER_HDRS} ${SERVER_SRCS}
+
+%.o : %.cxx
+ $(CXX) $(CXX_FLAGS) ${iMesh_SIDL_INCLUDES} -o $@ -c $<
+
+%.o : %.cpp
+ $(CXX) $(CXX_FLAGS) ${iMesh_SIDL_INCLUDES} -o $@ -c $<
+
+%.o : %.cc
+ $(CXX) $(CXX_FLAGS) ${iMesh_SIDL_INCLUDES} -o $@ -c $<
+
+%.o : %.c
+ $(CC) $(CC_FLAGS) ${iMesh_SIDL_INCLUDES} -o $@ -c $<
+
+%.o : %.f
+ $(FC) $(FC_FLAGS) ${iMesh_SIDL_INCLUDES} -o $@ -c $<
+
+# By default, iMesh-SIDL-Defs.inc will define these to $(srcdir). We
+# want to override that during the INSTALL of the file so
+# that the correct values are set (e.g. if someone does
+# 'make prefix=/foo install', we don't know the correct install
+# directory until we're doing the install.
+cfgdir = $(libdir)
+install-data-hook:
+ echo "iMesh_DIR=${DESTDIR}" >> $(DESTDIR)$(cfgdir)/iMesh-SIDL-Defs.inc
+ echo "iMesh_SIDLLIBDIR=${libdir}" >> $(DESTDIR)$(cfgdir)/iMesh-SIDL-Defs.inc
+ echo "iMesh_SIDLINCLUDEDIR=${includedir}/SIDL" >> $(DESTDIR)$(cfgdir)/iMesh-SIDL-Defs.inc
+ (cd mserver; install -d ${includedir}/SIDL; install -t ${includedir}/SIDL ${SERVER_HDRS})
+
+#include make.dependencies
Property changes on: MOAB/trunk/tools/iMesh/SIDL/bserver
___________________________________________________________________
Name: svn:ignore
- iBase_SetBoolOps.cc
babel.make
sidl_Scope.hh
sidl_PostViolation.hh
sidl_DLL.hh
iBase_EntTag_IOR.h
iBase_Error_IOR.c
sidl_Resolve.hh
sidl_rmi_ConnectRegistry.cc
sidl.hh
iBase_SetTag_IOR.h
sidl_ClassInfoI.cc
sidl_InvViolation.hh
iBase_Error.hh
iBase_SetRelation.hh
iBase_SetRelation_IOR.h
iBase_Error_IOR.h
sidl_rmi.hh
iBase_StorageOrder.hh
sidl_BaseException.hh
sidl_rmi_Response.cc
sidl_Loader.cc
sidl_Finder.cc
sidl_SIDLException.cc
sidl_rmi_ProtocolFactory.hh
sidl_BaseClass.hh
iBase_CreationStatus.hh
sidl_PreViolation.cc
iBase_ErrorActions.hh
babel.make.package
iBase_Tag.hh
iBase_SetTag.cc
iBase_ArrTag.hh
iBase_EntTag.hh
sidl_rmi_InstanceHandle.cc
iBase_SetBoolOps.hh
iBase_SetBoolOps_IOR.h
iBase_ErrorType.hh
iBase_Error_Skel.cc
iBase_StorageOrder_IOR.h
sidl_rmi_ConnectRegistry.hh
sidl_ClassInfoI.hh
sidl_io_Deserializer.cc
sidl_DFinder.cc
iBase_CreationStatus_IOR.h
sidl_io_IOException.cc
sidl_rmi_NetworkException.cc
sidl_rmi_Response.hh
sidl_rmi_Invocation.cc
sidl_Loader.hh
sidl_ClassInfo.cc
sidl_io.hh
sidl_Finder.hh
iBase_EntityType_IOR.h
iBase.hh
iBase_ArrTag_IOR.h
sidl_SIDLException.hh
sidl_PreViolation.hh
iBase_SetTag.hh
iBase_EntSet.cc
sidl_BaseInterface.cc
sidl_io_Serializer.cc
sidl_rmi_InstanceHandle.hh
sidl_io_Serializeable.cc
babel.make.depends
sidl_rmi_InstanceRegistry.cc
iBase_EntSet_IOR.h
sidl_PostViolation.cc
sidl_DLL.cc
iBase_TagValueType_IOR.h
iBase_Tag_IOR.h
iBase_EntityType.hh
sidl_InvViolation.cc
iBase_Error.cc
iBase_SetRelation.cc
sidl_io_Deserializer.hh
iBase_IOR.h
sidl_DFinder.hh
sidl_io_IOException.hh
sidl_rmi_NetworkException.hh
sidl_BaseException.cc
sidl_rmi_Invocation.hh
sidl_ClassInfo.hh
iBase_ErrorType_IOR.h
sidl_rmi_ProtocolFactory.cc
sidl_BaseClass.cc
iBase_Tag.cc
iBase_EntSet.hh
sidl_BaseInterface.hh
iBase_ArrTag.cc
iBase_EntTag.cc
sidl_io_Serializer.hh
sidl_io_Serializeable.hh
iBase_TagValueType.hh
iBase_ErrorActions_IOR.h
sidl_rmi_InstanceRegistry.hh
+ iBase_Error_Impl.hh
iBase_Error_Impl.cc
iBase_SetBoolOps.cc
babel.make
sidl_Scope.hh
sidl_PostViolation.hh
sidl_DLL.hh
iBase_EntTag_IOR.h
iBase_Error_IOR.c
sidl_Resolve.hh
sidl_rmi_ConnectRegistry.cc
sidl.hh
iBase_SetTag_IOR.h
sidl_ClassInfoI.cc
sidl_InvViolation.hh
iBase_Error.hh
iBase_SetRelation.hh
iBase_SetRelation_IOR.h
iBase_Error_IOR.h
sidl_rmi.hh
iBase_StorageOrder.hh
sidl_BaseException.hh
sidl_rmi_Response.cc
sidl_Loader.cc
sidl_Finder.cc
sidl_SIDLException.cc
sidl_rmi_ProtocolFactory.hh
sidl_BaseClass.hh
iBase_CreationStatus.hh
sidl_PreViolation.cc
iBase_ErrorActions.hh
babel.make.package
iBase_Tag.hh
iBase_SetTag.cc
iBase_ArrTag.hh
iBase_EntTag.hh
sidl_rmi_InstanceHandle.cc
iBase_SetBoolOps.hh
iBase_SetBoolOps_IOR.h
iBase_ErrorType.hh
iBase_Error_Skel.cc
iBase_StorageOrder_IOR.h
sidl_rmi_ConnectRegistry.hh
sidl_ClassInfoI.hh
sidl_io_Deserializer.cc
sidl_DFinder.cc
iBase_CreationStatus_IOR.h
sidl_io_IOException.cc
sidl_rmi_NetworkException.cc
sidl_rmi_Response.hh
sidl_rmi_Invocation.cc
sidl_Loader.hh
sidl_ClassInfo.cc
sidl_io.hh
sidl_Finder.hh
iBase_EntityType_IOR.h
iBase.hh
iBase_ArrTag_IOR.h
sidl_SIDLException.hh
sidl_PreViolation.hh
iBase_SetTag.hh
iBase_EntSet.cc
sidl_BaseInterface.cc
sidl_io_Serializer.cc
sidl_rmi_InstanceHandle.hh
sidl_io_Serializeable.cc
babel.make.depends
sidl_rmi_InstanceRegistry.cc
iBase_EntSet_IOR.h
sidl_PostViolation.cc
sidl_DLL.cc
iBase_TagValueType_IOR.h
iBase_Tag_IOR.h
iBase_EntityType.hh
sidl_InvViolation.cc
iBase_Error.cc
iBase_SetRelation.cc
sidl_io_Deserializer.hh
iBase_IOR.h
sidl_DFinder.hh
sidl_io_IOException.hh
sidl_rmi_NetworkException.hh
sidl_BaseException.cc
sidl_rmi_Invocation.hh
sidl_ClassInfo.hh
iBase_ErrorType_IOR.h
sidl_rmi_ProtocolFactory.cc
sidl_BaseClass.cc
iBase_Tag.cc
iBase_EntSet.hh
sidl_BaseInterface.hh
iBase_ArrTag.cc
iBase_EntTag.cc
sidl_io_Serializer.hh
sidl_io_Serializeable.hh
iBase_TagValueType.hh
iBase_ErrorActions_IOR.h
sidl_rmi_InstanceRegistry.hh
Modified: MOAB/trunk/tools/iMesh/SIDL/bserver/iBase_Error_Impl.cc
===================================================================
--- MOAB/trunk/tools/iMesh/SIDL/bserver/iBase_Error_Impl.cc 2007-06-24 18:38:09 UTC (rev 1129)
+++ MOAB/trunk/tools/iMesh/SIDL/bserver/iBase_Error_Impl.cc 2007-06-24 23:03:47 UTC (rev 1130)
@@ -3,8 +3,8 @@
// Symbol: iBase.Error-v0.7
// Symbol Type: class
// Babel Version: 0.10.12
-// sidl Created: 20070619 14:48:48 CDT
-// Generated: 20070619 14:48:53 CDT
+// sidl Created: 20070624 16:06:56 CDT
+// Generated: 20070624 16:07:02 CDT
// Description: Server-side implementation for iBase.Error
//
// WARNING: Automatically generated; only changes within splicers preserved
Modified: MOAB/trunk/tools/iMesh/SIDL/bserver/iBase_Error_Impl.hh
===================================================================
--- MOAB/trunk/tools/iMesh/SIDL/bserver/iBase_Error_Impl.hh 2007-06-24 18:38:09 UTC (rev 1129)
+++ MOAB/trunk/tools/iMesh/SIDL/bserver/iBase_Error_Impl.hh 2007-06-24 23:03:47 UTC (rev 1130)
@@ -3,8 +3,8 @@
// Symbol: iBase.Error-v0.7
// Symbol Type: class
// Babel Version: 0.10.12
-// sidl Created: 20070619 14:48:48 CDT
-// Generated: 20070619 14:48:53 CDT
+// sidl Created: 20070624 16:06:56 CDT
+// Generated: 20070624 16:07:02 CDT
// Description: Server-side implementation for iBase.Error
//
// WARNING: Automatically generated; only changes within splicers preserved
Deleted: MOAB/trunk/tools/iMesh/SIDL/iBase-Defs.inc
===================================================================
--- MOAB/trunk/tools/iMesh/SIDL/iBase-Defs.inc 2007-06-24 18:38:09 UTC (rev 1129)
+++ MOAB/trunk/tools/iMesh/SIDL/iBase-Defs.inc 2007-06-24 23:03:47 UTC (rev 1130)
@@ -1,23 +0,0 @@
-#
-# Copyright 2006 Sandia Corporation. Under the terms of Contract
-# DE-AC04-94AL85000 with Sandia Coroporation, the U.S. Government
-# retains certain rights in this software.
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-#
-include ${ITAPS_SIDL_DIR}/Itaps-Defs.inc
-
-iBase_SIDL_SERVER_INCLUDES = \
- -I${iBase_DIR} -I${iBase_DIR}/bserver -I${SIDLDIR}/include
-
-iBase_SIDL_SERVER_LIBS = \
- -L${iBase_DIR} -liBaseserver -L$(SIDLDIR)/lib -lsidl \
- -Wl,-rpath,${iBase_DIR} -Wl,-rpath,${SIDLDIR}/lib
-
-iBase_SIDL_SERVER_FILES = \
- ${iBase_DIR}/libiBaseserver.so
-
Deleted: MOAB/trunk/tools/iMesh/SIDL/iMesh-Defs.inc
===================================================================
--- MOAB/trunk/tools/iMesh/SIDL/iMesh-Defs.inc 2007-06-24 18:38:09 UTC (rev 1129)
+++ MOAB/trunk/tools/iMesh/SIDL/iMesh-Defs.inc 2007-06-24 23:03:47 UTC (rev 1130)
@@ -1,29 +0,0 @@
-include ${ITAPS_SIDL_DIR}/Itaps-Defs.inc
-
-#=========================================
-# specify implementation includes/libs here
-
-iMesh_IMPL_DIR=${HOME}/MOAB_gcc4.2
-include ${iMesh_IMPL_DIR}/lib/moab.make
-include ${iMesh_IMPL_DIR}/lib/iMesh-Defs.inc
-iMesh_IMPL_LIBS = ${IMESH_LIBS_LINK}
-iMesh_IMPL_INCLUDES = ${IMESH_INCLUDES}
-#=========================================
-
-include ${iBase_DIR}/iBase-Defs.inc
-
-iMesh_SIDL_SERVER_LIBS = \
- -L${iMesh_DIR} -liMeshserver -Wl,-rpath,${iMesh_DIR} \
- ${iBase_SIDL_SERVER_LIBS} \
- ${iMesh_IMPL_LIBS}
-
-iMesh_SIDL_SERVER_FILES = \
- ${iMesh_DIR}/libiMeshserver.so ${iBase_SIDL_SERVER_FILES}
-
-iMesh_SIDL_SERVER_INCLUDES = \
- -I${iMesh_DIR}/mserver ${iBase_SIDL_SERVER_INCLUDES} ${iMesh_IMPL_INCLUDES}
-
-iMesh_SIDL_CCLIENT_INCLUDES = -I${iMesh_DIR}/Cclient \
- ${iBase_SIDL_CCLIENT_INCLUDES}
-iMesh_SIDL_CCLIENT_FILES = libiMeshCclient.so ${iBase_SIDL_CCLIENT_FILES}
-iMesh_SIDL_CCLIENT_LIBS = -L${iMesh_DIR} -liMeshCclient
Added: MOAB/trunk/tools/iMesh/SIDL/iMesh-SIDL-Defs.inc.in
===================================================================
--- MOAB/trunk/tools/iMesh/SIDL/iMesh-SIDL-Defs.inc.in (rev 0)
+++ MOAB/trunk/tools/iMesh/SIDL/iMesh-SIDL-Defs.inc.in 2007-06-24 23:03:47 UTC (rev 1130)
@@ -0,0 +1,18 @@
+iMesh_DIR = @abs_srcdir@/..
+
+include ${iMesh_DIR}/iMesh-Defs.inc
+
+iMesh_SIDLINCLUDEDIR = @abs_srcdir@
+iMesh_SIDLLIBDIR = @abs_builddir@
+
+iMesh_SIDL_INCLUDES = \
+ -I${iMesh_SIDLINCLUDEDIR} -I${iMesh_SIDLINCLUDEDIR}/SIDL -I${iMesh_SIDLINCLUDEDIR}/SIDL/bserver \
+ -I${iMesh_SIDLINCLUDEDIR}/SIDL/mserver -I at BABEL_DIR@/include ${iMesh_INCLUDES}
+
+iMesh_SIDL_LIBS = \
+ -L${iMesh_SIDLLIBDIR} -liMeshserver -L at BABEL_DIR@/lib -lsidl \
+ -Wl,-rpath,${iMesh_SIDLLIBDIR} -Wl,-rpath,${iMesh_SIDLLIBDIR} -Wl,-rpath, at BABEL_DIR@/lib ${IMESH_LIBS_LINK}
+
+iMesh_SIDL_FILES = \
+ ${iMesh_SIDLLIBDIR}/libiMeshserver.so
+
Property changes on: MOAB/trunk/tools/iMesh/SIDL/mserver
___________________________________________________________________
Name: svn:ignore
- iMesh_SIDL_IOR.h
sidl_Scope.hh
sidl_PostViolation.hh
sidl_DLL.hh
iBase_EntTag_IOR.h
sidl_Resolve.hh
iBase_SetTag_IOR.h
iBase_SetRelation.hh
iBase_SetRelation_IOR.h
iMesh_Modify.cc
iMesh_EntityType.hh
iBase_StorageOrder.hh
sidl_rmi_Response.cc
iMesh_IOR.h
sidl_Finder.cc
sidl_BaseClass.hh
iMesh_SIDL_MeshSidl_Skel.cc
sidl_PreViolation.cc
babel.make.package
iBase_Tag.hh
iBase_SetTag.cc
sidl_rmi_InstanceHandle.cc
iBase_SetBoolOps.hh
iBase_SetBoolOps_IOR.h
iBase_ErrorType.hh
iMesh_ArrMod.cc
iMesh_Arr.cc
iBase_Error_Skel.cc
sidl_rmi_ConnectRegistry.hh
sidl_ClassInfoI.hh
iMesh_Mesh.cc
sidl_io_Deserializer.cc
sidl_DFinder.cc
iBase_CreationStatus_IOR.h
sidl_io_IOException.cc
sidl_rmi_Invocation.cc
sidl_Loader.hh
sidl_ClassInfo.cc
iBase_EntityType_IOR.h
iBase_ArrTag_IOR.h
iMesh_StorageOrder.hh
sidl_SIDLException.hh
iMesh_Entity.cc
iBase_EntSet.cc
iMesh_CreationStatus.hh
iMesh_SIDL_MeshSidl.cc
iMesh_EntityTopology_IOR.h
sidl_rmi_InstanceRegistry.cc
iBase_EntSet_IOR.h
sidl_PostViolation.cc
sidl_DLL.cc
iBase_EntityType.hh
iBase_SetRelation.cc
iMesh_AdjacencyInfo.hh
iBase_IOR.h
sidl_rmi_NetworkException.hh
sidl_BaseClass.cc
iMesh_SIDL_MeshSidl_IOR.c
iBase_Tag.cc
sidl_BaseInterface.hh
iMesh_SIDL_MeshSidl_IOR.h
sidl_io_Serializer.hh
iBase_TagValueType.hh
sidl_io_Serializeable.hh
iMesh_SIDL.hh
iBase_SetBoolOps.cc
babel.make
iBase_Error_IOR.c
sidl_rmi_ConnectRegistry.cc
sidl_ClassInfoI.cc
sidl.hh
iBase_Error.hh
sidl_InvViolation.hh
iBase_Error_IOR.h
iMesh_EntityTopology.hh
sidl_rmi.hh
sidl_BaseException.hh
sidl_Loader.cc
sidl_rmi_ProtocolFactory.hh
sidl_SIDLException.cc
iBase_CreationStatus.hh
iBase_ErrorActions.hh
iBase_ArrTag.hh
iMesh_AdjacencyInfo_IOR.h
iBase_EntTag.hh
iMesh_StorageOrder_IOR.h
iMesh_CreationStatus_IOR.h
iBase_StorageOrder_IOR.h
iMesh_EntityType_IOR.h
iMesh.hh
iMesh_ArrMod_IOR.h
iMesh_Arr_IOR.h
iMesh_Modify.hh
iMesh_Modify_IOR.h
sidl_rmi_Response.hh
sidl_rmi_NetworkException.cc
sidl_Finder.hh
iMesh_Mesh_IOR.h
sidl_io.hh
iBase.hh
sidl_PreViolation.hh
iBase_SetTag.hh
sidl_BaseInterface.cc
sidl_io_Serializer.cc
sidl_rmi_InstanceHandle.hh
iMesh_Entity_IOR.h
sidl_io_Serializeable.cc
babel.make.depends
iMesh_ArrMod.hh
iMesh_Arr.hh
iBase_TagValueType_IOR.h
iBase_Tag_IOR.h
iMesh_Mesh.hh
iBase_Error.cc
sidl_InvViolation.cc
sidl_io_Deserializer.hh
sidl_DFinder.hh
sidl_io_IOException.hh
sidl_BaseException.cc
sidl_rmi_Invocation.hh
sidl_ClassInfo.hh
iBase_ErrorType_IOR.h
iMesh_Entity.hh
sidl_rmi_ProtocolFactory.cc
iBase_EntSet.hh
iMesh_SIDL_MeshSidl.hh
iBase_ArrTag.cc
iBase_EntTag.cc
iBase_ErrorActions_IOR.h
sidl_rmi_InstanceRegistry.hh
+ iMesh_SIDL_MeshSidl_Impl.hh
iMesh_SIDL_MeshSidl_Impl.cc
iBase_Error_Impl.cc
iBase_Error_Impl.hh
iMesh_SIDL_IOR.h
sidl_Scope.hh
sidl_PostViolation.hh
sidl_DLL.hh
iBase_EntTag_IOR.h
sidl_Resolve.hh
iBase_SetTag_IOR.h
iBase_SetRelation.hh
iBase_SetRelation_IOR.h
iMesh_Modify.cc
iMesh_EntityType.hh
iBase_StorageOrder.hh
sidl_rmi_Response.cc
iMesh_IOR.h
sidl_Finder.cc
sidl_BaseClass.hh
iMesh_SIDL_MeshSidl_Skel.cc
sidl_PreViolation.cc
babel.make.package
iBase_Tag.hh
iBase_SetTag.cc
sidl_rmi_InstanceHandle.cc
iBase_SetBoolOps.hh
iBase_SetBoolOps_IOR.h
iBase_ErrorType.hh
iMesh_ArrMod.cc
iMesh_Arr.cc
iBase_Error_Skel.cc
sidl_rmi_ConnectRegistry.hh
sidl_ClassInfoI.hh
iMesh_Mesh.cc
sidl_io_Deserializer.cc
sidl_DFinder.cc
iBase_CreationStatus_IOR.h
sidl_io_IOException.cc
sidl_rmi_Invocation.cc
sidl_Loader.hh
sidl_ClassInfo.cc
iBase_EntityType_IOR.h
iBase_ArrTag_IOR.h
iMesh_StorageOrder.hh
sidl_SIDLException.hh
iMesh_Entity.cc
iBase_EntSet.cc
iMesh_CreationStatus.hh
iMesh_SIDL_MeshSidl.cc
iMesh_EntityTopology_IOR.h
sidl_rmi_InstanceRegistry.cc
iBase_EntSet_IOR.h
sidl_PostViolation.cc
sidl_DLL.cc
iBase_EntityType.hh
iBase_SetRelation.cc
iMesh_AdjacencyInfo.hh
iBase_IOR.h
sidl_rmi_NetworkException.hh
sidl_BaseClass.cc
iMesh_SIDL_MeshSidl_IOR.c
iBase_Tag.cc
sidl_BaseInterface.hh
iMesh_SIDL_MeshSidl_IOR.h
sidl_io_Serializer.hh
iBase_TagValueType.hh
sidl_io_Serializeable.hh
iMesh_SIDL.hh
iBase_SetBoolOps.cc
babel.make
iBase_Error_IOR.c
sidl_rmi_ConnectRegistry.cc
sidl_ClassInfoI.cc
sidl.hh
iBase_Error.hh
sidl_InvViolation.hh
iBase_Error_IOR.h
iMesh_EntityTopology.hh
sidl_rmi.hh
sidl_BaseException.hh
sidl_Loader.cc
sidl_rmi_ProtocolFactory.hh
sidl_SIDLException.cc
iBase_CreationStatus.hh
iBase_ErrorActions.hh
iBase_ArrTag.hh
iMesh_AdjacencyInfo_IOR.h
iBase_EntTag.hh
iMesh_StorageOrder_IOR.h
iMesh_CreationStatus_IOR.h
iBase_StorageOrder_IOR.h
iMesh_EntityType_IOR.h
iMesh.hh
iMesh_ArrMod_IOR.h
iMesh_Arr_IOR.h
iMesh_Modify.hh
iMesh_Modify_IOR.h
sidl_rmi_Response.hh
sidl_rmi_NetworkException.cc
sidl_Finder.hh
iMesh_Mesh_IOR.h
sidl_io.hh
iBase.hh
sidl_PreViolation.hh
iBase_SetTag.hh
sidl_BaseInterface.cc
sidl_io_Serializer.cc
sidl_rmi_InstanceHandle.hh
iMesh_Entity_IOR.h
sidl_io_Serializeable.cc
babel.make.depends
iMesh_ArrMod.hh
iMesh_Arr.hh
iBase_TagValueType_IOR.h
iBase_Tag_IOR.h
iMesh_Mesh.hh
iBase_Error.cc
sidl_InvViolation.cc
sidl_io_Deserializer.hh
sidl_DFinder.hh
sidl_io_IOException.hh
sidl_BaseException.cc
sidl_rmi_Invocation.hh
sidl_ClassInfo.hh
iBase_ErrorType_IOR.h
iMesh_Entity.hh
sidl_rmi_ProtocolFactory.cc
iBase_EntSet.hh
iMesh_SIDL_MeshSidl.hh
iBase_ArrTag.cc
iBase_EntTag.cc
iBase_ErrorActions_IOR.h
sidl_rmi_InstanceRegistry.hh
Modified: MOAB/trunk/tools/iMesh/SIDL/mserver/iBase_Error_Impl.cc
===================================================================
--- MOAB/trunk/tools/iMesh/SIDL/mserver/iBase_Error_Impl.cc 2007-06-24 18:38:09 UTC (rev 1129)
+++ MOAB/trunk/tools/iMesh/SIDL/mserver/iBase_Error_Impl.cc 2007-06-24 23:03:47 UTC (rev 1130)
@@ -3,8 +3,8 @@
// Symbol: iBase.Error-v0.7
// Symbol Type: class
// Babel Version: 0.10.12
-// sidl Created: 20070619 14:48:41 CDT
-// Generated: 20070619 14:49:26 CDT
+// sidl Created: 20070624 16:06:51 CDT
+// Generated: 20070624 16:07:38 CDT
// Description: Server-side implementation for iBase.Error
//
// WARNING: Automatically generated; only changes within splicers preserved
Modified: MOAB/trunk/tools/iMesh/SIDL/mserver/iBase_Error_Impl.hh
===================================================================
--- MOAB/trunk/tools/iMesh/SIDL/mserver/iBase_Error_Impl.hh 2007-06-24 18:38:09 UTC (rev 1129)
+++ MOAB/trunk/tools/iMesh/SIDL/mserver/iBase_Error_Impl.hh 2007-06-24 23:03:47 UTC (rev 1130)
@@ -3,8 +3,8 @@
// Symbol: iBase.Error-v0.7
// Symbol Type: class
// Babel Version: 0.10.12
-// sidl Created: 20070619 14:48:41 CDT
-// Generated: 20070619 14:49:26 CDT
+// sidl Created: 20070624 16:06:51 CDT
+// Generated: 20070624 16:07:38 CDT
// Description: Server-side implementation for iBase.Error
//
// WARNING: Automatically generated; only changes within splicers preserved
Modified: MOAB/trunk/tools/iMesh/SIDL/mserver/iMesh_SIDL_MeshSidl_Impl.cc
===================================================================
--- MOAB/trunk/tools/iMesh/SIDL/mserver/iMesh_SIDL_MeshSidl_Impl.cc 2007-06-24 18:38:09 UTC (rev 1129)
+++ MOAB/trunk/tools/iMesh/SIDL/mserver/iMesh_SIDL_MeshSidl_Impl.cc 2007-06-24 23:03:47 UTC (rev 1130)
@@ -3,14 +3,14 @@
// Symbol: iMesh_SIDL.MeshSidl-v0.2
// Symbol Type: class
// Babel Version: 0.10.12
-// sidl Created: 20070619 14:49:21 CDT
-// Generated: 20070619 14:49:27 CDT
+// sidl Created: 20070624 16:07:30 CDT
+// Generated: 20070624 16:07:39 CDT
// Description: Server-side implementation for iMesh_SIDL.MeshSidl
//
// WARNING: Automatically generated; only changes within splicers preserved
//
// babel-version = 0.10.12
-// source-line = 16
+// source-line = 5
// source-url = file:/home/tautges/MOAB/tools/iMesh/SIDL/iMesh_SIDL.sidl
//
#include "iMesh_SIDL_MeshSidl_Impl.hh"
Modified: MOAB/trunk/tools/iMesh/SIDL/mserver/iMesh_SIDL_MeshSidl_Impl.hh
===================================================================
--- MOAB/trunk/tools/iMesh/SIDL/mserver/iMesh_SIDL_MeshSidl_Impl.hh 2007-06-24 18:38:09 UTC (rev 1129)
+++ MOAB/trunk/tools/iMesh/SIDL/mserver/iMesh_SIDL_MeshSidl_Impl.hh 2007-06-24 23:03:47 UTC (rev 1130)
@@ -3,14 +3,14 @@
// Symbol: iMesh_SIDL.MeshSidl-v0.2
// Symbol Type: class
// Babel Version: 0.10.12
-// sidl Created: 20070619 14:49:21 CDT
-// Generated: 20070619 14:49:27 CDT
+// sidl Created: 20070624 16:07:30 CDT
+// Generated: 20070624 16:07:38 CDT
// Description: Server-side implementation for iMesh_SIDL.MeshSidl
//
// WARNING: Automatically generated; only changes within splicers preserved
//
// babel-version = 0.10.12
-// source-line = 16
+// source-line = 5
// source-url = file:/home/tautges/MOAB/tools/iMesh/SIDL/iMesh_SIDL.sidl
//
Modified: MOAB/trunk/tools/iMesh/iBase.h
===================================================================
--- MOAB/trunk/tools/iMesh/iBase.h 2007-06-24 18:38:09 UTC (rev 1129)
+++ MOAB/trunk/tools/iMesh/iBase.h 2007-06-24 23:03:47 UTC (rev 1130)
@@ -15,6 +15,7 @@
* TYPEDEF'S
*==========================================================
*/
+ typedef void* iBase_Instance;
typedef void* iBase_EntityHandle;
typedef void* iBase_EntitySetHandle;
typedef void* iBase_TagHandle;
Added: MOAB/trunk/tools/iMesh/iBase_FCDefs.h.in
===================================================================
--- MOAB/trunk/tools/iMesh/iBase_FCDefs.h.in (rev 0)
+++ MOAB/trunk/tools/iMesh/iBase_FCDefs.h.in 2007-06-24 23:03:47 UTC (rev 1130)
@@ -0,0 +1,7 @@
+
+/* Define to a macro mangling the given C identifier (in lower and upper
+ case), which must not contain underscores, for linking with Fortran. */
+#undef FC_FUNC
+
+/* As FC_FUNC, but for C identifiers containing underscores. */
+#undef FC_FUNC_
Modified: MOAB/trunk/tools/iMesh/iBase_f.h
===================================================================
--- MOAB/trunk/tools/iMesh/iBase_f.h 2007-06-24 18:38:09 UTC (rev 1129)
+++ MOAB/trunk/tools/iMesh/iBase_f.h 2007-06-24 23:03:47 UTC (rev 1130)
@@ -1,5 +1,10 @@
#ifndef IBASE_F_H
#define IBASE_F_H
+
+#define iBase_EntityHandle integer
+#define iBase_EntitySetHandle integer
+#define iBase_TagHandle integer
+
integer iBase_VERTEX
integer iBase_EDGE
integer iBase_FACE
Modified: MOAB/trunk/tools/iMesh/iMesh-Defs.inc.in
===================================================================
--- MOAB/trunk/tools/iMesh/iMesh-Defs.inc.in 2007-06-24 18:38:09 UTC (rev 1129)
+++ MOAB/trunk/tools/iMesh/iMesh-Defs.inc.in 2007-06-24 23:03:47 UTC (rev 1130)
@@ -1,22 +1,20 @@
-IMESH_CXXFLAGS = @CXXFLAGS@
-IMESH_CFLAGS = @CFLAGS@
-IMESH_LDFLAGS = @LDFLAGS@
-IMESH_CXX_LDFLAGS = @MOAB_CXX_LDFLAGS@
-IMESH_CXX_LIBS = @MOAB_CXX_LIBS@
+iMesh_CXXFLAGS = @CXXFLAGS@
+iMesh_CFLAGS = @CFLAGS@
+iMesh_LDFLAGS = @LDFLAGS@
+iMesh_CXX_LDFLAGS = @MOAB_CXX_LDFLAGS@
+iMesh_CXX_LIBS = @MOAB_CXX_LIBS@
-IMESH_FC = @FC@
-IMESH_FCFLAGS = @FCFLAGS@
+iMesh_FC = @FC@
+iMesh_FCFLAGS = @FCFLAGS@
-IMESH_FCDEFS = @DEFS@
+iMesh_FCDEFS = @DEFS@
-IMESH_INCLUDES = -I$(IMESH_INCLUDEDIR)
-IMESH_SIDL_INCLUDES = -I$(IMESH_INCLUDEDIR)
+iMesh_INCLUDES = -I$(iMesh_INCLUDEDIR)
-IMESH_LIBS_LINK = $(IMESH_LDFLAGS) -L$(MOAB_LIBDIR) \
- -L${IMESH_LIBDIR} -liMesh -lMOAB @LIBS@ \
- $(IMESH_CXX_LDFLAGS) $(IMESM_CXX_LIBS)
-IMESH_SIDL_LIBS_LINK = -L$(IMESH_LIBDIR) -liMeshserver -liBaseserver $(IMESH_LIBS_LINK)
+iMesh_LIBS = $(iMesh_LDFLAGS) -L$(MOAB_LIBDIR) \
+ -L${iMesh_LIBDIR} -liMesh -lMOAB @LIBS@ \
+ $(iMesh_CXX_LDFLAGS) $(IMESM_CXX_LIBS)
-IMESH_INCLUDEDIR = @abs_srcdir@
-IMESH_LIBDIR = @abs_builddir@/.libs
+iMesh_INCLUDEDIR = @abs_srcdir@
+iMesh_LIBDIR = @abs_builddir@/.libs
MOAB_LIBDIR = @abs_builddir@/../../.libs
Deleted: MOAB/trunk/tools/iMesh/iMesh_FCDefs.h.in
===================================================================
--- MOAB/trunk/tools/iMesh/iMesh_FCDefs.h.in 2007-06-24 18:38:09 UTC (rev 1129)
+++ MOAB/trunk/tools/iMesh/iMesh_FCDefs.h.in 2007-06-24 23:03:47 UTC (rev 1130)
@@ -1,7 +0,0 @@
-
-/* Define to a macro mangling the given C identifier (in lower and upper
- case), which must not contain underscores, for linking with Fortran. */
-#undef FC_FUNC
-
-/* As FC_FUNC, but for C identifiers containing underscores. */
-#undef FC_FUNC_
Modified: MOAB/trunk/tools/iMesh/iMesh_f.h
===================================================================
--- MOAB/trunk/tools/iMesh/iMesh_f.h 2007-06-24 18:38:09 UTC (rev 1129)
+++ MOAB/trunk/tools/iMesh/iMesh_f.h 2007-06-24 23:03:47 UTC (rev 1130)
@@ -6,9 +6,6 @@
#define iMesh_Instance integer
#define iMesh_EntityIterator integer
#define iMesh_EntityArrIterator integer
-#define iBase_EntityHandle integer
-#define iBase_EntitySetHandle integer
-#define iBase_TagHandle integer
integer iMesh_POINT
integer iMesh_LINE_SEGMENT
Modified: MOAB/trunk/tools/iMesh/iMesh_protos.h
===================================================================
--- MOAB/trunk/tools/iMesh/iMesh_protos.h 2007-06-24 18:38:09 UTC (rev 1129)
+++ MOAB/trunk/tools/iMesh/iMesh_protos.h 2007-06-24 23:03:47 UTC (rev 1130)
@@ -1,4 +1,4 @@
-#include "iMesh_FCDefs.h"
+#include "iBase_FCDefs.h"
#ifdef FC_FUNC_
#define iMesh_getErrorType FC_FUNC_(imesh_geterrortype, IMESH_GETERRORTYPE)
@@ -103,6 +103,5 @@
#define iMesh_subtract FC_FUNC_(imesh_subtract, IMESH_SUBTRACT)
#define iMesh_intersect FC_FUNC_(imesh_intersect, IMESH_INTERSECT)
#define iMesh_unite FC_FUNC_(imesh_unite, IMESH_UNITE)
-#define iMesh_free FC_FUNC_(imesh_free, IMESH_FREE)
#endif
More information about the moab-dev
mailing list