November 2012 - cgma-dev - mailman3.cels.anl.gov

r5886 - in cgm/trunk: . geom geom/Cholla geom/facet geom/facetbool geom/virtual itaps util
by janehu＠mcs.anl.gov 27 Nov '12

27 Nov '12

Author: janehu Date: 2012-11-27 13:07:41 -0600 (Tue, 27 Nov 2012) New Revision: 5886 Modified: cgm/trunk/Makefile.am cgm/trunk/configure.ac cgm/trunk/geom/Cholla/Makefile.am cgm/trunk/geom/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/util/Makefile.am Log: Changed Makefiles to make cgm on cubit build generated less libraries, to remove the confusion for the linker when doing 'make check' after 'make install'; Passed make check before and after install for cgm on cubit shared build and cgm on occ shared/static build. Modified: cgm/trunk/Makefile.am =================================================================== --- cgm/trunk/Makefile.am 2012-11-26 19:01:09 UTC (rev 5885) +++ cgm/trunk/Makefile.am 2012-11-27 19:07:41 UTC (rev 5886) @@ -43,16 +43,15 @@ geom/Cholla/libCholla.la \ geom/facetbool/libcubit_facetbool.la \ geom/libcubit_geom.la \ - util/libcubit_util.la \ - amendment/libcgma_amendment.la + util/libcubit_util.la else - CORE_CGM_LIBS = geom/libcubit_geom.la amendment/libcgma_amendment.la $(CGM_ll_LIB) + CORE_CGM_LIBS = $(CGM_ll_LIB) endif SUBDIRS = compat amendment util geom init . $(igeom_DIR) test cgm_apps # geom/testing -libcgm_la_LIBADD = $(CORE_CGM_LIBS) $(CGM_EXT_LIBS) $(CUBIT_FILE) +libcgm_la_LIBADD = init/libcgma_init.la amendment/libcgma_amendment.la $(CORE_CGM_LIBS) $(CGM_EXT_LIBS) $(CUBIT_FILE) libcgm_la_SOURCES = Modified: cgm/trunk/configure.ac =================================================================== --- cgm/trunk/configure.ac 2012-11-26 19:01:09 UTC (rev 5885) +++ cgm/trunk/configure.ac 2012-11-27 19:07:41 UTC (rev 5886) @@ -22,6 +22,8 @@ AC_C_BIGENDIAN( [], [AM_CPPFLAGS="$AM_CPPFLAGS -DLITTLE_ENDIAN=BYTE_ORDER"] ) FATHOM_COMPILER_FLAGS +FATHOM_CHECK_CXX_WORKS([], [AC_MSG_ERROR([Cannot build without C++ compiler])]) + ################################################################################ # Fortran Stuff for ITAPS C bindings ################################################################################ Modified: cgm/trunk/geom/Cholla/Makefile.am =================================================================== --- cgm/trunk/geom/Cholla/Makefile.am 2012-11-26 19:01:09 UTC (rev 5885) +++ cgm/trunk/geom/Cholla/Makefile.am 2012-11-27 19:07:41 UTC (rev 5886) @@ -1,12 +1,14 @@ # Don't require GNU-standard files (Changelog, README, etc.) AUTOMAKE_OPTIONS = foreign -# Override default defines with the ones we want from the configure script DEFS = $(TEMPLATE_DEFS_INCLUDED) $(LITTLE_ENDIAN) -AM_CPPFLAGS = -I$(top_srcdir)/util -I$(top_srcdir)/geom +AM_CPPFLAGS = -I$(top_srcdir)/util -I$(top_srcdir)/geom

1 0

r5885 - cgm/trunk/util
by janehu＠mcs.anl.gov 26 Nov '12

26 Nov '12

Author: janehu Date: 2012-11-26 13:01:09 -0600 (Mon, 26 Nov 2012) New Revision: 5885 Modified: cgm/trunk/util/Makefile.am Log: Just add those files in cubit build mode, other builds shouldn't be affected. Modified: cgm/trunk/util/Makefile.am =================================================================== --- cgm/trunk/util/Makefile.am 2012-11-26 17:48:07 UTC (rev 5884) +++ cgm/trunk/util/Makefile.am 2012-11-26 19:01:09 UTC (rev 5885) @@ -26,13 +26,11 @@ CubitFileIOWrapper.cpp \ CubitFileMetaData.cpp \ CubitFileUtil.cpp \ - CubitInstrumentation.cpp \ CubitMatrix.cpp \ CubitMessage.cpp \ CubitObservable.cpp \ CubitObserver.cpp \ CubitPlane.cpp \ - CubitProcess.cpp \ CubitStack.cpp \ CubitString.cpp \ CubitTransformMatrix.cpp \ @@ -44,7 +42,6 @@ GMem.cpp \ GetLongOpt.cpp \ GfxDebug.cpp \ - GlobalCommandFeedback.cpp \ IntersectionTool.cpp \ MemoryBlock.cpp \ MemoryManager.cpp \ @@ -63,6 +60,12 @@ Tree.cpp \ TtyProgressTool.cpp +#if WITH_CUBIT + libcubit_util_la_SOURCES += GlobalCommandFeedback.cpp \ + CubitProcess.cpp \ + CubitInstrumentation.cpp +#endif + # Headers to be installed. If any file in this list should # not be installed, move it to the _SOURCES list above. libcubit_util_la_include_HEADERS = \ @@ -89,14 +92,12 @@ CubitFileMetaData.hpp \ CubitFileUtil.hpp \ CubitInputFile.hpp \ - CubitInstrumentation.hpp \ CubitMatrix.hpp \ CubitMessage.hpp \ CubitObservable.hpp \ CubitObserver.hpp \ CubitPlane.hpp \ CubitPlaneStruct.h \ - CubitProcess.hpp \

1 0

r5884 - cgm/trunk/util
by janehu＠mcs.anl.gov 26 Nov '12

26 Nov '12

Author: janehu Date: 2012-11-26 11:48:07 -0600 (Mon, 26 Nov 2012) New Revision: 5884 Added: cgm/trunk/util/CubitInstrumentation.cpp cgm/trunk/util/CubitProcess.cpp cgm/trunk/util/CubitProcess.hpp cgm/trunk/util/GlobalCommandFeedback.cpp cgm/trunk/util/GlobalCommandFeedback.hpp cgm/trunk/util/ManagedPtrVector.hpp Modified: cgm/trunk/util/Makefile.am Log: Added files in Makefile.am for make check after install, still there's one testcase failing in itaps and test directory each, and seems to be the same problem. Still looking into it. Copied: cgm/trunk/util/CubitInstrumentation.cpp (from rev 5883, cgm/branches/cubit13.1/util/CubitInstrumentation.cpp) =================================================================== --- cgm/trunk/util/CubitInstrumentation.cpp (rev 0) +++ cgm/trunk/util/CubitInstrumentation.cpp 2012-11-26 17:48:07 UTC (rev 5884) @@ -0,0 +1,221 @@ + +// File: CubitInstrumentation.cpp +// Author: Boyd Tidwell +// +// Purpose: CubitInstrumentation is used to collect and write command and +// feature usage by Cubit users. + +#include "CubitInstrumentation.hpp" +#include "CubitMessage.hpp" + + +//#include <iostream> + +CubitInstrumentation* CubitInstrumentation::thisInstance = NULL; + +//============================================================================= +CubitInstrumentation* CubitInstrumentation::instance() +{ + if (!thisInstance) + { + thisInstance = new CubitInstrumentation; + if (!thisInstance) + { + PRINT_ERROR("Unable to instantiate instrumentation object!\n"); + exit(1); + } + } + return thisInstance; +} + +//============================================================================= +void CubitInstrumentation::delete_instance() +{ + if (thisInstance) + delete thisInstance; + thisInstance = NULL; +} + +//============================================================================= +CubitInstrumentation::CubitInstrumentation() + : outputState(Unknown), + recordTokens(true), validKeywords(false), writeKeywords(true), + tokenUsageStream(NULL) +{} + +//=============================================================================

1 0

r5883 - cgm/trunk
by janehu＠mcs.anl.gov 26 Nov '12

26 Nov '12

Author: janehu Date: 2012-11-26 09:48:43 -0600 (Mon, 26 Nov 2012) New Revision: 5883 Modified: cgm/trunk/README.CGM Log: Update the build instruction, to do check build first, then installation. Modified: cgm/trunk/README.CGM =================================================================== --- cgm/trunk/README.CGM 2012-11-21 20:57:12 UTC (rev 5882) +++ cgm/trunk/README.CGM 2012-11-26 15:48:43 UTC (rev 5883) @@ -55,10 +55,10 @@ ACIS libraries are located and other options (run "./configure -h" for a list of options). 3. Make the CGM libraries by typing "make". -4. Install the CGM libraries by typing "make install" (this installs +4. Test the libraries using "make check". +5. Install the CGM libraries by typing "make install" (this installs the libraries to the location specified by the --prefix option to configure, or to /usr/local by default). -5. Test the installation using "make test". ===================================== Documentation, Testing, Example Applications

1 0

buildbot failure in cgm-cub-sertrunk: failed shell test
by cgma-dev＠mcs.anl.gov 25 Nov '12

25 Nov '12

1 0

buildbot failure in cgm-cub-sertrunk: failed test
by cgma-dev＠mcs.anl.gov 24 Nov '12

24 Nov '12

1 0

buildbot failure in cgm-cub-sertrunk: failed test
by cgma-dev＠mcs.anl.gov 23 Nov '12

23 Nov '12

1 0

buildbot failure in cgm-cub-sertrunk: failed test
by cgma-dev＠mcs.anl.gov 22 Nov '12

22 Nov '12

1 0

xingyao wu shared photos with you
by xingyao wu 21 Nov '12

21 Nov '12

Dear sir How are you? We have JBL speakers, YAMAHA amplifier,SHURE microphones, DBX equalizer. . . If you are interested in our products, please contact us, we can send the price list to you, we can give you the lowest price, best quality. We will make you satisfied. Thank you I wish you happy every day! Meiling

1 0

buildbot failure in cgm-cub-sertrunk: failed test
by cgma-dev＠mcs.anl.gov 21 Nov '12

21 Nov '12

1 0