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

r6040 - cgm/trunk
by jain＠mcs.anl.gov 12 Apr '13

12 Apr '13

Author: jain Date: 2013-04-12 01:50:48 -0500 (Fri, 12 Apr 2013) New Revision: 6040 Modified: cgm/trunk/configure.ac Log: Fixes for automake 1.12, needs AM_PROG_AR Modified: cgm/trunk/configure.ac =================================================================== --- cgm/trunk/configure.ac 2013-04-12 06:49:10 UTC (rev 6039) +++ cgm/trunk/configure.ac 2013-04-12 06:50:48 UTC (rev 6040) @@ -5,6 +5,8 @@ AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([.]) AC_CANONICAL_SYSTEM +# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it +m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) m4_ifdef([AM_SILENT_RULES], [AM_INIT_AUTOMAKE([foreign -Wall silent-rules color-tests parallel-tests])], [AM_INIT_AUTOMAKE([foreign -Wall])])

1 0

r6039 - cgm/branches/merge-cubit12.2
by jain＠mcs.anl.gov 12 Apr '13

12 Apr '13

Author: jain Date: 2013-04-12 01:49:10 -0500 (Fri, 12 Apr 2013) New Revision: 6039 Modified: cgm/branches/merge-cubit12.2/configure.ac Log: Fixes for automake 1.12, needs AM_PROG_AR Modified: cgm/branches/merge-cubit12.2/configure.ac =================================================================== --- cgm/branches/merge-cubit12.2/configure.ac 2013-04-10 20:46:05 UTC (rev 6038) +++ cgm/branches/merge-cubit12.2/configure.ac 2013-04-12 06:49:10 UTC (rev 6039) @@ -5,6 +5,8 @@ AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([.]) AC_CANONICAL_SYSTEM +# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it +m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) m4_ifdef([AM_SILENT_RULES], [AM_INIT_AUTOMAKE([foreign -Wall silent-rules color-tests parallel-tests])], [AM_INIT_AUTOMAKE([foreign -Wall])])

1 0

r6036 - cgm/trunk
by janehu＠mcs.anl.gov 03 Apr '13

03 Apr '13

Author: janehu Date: 2013-04-03 12:40:39 -0500 (Wed, 03 Apr 2013) New Revision: 6036 Modified: cgm/trunk/README.OCC Log: Changed the document for building opencascase6.5.4, since it's pretty painful to get everything straightened. Modified: cgm/trunk/README.OCC =================================================================== --- cgm/trunk/README.OCC 2013-04-03 17:20:14 UTC (rev 6035) +++ cgm/trunk/README.OCC 2013-04-03 17:40:39 UTC (rev 6036) @@ -18,19 +18,25 @@ Go to http://www.opencascade.org/getocc/download/loadocc/ and get desired source files. -Untar the files. Change directory to OpenCASCADE6.3.0. -Patch OCC by doing: +Untar the files. Change directory to OpenCASCADE6.5.4. +Patch OCC under ros directory by doing: - patch -p0 <cgm_source>/geom/OCC/occ_patches + patch -p1 < <cgm_source>/geom/OCC/occ_patches_6.5.4 + patch -p0 < <cgm_source>/geom/OCC/occ654_configure.ac.patch This will update the OCC distribution. -Change directories to ros. Build OCC by doing: +Build OCC by doing: autoreconf -fi - ./configure (Add --prefix=dir for your install directory) + ./configure (Add --prefix=dir for your install directory) --with-tcl=dir for tcl/lib --with-tk=dir for tk/lib --with-freetype=dir for ft --with-ftgl=dir for ftgl --enable-shared=yes make make install +Here tcl and tk are in version 8.5.13, freetype is in version 2.4.10 and ftgl isin version 2.1.3. +Configures for tcl, tk and freetype are simple forms, give only --prefix directory. +Configure for ftgl needs following: +./configure --enable-shared=yes --with-ft-prefix=dir for freetype --prefix= --with-gl-inc=dir for OpenGL include files --with-gl-lib=dir for OpenGL lib --with-glut-inc=dir for glut include files --with-glut-libraries=dir for glut lib + ===================================== Dependencies =====================================

1 0

r6035 - cgm/trunk/geom/OCC
by janehu＠mcs.anl.gov 03 Apr '13

03 Apr '13

Author: janehu Date: 2013-04-03 12:20:14 -0500 (Wed, 03 Apr 2013) New Revision: 6035 Added: cgm/trunk/geom/OCC/occ654_configure.ac.patch Log: Added patch file for occ6.5.4's configure.ac, AC_TRY_LINK is not working in Ubuntu 12.04, and the first change is to remove configure warnings. Both changes are foundon web discussions. Added: cgm/trunk/geom/OCC/occ654_configure.ac.patch =================================================================== --- cgm/trunk/geom/OCC/occ654_configure.ac.patch (rev 0) +++ cgm/trunk/geom/OCC/occ654_configure.ac.patch 2013-04-03 17:20:14 UTC (rev 6035) @@ -0,0 +1,23 @@ +--- configure.ac_bck 2013-04-02 14:24:49.000000000 -0500 ++++ configure.ac 2013-04-02 14:24:05.000000000 -0500 +@@ -54,10 +54,8 @@ + 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(sys/filio.h sys/mman.h libc.h) ++AC_CHECK_HEADERS([X11/Xlib.h X11/extensions/multibuf.h], [], [], [#include <X11/Xlib.h>]) + #----------------------------------------------------------------------------- + # Posix threads library is required + #----------------------------------------------------------------------------- +@@ -554,7 +552,7 @@ + if test "x${HAVE_FTGL_INC}" = "xyes"; then + AC_MSG_CHECKING([for FTGLTextureFont in -lftgl]) + CPPFLAGS="${FTGL_INCLUDES} ${HAVE_FTGL_UPPERCASE} ${CSF_FREETYPE_INCLUDES} ${CPPFLAGS_old}" +- AC_TRY_LINK( ++ AC_TRY_COMPILE( + [ + #ifdef HAVE_FTGL_UPPERCASE + #include <FTGL/FTGL.h>

1 0

r6034 - cgm/trunk/geom/OCC
by janehu＠mcs.anl.gov 03 Apr '13

03 Apr '13

Author: janehu Date: 2013-04-03 12:16:10 -0500 (Wed, 03 Apr 2013) New Revision: 6034 Added: cgm/trunk/geom/OCC/occ_patches_6.5.4 Log: Added patch for occ654 code. Added: cgm/trunk/geom/OCC/occ_patches_6.5.4 =================================================================== --- cgm/trunk/geom/OCC/occ_patches_6.5.4 (rev 0) +++ cgm/trunk/geom/OCC/occ_patches_6.5.4 2013-04-03 17:16:10 UTC (rev 6034) @@ -0,0 +1,118 @@ +--- a/src/BRepBuilderAPI/BRepBuilderAPI_Collect.cxx 2013-04-03 11:08:17.000000000 -0500 ++++ b/src/BRepBuilderAPI/BRepBuilderAPI_Collect.cxx 2013-04-03 11:20:44.000000000 -0500 +@@ -217,9 +217,18 @@ + BuildBack (myGen, GenBack); // Vraiment pas optimum a Revoir + BuildBack (myMod, ModBack); + +- Update (myMod,myGen,ModBack,GenBack,SI,MKS,TopAbs_FACE); +- Update (myMod,myGen,ModBack,GenBack,SI,MKS,TopAbs_EDGE); +- Update (myMod,myGen,ModBack,GenBack,SI,MKS,TopAbs_VERTEX); ++ TopAbs_ShapeEnum type = SI.ShapeType(); ++ Update (myMod,myGen,ModBack,GenBack,SI,MKS,type); ++ if(type < TopAbs_SHELL) ++ Update (myMod,myGen,ModBack,GenBack,SI,MKS,TopAbs_SHELL); ++ if(type < TopAbs_FACE) ++ Update (myMod,myGen,ModBack,GenBack,SI,MKS,TopAbs_FACE); ++ if(type < TopAbs_WIRE) ++ Update (myMod,myGen,ModBack,GenBack,SI,MKS,TopAbs_WIRE); ++ if(type < TopAbs_EDGE) ++ Update (myMod,myGen,ModBack,GenBack,SI,MKS,TopAbs_EDGE); ++ if(type < TopAbs_VERTEX) ++ Update (myMod,myGen,ModBack,GenBack,SI,MKS,TopAbs_VERTEX); + + #ifdef DEB + if (Affich) { +--- a/src/Extrema/Extrema_ExtPElS.cxx 2013-04-03 11:08:29.000000000 -0500 ++++ b/src/Extrema/Extrema_ExtPElS.cxx 2013-04-03 11:25:30.000000000 -0500 +@@ -71,6 +71,7 @@ + gp_Vec myZ = Pos.XDirection()^Pos.YDirection(); + Standard_Real U1 = gp_Vec(Pos.XDirection()).AngleWithRef(OPp,myZ); //-M_PI<U1<M_PI + Standard_Real U2 = U1 + M_PI; ++ if(U1 > -Tol && U1 < 0.) {U1 = 0.;} + if (U1 < 0.) { U1 += 2. * M_PI; } + + gp_Pnt Ps; +@@ -167,7 +168,9 @@ + B = MP.Angle(DirZ); + if (!Same) { U1 += M_PI; } + U2 = U1 + M_PI; ++ if(U1 > -Tol && U1 < 0.) {U1 = 0.;} + if (U1 < 0.) { U1 += 2. * M_PI; } ++ if (U2 - 2.*M_PI < Tol && U2 > 2.*M_PI) {U2 = 2. * M_PI; } + if (U2 > 2.*M_PI) { U2 -= 2. * M_PI; } + B = MP.Angle(DirZ); + A = Abs(A); +@@ -258,6 +261,7 @@ + gp_Vec myZ = Pos.XDirection()^Pos.YDirection();

1 0