March 2013 - cgma-dev - mailman3.cels.anl.gov

r6033 - cgm/trunk
by iulian＠mcs.anl.gov 27 Mar '13

27 Mar '13

Author: iulian Date: 2013-03-27 16:56:24 -0500 (Wed, 27 Mar 2013) New Revision: 6033 Modified: cgm/trunk/configure.ac Log: again, gold linker gives us trouble on ubuntu 12.04 I think that these libraries need to be specified explicitly, so then MOAB will use them for linking (cubit_geom, cubit_util) these libraries are part of cubit, we are not building them Modified: cgm/trunk/configure.ac =================================================================== --- cgm/trunk/configure.ac 2013-03-15 21:33:05 UTC (rev 6032) +++ cgm/trunk/configure.ac 2013-03-27 21:56:24 UTC (rev 6033) @@ -144,7 +144,7 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM( [class AcisQueryEngine { public: static AcisQueryEngine* instance_; };], [AcisQueryEngine::instance_ = 0;])], - [CUBIT_LIBS="-L${CUBIT_BIN_DIR} -lcubiti$num" + [CUBIT_LIBS="-L${CUBIT_BIN_DIR} -lcubiti$num -lcubit_geom -lcubit_util" CUBIT_FILE=`expr x"$file" : x"$CUBIT_BIN_DIR/$.*$"` CUBIT_FILE="${CUBIT_BIN_DIR}/$CUBIT_FILE" AC_MSG_RESULT(yes)

1 0

Fwd: r6032 - in cgm/branches/merge-cubit12: cgm_apps/examples/facetdriver geom/testing
by Iulian Grindeanu 15 Mar '13

15 Mar '13

Sorry about these commits; the commit message was about merge-cubit12.2, while in fact I was on cubit-merge12 branch. It will not hurt cubit-merge12 branch though; although this one should be discontinued; and it confused me because its name was very close to cubit-merge12.2 . Best Regards, Iulian ----- Forwarded Message ----- From: iulian(a)mcs.anl.gov To: cgma-dev(a)mcs.anl.gov Sent: Friday, March 15, 2013 4:33:06 PM Subject: [cgma-dev] r6032 - in cgm/branches/merge-cubit12: cgm_apps/examples/facetdriver geom/testing Author: iulian Date: 2013-03-15 16:33:05 -0500 (Fri, 15 Mar 2013) New Revision: 6032 Modified: cgm/branches/merge-cubit12/cgm_apps/examples/facetdriver/Makefile.am cgm/branches/merge-cubit12/geom/testing/Makefile.am Log: forgot these two changes at the previous commit on mergecubit12.2 branch, shared build, we need this for ubuntu 12.04 (because of golden linker rule, dependent libraries need to be explicit) Modified: cgm/branches/merge-cubit12/cgm_apps/examples/facetdriver/Makefile.am =================================================================== --- cgm/branches/merge-cubit12/cgm_apps/examples/facetdriver/Makefile.am 2013-03-15 21:00:25 UTC (rev 6031) +++ cgm/branches/merge-cubit12/cgm_apps/examples/facetdriver/Makefile.am 2013-03-15 21:33:05 UTC (rev 6032) @@ -11,4 +11,4 @@ -I$(top_srcdir)/geom/Cholla \ -I$(top_srcdir)/geom/facet -LDADD = $(top_builddir)/libcgm.la $(CGM_EXT_LDFLAGS) $(CGM_EXT_LTFLAGS) +LDADD = $(top_builddir)/libcgm.la $(CGM_EXT_LDFLAGS) $(CGM_EXT_LTFLAGS) $(CGM_EXT_LIBS) Modified: cgm/branches/merge-cubit12/geom/testing/Makefile.am =================================================================== --- cgm/branches/merge-cubit12/geom/testing/Makefile.am 2013-03-15 21:00:25 UTC (rev 6031) +++ cgm/branches/merge-cubit12/geom/testing/Makefile.am 2013-03-15 21:33:05 UTC (rev 6032) @@ -14,7 +14,7 @@ endif AM_CPPFLAGS += -I$(top_srcdir)/util -I$(top_srcdir)/geom -I. -LDADD = libcgm_test.la ../../libcgm.la $(CGM_EXT_LDFLAGS) $(CGM_EXT_LTFLAGS) +LDADD = libcgm_test.la ../../libcgm.la $(CGM_EXT_LDFLAGS) $(CGM_EXT_LTFLAGS) $(CGM_EXT_LIBS) SUFFIXES = .acis .occ check_PROGRAMS = $(BASE_TESTS:.engine=)

1 0

r6032 - in cgm/branches/merge-cubit12: cgm_apps/examples/facetdriver geom/testing
by iulian＠mcs.anl.gov 15 Mar '13

15 Mar '13

Author: iulian Date: 2013-03-15 16:33:05 -0500 (Fri, 15 Mar 2013) New Revision: 6032 Modified: cgm/branches/merge-cubit12/cgm_apps/examples/facetdriver/Makefile.am cgm/branches/merge-cubit12/geom/testing/Makefile.am Log: forgot these two changes at the previous commit on mergecubit12.2 branch, shared build, we need this for ubuntu 12.04 (because of golden linker rule, dependent libraries need to be explicit) Modified: cgm/branches/merge-cubit12/cgm_apps/examples/facetdriver/Makefile.am =================================================================== --- cgm/branches/merge-cubit12/cgm_apps/examples/facetdriver/Makefile.am 2013-03-15 21:00:25 UTC (rev 6031) +++ cgm/branches/merge-cubit12/cgm_apps/examples/facetdriver/Makefile.am 2013-03-15 21:33:05 UTC (rev 6032) @@ -11,4 +11,4 @@ -I$(top_srcdir)/geom/Cholla \ -I$(top_srcdir)/geom/facet -LDADD = $(top_builddir)/libcgm.la $(CGM_EXT_LDFLAGS) $(CGM_EXT_LTFLAGS) +LDADD = $(top_builddir)/libcgm.la $(CGM_EXT_LDFLAGS) $(CGM_EXT_LTFLAGS) $(CGM_EXT_LIBS) Modified: cgm/branches/merge-cubit12/geom/testing/Makefile.am =================================================================== --- cgm/branches/merge-cubit12/geom/testing/Makefile.am 2013-03-15 21:00:25 UTC (rev 6031) +++ cgm/branches/merge-cubit12/geom/testing/Makefile.am 2013-03-15 21:33:05 UTC (rev 6032) @@ -14,7 +14,7 @@ endif AM_CPPFLAGS += -I$(top_srcdir)/util -I$(top_srcdir)/geom -I. -LDADD = libcgm_test.la ../../libcgm.la $(CGM_EXT_LDFLAGS) $(CGM_EXT_LTFLAGS) +LDADD = libcgm_test.la ../../libcgm.la $(CGM_EXT_LDFLAGS) $(CGM_EXT_LTFLAGS) $(CGM_EXT_LIBS) SUFFIXES = .acis .occ check_PROGRAMS = $(BASE_TESTS:.engine=)

1 0

r6031 - cgm/branches/merge-cubit12/test
by iulian＠mcs.anl.gov 15 Mar '13

15 Mar '13

Author: iulian Date: 2013-03-15 16:00:25 -0500 (Fri, 15 Mar 2013) New Revision: 6031 Modified: cgm/branches/merge-cubit12/test/Makefile.am Log: on mergecubit12.2 branch, shared build, we need this for ubuntu 12.04 (because of golden linker rule, depedent libraries need to be explicit) Modified: cgm/branches/merge-cubit12/test/Makefile.am =================================================================== --- cgm/branches/merge-cubit12/test/Makefile.am 2013-03-13 14:44:19 UTC (rev 6030) +++ cgm/branches/merge-cubit12/test/Makefile.am 2013-03-15 21:00:25 UTC (rev 6031) @@ -27,7 +27,7 @@ check_PROGRAMS = $(TESTS) -LDADD = ../libcgm.la +LDADD = ../libcgm.la $(CGM_EXT_LIBS) AM_LDFLAGS += $(CGM_EXT_LDFLAGS) $(CGM_EXT_LTFLAGS) webcut_SOURCES = webcut.cpp

1 0

r6026 - in cgm/trunk: . geom geom/Cholla geom/OCC geom/facet geom/facetbool geom/virtual itaps test util
by janehu＠mcs.anl.gov 07 Mar '13

07 Mar '13

Author: janehu Date: 2013-03-07 13:28:15 -0600 (Thu, 07 Mar 2013) New Revision: 6026 Added: cgm/trunk/geom/AutoMidsurfaceTool.cpp cgm/trunk/geom/AutoMidsurfaceTool.hpp cgm/trunk/geom/CAEntitySense.cpp cgm/trunk/geom/CAEntitySense.hpp cgm/trunk/geom/CAEntityTol.cpp cgm/trunk/geom/CAEntityTol.hpp cgm/trunk/geom/CGMHistory.cpp cgm/trunk/geom/CGMHistory.hpp cgm/trunk/geom/CubitCompat.cpp cgm/trunk/geom/CubitCompat.h.in cgm/trunk/geom/CubitCompat.hpp cgm/trunk/geom/GfxPreview.cpp cgm/trunk/geom/GfxPreview.hpp cgm/trunk/geom/LocalToleranceTool.cpp cgm/trunk/geom/LocalToleranceTool.hpp cgm/trunk/util/CubitFileSimModel.cpp cgm/trunk/util/CubitFileSimModel.hpp cgm/trunk/util/CubitUndo.cpp cgm/trunk/util/CubitUndo.hpp Modified: cgm/trunk/Makefile.am cgm/trunk/configure.ac cgm/trunk/geom/Cholla/Makefile.am cgm/trunk/geom/Makefile.am cgm/trunk/geom/OCC/Makefile.am cgm/trunk/geom/facet/Makefile.am cgm/trunk/geom/facetbool/Makefile.am cgm/trunk/geom/virtual/Makefile.am cgm/trunk/itaps/Makefile.am cgm/trunk/test/Makefile.am cgm/trunk/util/Makefile.am Log: Changed to remove amendment directory, and put all files back to util or geom directory; Changed back to install only cgm and iGeom libraries. Passed occ, cubit and parallel make checks. Modified: cgm/trunk/Makefile.am =================================================================== --- cgm/trunk/Makefile.am 2013-03-06 20:57:17 UTC (rev 6025) +++ cgm/trunk/Makefile.am 2013-03-07 19:28:15 UTC (rev 6026) @@ -45,13 +45,13 @@ geom/libcubit_geom.la \ util/libcubit_util.la else - CORE_CGM_LIBS = $(CGM_ll_LIB) + CORE_CGM_LIBS = geom/libcubit_geom.la $(CGM_ll_LIB) endif -SUBDIRS = compat amendment util geom init . $(igeom_DIR) test cgm_apps +SUBDIRS = compat util geom init . $(igeom_DIR) test cgm_apps # geom/testing -libcgm_la_LIBADD = init/libcgma_init.la amendment/libcgma_amendment.la $(CORE_CGM_LIBS) $(CGM_EXT_LIBS) $(CUBIT_FILE) +libcgm_la_LIBADD = init/libcgma_init.la $(CORE_CGM_LIBS) $(CGM_EXT_LIBS) $(CUBIT_FILE) libcgm_la_SOURCES = Modified: cgm/trunk/configure.ac =================================================================== --- cgm/trunk/configure.ac 2013-03-06 20:57:17 UTC (rev 6025) +++ cgm/trunk/configure.ac 2013-03-07 19:28:15 UTC (rev 6026) @@ -144,7 +144,7 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM( [class AcisQueryEngine { public: static AcisQueryEngine* instance_; };], [AcisQueryEngine::instance_ = 0;])], - [CUBIT_LIBS="-L${CUBIT_BIN_DIR} -lcubiti$num -lcubit_geom -lcubit_util" + [CUBIT_LIBS="-L${CUBIT_BIN_DIR} -lcubiti$num" CUBIT_FILE=`expr x"$file" : x"$CUBIT_BIN_DIR/$.*$"` CUBIT_FILE="${CUBIT_BIN_DIR}/$CUBIT_FILE" AC_MSG_RESULT(yes) @@ -552,7 +552,7 @@ AC_MSG_RESULT([AM_CPPFLAGS = $AM_CPPFLAGS]) dnl AC_OUTPUT_COMMANDS( [if test -f util/CubitUtilConfigure.h; then true; else echo "#define CUBIT_UTIL_EXPORT" > util/CubitUtilConfigure.h; fi], dnl [if test -f geom/CubitGeomConfigure.h; then true; else echo "#define CUBIT_GEOM_EXPORT" > geom/CubitGeomConfigure.h; fi] ) -AC_CONFIG_HEADERS(config.h geom/parallel/CGMmpi_config.h amendment/CubitCompat.h) +AC_CONFIG_HEADERS(config.h geom/parallel/CGMmpi_config.h geom/CubitCompat.h) AC_CONFIG_HEADERS(itaps/iBase_FCDefs.h) AC_CONFIG_FILES(Makefile util/Makefile @@ -565,7 +565,6 @@ geom/parallel/Makefile geom/virtual/Makefile init/Makefile - amendment/Makefile compat/Makefile cgm.make

1 0

r6023 - in cgm/trunk: amendment geom geom/Cholla geom/OCC geom/facet geom/facetbool geom/virtual util
by janehu＠mcs.anl.gov 05 Mar '13

05 Mar '13

Author: janehu Date: 2013-03-05 13:40:36 -0600 (Tue, 05 Mar 2013) New Revision: 6023 Modified: cgm/trunk/amendment/Makefile.am cgm/trunk/geom/Cholla/Makefile.am cgm/trunk/geom/Makefile.am cgm/trunk/geom/OCC/Makefile.am cgm/trunk/geom/facet/Makefile.am cgm/trunk/geom/facetbool/Makefile.am cgm/trunk/geom/virtual/Makefile.am cgm/trunk/util/Makefile.am Log: Change the libraries back to installed libraries, fixed the shared build issue. Modified: cgm/trunk/amendment/Makefile.am =================================================================== --- cgm/trunk/amendment/Makefile.am 2013-03-04 04:14:27 UTC (rev 6022) +++ cgm/trunk/amendment/Makefile.am 2013-03-05 19:40:36 UTC (rev 6023) @@ -3,7 +3,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/geom -I$(top_srcdir)/util -I. -noinst_LTLIBRARIES = libcgma_amendment.la +lib_LTLIBRARIES = libcgma_amendment.la libcgma_amendment_la_includedir = $(includedir) libcgma_amendment_la_SOURCES = AutoMidsurfaceTool.cpp \ CAEntityTol.cpp \ Modified: cgm/trunk/geom/Cholla/Makefile.am =================================================================== --- cgm/trunk/geom/Cholla/Makefile.am 2013-03-04 04:14:27 UTC (rev 6022) +++ cgm/trunk/geom/Cholla/Makefile.am 2013-03-05 19:40:36 UTC (rev 6023) @@ -5,9 +5,9 @@ AM_CPPFLAGS = -I$(top_srcdir)/util -I$(top_srcdir)/geom # The name of the library to build -noinst_LTLIBRARIES = +lib_LTLIBRARIES = if BUILD_CGM - noinst_LTLIBRARIES += libCholla.la + lib_LTLIBRARIES += libCholla.la endif # The directory where headers will be installed Modified: cgm/trunk/geom/Makefile.am =================================================================== --- cgm/trunk/geom/Makefile.am 2013-03-04 04:14:27 UTC (rev 6022) +++ cgm/trunk/geom/Makefile.am 2013-03-05 19:40:36 UTC (rev 6023) @@ -20,9 +20,9 @@ AM_CPPFLAGS = -I$(top_srcdir)/util -I$(top_srcdir)/amendment -I. # The name of the library to build -noinst_LTLIBRARIES = +lib_LTLIBRARIES = if BUILD_CGM - noinst_LTLIBRARIES += libcubit_geom.la + lib_LTLIBRARIES += libcubit_geom.la endif # The directory where headers will be installed Modified: cgm/trunk/geom/OCC/Makefile.am =================================================================== --- cgm/trunk/geom/OCC/Makefile.am 2013-03-04 04:14:27 UTC (rev 6022)

1 0

buildbot failure in cgm-occ-sertrunk: failed shell test install
by cgma-dev＠mcs.anl.gov 02 Mar '13

02 Mar '13

1 0

r6021 - in cgm/trunk: amendment geom geom/Cholla geom/OCC geom/facet geom/facetbool geom/virtual util
by janehu＠mcs.anl.gov 01 Mar '13

01 Mar '13

Author: janehu Date: 2013-03-01 13:45:57 -0600 (Fri, 01 Mar 2013) New Revision: 6021 Modified: cgm/trunk/amendment/Makefile.am cgm/trunk/geom/Cholla/Makefile.am cgm/trunk/geom/Makefile.am cgm/trunk/geom/OCC/Makefile.am cgm/trunk/geom/facet/Makefile.am cgm/trunk/geom/facetbool/Makefile.am cgm/trunk/geom/virtual/Makefile.am cgm/trunk/util/Makefile.am Log: Follow cubit12.2's cgm, not to install all libraries, hoping to help build mesquite. Modified: cgm/trunk/amendment/Makefile.am =================================================================== --- cgm/trunk/amendment/Makefile.am 2013-03-01 18:03:07 UTC (rev 6020) +++ cgm/trunk/amendment/Makefile.am 2013-03-01 19:45:57 UTC (rev 6021) @@ -3,7 +3,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/geom -I$(top_srcdir)/util -I. -lib_LTLIBRARIES = libcgma_amendment.la +noinst_LTLIBRARIES = libcgma_amendment.la libcgma_amendment_la_includedir = $(includedir) libcgma_amendment_la_SOURCES = AutoMidsurfaceTool.cpp \ CAEntityTol.cpp \ Modified: cgm/trunk/geom/Cholla/Makefile.am =================================================================== --- cgm/trunk/geom/Cholla/Makefile.am 2013-03-01 18:03:07 UTC (rev 6020) +++ cgm/trunk/geom/Cholla/Makefile.am 2013-03-01 19:45:57 UTC (rev 6021) @@ -5,9 +5,9 @@ AM_CPPFLAGS = -I$(top_srcdir)/util -I$(top_srcdir)/geom # The name of the library to build -lib_LTLIBRARIES = +noinst_LTLIBRARIES = if BUILD_CGM - lib_LTLIBRARIES += libCholla.la + noinst_LTLIBRARIES += libCholla.la endif # The directory where headers will be installed Modified: cgm/trunk/geom/Makefile.am =================================================================== --- cgm/trunk/geom/Makefile.am 2013-03-01 18:03:07 UTC (rev 6020) +++ cgm/trunk/geom/Makefile.am 2013-03-01 19:45:57 UTC (rev 6021) @@ -20,9 +20,9 @@ AM_CPPFLAGS = -I$(top_srcdir)/util -I$(top_srcdir)/amendment -I. # The name of the library to build -lib_LTLIBRARIES = +noinst_LTLIBRARIES = if BUILD_CGM - lib_LTLIBRARIES += libcubit_geom.la + noinst_LTLIBRARIES += libcubit_geom.la endif # The directory where headers will be installed Modified: cgm/trunk/geom/OCC/Makefile.am =================================================================== --- cgm/trunk/geom/OCC/Makefile.am 2013-03-01 18:03:07 UTC (rev 6020)

1 0

r6020 - cgm/branches/merge-cubit14.0/geom/OCC
by janehu＠mcs.anl.gov 01 Mar '13

01 Mar '13

Author: janehu Date: 2013-03-01 12:03:07 -0600 (Fri, 01 Mar 2013) New Revision: 6020 Modified: cgm/branches/merge-cubit14.0/geom/OCC/configure.ac.patch Log: trying to stick with the wiki description of patching under ros directory. Modified: cgm/branches/merge-cubit14.0/geom/OCC/configure.ac.patch =================================================================== --- cgm/branches/merge-cubit14.0/geom/OCC/configure.ac.patch 2013-03-01 17:53:24 UTC (rev 6019) +++ cgm/branches/merge-cubit14.0/geom/OCC/configure.ac.patch 2013-03-01 18:03:07 UTC (rev 6020) @@ -1,5 +1,5 @@ ---- configure.ac 2012-11-12 04:53:15.000000000 -0600 -+++ /mnt/disk2b/jhu/OpenCASCADE6.5.4/ros/configure.ac 2013-03-01 11:13:28.000000000 -0600 +--- a/configure.ac 2012-11-12 04:53:15.000000000 -0600 ++++ b/configure.ac 2013-03-01 11:13:28.000000000 -0600 @@ -54,9 +54,7 @@ AC_CHECK_HEADERS(iomanip.h limits.h values.h float.h) AC_CHECK_HEADERS(siginfo.h bits/sigset.h bstring.h sys/types.h sys/select.h)

1 0

r6019 - cgm/branches/merge-cubit14.0/geom/OCC
by janehu＠mcs.anl.gov 01 Mar '13

01 Mar '13

Author: janehu Date: 2013-03-01 11:53:24 -0600 (Fri, 01 Mar 2013) New Revision: 6019 Added: cgm/branches/merge-cubit14.0/geom/OCC/configure.ac.patch Log: Check in the patch for configure.ac from https://build.opensuse.org/package/view_file?file=OpenCASCADE-6.5.0-multibu…. Added: cgm/branches/merge-cubit14.0/geom/OCC/configure.ac.patch =================================================================== --- cgm/branches/merge-cubit14.0/geom/OCC/configure.ac.patch (rev 0) +++ cgm/branches/merge-cubit14.0/geom/OCC/configure.ac.patch 2013-03-01 17:53:24 UTC (rev 6019) @@ -0,0 +1,13 @@ +--- configure.ac 2012-11-12 04:53:15.000000000 -0600 ++++ /mnt/disk2b/jhu/OpenCASCADE6.5.4/ros/configure.ac 2013-03-01 11:13:28.000000000 -0600 +@@ -54,9 +54,7 @@ + AC_CHECK_HEADERS(iomanip.h limits.h values.h float.h) + AC_CHECK_HEADERS(siginfo.h bits/sigset.h bstring.h sys/types.h sys/select.h) + AC_CHECK_HEADERS(X11/extensions/transovl.h X11/extensions/readdisplay.h) +-AC_CHECK_HEADERS(X11/extensions/multibuf.h) +-AC_CHECK_HEADERS(sys/filio.h sys/mman.h libc.h) +-AC_CHECK_HEADERS(X11/extensions/multibuf.h) ++AC_CHECK_HEADERS([X11/Xlib.h X11/extensions/multibuf.h], [], [], [#include <X11/Xlib.h>]) + AC_CHECK_HEADERS(sys/filio.h sys/mman.h libc.h) + + #-----------------------------------------------------------------------------

1 0