From owner-svn-ports-head@freebsd.org Sat Jul 15 17:23:52 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7EEFFAFE5E7; Sat, 15 Jul 2017 17:23:52 +0000 (UTC) (envelope-from thierry@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1E4A77729B; Sat, 15 Jul 2017 17:23:52 +0000 (UTC) (envelope-from thierry@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6FHNpxn063447; Sat, 15 Jul 2017 17:23:51 GMT (envelope-from thierry@FreeBSD.org) Received: (from thierry@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6FHNoJR063437; Sat, 15 Jul 2017 17:23:50 GMT (envelope-from thierry@FreeBSD.org) Message-Id: <201707151723.v6FHNoJR063437@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: thierry set sender to thierry@FreeBSD.org using -f From: Thierry Thomas Date: Sat, 15 Jul 2017 17:23:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r445905 - in head/cad/opencascade: . files X-SVN-Group: ports-head X-SVN-Commit-Author: thierry X-SVN-Commit-Paths: in head/cad/opencascade: . files X-SVN-Commit-Revision: 445905 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Jul 2017 17:23:52 -0000 Author: thierry Date: Sat Jul 15 17:23:50 2017 New Revision: 445905 URL: https://svnweb.freebsd.org/changeset/ports/445905 Log: Upgrade to 7.1.0. Release notes at https://www.opencascade.com/sites/default/files/documents/release_notes_7.1.0.pdf PR: 220110 Submitted by: tj+freebsd_portsxi (at) a13.fr With bits from: ml (at) netfence.it Added: head/cad/opencascade/files/patch-CMakeLists.txt (contents, props changed) head/cad/opencascade/files/patch-adm_cmake_occt__csf.cmake (contents, props changed) head/cad/opencascade/files/patch-adm_cmake_occt__macros.cmake (contents, props changed) head/cad/opencascade/files/patch-adm_templates_custom.install.sh.in (contents, props changed) head/cad/opencascade/files/patch-src_Standard_Standard__CLocaleSentry.hxx (contents, props changed) head/cad/opencascade/files/patch-src_Standard_Standard__CString.cxx (contents, props changed) Deleted: head/cad/opencascade/files/patch-adm_templates_occt_macros.cmake head/cad/opencascade/files/patch-configure.ac head/cad/opencascade/files/patch-inc_Standard_CLocaleSentry.hxx head/cad/opencascade/files/patch-inc_Standard_Time.hxx head/cad/opencascade/files/patch-src_OSD_OSD_MemInfo.cxx head/cad/opencascade/files/patch-src_Standard_Standard_CString.cxx Modified: head/cad/opencascade/Makefile head/cad/opencascade/distinfo head/cad/opencascade/files/patch-src_STEPConstruct_STEPConstruct__AP203Context.cxx head/cad/opencascade/pkg-plist Modified: head/cad/opencascade/Makefile ============================================================================== --- head/cad/opencascade/Makefile Sat Jul 15 17:23:48 2017 (r445904) +++ head/cad/opencascade/Makefile Sat Jul 15 17:23:50 2017 (r445905) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= opencascade -PORTVERSION= 6.9.1 -PORTREVISION= 9 +PORTVERSION= 7.1.0 CATEGORIES= cad science MASTER_SITES= LOCAL/thierry @@ -15,20 +14,23 @@ LICENSE_NAME= LGPL21 with exception LICENSE_FILE= ${WRKSRC}/OCCT_LGPL_EXCEPTION.txt LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -LIB_DEPENDS= libtbb.so:devel/tbb \ +LIB_DEPENDS= libfreetype.so:print/freetype2 \ + libtbb.so:devel/tbb \ libvtksys-${VTKVER}.so:math/vtk6 RUN_DEPENDS= bash:shells/bash -# Check ${WRKSRC}/dox/overview/Overview.md +# Check ${WRKSRC}/dox/overview/overview.md # and ${WRKSRC}/dox/dev_guides/building -USES= alias:10 bison cmake compiler:c++11-lib dos2unix \ +USES= alias:10 cmake:outsource compiler:c++11-lib dos2unix \ shebangfix tk tar:tgz -USE_XORG= xmu +USE_XORG= ice sm x11 xext xi xmu xt +USE_GL= gl glu DOS2UNIX_FILES= adm/templates/* -SHEBANG_FILES= adm/templates/env.sh.in adm/templates/draw.sh \ - adm/templates/custom.sh.in adm/templates/custom.sh.main \ - adm/start.tcl draw.sh xcode.sh env.sh custom.sh.in \ - gendoc codeblocks.sh +SHEBANG_FILES= adm/templates/*.sh \ + adm/templates/*.sh.in \ + adm/templates/*.sh.main \ + gendoc +ENVSH= env.sh adm/templates/env.sh.in adm/templates/env.sh VTKVER= 6.2 OPTIONS_DEFINE= VIS DOXYGEN @@ -37,19 +39,18 @@ OPTIONS_DEFAULT=VIS OPTIONS_SUB= yes REINPLACE_ARGS= -i "" -CFLAGS+= -I${LOCALBASE}/include -I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR} -LDFLAGS+= -L${LOCALBASE}/lib -L${TCL_LIBDIR} -L${TK_LIBDIR} -CMAKE_ARGS+= -D3RDPARTY_TCL_INCLUDE_DIR=${TCL_INCLUDEDIR} \ - -D3RDPARTY_TCL_LIBRARY=${TCL_LIBDIR} \ - -D3RDPARTY_TBB_DIR=${LOCALBASE} \ - -D3RDPARTY_TBB_LIBRARY_DIR=${LOCALBASE}/lib \ - -DINSTALL_DIR=${OCCROOT}/ -DUSE_TBB:BOOL=ON \ - -D3RDPARTY_TBBMALLOC_LIBRARY=${LOCALBASE}/lib/libtbbmalloc.so \ - -D3RDPARTY_TBB_LIBRARY=${LOCALBASE}/lib/libtbb.so \ - -D3RDPARTY_TBBMALLOC_LIBRARY_DIR=${LOCALBASE}/lib \ - -DUSE_VTK:BOOL=ON -D3RDPARTY_VTK_DIR=${LOCALBASE} \ - -D3RDPARTY_VTK_INCLUDE_DIR=${LOCALBASE}/include/vtk-${VTKVER} \ - -D3RDPARTY_VTK_LIBRARY_DIR=${LOCALBASE}/lib/vtk-${VTKVER} +CFLAGS+= -I${LOCALBASE}/include +CMAKE_ARGS+= -DINSTALL_DIR=${OCCROOT} \ + -DINSTALL_DIR_INCLUDE=${PREFIX}/include/OpenCASCADE \ + -DINSTALL_DIR_LIB=${PREFIX}/lib \ + -DINSTALL_DIR_CMAKE=${OCCROOT}/lib/cmake \ + -DINSTALL_DIR_DATA=${OCCROOT}/data \ + -DINSTALL_DIR_RESOURCE=${OCCROOT}/resources \ + -DINSTALL_DIR_SAMPLES=${OCCROOT}/samples \ + -DINSTALL_DIR_TESTS=${OCCROOT}/tests \ + -DINSTALL_TEST_CASES:BOOL=ON \ + -DUSE_TBB:BOOL=ON \ + -DUSE_VTK:BOOL=ON USE_LDCONFIG= yes @@ -61,15 +62,11 @@ VIS_CMAKE_ON= -DUSE_FREEIMAGE:BOOL=ON -DUSE_GL2PS:BOO -DUSE_FREETYPE:BOOL=ON VIS_CMAKE_OFF= -DUSE_FREEIMAGE:BOOL=OFF -DUSE_GL2PS:BOOL=OFF \ -DUSE_FREETYPE:BOOL=OFF -VIS_USE= GL=glu VIS_LIB_DEPENDS= libftgl.so:graphics/ftgl \ - libfreetype.so:print/freetype2 \ libgl2ps.so:print/gl2ps \ libfreeimageplus.so:graphics/freeimage -VIS_CMAKE_ON= -D3RDPARTY_FREETYPE_DIR=${LOCALBASE} \ - -D3RDPARTY_FREEIMAGE_DIR=${LOCALBASE} \ - -D3RDPARTY_GL2PS_DIR=${LOCALBASE} +VIS_CMAKE_ON= -D3RDPARTY_FREETYPE_DIR=${LOCALBASE} DOXYGEN_USE= TEX=latex:build DOXYGEN_BUILD_DEPENDS= bash:shells/bash \ @@ -80,12 +77,6 @@ DOXYGEN_RUN_DEPENDS= ${LOCALBASE}/www/MathJax/MathJax. .include -.if ${ARCH} == "i386" -BITS= 32 -.else -BITS= 64 -.endif - pre-everything:: @${ECHO_MSG} @${ECHO_MSG} "Warning: to build OpenCascade, you should have at least" @@ -94,39 +85,23 @@ pre-everything:: pre-configure: ${REINPLACE_CMD} -e 's|tclsh|${TCLSH}|' ${WRKSRC}/gendoc -.for mod in TKDraw TKViewerTest - ${REINPLACE_CMD} -e 's|tcl8.6|tcl${TCL_VER:C|\.||}|;s|tk8.6|tk${TK_VER:C|\.||}|' \ - ${WRKSRC}/adm/cmake/${mod}/CMakeLists.txt +.for es in ${ENVSH} + ${REINPLACE_CMD} -e 's|lin|bsd|;s|x86_64|amd64|' ${WRKSRC}/${es} .endfor -.for mod in TKIVtk TKIVtkDraw - ${REINPLACE_CMD} -E 's/(vtk[[:alnum:]]+)\-6.1/\1\-${VTKVER}/' \ - ${WRKSRC}/adm/cmake/${mod}/CMakeLists.txt -.endfor -.for es in env.sh adm/templates/env.sh.in - ${REINPLACE_CMD} -e 's|lin|bsd|' ${WRKSRC}/${es} -.endfor +pre-patch: + @${REINPLACE_CMD} 's|||' \ + ${WRKSRC}/src/OSD/OSD_MemInfo.cxx \ + ${WRKSRC}/src/StepFile/step.tab.c \ + ${WRKSRC}/src/StepFile/step.yacc + post-build-DOXYGEN-on: (cd ${WRKSRC} && ./gendoc -overview) post-install: - ${MV} ${STAGEDIR}${OCCROOT}/bsd${BITS}/${CHOSEN_COMPILER_TYPE}/bin/DRAWEXE \ - ${STAGEDIR}${PREFIX}/bin/ + ${MV} ${STAGEDIR}${OCCROOT}/bin/DRAWEXE-${PORTVERSION} ${STAGEDIR}${PREFIX}/bin/DRAWEXE (cd ${STAGEDIR}${PREFIX}/bin && \ - ${LN} -sf DRAWEXE ${STAGEDIR}${OCCROOT}/bsd${BITS}/${CHOSEN_COMPILER_TYPE}/bin/DRAWEXE) - ${MV} ${STAGEDIR}${OCCROOT}/bsd${BITS}/${CHOSEN_COMPILER_TYPE}/lib/lib*.so \ - ${STAGEDIR}${PREFIX}/lib/ - (cd ${STAGEDIR}${PREFIX}/lib \ - && for l in lib*.so; do \ - ${MV} $${l} $${l}.0; \ - ${LN} -sf $${l}.0 $${l}; \ - ${LN} -sf $${l}.0 ${STAGEDIR}${OCCROOT}/bsd${BITS}/${CHOSEN_COMPILER_TYPE}/lib/$${l}; \ - done) - ${MKDIR} ${STAGEDIR}${PREFIX}/include/OpenCASCADE - (cd ${STAGEDIR}${OCCROOT}/inc && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include/OpenCASCADE) - ${RM} -r ${STAGEDIR}${OCCROOT}/inc - ${LN} -sf ${PREFIX}/include/OpenCASCADE ${STAGEDIR}${OCCROOT}/inc - (cd ${WRKSRC} && ${COPYTREE_SHARE} tests ${STAGEDIR}${OCCROOT}) + ${LN} -sf DRAWEXE ${STAGEDIR}${OCCROOT}/bin/DRAWEXE) post-install-DOXYGEN-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC}/doc/overview && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) @@ -136,9 +111,9 @@ post-install-DOXYGEN-on: regression-test: install ${MKDIR} /tmp/testOCC bash -c "\ - cd ${OCCROOT} && . ${OCCROOT}/env.sh && \ - CSF_TestScriptsPath=${OCCROOT}/tests \ - CSF_TestDataPath=${OCCROOT}/data \ + cd ${OCCROOT} && . ${OCCROOT}/bin/env.sh && \ + CSF_TestScriptsPath=${OCCROOT}/tests \ + CSF_TestDataPath=${OCCROOT}/data \ DRAWEXE -f ${FILESDIR}/regtest " .endif Modified: head/cad/opencascade/distinfo ============================================================================== --- head/cad/opencascade/distinfo Sat Jul 15 17:23:48 2017 (r445904) +++ head/cad/opencascade/distinfo Sat Jul 15 17:23:50 2017 (r445905) @@ -1,2 +1,3 @@ -SHA256 (opencascade-6.9.1.tgz) = f92659ae3fb09c28233fb9178bc24fd2aab6776f6d9ea2479c3bdfe6296b873f -SIZE (opencascade-6.9.1.tgz) = 209589289 +TIMESTAMP = 1498857001 +SHA256 (opencascade-7.1.0.tgz) = 0e23f038f4d12ed68d402dd8093923ac506db34abcf1c09bd2bffba1587f68d5 +SIZE (opencascade-7.1.0.tgz) = 221861542 Added: head/cad/opencascade/files/patch-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/opencascade/files/patch-CMakeLists.txt Sat Jul 15 17:23:50 2017 (r445905) @@ -0,0 +1,26 @@ +--- CMakeLists.txt.orig 2016-11-25 09:52:00 UTC ++++ CMakeLists.txt +@@ -739,7 +739,7 @@ if (${DRAWEXE_INDEX} GREATER -1) + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE) + else() + install (FILES "${CMAKE_SOURCE_DIR}/adm/templates/draw.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR_SCRIPT}" +- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE) ++ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) + endif() + + # copy draw script to CMake binary folder +@@ -906,7 +906,13 @@ foreach (OCCT_CONFIGURATION ${CMAKE_CONF + endforeach() + # install OpenCASCADE config file with compile definitions and C/C++ flags ONLY for current configuration + install (CODE "string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWER)") +-install (CODE "configure_file(\"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" COPYONLY)") ++install(CODE " ++ configure_file( ++ \"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" ++ \"\$ENV{DESTDIR}/${INSTALL_DIR_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" ++ COPYONLY) ++") ++ + + foreach (OCCT_MODULE ${OCCT_MODULES}) + if (BUILD_MODULE_${OCCT_MODULE}) Added: head/cad/opencascade/files/patch-adm_cmake_occt__csf.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/opencascade/files/patch-adm_cmake_occt__csf.cmake Sat Jul 15 17:23:50 2017 (r445905) @@ -0,0 +1,17 @@ +--- adm/cmake/occt_csf.cmake.orig 2016-11-25 09:52:00 UTC ++++ adm/cmake/occt_csf.cmake +@@ -100,7 +100,6 @@ else() + set (CSF_ThreadLibs "pthread rt stdc++") + set (CSF_OpenGlLibs "GL") + set (CSF_XwLibs "X11 Xext Xmu Xi") +- set (CSF_dl "dl") + + if (USE_TCL) + set (CSF_TclLibs "tcl${3RDPARTY_TCL_LIBRARY_VERSION}") +@@ -127,4 +126,4 @@ else() + set (CSF_GL2PS) + endif() + endif() +-endif() +\ No newline at end of file ++endif() Added: head/cad/opencascade/files/patch-adm_cmake_occt__macros.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/opencascade/files/patch-adm_cmake_occt__macros.cmake Sat Jul 15 17:23:50 2017 (r445905) @@ -0,0 +1,11 @@ +--- adm/cmake/occt_macros.cmake.orig 2016-11-25 09:52:00 UTC ++++ adm/cmake/occt_macros.cmake +@@ -53,7 +53,7 @@ macro (OCCT_MAKE_OS_WITH_BITNESS) + elseif(APPLE) + set (OS_WITH_BIT "mac${COMPILER_BITNESS}") + else() +- set (OS_WITH_BIT "lin${COMPILER_BITNESS}") ++ set (OS_WITH_BIT "bsd${COMPILER_BITNESS}") + endif() + endmacro() + Added: head/cad/opencascade/files/patch-adm_templates_custom.install.sh.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/opencascade/files/patch-adm_templates_custom.install.sh.in Sat Jul 15 17:23:50 2017 (r445905) @@ -0,0 +1,24 @@ +--- adm/templates/custom.install.sh.in.orig 2017-07-15 14:03:43 UTC ++++ adm/templates/custom.install.sh.in +@@ -14,14 +14,14 @@ if [ "$1" == "@BIN_LETTER@" ]; then + export TK_VERSION_WITH_DOT="@3RDPARTY_TK_LIBRARY_VERSION_WITH_DOT@" + + export CSF_OCCTBinPath="@INSTALL_DIR_ABSOLUTE@/@INSTALL_DIR_BIN@" +- export CSF_OCCTLibPath="@INSTALL_DIR_ABSOLUTE@/@INSTALL_DIR_LIB@" +- export CSF_OCCTIncludePath="@INSTALL_DIR_ABSOLUTE@/@INSTALL_DIR_INCLUDE@" +- export CSF_OCCTResourcePath="@INSTALL_DIR_ABSOLUTE@/@INSTALL_DIR_RESOURCE@" +- export CSF_OCCTDataPath="@INSTALL_DIR_ABSOLUTE@/@INSTALL_DIR_DATA@" +- export CSF_OCCTSamplesPath="@INSTALL_DIR_ABSOLUTE@/@INSTALL_DIR_SAMPLES@" +- export CSF_OCCTTestsPath="@INSTALL_DIR_ABSOLUTE@/@INSTALL_DIR_TESTS@" ++ export CSF_OCCTLibPath="@INSTALL_DIR_LIB@" ++ export CSF_OCCTIncludePath="@INSTALL_DIR_INCLUDE@" ++ export CSF_OCCTResourcePath="@INSTALL_DIR_RESOURCE@" ++ export CSF_OCCTDataPath="@INSTALL_DIR_DATA@" ++ export CSF_OCCTSamplesPath="@INSTALL_DIR_SAMPLES@" ++ export CSF_OCCTTestsPath="@INSTALL_DIR_TESTS@" + export CSF_OCCTDocPath="@INSTALL_DIR_ABSOLUTE@/@INSTALL_DIR_DOC@" +- ++ + # for compatability with external application using CASROOT + export CASROOT="@INSTALL_DIR_ABSOLUTE@" + fi Modified: head/cad/opencascade/files/patch-src_STEPConstruct_STEPConstruct__AP203Context.cxx ============================================================================== --- head/cad/opencascade/files/patch-src_STEPConstruct_STEPConstruct__AP203Context.cxx Sat Jul 15 17:23:48 2017 (r445904) +++ head/cad/opencascade/files/patch-src_STEPConstruct_STEPConstruct__AP203Context.cxx Sat Jul 15 17:23:50 2017 (r445905) @@ -1,6 +1,6 @@ ---- src/STEPConstruct/STEPConstruct_AP203Context.cxx.orig 2015-09-25 16:19:10.000000000 +0200 -+++ src/STEPConstruct/STEPConstruct_AP203Context.cxx 2015-10-25 20:37:31.000000000 +0100 -@@ -105,7 +105,7 @@ +--- src/STEPConstruct/STEPConstruct_AP203Context.cxx.orig 2016-11-25 09:52:26 UTC ++++ src/STEPConstruct/STEPConstruct_AP203Context.cxx +@@ -123,7 +123,7 @@ Handle(StepBasic_DateAndTime) STEPConstr long shift = 0; _get_timezone (&shift); #else Added: head/cad/opencascade/files/patch-src_Standard_Standard__CLocaleSentry.hxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/opencascade/files/patch-src_Standard_Standard__CLocaleSentry.hxx Sat Jul 15 17:23:50 2017 (r445905) @@ -0,0 +1,11 @@ +--- src/Standard/Standard_CLocaleSentry.hxx.orig 2016-11-25 09:52:27 UTC ++++ src/Standard/Standard_CLocaleSentry.hxx +@@ -25,7 +25,7 @@ + //! and become part of POSIX since '2008. + //! Notice that this is impossible to test (_POSIX_C_SOURCE >= 200809L) + //! since POSIX didn't declared such identifier. +- #if defined(__APPLE__) ++ #if defined(__APPLE__) || (defined(__FreeBSD__) && (__FreeBSD_version > 910000)) + #define HAVE_XLOCALE_H + #endif + Added: head/cad/opencascade/files/patch-src_Standard_Standard__CString.cxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/opencascade/files/patch-src_Standard_Standard__CString.cxx Sat Jul 15 17:23:50 2017 (r445905) @@ -0,0 +1,11 @@ +--- src/Standard/Standard_CString.cxx.orig 2016-11-25 09:52:27 UTC ++++ src/Standard/Standard_CString.cxx +@@ -81,7 +81,7 @@ Standard_Integer HashCodes (const Standa + // strtod, strtol, strtoll functions. For other system with locale-depended + // implementations problems may appear if "C" locale is not set explicitly. + #if !defined(__ANDROID__) && !defined(__QNX__) && !defined(__MINGW32__) +- #error System does not support xlocale. Import/export could be broken if C locale did not specified by application. ++ #warning System does not support xlocale. Import/export could be broken if C locale did not specified by application. + #endif + #define strtod_l(thePtr, theNextPtr, theLocale) strtod(thePtr, theNextPtr) + #endif Modified: head/cad/opencascade/pkg-plist ============================================================================== --- head/cad/opencascade/pkg-plist Sat Jul 15 17:23:48 2017 (r445904) +++ head/cad/opencascade/pkg-plist Sat Jul 15 17:23:50 2017 (r445905) @@ -1,74 +1,8 @@ -%%OCCROOT%%/bsd%%BITS%%/%%CC%%/bin/DRAWEXE -%%OCCROOT%%/bsd%%BITS%%/%%CC%%/lib/libFWOSPlugin.so -%%OCCROOT%%/bsd%%BITS%%/%%CC%%/lib/libPTKernel.so -%%OCCROOT%%/bsd%%BITS%%/%%CC%%/lib/libTKBO.so -%%OCCROOT%%/bsd%%BITS%%/%%CC%%/lib/libTKBRep.so -%%OCCROOT%%/bsd%%BITS%%/%%CC%%/lib/libTKBin.so -%%OCCROOT%%/bsd%%BITS%%/%%CC%%/lib/libTKBinL.so -%%OCCROOT%%/bsd%%BITS%%/%%CC%%/lib/libTKBinTObj.so -%%OCCROOT%%/bsd%%BITS%%/%%CC%%/lib/libTKBinXCAF.so -%%OCCROOT%%/bsd%%BITS%%/%%CC%%/lib/libTKBool.so -%%OCCROOT%%/bsd%%BITS%%/%%CC%%/lib/libTKCAF.so -%%OCCROOT%%/bsd%%BITS%%/%%CC%%/lib/libTKCDF.so -%%OCCROOT%%/bsd%%BITS%%/%%CC%%/lib/libTKDCAF.so -%%OCCROOT%%/bsd%%BITS%%/%%CC%%/lib/libTKDraw.so -%%OCCROOT%%/bsd%%BITS%%/%%CC%%/lib/libTKFeat.so -%%OCCROOT%%/bsd%%BITS%%/%%CC%%/lib/libTKFillet.so -%%OCCROOT%%/bsd%%BITS%%/%%CC%%/lib/libTKG2d.so -%%OCCROOT%%/bsd%%BITS%%/%%CC%%/lib/libTKG3d.so -%%OCCROOT%%/bsd%%BITS%%/%%CC%%/lib/libTKGeomAlgo.so -%%OCCROOT%%/bsd%%BITS%%/%%CC%%/lib/libTKGeomBase.so -%%OCCROOT%%/bsd%%BITS%%/%%CC%%/lib/libTKHLR.so -%%OCCROOT%%/bsd%%BITS%%/%%CC%%/lib/libTKIGES.so -%%OCCROOT%%/bsd%%BITS%%/%%CC%%/lib/libTKIVtk.so -%%OCCROOT%%/bsd%%BITS%%/%%CC%%/lib/libTKIVtkDraw.so -%%OCCROOT%%/bsd%%BITS%%/%%CC%%/lib/libTKLCAF.so -%%OCCROOT%%/bsd%%BITS%%/%%CC%%/lib/libTKMath.so -%%OCCROOT%%/bsd%%BITS%%/%%CC%%/lib/libTKMesh.so -%%OCCROOT%%/bsd%%BITS%%/%%CC%%/lib/libTKMeshVS.so -%%OCCROOT%%/bsd%%BITS%%/%%CC%%/lib/libTKNIS.so -%%OCCROOT%%/bsd%%BITS%%/%%CC%%/lib/libTKOffset.so -%%OCCROOT%%/bsd%%BITS%%/%%CC%%/lib/libTKOpenGl.so -%%OCCROOT%%/bsd%%BITS%%/%%CC%%/lib/libTKPCAF.so -%%OCCROOT%%/bsd%%BITS%%/%%CC%%/lib/libTKPLCAF.so -%%OCCROOT%%/bsd%%BITS%%/%%CC%%/lib/libTKPShape.so -%%OCCROOT%%/bsd%%BITS%%/%%CC%%/lib/libTKPrim.so -%%OCCROOT%%/bsd%%BITS%%/%%CC%%/lib/libTKQADraw.so -%%OCCROOT%%/bsd%%BITS%%/%%CC%%/lib/libTKSTEP.so -%%OCCROOT%%/bsd%%BITS%%/%%CC%%/lib/libTKSTEP209.so -%%OCCROOT%%/bsd%%BITS%%/%%CC%%/lib/libTKSTEPAttr.so -%%OCCROOT%%/bsd%%BITS%%/%%CC%%/lib/libTKSTEPBase.so -%%OCCROOT%%/bsd%%BITS%%/%%CC%%/lib/libTKSTL.so -%%OCCROOT%%/bsd%%BITS%%/%%CC%%/lib/libTKService.so -%%OCCROOT%%/bsd%%BITS%%/%%CC%%/lib/libTKShHealing.so -%%OCCROOT%%/bsd%%BITS%%/%%CC%%/lib/libTKShapeSchema.so -%%OCCROOT%%/bsd%%BITS%%/%%CC%%/lib/libTKStdLSchema.so -%%OCCROOT%%/bsd%%BITS%%/%%CC%%/lib/libTKStdSchema.so -%%OCCROOT%%/bsd%%BITS%%/%%CC%%/lib/libTKTObj.so -%%OCCROOT%%/bsd%%BITS%%/%%CC%%/lib/libTKTObjDRAW.so -%%OCCROOT%%/bsd%%BITS%%/%%CC%%/lib/libTKTopAlgo.so -%%OCCROOT%%/bsd%%BITS%%/%%CC%%/lib/libTKTopTest.so -%%OCCROOT%%/bsd%%BITS%%/%%CC%%/lib/libTKV3d.so -%%OCCROOT%%/bsd%%BITS%%/%%CC%%/lib/libTKVRML.so -%%OCCROOT%%/bsd%%BITS%%/%%CC%%/lib/libTKViewerTest.so -%%OCCROOT%%/bsd%%BITS%%/%%CC%%/lib/libTKVoxel.so -%%OCCROOT%%/bsd%%BITS%%/%%CC%%/lib/libTKXCAF.so -%%OCCROOT%%/bsd%%BITS%%/%%CC%%/lib/libTKXCAFSchema.so -%%OCCROOT%%/bsd%%BITS%%/%%CC%%/lib/libTKXDEDRAW.so -%%OCCROOT%%/bsd%%BITS%%/%%CC%%/lib/libTKXDEIGES.so -%%OCCROOT%%/bsd%%BITS%%/%%CC%%/lib/libTKXDESTEP.so -%%OCCROOT%%/bsd%%BITS%%/%%CC%%/lib/libTKXMesh.so -%%OCCROOT%%/bsd%%BITS%%/%%CC%%/lib/libTKXSBase.so -%%OCCROOT%%/bsd%%BITS%%/%%CC%%/lib/libTKXSDRAW.so -%%OCCROOT%%/bsd%%BITS%%/%%CC%%/lib/libTKXml.so -%%OCCROOT%%/bsd%%BITS%%/%%CC%%/lib/libTKXmlL.so -%%OCCROOT%%/bsd%%BITS%%/%%CC%%/lib/libTKXmlTObj.so -%%OCCROOT%%/bsd%%BITS%%/%%CC%%/lib/libTKXmlXCAF.so -%%OCCROOT%%/bsd%%BITS%%/%%CC%%/lib/libTKernel.so -%%OCCROOT%%/custom.sh -%%OCCROOT%%/custom_%%CC%%_%%BITS%%_.sh -%%OCCROOT%%/data/csfdb/Motor-c.csfdb -%%OCCROOT%%/data/csfdb/Motor-compound.csfdb +%%OCCROOT%%/bin/DRAWEXE +%%OCCROOT%%/bin/custom.sh +%%OCCROOT%%/bin/custom_%%CC%%_64.sh +%%OCCROOT%%/bin/draw.sh +%%OCCROOT%%/bin/env.sh %%OCCROOT%%/data/iges/bearing.iges %%OCCROOT%%/data/iges/hammer.iges %%OCCROOT%%/data/images/Graph.PNG @@ -80,15 +14,18 @@ %%OCCROOT%%/data/images/marker_box1.png %%OCCROOT%%/data/images/marker_box2.png %%OCCROOT%%/data/images/marker_dot.png +%%OCCROOT%%/data/images/marker_kr.png %%OCCROOT%%/data/images/nut.bmp %%OCCROOT%%/data/images/petitsobj.gif %%OCCROOT%%/data/images/salome_interface04.jpg %%OCCROOT%%/data/occ/Axis_of_bearing.brep +%%OCCROOT%%/data/occ/Ball.brep %%OCCROOT%%/data/occ/Bottom.brep %%OCCROOT%%/data/occ/CrankArm.brep %%OCCROOT%%/data/occ/CrankArm.rle %%OCCROOT%%/data/occ/CylinderHead.rle %%OCCROOT%%/data/occ/EngineBlock.rle +%%OCCROOT%%/data/occ/Motor-c.brep %%OCCROOT%%/data/occ/Piston.rle %%OCCROOT%%/data/occ/Propeller.rle %%OCCROOT%%/data/occ/Top.brep @@ -115,12 +52,128 @@ %%OCCROOT%%/data/stl/shape.stl %%OCCROOT%%/data/stl/video_part.stl %%OCCROOT%%/data/vrml/face.vrml -@mode 555 -%%OCCROOT%%/draw.sh -%%OCCROOT%%/env.sh -@mode -%%OCCROOT%%/inc +%%OCCROOT%%/lib/cmake/OpenCASCADEApplicationFrameworkTargets-%%CMAKE_BUILD_TYPE%%.cmake +%%OCCROOT%%/lib/cmake/OpenCASCADEApplicationFrameworkTargets.cmake +%%OCCROOT%%/lib/cmake/OpenCASCADECompileDefinitionsAndFlags-%%CMAKE_BUILD_TYPE%%.cmake +%%OCCROOT%%/lib/cmake/OpenCASCADEConfig.cmake +%%OCCROOT%%/lib/cmake/OpenCASCADEConfigVersion.cmake +%%OCCROOT%%/lib/cmake/OpenCASCADEDataExchangeTargets-%%CMAKE_BUILD_TYPE%%.cmake +%%OCCROOT%%/lib/cmake/OpenCASCADEDataExchangeTargets.cmake +%%OCCROOT%%/lib/cmake/OpenCASCADEDrawTargets-%%CMAKE_BUILD_TYPE%%.cmake +%%OCCROOT%%/lib/cmake/OpenCASCADEDrawTargets.cmake +%%OCCROOT%%/lib/cmake/OpenCASCADEFoundationClassesTargets-%%CMAKE_BUILD_TYPE%%.cmake +%%OCCROOT%%/lib/cmake/OpenCASCADEFoundationClassesTargets.cmake +%%OCCROOT%%/lib/cmake/OpenCASCADEModelingAlgorithmsTargets-%%CMAKE_BUILD_TYPE%%.cmake +%%OCCROOT%%/lib/cmake/OpenCASCADEModelingAlgorithmsTargets.cmake +%%OCCROOT%%/lib/cmake/OpenCASCADEModelingDataTargets-%%CMAKE_BUILD_TYPE%%.cmake +%%OCCROOT%%/lib/cmake/OpenCASCADEModelingDataTargets.cmake +%%OCCROOT%%/lib/cmake/OpenCASCADEVisualizationTargets-%%CMAKE_BUILD_TYPE%%.cmake +%%OCCROOT%%/lib/cmake/OpenCASCADEVisualizationTargets.cmake +%%OCCROOT%%/resources/DrawResources/CURVES.tcl +%%OCCROOT%%/resources/DrawResources/CheckCommands.tcl +%%OCCROOT%%/resources/DrawResources/DrawDefault +%%OCCROOT%%/resources/DrawResources/DrawPlugin +%%OCCROOT%%/resources/DrawResources/DrawTK.tcl +%%OCCROOT%%/resources/DrawResources/FILES +%%OCCROOT%%/resources/DrawResources/Geometry.tcl +%%OCCROOT%%/resources/DrawResources/InitEnvironment.tcl +%%OCCROOT%%/resources/DrawResources/Move.tcl +%%OCCROOT%%/resources/DrawResources/OCC_logo.png +%%OCCROOT%%/resources/DrawResources/PROFIL.tcl +%%OCCROOT%%/resources/DrawResources/SCAN.tcl +%%OCCROOT%%/resources/DrawResources/SURFACES.tcl +%%OCCROOT%%/resources/DrawResources/StandardCommands.tcl +%%OCCROOT%%/resources/DrawResources/StandardViews.tcl +%%OCCROOT%%/resources/DrawResources/TKTopTest.tcl +%%OCCROOT%%/resources/DrawResources/TestCommands.tcl +%%OCCROOT%%/resources/DrawResources/dftree.tcl +%%OCCROOT%%/resources/DrawResources/lamp.ico +%%OCCROOT%%/resources/SHMessage/FILES +%%OCCROOT%%/resources/SHMessage/SHAPE.fr +%%OCCROOT%%/resources/SHMessage/SHAPE.us +%%OCCROOT%%/resources/SHMessage/SHMessage_SHAPE_us.pxx +%%OCCROOT%%/resources/Shaders/Declarations.glsl +%%OCCROOT%%/resources/Shaders/DeclarationsImpl.glsl +%%OCCROOT%%/resources/Shaders/Display.fs +%%OCCROOT%%/resources/Shaders/FILES +%%OCCROOT%%/resources/Shaders/PathtraceBase.fs +%%OCCROOT%%/resources/Shaders/PhongShading.fs +%%OCCROOT%%/resources/Shaders/PhongShading.vs +%%OCCROOT%%/resources/Shaders/RaytraceBase.fs +%%OCCROOT%%/resources/Shaders/RaytraceBase.vs +%%OCCROOT%%/resources/Shaders/RaytraceRender.fs +%%OCCROOT%%/resources/Shaders/RaytraceSmooth.fs +%%OCCROOT%%/resources/Shaders/Shaders_DeclarationsImpl_glsl.pxx +%%OCCROOT%%/resources/Shaders/Shaders_Declarations_glsl.pxx +%%OCCROOT%%/resources/Shaders/Shaders_Display_fs.pxx +%%OCCROOT%%/resources/Shaders/Shaders_PathtraceBase_fs.pxx +%%OCCROOT%%/resources/Shaders/Shaders_RaytraceBase_fs.pxx +%%OCCROOT%%/resources/Shaders/Shaders_RaytraceBase_vs.pxx +%%OCCROOT%%/resources/Shaders/Shaders_RaytraceRender_fs.pxx +%%OCCROOT%%/resources/Shaders/Shaders_RaytraceSmooth_fs.pxx +%%OCCROOT%%/resources/StdResource/FILES +%%OCCROOT%%/resources/StdResource/MigrationSheet.txt +%%OCCROOT%%/resources/StdResource/Plugin +%%OCCROOT%%/resources/StdResource/Standard +%%OCCROOT%%/resources/StdResource/StandardLite +%%OCCROOT%%/resources/StdResource/TObj +%%OCCROOT%%/resources/StdResource/XCAF +%%OCCROOT%%/resources/TObj/TObj.msg +%%OCCROOT%%/resources/Textures/1d_elevation.rgb +%%OCCROOT%%/resources/Textures/2d_MatraDatavision.rgb +%%OCCROOT%%/resources/Textures/2d_alienskin.rgb +%%OCCROOT%%/resources/Textures/2d_aluminum.rgb +%%OCCROOT%%/resources/Textures/2d_blue_rock.rgb +%%OCCROOT%%/resources/Textures/2d_bluewhite_paper.rgb +%%OCCROOT%%/resources/Textures/2d_brushed.rgb +%%OCCROOT%%/resources/Textures/2d_bubbles.rgb +%%OCCROOT%%/resources/Textures/2d_bumps.rgb +%%OCCROOT%%/resources/Textures/2d_cast.rgb +%%OCCROOT%%/resources/Textures/2d_chess.rgba +%%OCCROOT%%/resources/Textures/2d_chipbd.rgb +%%OCCROOT%%/resources/Textures/2d_clouds.rgb +%%OCCROOT%%/resources/Textures/2d_flesh.rgb +%%OCCROOT%%/resources/Textures/2d_floor.rgb +%%OCCROOT%%/resources/Textures/2d_galvnisd.rgb +%%OCCROOT%%/resources/Textures/2d_grass.rgb +%%OCCROOT%%/resources/Textures/2d_knurl.rgb +%%OCCROOT%%/resources/Textures/2d_maple.rgb +%%OCCROOT%%/resources/Textures/2d_marble.rgb +%%OCCROOT%%/resources/Textures/2d_mottled.rgb +%%OCCROOT%%/resources/Textures/2d_rain.rgb +%%OCCROOT%%/resources/Textures/2d_rock.rgb +%%OCCROOT%%/resources/Textures/FILES +%%OCCROOT%%/resources/Textures/env_clouds.rgb +%%OCCROOT%%/resources/Textures/env_cv.rgb +%%OCCROOT%%/resources/Textures/env_lines.rgb +%%OCCROOT%%/resources/Textures/env_medit.rgb +%%OCCROOT%%/resources/Textures/env_pearl.rgb +%%OCCROOT%%/resources/Textures/env_road.rgb +%%OCCROOT%%/resources/Textures/env_sky1.rgb +%%OCCROOT%%/resources/Textures/env_sky2.rgb +%%OCCROOT%%/resources/UnitsAPI/Units.dat +%%OCCROOT%%/resources/XSMessage/FILES +%%OCCROOT%%/resources/XSMessage/XSMessage_XSTEP_us.pxx +%%OCCROOT%%/resources/XSMessage/XSTEP.fr +%%OCCROOT%%/resources/XSMessage/XSTEP.us +%%OCCROOT%%/resources/XSTEPResource/FILES +%%OCCROOT%%/resources/XSTEPResource/IGES +%%OCCROOT%%/resources/XSTEPResource/STEP +%%OCCROOT%%/resources/XmlOcafResource/FILES +%%OCCROOT%%/resources/XmlOcafResource/XmlOcaf.xsd +%%OCCROOT%%/resources/XmlOcafResource/XmlOcaf_SmallTypes.xsd +%%OCCROOT%%/resources/XmlOcafResource/XmlOcaf_TDF.xsd +%%OCCROOT%%/resources/XmlOcafResource/XmlOcaf_TDataStd.xsd +%%OCCROOT%%/resources/XmlOcafResource/XmlOcaf_TDataStd_Name.xsd +%%OCCROOT%%/resources/XmlOcafResource/XmlOcaf_TDocStd.xsd +%%OCCROOT%%/resources/XmlOcafResource/XmlOcaf_TFunction.xsd +%%OCCROOT%%/resources/XmlOcafResource/XmlOcaf_TNaming.xsd +%%OCCROOT%%/resources/XmlOcafResource/XmlOcaf_TNaming_NamedShape.xsd +%%OCCROOT%%/resources/XmlOcafResource/XmlOcaf_TPrsStd.xsd +%%OCCROOT%%/resources/XmlOcafResource/XmlXcaf.xsd +%%OCCROOT%%/samples/tcl/ANC101.tcl %%OCCROOT%%/samples/tcl/DataExchangeDemo.tcl +%%OCCROOT%%/samples/tcl/MBBGehauseRohteil.tcl %%OCCROOT%%/samples/tcl/ModelingDemo.tcl %%OCCROOT%%/samples/tcl/Penrose.tcl %%OCCROOT%%/samples/tcl/Readme.txt @@ -131,106 +184,15 @@ %%OCCROOT%%/samples/tcl/cutter.tcl %%OCCROOT%%/samples/tcl/dimensions.tcl %%OCCROOT%%/samples/tcl/drill.tcl +%%OCCROOT%%/samples/tcl/markers.tcl %%OCCROOT%%/samples/tcl/materials.tcl +%%OCCROOT%%/samples/tcl/pathtrace_ball.tcl +%%OCCROOT%%/samples/tcl/pathtrace_cube.tcl %%OCCROOT%%/samples/tcl/pencil.tcl %%OCCROOT%%/samples/tcl/raytrace.tcl %%OCCROOT%%/samples/tcl/snowflake.tcl %%OCCROOT%%/samples/tcl/spheres.tcl %%OCCROOT%%/samples/tcl/xde.tcl -%%OCCROOT%%/src/DrawResources/CURVES.tcl -%%OCCROOT%%/src/DrawResources/CheckCommands.tcl -%%OCCROOT%%/src/DrawResources/DrawDefault -%%OCCROOT%%/src/DrawResources/DrawPlugin -%%OCCROOT%%/src/DrawResources/DrawTK.tcl -%%OCCROOT%%/src/DrawResources/FILES -%%OCCROOT%%/src/DrawResources/Geometry.tcl -%%OCCROOT%%/src/DrawResources/InitEnvironment.tcl -%%OCCROOT%%/src/DrawResources/Move.tcl -%%OCCROOT%%/src/DrawResources/OCC_logo.png -%%OCCROOT%%/src/DrawResources/PROFIL.tcl -%%OCCROOT%%/src/DrawResources/SCAN.tcl -%%OCCROOT%%/src/DrawResources/SURFACES.tcl -%%OCCROOT%%/src/DrawResources/StandardCommands.tcl -%%OCCROOT%%/src/DrawResources/StandardViews.tcl -%%OCCROOT%%/src/DrawResources/TKTopTest.tcl -%%OCCROOT%%/src/DrawResources/TestCommands.tcl -%%OCCROOT%%/src/DrawResources/dftree.tcl -%%OCCROOT%%/src/DrawResources/lamp.ico -%%OCCROOT%%/src/SHMessage/FILES -%%OCCROOT%%/src/SHMessage/SHAPE.fr -%%OCCROOT%%/src/SHMessage/SHAPE.us -%%OCCROOT%%/src/Shaders/Declarations.glsl -%%OCCROOT%%/src/Shaders/DeclarationsImpl.glsl -%%OCCROOT%%/src/Shaders/FILES -%%OCCROOT%%/src/Shaders/PhongShading.fs -%%OCCROOT%%/src/Shaders/PhongShading.vs -%%OCCROOT%%/src/Shaders/RaytraceBase.fs -%%OCCROOT%%/src/Shaders/RaytraceBase.vs -%%OCCROOT%%/src/Shaders/RaytraceRender.fs -%%OCCROOT%%/src/Shaders/RaytraceSmooth.fs -%%OCCROOT%%/src/StdResource/FILES -%%OCCROOT%%/src/StdResource/MDTV-Standard.xwd -%%OCCROOT%%/src/StdResource/MigrationSheet.txt -%%OCCROOT%%/src/StdResource/Plugin -%%OCCROOT%%/src/StdResource/Standard -%%OCCROOT%%/src/StdResource/Standard.us -%%OCCROOT%%/src/StdResource/StandardLite -%%OCCROOT%%/src/StdResource/TObj -%%OCCROOT%%/src/StdResource/XCAF -%%OCCROOT%%/src/TObj/TObj.msg -%%OCCROOT%%/src/Textures/1d_elevation.rgb -%%OCCROOT%%/src/Textures/2d_MatraDatavision.rgb -%%OCCROOT%%/src/Textures/2d_alienskin.rgb -%%OCCROOT%%/src/Textures/2d_aluminum.rgb -%%OCCROOT%%/src/Textures/2d_blue_rock.rgb -%%OCCROOT%%/src/Textures/2d_bluewhite_paper.rgb -%%OCCROOT%%/src/Textures/2d_brushed.rgb -%%OCCROOT%%/src/Textures/2d_bubbles.rgb -%%OCCROOT%%/src/Textures/2d_bumps.rgb -%%OCCROOT%%/src/Textures/2d_cast.rgb -%%OCCROOT%%/src/Textures/2d_chipbd.rgb -%%OCCROOT%%/src/Textures/2d_clouds.rgb -%%OCCROOT%%/src/Textures/2d_flesh.rgb -%%OCCROOT%%/src/Textures/2d_floor.rgb -%%OCCROOT%%/src/Textures/2d_galvnisd.rgb -%%OCCROOT%%/src/Textures/2d_grass.rgb -%%OCCROOT%%/src/Textures/2d_knurl.rgb -%%OCCROOT%%/src/Textures/2d_maple.rgb -%%OCCROOT%%/src/Textures/2d_marble.rgb -%%OCCROOT%%/src/Textures/2d_mottled.rgb -%%OCCROOT%%/src/Textures/2d_rain.rgb -%%OCCROOT%%/src/Textures/2d_rock.rgb -%%OCCROOT%%/src/Textures/FILES -%%OCCROOT%%/src/Textures/env_clouds.rgb -%%OCCROOT%%/src/Textures/env_cv.rgb -%%OCCROOT%%/src/Textures/env_lines.rgb -%%OCCROOT%%/src/Textures/env_medit.rgb -%%OCCROOT%%/src/Textures/env_pearl.rgb -%%OCCROOT%%/src/Textures/env_road.rgb -%%OCCROOT%%/src/Textures/env_sky1.rgb -%%OCCROOT%%/src/Textures/env_sky2.rgb -%%OCCROOT%%/src/UnitsAPI/Lexi_Expr.dat -%%OCCROOT%%/src/UnitsAPI/Units.dat -%%OCCROOT%%/src/XSMessage/FILES -%%OCCROOT%%/src/XSMessage/IGES.fr -%%OCCROOT%%/src/XSMessage/IGES.us -%%OCCROOT%%/src/XSMessage/XSTEP.fr -%%OCCROOT%%/src/XSMessage/XSTEP.us -%%OCCROOT%%/src/XSTEPResource/FILES -%%OCCROOT%%/src/XSTEPResource/IGES -%%OCCROOT%%/src/XSTEPResource/STEP -%%OCCROOT%%/src/XmlOcafResource/FILES -%%OCCROOT%%/src/XmlOcafResource/XmlOcaf.xsd -%%OCCROOT%%/src/XmlOcafResource/XmlOcaf_SmallTypes.xsd -%%OCCROOT%%/src/XmlOcafResource/XmlOcaf_TDF.xsd -%%OCCROOT%%/src/XmlOcafResource/XmlOcaf_TDataStd.xsd -%%OCCROOT%%/src/XmlOcafResource/XmlOcaf_TDataStd_Name.xsd -%%OCCROOT%%/src/XmlOcafResource/XmlOcaf_TDocStd.xsd -%%OCCROOT%%/src/XmlOcafResource/XmlOcaf_TFunction.xsd -%%OCCROOT%%/src/XmlOcafResource/XmlOcaf_TNaming.xsd -%%OCCROOT%%/src/XmlOcafResource/XmlOcaf_TNaming_NamedShape.xsd -%%OCCROOT%%/src/XmlOcafResource/XmlOcaf_TPrsStd.xsd -%%OCCROOT%%/src/XmlOcafResource/XmlXcaf.xsd %%OCCROOT%%/tests/3rdparty/begin %%OCCROOT%%/tests/3rdparty/end %%OCCROOT%%/tests/3rdparty/export/A1 @@ -249,11 +211,16 @@ %%OCCROOT%%/tests/3rdparty/fonts/A5 %%OCCROOT%%/tests/3rdparty/fonts/A6 %%OCCROOT%%/tests/3rdparty/fonts/A7 +%%OCCROOT%%/tests/3rdparty/fonts/A8 %%OCCROOT%%/tests/3rdparty/fonts/B1 %%OCCROOT%%/tests/3rdparty/fonts/B2 %%OCCROOT%%/tests/3rdparty/fonts/B3 +%%OCCROOT%%/tests/3rdparty/fonts/B4 +%%OCCROOT%%/tests/3rdparty/fonts/B5 +%%OCCROOT%%/tests/3rdparty/fonts/C1 %%OCCROOT%%/tests/3rdparty/grids.list %%OCCROOT%%/tests/3rdparty/parse.rules +%%OCCROOT%%/tests/3rdparty/text3d/A1 %%OCCROOT%%/tests/blend/begin %%OCCROOT%%/tests/blend/bfuseblend/A1 %%OCCROOT%%/tests/blend/bfuseblend/A2 @@ -879,7 +846,7 @@ %%OCCROOT%%/tests/boolean/bcommon_2d/P6 %%OCCROOT%%/tests/boolean/bcommon_2d/P7 %%OCCROOT%%/tests/boolean/bcommon_2d/P8 -%%OCCROOT%%/tests/boolean/bcommon_2d/begin +%%OCCROOT%%/tests/boolean/bcommon_2d/end %%OCCROOT%%/tests/boolean/bcommon_complex/A1 %%OCCROOT%%/tests/boolean/bcommon_complex/A2 %%OCCROOT%%/tests/boolean/bcommon_complex/A3 @@ -905,7 +872,6 @@ %%OCCROOT%%/tests/boolean/bcommon_complex/C5 %%OCCROOT%%/tests/boolean/bcommon_complex/C6 %%OCCROOT%%/tests/boolean/bcommon_complex/C7 -%%OCCROOT%%/tests/boolean/bcommon_complex/begin %%OCCROOT%%/tests/boolean/bcommon_simple/A1 %%OCCROOT%%/tests/boolean/bcommon_simple/A2 %%OCCROOT%%/tests/boolean/bcommon_simple/A3 @@ -989,7 +955,6 @@ %%OCCROOT%%/tests/boolean/bcommon_simple/I9 %%OCCROOT%%/tests/boolean/bcommon_simple/J1 %%OCCROOT%%/tests/boolean/bcommon_simple/J2 -%%OCCROOT%%/tests/boolean/bcommon_simple/begin %%OCCROOT%%/tests/boolean/bcut_2d/A1 %%OCCROOT%%/tests/boolean/bcut_2d/A2 %%OCCROOT%%/tests/boolean/bcut_2d/A3 @@ -1160,7 +1125,7 @@ %%OCCROOT%%/tests/boolean/bcut_2d/S6 %%OCCROOT%%/tests/boolean/bcut_2d/S7 %%OCCROOT%%/tests/boolean/bcut_2d/S8 -%%OCCROOT%%/tests/boolean/bcut_2d/begin +%%OCCROOT%%/tests/boolean/bcut_2d/end %%OCCROOT%%/tests/boolean/bcut_complex/A1 %%OCCROOT%%/tests/boolean/bcut_complex/A2 %%OCCROOT%%/tests/boolean/bcut_complex/A3 @@ -1314,7 +1279,6 @@ %%OCCROOT%%/tests/boolean/bcut_complex/Q7 %%OCCROOT%%/tests/boolean/bcut_complex/Q8 %%OCCROOT%%/tests/boolean/bcut_complex/Q9 -%%OCCROOT%%/tests/boolean/bcut_complex/begin %%OCCROOT%%/tests/boolean/bcut_simple/A1 %%OCCROOT%%/tests/boolean/bcut_simple/A2 %%OCCROOT%%/tests/boolean/bcut_simple/A3 @@ -1425,9 +1389,7 @@ %%OCCROOT%%/tests/boolean/bcut_simple/M1 %%OCCROOT%%/tests/boolean/bcut_simple/M2 %%OCCROOT%%/tests/boolean/bcut_simple/M3 -%%OCCROOT%%/tests/boolean/bcut_simple/begin %%OCCROOT%%/tests/boolean/bcutblend/A1 -%%OCCROOT%%/tests/boolean/bcutblend/begin %%OCCROOT%%/tests/boolean/begin %%OCCROOT%%/tests/boolean/bfuse_2d/A1 %%OCCROOT%%/tests/boolean/bfuse_2d/A2 @@ -1457,7 +1419,7 @@ %%OCCROOT%%/tests/boolean/bfuse_2d/C8 %%OCCROOT%%/tests/boolean/bfuse_2d/C9 %%OCCROOT%%/tests/boolean/bfuse_2d/D1 -%%OCCROOT%%/tests/boolean/bfuse_2d/begin +%%OCCROOT%%/tests/boolean/bfuse_2d/end %%OCCROOT%%/tests/boolean/bfuse_complex/A1 %%OCCROOT%%/tests/boolean/bfuse_complex/A2 %%OCCROOT%%/tests/boolean/bfuse_complex/A3 @@ -1624,7 +1586,6 @@ %%OCCROOT%%/tests/boolean/bfuse_complex/S4 %%OCCROOT%%/tests/boolean/bfuse_complex/S5 %%OCCROOT%%/tests/boolean/bfuse_complex/S6 -%%OCCROOT%%/tests/boolean/bfuse_complex/begin %%OCCROOT%%/tests/boolean/bfuse_simple/A1 %%OCCROOT%%/tests/boolean/bfuse_simple/A2 %%OCCROOT%%/tests/boolean/bfuse_simple/A3 @@ -1727,7 +1688,6 @@ %%OCCROOT%%/tests/boolean/bfuse_simple/L1 %%OCCROOT%%/tests/boolean/bfuse_simple/L2 %%OCCROOT%%/tests/boolean/bfuse_simple/L3 -%%OCCROOT%%/tests/boolean/bfuse_simple/begin %%OCCROOT%%/tests/boolean/bopcommon_2d/A1 %%OCCROOT%%/tests/boolean/bopcommon_2d/A2 %%OCCROOT%%/tests/boolean/bopcommon_2d/A3 @@ -1871,7 +1831,7 @@ %%OCCROOT%%/tests/boolean/bopcommon_2d/P6 %%OCCROOT%%/tests/boolean/bopcommon_2d/P7 %%OCCROOT%%/tests/boolean/bopcommon_2d/P8 -%%OCCROOT%%/tests/boolean/bopcommon_2d/begin +%%OCCROOT%%/tests/boolean/bopcommon_2d/end %%OCCROOT%%/tests/boolean/bopcommon_complex/A1 %%OCCROOT%%/tests/boolean/bopcommon_complex/A2 %%OCCROOT%%/tests/boolean/bopcommon_complex/A3 @@ -1987,7 +1947,6 @@ %%OCCROOT%%/tests/boolean/bopcommon_complex/M5 %%OCCROOT%%/tests/boolean/bopcommon_complex/M6 %%OCCROOT%%/tests/boolean/bopcommon_complex/M7 -%%OCCROOT%%/tests/boolean/bopcommon_complex/begin %%OCCROOT%%/tests/boolean/bopcommon_simple/A1 %%OCCROOT%%/tests/boolean/bopcommon_simple/A2 %%OCCROOT%%/tests/boolean/bopcommon_simple/A3 @@ -2366,7 +2325,6 @@ %%OCCROOT%%/tests/boolean/bopcommon_simple/ZP7 %%OCCROOT%%/tests/boolean/bopcommon_simple/ZP8 %%OCCROOT%%/tests/boolean/bopcommon_simple/ZP9 -%%OCCROOT%%/tests/boolean/bopcommon_simple/begin %%OCCROOT%%/tests/boolean/bopcut_2d/A1 %%OCCROOT%%/tests/boolean/bopcut_2d/A2 %%OCCROOT%%/tests/boolean/bopcut_2d/A3 @@ -2399,7 +2357,7 @@ %%OCCROOT%%/tests/boolean/bopcut_2d/D3 %%OCCROOT%%/tests/boolean/bopcut_2d/D4 %%OCCROOT%%/tests/boolean/bopcut_2d/D5 -%%OCCROOT%%/tests/boolean/bopcut_2d/begin +%%OCCROOT%%/tests/boolean/bopcut_2d/end %%OCCROOT%%/tests/boolean/bopcut_complex/A1 %%OCCROOT%%/tests/boolean/bopcut_complex/A2 %%OCCROOT%%/tests/boolean/bopcut_complex/A3 @@ -2540,7 +2498,6 @@ %%OCCROOT%%/tests/boolean/bopcut_complex/P4 %%OCCROOT%%/tests/boolean/bopcut_complex/P5 %%OCCROOT%%/tests/boolean/bopcut_complex/P8 -%%OCCROOT%%/tests/boolean/bopcut_complex/begin %%OCCROOT%%/tests/boolean/bopcut_simple/A1 %%OCCROOT%%/tests/boolean/bopcut_simple/A2 %%OCCROOT%%/tests/boolean/bopcut_simple/A3 @@ -2920,7 +2877,6 @@ %%OCCROOT%%/tests/boolean/bopcut_simple/ZP8 %%OCCROOT%%/tests/boolean/bopcut_simple/ZP9 %%OCCROOT%%/tests/boolean/bopcut_simple/ZQ1 -%%OCCROOT%%/tests/boolean/bopcut_simple/begin %%OCCROOT%%/tests/boolean/bopfuse_2d/A1 %%OCCROOT%%/tests/boolean/bopfuse_2d/A2 %%OCCROOT%%/tests/boolean/bopfuse_2d/A3 @@ -2949,7 +2905,7 @@ %%OCCROOT%%/tests/boolean/bopfuse_2d/C8 %%OCCROOT%%/tests/boolean/bopfuse_2d/C9 %%OCCROOT%%/tests/boolean/bopfuse_2d/D1 -%%OCCROOT%%/tests/boolean/bopfuse_2d/begin +%%OCCROOT%%/tests/boolean/bopfuse_2d/end %%OCCROOT%%/tests/boolean/bopfuse_complex/A1 %%OCCROOT%%/tests/boolean/bopfuse_complex/A2 %%OCCROOT%%/tests/boolean/bopfuse_complex/A3 @@ -3078,7 +3034,6 @@ %%OCCROOT%%/tests/boolean/bopfuse_complex/O2 %%OCCROOT%%/tests/boolean/bopfuse_complex/O3 %%OCCROOT%%/tests/boolean/bopfuse_complex/O4 -%%OCCROOT%%/tests/boolean/bopfuse_complex/begin %%OCCROOT%%/tests/boolean/bopfuse_simple/A1 %%OCCROOT%%/tests/boolean/bopfuse_simple/A2 %%OCCROOT%%/tests/boolean/bopfuse_simple/A3 @@ -3454,7 +3409,6 @@ %%OCCROOT%%/tests/boolean/bopfuse_simple/ZP4 %%OCCROOT%%/tests/boolean/bopfuse_simple/ZP5 %%OCCROOT%%/tests/boolean/bopfuse_simple/ZP6 -%%OCCROOT%%/tests/boolean/bopfuse_simple/begin %%OCCROOT%%/tests/boolean/bopsection/A1 %%OCCROOT%%/tests/boolean/bopsection/A2 %%OCCROOT%%/tests/boolean/bopsection/A3 @@ -3504,7 +3458,6 @@ %%OCCROOT%%/tests/boolean/bopsection/F3 %%OCCROOT%%/tests/boolean/bopsection/F4 %%OCCROOT%%/tests/boolean/bopsection/F5 -%%OCCROOT%%/tests/boolean/bopsection/begin %%OCCROOT%%/tests/boolean/boptuc_2d/A1 %%OCCROOT%%/tests/boolean/boptuc_2d/A2 %%OCCROOT%%/tests/boolean/boptuc_2d/A3 @@ -3645,7 +3598,7 @@ %%OCCROOT%%/tests/boolean/boptuc_2d/P3 %%OCCROOT%%/tests/boolean/boptuc_2d/P4 %%OCCROOT%%/tests/boolean/boptuc_2d/P5 -%%OCCROOT%%/tests/boolean/boptuc_2d/begin +%%OCCROOT%%/tests/boolean/boptuc_2d/end %%OCCROOT%%/tests/boolean/boptuc_complex/A1 %%OCCROOT%%/tests/boolean/boptuc_complex/A2 %%OCCROOT%%/tests/boolean/boptuc_complex/A3 @@ -3719,7 +3672,6 @@ %%OCCROOT%%/tests/boolean/boptuc_complex/H9 %%OCCROOT%%/tests/boolean/boptuc_complex/I1 %%OCCROOT%%/tests/boolean/boptuc_complex/I2 -%%OCCROOT%%/tests/boolean/boptuc_complex/begin %%OCCROOT%%/tests/boolean/boptuc_simple/A1 %%OCCROOT%%/tests/boolean/boptuc_simple/A2 %%OCCROOT%%/tests/boolean/boptuc_simple/A3 @@ -4093,7 +4045,6 @@ %%OCCROOT%%/tests/boolean/boptuc_simple/ZP2 %%OCCROOT%%/tests/boolean/boptuc_simple/ZP3 %%OCCROOT%%/tests/boolean/boptuc_simple/ZP4 -%%OCCROOT%%/tests/boolean/boptuc_simple/begin %%OCCROOT%%/tests/boolean/bsection/A1 %%OCCROOT%%/tests/boolean/bsection/A2 %%OCCROOT%%/tests/boolean/bsection/A3 @@ -4259,7 +4210,68 @@ %%OCCROOT%%/tests/boolean/bsection/S3 %%OCCROOT%%/tests/boolean/bsection/S4 %%OCCROOT%%/tests/boolean/bsection/S5 -%%OCCROOT%%/tests/boolean/bsection/begin +%%OCCROOT%%/tests/boolean/cells_test/A1 +%%OCCROOT%%/tests/boolean/cells_test/A2 +%%OCCROOT%%/tests/boolean/cells_test/A3 +%%OCCROOT%%/tests/boolean/cells_test/A4 +%%OCCROOT%%/tests/boolean/cells_test/A5 +%%OCCROOT%%/tests/boolean/cells_test/A6 +%%OCCROOT%%/tests/boolean/cells_test/A7 +%%OCCROOT%%/tests/boolean/cells_test/A8 +%%OCCROOT%%/tests/boolean/cells_test/A9 +%%OCCROOT%%/tests/boolean/cells_test/B1 +%%OCCROOT%%/tests/boolean/cells_test/B2 +%%OCCROOT%%/tests/boolean/cells_test/B3 +%%OCCROOT%%/tests/boolean/cells_test/B4 +%%OCCROOT%%/tests/boolean/cells_test/B5 +%%OCCROOT%%/tests/boolean/cells_test/B6 +%%OCCROOT%%/tests/boolean/cells_test/C1 +%%OCCROOT%%/tests/boolean/cells_test/C2 +%%OCCROOT%%/tests/boolean/cells_test/C3 +%%OCCROOT%%/tests/boolean/cells_test/C4 +%%OCCROOT%%/tests/boolean/cells_test/C5 +%%OCCROOT%%/tests/boolean/cells_test/C6 +%%OCCROOT%%/tests/boolean/cells_test/C7 +%%OCCROOT%%/tests/boolean/cells_test/C8 +%%OCCROOT%%/tests/boolean/cells_test/C9 +%%OCCROOT%%/tests/boolean/cells_test/D1 +%%OCCROOT%%/tests/boolean/cells_test/D2 +%%OCCROOT%%/tests/boolean/cells_test/D3 +%%OCCROOT%%/tests/boolean/cells_test/D4 +%%OCCROOT%%/tests/boolean/cells_test/D5 +%%OCCROOT%%/tests/boolean/cells_test/E1 +%%OCCROOT%%/tests/boolean/cells_test/E2 +%%OCCROOT%%/tests/boolean/cells_test/E3 +%%OCCROOT%%/tests/boolean/cells_test/E4 +%%OCCROOT%%/tests/boolean/cells_test/E5 +%%OCCROOT%%/tests/boolean/cells_test/E6 +%%OCCROOT%%/tests/boolean/cells_test/E7 +%%OCCROOT%%/tests/boolean/cells_test/E8 +%%OCCROOT%%/tests/boolean/cells_test/E9 +%%OCCROOT%%/tests/boolean/cells_test/F1 +%%OCCROOT%%/tests/boolean/cells_test/F2 +%%OCCROOT%%/tests/boolean/cells_test/F3 +%%OCCROOT%%/tests/boolean/cells_test/F4 +%%OCCROOT%%/tests/boolean/cells_test/F5 +%%OCCROOT%%/tests/boolean/cells_test/F6 +%%OCCROOT%%/tests/boolean/cells_test/F7 +%%OCCROOT%%/tests/boolean/cells_test/F8 +%%OCCROOT%%/tests/boolean/cells_test/F9 +%%OCCROOT%%/tests/boolean/cells_test/G1 +%%OCCROOT%%/tests/boolean/cells_test/G2 +%%OCCROOT%%/tests/boolean/cells_test/G3 +%%OCCROOT%%/tests/boolean/cells_test/G4 +%%OCCROOT%%/tests/boolean/cells_test/G5 +%%OCCROOT%%/tests/boolean/cells_test/G6 +%%OCCROOT%%/tests/boolean/cells_test/G7 +%%OCCROOT%%/tests/boolean/cells_test/G8 +%%OCCROOT%%/tests/boolean/cells_test/H1 +%%OCCROOT%%/tests/boolean/cells_test/H2 +%%OCCROOT%%/tests/boolean/cells_test/H3 +%%OCCROOT%%/tests/boolean/cells_test/H4 +%%OCCROOT%%/tests/boolean/cells_test/I1 +%%OCCROOT%%/tests/boolean/cells_test/I2 +%%OCCROOT%%/tests/boolean/cells_test/end %%OCCROOT%%/tests/boolean/end %%OCCROOT%%/tests/boolean/gdml_private/A1 %%OCCROOT%%/tests/boolean/gdml_private/A2 @@ -4351,7 +4363,6 @@ %%OCCROOT%%/tests/boolean/gdml_private/J7 %%OCCROOT%%/tests/boolean/gdml_private/J8 %%OCCROOT%%/tests/boolean/gdml_private/J9 -%%OCCROOT%%/tests/boolean/gdml_private/M1 %%OCCROOT%%/tests/boolean/gdml_private/M2 %%OCCROOT%%/tests/boolean/gdml_private/M3 %%OCCROOT%%/tests/boolean/gdml_private/M4 @@ -4442,7 +4453,6 @@ %%OCCROOT%%/tests/boolean/gdml_private/V8 %%OCCROOT%%/tests/boolean/gdml_private/V9 %%OCCROOT%%/tests/boolean/gdml_private/W1 -%%OCCROOT%%/tests/boolean/gdml_private/W2 %%OCCROOT%%/tests/boolean/gdml_private/W3 %%OCCROOT%%/tests/boolean/gdml_private/W4 %%OCCROOT%%/tests/boolean/gdml_private/W5 @@ -4570,7 +4580,7 @@ %%OCCROOT%%/tests/boolean/gdml_private/ZK1 %%OCCROOT%%/tests/boolean/gdml_private/ZK2 %%OCCROOT%%/tests/boolean/gdml_private/ZK3 -%%OCCROOT%%/tests/boolean/gdml_private/begin +%%OCCROOT%%/tests/boolean/gdml_private/end %%OCCROOT%%/tests/boolean/gdml_public/A1 %%OCCROOT%%/tests/boolean/gdml_public/A2 %%OCCROOT%%/tests/boolean/gdml_public/A3 @@ -4596,7 +4606,7 @@ %%OCCROOT%%/tests/boolean/gdml_public/C5 %%OCCROOT%%/tests/boolean/gdml_public/C6 %%OCCROOT%%/tests/boolean/gdml_public/C7 -%%OCCROOT%%/tests/boolean/gdml_public/begin +%%OCCROOT%%/tests/boolean/gdml_public/end %%OCCROOT%%/tests/boolean/grids.list %%OCCROOT%%/tests/boolean/parse.rules %%OCCROOT%%/tests/boolean/volumemaker/A1 @@ -4673,10 +4683,11 @@ %%OCCROOT%%/tests/boolean/volumemaker/H9 %%OCCROOT%%/tests/boolean/volumemaker/I1 %%OCCROOT%%/tests/boolean/volumemaker/I2 -%%OCCROOT%%/tests/boolean/volumemaker/begin +%%OCCROOT%%/tests/boolean/volumemaker/end %%OCCROOT%%/tests/bugs/begin %%OCCROOT%%/tests/bugs/caf/begin %%OCCROOT%%/tests/bugs/caf/buc60756 +%%OCCROOT%%/tests/bugs/caf/buc60756_std %%OCCROOT%%/tests/bugs/caf/buc60790 %%OCCROOT%%/tests/bugs/caf/buc60813 %%OCCROOT%%/tests/bugs/caf/buc60817 @@ -4685,6 +4696,7 @@ %%OCCROOT%%/tests/bugs/caf/buc60847 %%OCCROOT%%/tests/bugs/caf/buc60862 %%OCCROOT%%/tests/bugs/caf/buc60867 +%%OCCROOT%%/tests/bugs/caf/buc60867_std %%OCCROOT%%/tests/bugs/caf/buc60910 %%OCCROOT%%/tests/bugs/caf/buc60917 %%OCCROOT%%/tests/bugs/caf/buc60921 @@ -4702,22 +4714,27 @@ %%OCCROOT%%/tests/bugs/caf/bug1395_1 %%OCCROOT%%/tests/bugs/caf/bug1395_2 %%OCCROOT%%/tests/bugs/caf/bug1454 +%%OCCROOT%%/tests/bugs/caf/bug1454_std %%OCCROOT%%/tests/bugs/caf/bug158 %%OCCROOT%%/tests/bugs/caf/bug159 %%OCCROOT%%/tests/bugs/caf/bug170_3 %%OCCROOT%%/tests/bugs/caf/bug1722 %%OCCROOT%%/tests/bugs/caf/bug1724 %%OCCROOT%%/tests/bugs/caf/bug1726 +%%OCCROOT%%/tests/bugs/caf/bug1726_std %%OCCROOT%%/tests/bugs/caf/bug1919 %%OCCROOT%%/tests/bugs/caf/bug21231 %%OCCROOT%%/tests/bugs/caf/bug21707 %%OCCROOT%%/tests/bugs/caf/bug2269 %%OCCROOT%%/tests/bugs/caf/bug22788_1 +%%OCCROOT%%/tests/bugs/caf/bug22788_1_std %%OCCROOT%%/tests/bugs/caf/bug22788_2 +%%OCCROOT%%/tests/bugs/caf/bug22788_2_std %%OCCROOT%%/tests/bugs/caf/bug22976 *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***