Revision: 78221
http://sourceforge.net/p/brlcad/code/78221
Author: starseeker
Date: 2021-02-08 04:54:55 +0000 (Mon, 08 Feb 2021)
Log Message:
-----------
Merge the stepsync branch into trunk. This updates BRL-CAD (step-g, g-step) to
work with upstream stepcode, rather than our older pseudo-fork.
Modified Paths:
--------------
brlcad/trunk/src/conv/step/CMakeLists.txt
brlcad/trunk/src/other/CMakeLists.txt
brlcad/trunk/src/other/stepcode/AUTHORS
brlcad/trunk/src/other/stepcode/CMakeLists.txt
brlcad/trunk/src/other/stepcode/COPYING
brlcad/trunk/src/other/stepcode/CTestConfig.cmake
brlcad/trunk/src/other/stepcode/NEWS
brlcad/trunk/src/other/stepcode/cmake/FindLEMON.cmake
brlcad/trunk/src/other/stepcode/cmake/FindPERPLEX.cmake
brlcad/trunk/src/other/stepcode/cmake/FindRE2C.cmake
brlcad/trunk/src/other/stepcode/ctest_matrix.cmake
brlcad/trunk/src/other/stepcode/data/CMakeLists.txt
brlcad/trunk/src/other/stepcode/data/ap238/ap238-aim-long.exp
brlcad/trunk/src/other/stepcode/doc/CMakeLists.txt
brlcad/trunk/src/other/stepcode/doc/Doxyfile
brlcad/trunk/src/other/stepcode/doc/doxyassist.xml
brlcad/trunk/src/other/stepcode/doc/man/man1/exp2cxx.1
brlcad/trunk/src/other/stepcode/include/CMakeLists.txt
brlcad/trunk/src/other/stepcode/include/exppp/exppp.h
brlcad/trunk/src/other/stepcode/include/express/alg.h
brlcad/trunk/src/other/stepcode/include/express/basic.h
brlcad/trunk/src/other/stepcode/include/express/caseitem.h
brlcad/trunk/src/other/stepcode/include/express/dict.h
brlcad/trunk/src/other/stepcode/include/express/entity.h
brlcad/trunk/src/other/stepcode/include/express/error.h
brlcad/trunk/src/other/stepcode/include/express/expbasic.h
brlcad/trunk/src/other/stepcode/include/express/expr.h
brlcad/trunk/src/other/stepcode/include/express/express.h
brlcad/trunk/src/other/stepcode/include/express/hash.h
brlcad/trunk/src/other/stepcode/include/express/lexact.h
brlcad/trunk/src/other/stepcode/include/express/linklist.h
brlcad/trunk/src/other/stepcode/include/express/memory.h
brlcad/trunk/src/other/stepcode/include/express/object.h
brlcad/trunk/src/other/stepcode/include/express/resolve.h
brlcad/trunk/src/other/stepcode/include/express/schema.h
brlcad/trunk/src/other/stepcode/include/express/scope.h
brlcad/trunk/src/other/stepcode/include/express/stmt.h
brlcad/trunk/src/other/stepcode/include/express/symbol.h
brlcad/trunk/src/other/stepcode/include/express/type.h
brlcad/trunk/src/other/stepcode/include/express/variable.h
brlcad/trunk/src/other/stepcode/include/ordered_attrs.h
brlcad/trunk/src/other/stepcode/include/sc_export.h
brlcad/trunk/src/other/stepcode/include/sc_stdbool.h
brlcad/trunk/src/other/stepcode/lcov.cmake
brlcad/trunk/src/other/stepcode/misc/astyle.cfg
brlcad/trunk/src/other/stepcode/misc/flawfinder
brlcad/trunk/src/other/stepcode/misc/wiki-scripts/update-matrix.py
brlcad/trunk/src/other/stepcode/run_ctest.cmake
brlcad/trunk/src/other/stepcode/src/base/CMakeLists.txt
brlcad/trunk/src/other/stepcode/src/base/judy/CMakeLists.txt
brlcad/trunk/src/other/stepcode/src/base/judy/misc/judy64n.c
brlcad/trunk/src/other/stepcode/src/base/judy/src/judy.c
brlcad/trunk/src/other/stepcode/src/base/judy/src/judy.h
brlcad/trunk/src/other/stepcode/src/base/judy/src/judyL2Array.h
brlcad/trunk/src/other/stepcode/src/base/judy/src/judyLArray.h
brlcad/trunk/src/other/stepcode/src/base/judy/src/judyS2Array.h
brlcad/trunk/src/other/stepcode/src/base/judy/src/judySArray.h
brlcad/trunk/src/other/stepcode/src/base/judy/test/hexSort.c
brlcad/trunk/src/other/stepcode/src/base/judy/test/judyL2test.cc
brlcad/trunk/src/other/stepcode/src/base/judy/test/judyLtest.cc
brlcad/trunk/src/other/stepcode/src/base/judy/test/judyS2test.cc
brlcad/trunk/src/other/stepcode/src/base/judy/test/judyStest.cc
brlcad/trunk/src/other/stepcode/src/base/judy/test/pennySort.c
brlcad/trunk/src/other/stepcode/src/base/judy/test/sort.c
brlcad/trunk/src/other/stepcode/src/base/judy/test/sort.h
brlcad/trunk/src/other/stepcode/src/base/sc_benchmark.cc
brlcad/trunk/src/other/stepcode/src/base/sc_benchmark.h
brlcad/trunk/src/other/stepcode/src/base/sc_getopt.cc
brlcad/trunk/src/other/stepcode/src/base/sc_getopt.h
brlcad/trunk/src/other/stepcode/src/base/sc_memmgr.cc
brlcad/trunk/src/other/stepcode/src/base/sc_memmgr.h
brlcad/trunk/src/other/stepcode/src/base/sc_trace_fprintf.c
brlcad/trunk/src/other/stepcode/src/base/sc_trace_fprintf.h
brlcad/trunk/src/other/stepcode/src/cldai/CMakeLists.txt
brlcad/trunk/src/other/stepcode/src/cldai/sdaiApplication_instance_set.cc
brlcad/trunk/src/other/stepcode/src/cldai/sdaiApplication_instance_set.h
brlcad/trunk/src/other/stepcode/src/cldai/sdaiBinary.cc
brlcad/trunk/src/other/stepcode/src/cldai/sdaiBinary.h
brlcad/trunk/src/other/stepcode/src/cldai/sdaiDaObject.cc
brlcad/trunk/src/other/stepcode/src/cldai/sdaiDaObject.h
brlcad/trunk/src/other/stepcode/src/cldai/sdaiEntity_extent.cc
brlcad/trunk/src/other/stepcode/src/cldai/sdaiEntity_extent.h
brlcad/trunk/src/other/stepcode/src/cldai/sdaiEntity_extent_set.cc
brlcad/trunk/src/other/stepcode/src/cldai/sdaiEntity_extent_set.h
brlcad/trunk/src/other/stepcode/src/cldai/sdaiEnum.cc
brlcad/trunk/src/other/stepcode/src/cldai/sdaiEnum.h
brlcad/trunk/src/other/stepcode/src/cldai/sdaiModel_contents.cc
brlcad/trunk/src/other/stepcode/src/cldai/sdaiModel_contents.h
brlcad/trunk/src/other/stepcode/src/cldai/sdaiModel_contents_list.cc
brlcad/trunk/src/other/stepcode/src/cldai/sdaiModel_contents_list.h
brlcad/trunk/src/other/stepcode/src/cldai/sdaiObject.cc
brlcad/trunk/src/other/stepcode/src/cldai/sdaiObject.h
brlcad/trunk/src/other/stepcode/src/cldai/sdaiSession_instance.cc
brlcad/trunk/src/other/stepcode/src/cldai/sdaiSession_instance.h
brlcad/trunk/src/other/stepcode/src/cldai/sdaiString.cc
brlcad/trunk/src/other/stepcode/src/cldai/sdaiString.h
brlcad/trunk/src/other/stepcode/src/cleditor/CMakeLists.txt
brlcad/trunk/src/other/stepcode/src/cleditor/README
brlcad/trunk/src/other/stepcode/src/cleditor/STEPfile.cc
brlcad/trunk/src/other/stepcode/src/cleditor/STEPfile.h
brlcad/trunk/src/other/stepcode/src/cleditor/STEPfile.inline.cc
brlcad/trunk/src/other/stepcode/src/cleditor/SdaiHeaderSchema.cc
brlcad/trunk/src/other/stepcode/src/cleditor/SdaiHeaderSchema.h
brlcad/trunk/src/other/stepcode/src/cleditor/SdaiHeaderSchemaAll.cc
brlcad/trunk/src/other/stepcode/src/cleditor/SdaiHeaderSchemaClasses.h
brlcad/trunk/src/other/stepcode/src/cleditor/SdaiHeaderSchemaInit.cc
brlcad/trunk/src/other/stepcode/src/cleditor/SdaiSchemaInit.cc
brlcad/trunk/src/other/stepcode/src/cleditor/SdaiSchemaInit.h
brlcad/trunk/src/other/stepcode/src/cleditor/cmdmgr.cc
brlcad/trunk/src/other/stepcode/src/cleditor/cmdmgr.h
brlcad/trunk/src/other/stepcode/src/cleditor/seeinfodefault.h
brlcad/trunk/src/other/stepcode/src/cllazyfile/CMakeLists.txt
brlcad/trunk/src/other/stepcode/src/cllazyfile/current_function.hpp
brlcad/trunk/src/other/stepcode/src/cllazyfile/headerSectionReader.h
brlcad/trunk/src/other/stepcode/src/cllazyfile/instMgrHelper.h
brlcad/trunk/src/other/stepcode/src/cllazyfile/lazyDataSectionReader.cc
brlcad/trunk/src/other/stepcode/src/cllazyfile/lazyDataSectionReader.h
brlcad/trunk/src/other/stepcode/src/cllazyfile/lazyFileReader.cc
brlcad/trunk/src/other/stepcode/src/cllazyfile/lazyFileReader.h
brlcad/trunk/src/other/stepcode/src/cllazyfile/lazyInstMgr.cc
brlcad/trunk/src/other/stepcode/src/cllazyfile/lazyInstMgr.h
brlcad/trunk/src/other/stepcode/src/cllazyfile/lazyP21DataSectionReader.cc
brlcad/trunk/src/other/stepcode/src/cllazyfile/lazyP21DataSectionReader.h
brlcad/trunk/src/other/stepcode/src/cllazyfile/lazyTypes.h
brlcad/trunk/src/other/stepcode/src/cllazyfile/lazy_test.cc
brlcad/trunk/src/other/stepcode/src/cllazyfile/p21HeaderSectionReader.cc
brlcad/trunk/src/other/stepcode/src/cllazyfile/p21HeaderSectionReader.h
brlcad/trunk/src/other/stepcode/src/cllazyfile/sectionReader.cc
brlcad/trunk/src/other/stepcode/src/cllazyfile/sectionReader.h
brlcad/trunk/src/other/stepcode/src/clstepcore/CMakeLists.txt
brlcad/trunk/src/other/stepcode/src/clstepcore/ExpDict.cc
brlcad/trunk/src/other/stepcode/src/clstepcore/ExpDict.h
brlcad/trunk/src/other/stepcode/src/clstepcore/Registry.h
brlcad/trunk/src/other/stepcode/src/clstepcore/STEPaggregate.cc
brlcad/trunk/src/other/stepcode/src/clstepcore/STEPaggregate.h
brlcad/trunk/src/other/stepcode/src/clstepcore/STEPattribute.cc
brlcad/trunk/src/other/stepcode/src/clstepcore/STEPattribute.h
brlcad/trunk/src/other/stepcode/src/clstepcore/STEPattributeList.cc
brlcad/trunk/src/other/stepcode/src/clstepcore/STEPattributeList.h
brlcad/trunk/src/other/stepcode/src/clstepcore/STEPcomplex.cc
brlcad/trunk/src/other/stepcode/src/clstepcore/STEPcomplex.h
brlcad/trunk/src/other/stepcode/src/clstepcore/STEPundefined.cc
brlcad/trunk/src/other/stepcode/src/clstepcore/STEPundefined.h
brlcad/trunk/src/other/stepcode/src/clstepcore/SingleLinkList.cc
brlcad/trunk/src/other/stepcode/src/clstepcore/SingleLinkList.h
brlcad/trunk/src/other/stepcode/src/clstepcore/SubSuperIterators.h
brlcad/trunk/src/other/stepcode/src/clstepcore/collect.cc
brlcad/trunk/src/other/stepcode/src/clstepcore/complexSupport.h
brlcad/trunk/src/other/stepcode/src/clstepcore/complexlist.cc
brlcad/trunk/src/other/stepcode/src/clstepcore/dict-pic.txt
brlcad/trunk/src/other/stepcode/src/clstepcore/dictdefs.h
brlcad/trunk/src/other/stepcode/src/clstepcore/dispnode.cc
brlcad/trunk/src/other/stepcode/src/clstepcore/dispnode.h
brlcad/trunk/src/other/stepcode/src/clstepcore/dispnodelist.cc
brlcad/trunk/src/other/stepcode/src/clstepcore/dispnodelist.h
brlcad/trunk/src/other/stepcode/src/clstepcore/entlist.cc
brlcad/trunk/src/other/stepcode/src/clstepcore/entnode.cc
brlcad/trunk/src/other/stepcode/src/clstepcore/instmgr.cc
brlcad/trunk/src/other/stepcode/src/clstepcore/instmgr.h
brlcad/trunk/src/other/stepcode/src/clstepcore/match-ors.cc
brlcad/trunk/src/other/stepcode/src/clstepcore/mgrnode.cc
brlcad/trunk/src/other/stepcode/src/clstepcore/mgrnode.h
brlcad/trunk/src/other/stepcode/src/clstepcore/mgrnodearray.cc
brlcad/trunk/src/other/stepcode/src/clstepcore/mgrnodearray.h
brlcad/trunk/src/other/stepcode/src/clstepcore/mgrnodelist.cc
brlcad/trunk/src/other/stepcode/src/clstepcore/mgrnodelist.h
brlcad/trunk/src/other/stepcode/src/clstepcore/multlist.cc
brlcad/trunk/src/other/stepcode/src/clstepcore/needFunc.cc
brlcad/trunk/src/other/stepcode/src/clstepcore/needFunc.h
brlcad/trunk/src/other/stepcode/src/clstepcore/non-ors.cc
brlcad/trunk/src/other/stepcode/src/clstepcore/orlist.cc
brlcad/trunk/src/other/stepcode/src/clstepcore/print.cc
brlcad/trunk/src/other/stepcode/src/clstepcore/read_func.cc
brlcad/trunk/src/other/stepcode/src/clstepcore/read_func.h
brlcad/trunk/src/other/stepcode/src/clstepcore/sdai.cc
brlcad/trunk/src/other/stepcode/src/clstepcore/sdai.h
brlcad/trunk/src/other/stepcode/src/clstepcore/sdaiApplication_instance.cc
brlcad/trunk/src/other/stepcode/src/clstepcore/sdaiApplication_instance.h
brlcad/trunk/src/other/stepcode/src/clstepcore/sdaiSelect.cc
brlcad/trunk/src/other/stepcode/src/clstepcore/sdaiSelect.h
brlcad/trunk/src/other/stepcode/src/clstepcore/trynext.cc
brlcad/trunk/src/other/stepcode/src/clutils/CMakeLists.txt
brlcad/trunk/src/other/stepcode/src/clutils/Str.cc
brlcad/trunk/src/other/stepcode/src/clutils/Str.h
brlcad/trunk/src/other/stepcode/src/clutils/dirobj.cc
brlcad/trunk/src/other/stepcode/src/clutils/dirobj.h
brlcad/trunk/src/other/stepcode/src/clutils/errordesc.cc
brlcad/trunk/src/other/stepcode/src/clutils/errordesc.h
brlcad/trunk/src/other/stepcode/src/clutils/gennode.cc
brlcad/trunk/src/other/stepcode/src/clutils/gennode.h
brlcad/trunk/src/other/stepcode/src/clutils/gennodearray.cc
brlcad/trunk/src/other/stepcode/src/clutils/gennodearray.h
brlcad/trunk/src/other/stepcode/src/clutils/gennodelist.cc
brlcad/trunk/src/other/stepcode/src/clutils/gennodelist.h
brlcad/trunk/src/other/stepcode/src/clutils/sc_hash.cc
brlcad/trunk/src/other/stepcode/src/clutils/sc_hash.h
brlcad/trunk/src/other/stepcode/src/exp2cxx/CMakeLists.txt
brlcad/trunk/src/other/stepcode/src/exp2cxx/classes.c
brlcad/trunk/src/other/stepcode/src/exp2cxx/classes.h
brlcad/trunk/src/other/stepcode/src/exp2cxx/classes_misc.c
brlcad/trunk/src/other/stepcode/src/exp2cxx/classes_wrapper.cc
brlcad/trunk/src/other/stepcode/src/exp2cxx/collect.cc
brlcad/trunk/src/other/stepcode/src/exp2cxx/complexSupport.h
brlcad/trunk/src/other/stepcode/src/exp2cxx/complexlist.cc
brlcad/trunk/src/other/stepcode/src/exp2cxx/entlist.cc
brlcad/trunk/src/other/stepcode/src/exp2cxx/entnode.cc
brlcad/trunk/src/other/stepcode/src/exp2cxx/expressbuild.cc
brlcad/trunk/src/other/stepcode/src/exp2cxx/fedex_main.c
brlcad/trunk/src/other/stepcode/src/exp2cxx/match-ors.cc
brlcad/trunk/src/other/stepcode/src/exp2cxx/multlist.cc
brlcad/trunk/src/other/stepcode/src/exp2cxx/multpass.c
brlcad/trunk/src/other/stepcode/src/exp2cxx/non-ors.cc
brlcad/trunk/src/other/stepcode/src/exp2cxx/orlist.cc
brlcad/trunk/src/other/stepcode/src/exp2cxx/print.cc
brlcad/trunk/src/other/stepcode/src/exp2cxx/selects.c
brlcad/trunk/src/other/stepcode/src/exp2cxx/trynext.cc
brlcad/trunk/src/other/stepcode/src/exp2cxx/write.cc
brlcad/trunk/src/other/stepcode/src/exp2python/CMakeLists.txt
brlcad/trunk/src/other/stepcode/src/exp2python/examples/unitary_schemas/index_attribute.py
brlcad/trunk/src/other/stepcode/src/exp2python/examples/unitary_schemas/multiple_rep.py
brlcad/trunk/src/other/stepcode/src/exp2python/examples/unitary_schemas/test_array.py
brlcad/trunk/src/other/stepcode/src/exp2python/examples/unitary_schemas/test_array_of_array_of_simple_types.py
brlcad/trunk/src/other/stepcode/src/exp2python/examples/unitary_schemas/test_array_of_simple_types.py
brlcad/trunk/src/other/stepcode/src/exp2python/examples/unitary_schemas/test_derived_attribute.py
brlcad/trunk/src/other/stepcode/src/exp2python/examples/unitary_schemas/test_entity_where_rule.py
brlcad/trunk/src/other/stepcode/src/exp2python/examples/unitary_schemas/test_multiple_inheritance.py
brlcad/trunk/src/other/stepcode/src/exp2python/examples/unitary_schemas/test_named_type.py
brlcad/trunk/src/other/stepcode/src/exp2python/examples/unitary_schemas/test_select_data_type.py
brlcad/trunk/src/other/stepcode/src/exp2python/examples/unitary_schemas/test_single_inheritance.py
brlcad/trunk/src/other/stepcode/src/exp2python/examples/unitary_schemas/test_single_inheritance_multi_level.py
brlcad/trunk/src/other/stepcode/src/exp2python/python/SCL/AggregationDataTypes.py
brlcad/trunk/src/other/stepcode/src/exp2python/python/SCL/BaseType.py
brlcad/trunk/src/other/stepcode/src/exp2python/python/SCL/Builtin.py
brlcad/trunk/src/other/stepcode/src/exp2python/python/SCL/ConstructedDataTypes.py
brlcad/trunk/src/other/stepcode/src/exp2python/python/SCL/Model.py
brlcad/trunk/src/other/stepcode/src/exp2python/python/SCL/Part21.py
brlcad/trunk/src/other/stepcode/src/exp2python/python/SCL/SimpleDataTypes.py
brlcad/trunk/src/other/stepcode/src/exp2python/python/SCL/TypeChecker.py
brlcad/trunk/src/other/stepcode/src/exp2python/python/SCL/Utils.py
brlcad/trunk/src/other/stepcode/src/exp2python/python/SCL/essa_par.py
brlcad/trunk/src/other/stepcode/src/exp2python/src/classes_misc_python.c
brlcad/trunk/src/other/stepcode/src/exp2python/src/classes_python.c
brlcad/trunk/src/other/stepcode/src/exp2python/src/classes_wrapper_python.cc
brlcad/trunk/src/other/stepcode/src/exp2python/src/fedex_main_python.c
brlcad/trunk/src/other/stepcode/src/exp2python/src/multpass_python.c
brlcad/trunk/src/other/stepcode/src/exp2python/src/selects_python.c
brlcad/trunk/src/other/stepcode/src/exp2python/test/test_base.py
brlcad/trunk/src/other/stepcode/src/exppp/CMakeLists.txt
brlcad/trunk/src/other/stepcode/src/exppp/exppp-main.c
brlcad/trunk/src/other/stepcode/src/exppp/exppp.c
brlcad/trunk/src/other/stepcode/src/express/CMakeLists.txt
brlcad/trunk/src/other/stepcode/src/express/Changes
brlcad/trunk/src/other/stepcode/src/express/README
brlcad/trunk/src/other/stepcode/src/express/alg.c
brlcad/trunk/src/other/stepcode/src/express/caseitem.c
brlcad/trunk/src/other/stepcode/src/express/dict.c
brlcad/trunk/src/other/stepcode/src/express/entity.c
brlcad/trunk/src/other/stepcode/src/express/error.c
brlcad/trunk/src/other/stepcode/src/express/expparse.y
brlcad/trunk/src/other/stepcode/src/express/expr.c
brlcad/trunk/src/other/stepcode/src/express/express.c
brlcad/trunk/src/other/stepcode/src/express/expscan.l
brlcad/trunk/src/other/stepcode/src/express/fedex.c
brlcad/trunk/src/other/stepcode/src/express/generated/README
brlcad/trunk/src/other/stepcode/src/express/generated/expparse.c
brlcad/trunk/src/other/stepcode/src/express/generated/expparse.h
brlcad/trunk/src/other/stepcode/src/express/generated/expscan.c
brlcad/trunk/src/other/stepcode/src/express/generated/expscan.h
brlcad/trunk/src/other/stepcode/src/express/hash.c
brlcad/trunk/src/other/stepcode/src/express/inithook.c
brlcad/trunk/src/other/stepcode/src/express/lexact.c
brlcad/trunk/src/other/stepcode/src/express/linklist.c
brlcad/trunk/src/other/stepcode/src/express/memory.c
brlcad/trunk/src/other/stepcode/src/express/object.c
brlcad/trunk/src/other/stepcode/src/express/ordered_attrs.cc
brlcad/trunk/src/other/stepcode/src/express/parse_data.h
brlcad/trunk/src/other/stepcode/src/express/resolve.c
brlcad/trunk/src/other/stepcode/src/express/schema.c
brlcad/trunk/src/other/stepcode/src/express/scope.c
brlcad/trunk/src/other/stepcode/src/express/stack.h
brlcad/trunk/src/other/stepcode/src/express/stmt.c
brlcad/trunk/src/other/stepcode/src/express/symbol.c
brlcad/trunk/src/other/stepcode/src/express/test/CMakeLists.txt
brlcad/trunk/src/other/stepcode/src/express/test/print_attrs.c
brlcad/trunk/src/other/stepcode/src/express/test/print_schemas.c
brlcad/trunk/src/other/stepcode/src/express/token_type.h
brlcad/trunk/src/other/stepcode/src/express/type.c
brlcad/trunk/src/other/stepcode/src/express/variable.c
brlcad/trunk/src/other/stepcode/src/test/SEarritr.h
brlcad/trunk/src/other/stepcode/src/test/generate_express/generate_express.cc
brlcad/trunk/src/other/stepcode/src/test/needFunc.cc
brlcad/trunk/src/other/stepcode/src/test/needFunc.h
brlcad/trunk/src/other/stepcode/src/test/p21read/p21read.cc
brlcad/trunk/src/other/stepcode/src/test/scl2html/scl2html.cc
brlcad/trunk/src/other/stepcode/src/test/tests.h
brlcad/trunk/src/other/stepcode/src/test/tio/tio.cc
brlcad/trunk/src/other/stepcode/src/test/treg/treg.cc
brlcad/trunk/src/other/stepcode/src/test/tstatic/tstatic.cc
brlcad/trunk/src/other/stepcode/test/CMakeLists.txt
brlcad/trunk/src/other/stepcode/test/cpp/CMakeLists.txt
brlcad/trunk/src/other/stepcode/test/cpp/schema_specific/CMakeLists.txt
brlcad/trunk/src/other/stepcode/test/cpp/schema_specific/aggregate_bound_runtime.cc
brlcad/trunk/src/other/stepcode/test/cpp/schema_specific/attribute.cc
brlcad/trunk/src/other/stepcode/test/cpp/schema_specific/inverse_attr1.cc
brlcad/trunk/src/other/stepcode/test/cpp/schema_specific/inverse_attr2.cc
brlcad/trunk/src/other/stepcode/test/cpp/schema_specific/inverse_attr3.cc
brlcad/trunk/src/other/stepcode/test/cpp/schema_specific/stepfile_rw_progress.cc
brlcad/trunk/src/other/stepcode/test/p21/CMakeLists.txt
brlcad/trunk/src/other/stepcode.dist
Added Paths:
-----------
brlcad/trunk/src/other/stepcode/CONTRIBUTING.md
brlcad/trunk/src/other/stepcode/INTENT.md
brlcad/trunk/src/other/stepcode/README.md
brlcad/trunk/src/other/stepcode/cmake/Path_Setup.cmake
brlcad/trunk/src/other/stepcode/cmake/SC_CXX_schema_macros.cmake
brlcad/trunk/src/other/stepcode/cmake/SC_Config_Headers.cmake
brlcad/trunk/src/other/stepcode/cmake/SC_Locale.cmake
brlcad/trunk/src/other/stepcode/cmake/SC_Outdirs.cmake
brlcad/trunk/src/other/stepcode/cmake/SC_Paths.cmake
brlcad/trunk/src/other/stepcode/cmake/SC_Regenerate.cmake
brlcad/trunk/src/other/stepcode/cmake/SC_Run_exp2cxx.cmake
brlcad/trunk/src/other/stepcode/cmake/SC_Targets.cmake
brlcad/trunk/src/other/stepcode/cmake/schema_scanner/
brlcad/trunk/src/other/stepcode/cmake/sync_generated.cmake.in
brlcad/trunk/src/other/stepcode/data/STEPTools_merged_schema/modified_step_merged_cad_schema.exp.broken
brlcad/trunk/src/other/stepcode/data/ap209/
brlcad/trunk/src/other/stepcode/data/ap210e3/
brlcad/trunk/src/other/stepcode/data/ap242/242_n8324_mim_lf.exp
brlcad/trunk/src/other/stepcode/example/
brlcad/trunk/src/other/stepcode/example/ap203min/include/
brlcad/trunk/src/other/stepcode/include/express/alloc.h
brlcad/trunk/src/other/stepcode/include/express/exp_kw.h
brlcad/trunk/src/other/stepcode/include/express/factory.h
brlcad/trunk/src/other/stepcode/include/express/info.h
brlcad/trunk/src/other/stepcode/include/sc_cf.h.in
brlcad/trunk/src/other/stepcode/misc/summarize-appveyor-log.go
brlcad/trunk/src/other/stepcode/src/base/path2str.c
brlcad/trunk/src/other/stepcode/src/base/path2str.h
brlcad/trunk/src/other/stepcode/src/base/sc_mkdir.c
brlcad/trunk/src/other/stepcode/src/base/sc_mkdir.h
brlcad/trunk/src/other/stepcode/src/base/sc_stdio.h
brlcad/trunk/src/other/stepcode/src/base/sc_strtoull.h
brlcad/trunk/src/other/stepcode/src/cllazyfile/lazyRefs.h
brlcad/trunk/src/other/stepcode/src/cllazyfile/lazyRefs.txt
brlcad/trunk/src/other/stepcode/src/clstepcore/Registry.cc
brlcad/trunk/src/other/stepcode/src/clstepcore/STEPaggrBinary.cc
brlcad/trunk/src/other/stepcode/src/clstepcore/STEPaggrBinary.h
brlcad/trunk/src/other/stepcode/src/clstepcore/STEPaggrEntity.cc
brlcad/trunk/src/other/stepcode/src/clstepcore/STEPaggrEntity.h
brlcad/trunk/src/other/stepcode/src/clstepcore/STEPaggrEnum.cc
brlcad/trunk/src/other/stepcode/src/clstepcore/STEPaggrEnum.h
brlcad/trunk/src/other/stepcode/src/clstepcore/STEPaggrGeneric.cc
brlcad/trunk/src/other/stepcode/src/clstepcore/STEPaggrGeneric.h
brlcad/trunk/src/other/stepcode/src/clstepcore/STEPaggrInt.cc
brlcad/trunk/src/other/stepcode/src/clstepcore/STEPaggrInt.h
brlcad/trunk/src/other/stepcode/src/clstepcore/STEPaggrReal.cc
brlcad/trunk/src/other/stepcode/src/clstepcore/STEPaggrReal.h
brlcad/trunk/src/other/stepcode/src/clstepcore/STEPaggrSelect.cc
brlcad/trunk/src/other/stepcode/src/clstepcore/STEPaggrSelect.h
brlcad/trunk/src/other/stepcode/src/clstepcore/STEPaggrString.cc
brlcad/trunk/src/other/stepcode/src/clstepcore/STEPaggrString.h
brlcad/trunk/src/other/stepcode/src/clstepcore/STEPinvAttrList.cc
brlcad/trunk/src/other/stepcode/src/clstepcore/STEPinvAttrList.h
brlcad/trunk/src/other/stepcode/src/clstepcore/aggrTypeDescriptor.cc
brlcad/trunk/src/other/stepcode/src/clstepcore/aggrTypeDescriptor.h
brlcad/trunk/src/other/stepcode/src/clstepcore/attrDescriptor.cc
brlcad/trunk/src/other/stepcode/src/clstepcore/attrDescriptor.h
brlcad/trunk/src/other/stepcode/src/clstepcore/attrDescriptorList.cc
brlcad/trunk/src/other/stepcode/src/clstepcore/attrDescriptorList.h
brlcad/trunk/src/other/stepcode/src/clstepcore/create_Aggr.cc
brlcad/trunk/src/other/stepcode/src/clstepcore/create_Aggr.h
brlcad/trunk/src/other/stepcode/src/clstepcore/derivedAttribute.cc
brlcad/trunk/src/other/stepcode/src/clstepcore/derivedAttribute.h
brlcad/trunk/src/other/stepcode/src/clstepcore/dictSchema.cc
brlcad/trunk/src/other/stepcode/src/clstepcore/dictSchema.h
brlcad/trunk/src/other/stepcode/src/clstepcore/dictionaryInstance.h
brlcad/trunk/src/other/stepcode/src/clstepcore/entityDescriptor.cc
brlcad/trunk/src/other/stepcode/src/clstepcore/entityDescriptor.h
brlcad/trunk/src/other/stepcode/src/clstepcore/entityDescriptorList.cc
brlcad/trunk/src/other/stepcode/src/clstepcore/entityDescriptorList.h
brlcad/trunk/src/other/stepcode/src/clstepcore/enumTypeDescriptor.cc
brlcad/trunk/src/other/stepcode/src/clstepcore/enumTypeDescriptor.h
brlcad/trunk/src/other/stepcode/src/clstepcore/explicitItemId.cc
brlcad/trunk/src/other/stepcode/src/clstepcore/explicitItemId.h
brlcad/trunk/src/other/stepcode/src/clstepcore/globalRule.cc
brlcad/trunk/src/other/stepcode/src/clstepcore/globalRule.h
brlcad/trunk/src/other/stepcode/src/clstepcore/implicitItemId.cc
brlcad/trunk/src/other/stepcode/src/clstepcore/implicitItemId.h
brlcad/trunk/src/other/stepcode/src/clstepcore/interfaceSpec.cc
brlcad/trunk/src/other/stepcode/src/clstepcore/interfaceSpec.h
brlcad/trunk/src/other/stepcode/src/clstepcore/interfacedItem.cc
brlcad/trunk/src/other/stepcode/src/clstepcore/interfacedItem.h
brlcad/trunk/src/other/stepcode/src/clstepcore/inverseAttribute.cc
brlcad/trunk/src/other/stepcode/src/clstepcore/inverseAttribute.h
brlcad/trunk/src/other/stepcode/src/clstepcore/inverseAttributeList.cc
brlcad/trunk/src/other/stepcode/src/clstepcore/inverseAttributeList.h
brlcad/trunk/src/other/stepcode/src/clstepcore/realTypeDescriptor.h
brlcad/trunk/src/other/stepcode/src/clstepcore/schRename.cc
brlcad/trunk/src/other/stepcode/src/clstepcore/schRename.h
brlcad/trunk/src/other/stepcode/src/clstepcore/selectTypeDescriptor.cc
brlcad/trunk/src/other/stepcode/src/clstepcore/selectTypeDescriptor.h
brlcad/trunk/src/other/stepcode/src/clstepcore/stringTypeDescriptor.h
brlcad/trunk/src/other/stepcode/src/clstepcore/superInvAttrIter.h
brlcad/trunk/src/other/stepcode/src/clstepcore/test/
brlcad/trunk/src/other/stepcode/src/clstepcore/typeDescriptor.cc
brlcad/trunk/src/other/stepcode/src/clstepcore/typeDescriptor.h
brlcad/trunk/src/other/stepcode/src/clstepcore/typeDescriptorList.cc
brlcad/trunk/src/other/stepcode/src/clstepcore/typeDescriptorList.h
brlcad/trunk/src/other/stepcode/src/clstepcore/typeOrRuleVar.cc
brlcad/trunk/src/other/stepcode/src/clstepcore/typeOrRuleVar.h
brlcad/trunk/src/other/stepcode/src/clstepcore/uniquenessRule.cc
brlcad/trunk/src/other/stepcode/src/clstepcore/uniquenessRule.h
brlcad/trunk/src/other/stepcode/src/clstepcore/whereRule.cc
brlcad/trunk/src/other/stepcode/src/clstepcore/whereRule.h
brlcad/trunk/src/other/stepcode/src/exp2cxx/class_strings.c
brlcad/trunk/src/other/stepcode/src/exp2cxx/class_strings.h
brlcad/trunk/src/other/stepcode/src/exp2cxx/classes_attribute.c
brlcad/trunk/src/other/stepcode/src/exp2cxx/classes_attribute.h
brlcad/trunk/src/other/stepcode/src/exp2cxx/classes_entity.c
brlcad/trunk/src/other/stepcode/src/exp2cxx/classes_entity.h
brlcad/trunk/src/other/stepcode/src/exp2cxx/classes_type.c
brlcad/trunk/src/other/stepcode/src/exp2cxx/classes_type.h
brlcad/trunk/src/other/stepcode/src/exp2cxx/genCxxFilenames.c
brlcad/trunk/src/other/stepcode/src/exp2cxx/genCxxFilenames.h
brlcad/trunk/src/other/stepcode/src/exp2cxx/rules.c
brlcad/trunk/src/other/stepcode/src/exp2cxx/rules.h
brlcad/trunk/src/other/stepcode/src/exp2cxx/test/
brlcad/trunk/src/other/stepcode/src/exp2python/DESIGN.txt
brlcad/trunk/src/other/stepcode/src/exp2python/python/.gitignore
brlcad/trunk/src/other/stepcode/src/exp2python/src/classes.h
brlcad/trunk/src/other/stepcode/src/exp2python/src/complexSupport.h
brlcad/trunk/src/other/stepcode/src/exppp/pp.h
brlcad/trunk/src/other/stepcode/src/exppp/pretty_alg.c
brlcad/trunk/src/other/stepcode/src/exppp/pretty_alg.h
brlcad/trunk/src/other/stepcode/src/exppp/pretty_case.c
brlcad/trunk/src/other/stepcode/src/exppp/pretty_case.h
brlcad/trunk/src/other/stepcode/src/exppp/pretty_entity.c
brlcad/trunk/src/other/stepcode/src/exppp/pretty_entity.h
brlcad/trunk/src/other/stepcode/src/exppp/pretty_expr.c
brlcad/trunk/src/other/stepcode/src/exppp/pretty_expr.h
brlcad/trunk/src/other/stepcode/src/exppp/pretty_express.c
brlcad/trunk/src/other/stepcode/src/exppp/pretty_express.h
brlcad/trunk/src/other/stepcode/src/exppp/pretty_func.c
brlcad/trunk/src/other/stepcode/src/exppp/pretty_func.h
brlcad/trunk/src/other/stepcode/src/exppp/pretty_loop.c
brlcad/trunk/src/other/stepcode/src/exppp/pretty_loop.h
brlcad/trunk/src/other/stepcode/src/exppp/pretty_proc.c
brlcad/trunk/src/other/stepcode/src/exppp/pretty_proc.h
brlcad/trunk/src/other/stepcode/src/exppp/pretty_ref.c
brlcad/trunk/src/other/stepcode/src/exppp/pretty_ref.h
brlcad/trunk/src/other/stepcode/src/exppp/pretty_rule.c
brlcad/trunk/src/other/stepcode/src/exppp/pretty_rule.h
brlcad/trunk/src/other/stepcode/src/exppp/pretty_schema.c
brlcad/trunk/src/other/stepcode/src/exppp/pretty_schema.h
brlcad/trunk/src/other/stepcode/src/exppp/pretty_scope.c
brlcad/trunk/src/other/stepcode/src/exppp/pretty_scope.h
brlcad/trunk/src/other/stepcode/src/exppp/pretty_stmt.c
brlcad/trunk/src/other/stepcode/src/exppp/pretty_stmt.h
brlcad/trunk/src/other/stepcode/src/exppp/pretty_subtype.c
brlcad/trunk/src/other/stepcode/src/exppp/pretty_subtype.h
brlcad/trunk/src/other/stepcode/src/exppp/pretty_type.c
brlcad/trunk/src/other/stepcode/src/exppp/pretty_type.h
brlcad/trunk/src/other/stepcode/src/exppp/pretty_where.c
brlcad/trunk/src/other/stepcode/src/exppp/pretty_where.h
brlcad/trunk/src/other/stepcode/src/exppp/test/
brlcad/trunk/src/other/stepcode/src/express/alloc.c
brlcad/trunk/src/other/stepcode/src/express/dummy.c
brlcad/trunk/src/other/stepcode/src/express/exp_kw.c
brlcad/trunk/src/other/stepcode/src/express/factory.c
brlcad/trunk/src/other/stepcode/src/express/generated/ybreaks.txt
brlcad/trunk/src/other/stepcode/src/express/info.c
brlcad/trunk/src/other/stepcode/src/express/resolve2.c
brlcad/trunk/src/other/stepcode/src/express/test/driver.c
brlcad/trunk/src/other/stepcode/src/express/test/driver.h
brlcad/trunk/src/other/stepcode/src/express/test/fff.h
brlcad/trunk/src/other/stepcode/src/express/test/plib_parse_err.exp
brlcad/trunk/src/other/stepcode/src/express/test/test_expr.c
brlcad/trunk/src/other/stepcode/src/express/test/test_express.c
brlcad/trunk/src/other/stepcode/src/express/test/test_resolve.c
brlcad/trunk/src/other/stepcode/src/express/test/test_resolve2.c
brlcad/trunk/src/other/stepcode/src/express/test/test_schema.c
brlcad/trunk/src/other/stepcode/src/express/test/test_scope.c
brlcad/trunk/src/other/stepcode/src/express/test/test_type.c
brlcad/trunk/src/other/stepcode/src/express/ybreaks.py
brlcad/trunk/src/other/stepcode/test/p21/select_segfault_2.stp
brlcad/trunk/src/other/stepcode/test/p21/test_inherit_inverse.p21
brlcad/trunk/src/other/stepcode/test/unitary_schemas/inherit_inverse.exp
brlcad/trunk/src/other/stepcode/test/unitary_schemas/inverse_bug.exp
brlcad/trunk/src/other/stepcode/test/unitary_schemas/inverse_qualifiers.exp
brlcad/trunk/src/other/stepcode/test/unitary_schemas/numbered_inverse_attr.exp
brlcad/trunk/src/other/stepcode/test/unitary_schemas/select_segfault_2.exp
brlcad/trunk/src/other/stepcode/test/unitary_schemas/unique_qualifiers.exp
brlcad/trunk/src/other/stepcode/test/unitary_schemas/ur_redecl.exp
Removed Paths:
-------------
brlcad/trunk/src/other/stepcode/README
brlcad/trunk/src/other/stepcode/SC_VERSION.txt
brlcad/trunk/src/other/stepcode/TODO
brlcad/trunk/src/other/stepcode/cmake/CheckCFileRuns.cmake
brlcad/trunk/src/other/stepcode/cmake/Generated_Source_Utils.cmake
brlcad/trunk/src/other/stepcode/cmake/SC_Utils.cmake
brlcad/trunk/src/other/stepcode/cmake/md5_gen.cmake.in
brlcad/trunk/src/other/stepcode/cmake/md5_verify.cmake.in
brlcad/trunk/src/other/stepcode/cmake/sc_version_string.cmake
brlcad/trunk/src/other/stepcode/data/STEPTools_merged_schema/modified_step_merged_cad_schema.exp
brlcad/trunk/src/other/stepcode/data/ap210e2/Cable_db.stp
brlcad/trunk/src/other/stepcode/data/ap210e2/FlasherThruHole.stp
brlcad/trunk/src/other/stepcode/data/ap210e2/PDES-181.stp
brlcad/trunk/src/other/stepcode/data/ap210e2/SurfaceMountFlasher.stp
brlcad/trunk/src/other/stepcode/data/ap227/mitre.p21
brlcad/trunk/src/other/stepcode/data/ap227/mitre.step.txt
brlcad/trunk/src/other/stepcode/data/ap242/ap242e1.exp
brlcad/trunk/src/other/stepcode/data/cd209/
brlcad/trunk/src/other/stepcode/data/cd242/
brlcad/trunk/src/other/stepcode/data/wip210e3/
brlcad/trunk/src/other/stepcode/doc/man/man1/dataprobe.1
brlcad/trunk/src/other/stepcode/doc/man/man1/mkProbe.1
brlcad/trunk/src/other/stepcode/include/sc_cf_cmake.h.in
brlcad/trunk/src/other/stepcode/src/clSchemas/
brlcad/trunk/src/other/stepcode/src/clprobe-ui/
brlcad/trunk/src/other/stepcode/src/clstepcore/ExpDict.inline.cc
brlcad/trunk/src/other/stepcode/src/clstepcore/Registry.inline.cc
brlcad/trunk/src/other/stepcode/src/clstepcore/STEPattribute.inline.cc
brlcad/trunk/src/other/stepcode/src/clstepcore/SingleLinkList.inline.cc
brlcad/trunk/src/other/stepcode/src/express/exptoks.h
brlcad/trunk/src/other/stepcode/src/express/generated/verification_info.cmake
brlcad/trunk/src/other/stepcode/src/test/schema-loc
brlcad/trunk/src/other/stepcode/test/cpp/stepcore/
Property Changed:
----------------
brlcad/trunk/
brlcad/trunk/CHANGES
brlcad/trunk/NEWS
brlcad/trunk/bench/
brlcad/trunk/db/
brlcad/trunk/doc/
brlcad/trunk/include/
brlcad/trunk/regress/
brlcad/trunk/src/libbu/
brlcad/trunk/src/libged/kill/kill.c
brlcad/trunk/src/libged/polyclip.cpp
brlcad/trunk/src/other/
brlcad/trunk/src/other/stepcode/
brlcad/trunk/src/tclscripts/archer/
Index: brlcad/trunk
===================================================================
--- brlcad/trunk 2021-02-08 04:44:44 UTC (rev 78220)
+++ brlcad/trunk 2021-02-08 04:54:55 UTC (rev 78221)
Property changes on: brlcad/trunk
___________________________________________________________________
Modified: svn:mergeinfo
## -10,4 +10,5 ##
/brlcad/branches/opencl:65867-66137
/brlcad/branches/osg:62110-62113
/brlcad/branches/prep-cache:68236-68933
+/brlcad/branches/stepsync:77952-78220
/brlcad/branches/tcltk86:68300-75257
\ No newline at end of property
Index: brlcad/trunk/CHANGES
===================================================================
--- brlcad/trunk/CHANGES 2021-02-08 04:44:44 UTC (rev 78220)
+++ brlcad/trunk/CHANGES 2021-02-08 04:54:55 UTC (rev 78221)
Property changes on: brlcad/trunk/CHANGES
___________________________________________________________________
Modified: svn:mergeinfo
## -1,3 +1,4 ##
/brlcad/branches/RELEASE/CHANGES:70323-70333,71915-72242,72525-72534,72826-72858,74376-74454,74964-75140
/brlcad/branches/brep-debug/CHANGES:69168,69927,69995-69996,70148-70149,70347-70349,70377,70526-70527,71006-71007,71009-71022,71046-71047,71049,71096-71100
-/brlcad/branches/dm-fb-merge/CHANGES:75426-76198
\ No newline at end of property
+/brlcad/branches/dm-fb-merge/CHANGES:75426-76198
+/brlcad/branches/stepsync/CHANGES:77952-78215
\ No newline at end of property
Index: brlcad/trunk/NEWS
===================================================================
--- brlcad/trunk/NEWS 2021-02-08 04:44:44 UTC (rev 78220)
+++ brlcad/trunk/NEWS 2021-02-08 04:54:55 UTC (rev 78221)
Property changes on: brlcad/trunk/NEWS
___________________________________________________________________
Modified: svn:mergeinfo
## -8,4 +8,5 ##
/brlcad/branches/opencl/NEWS:65867-66137
/brlcad/branches/osg/NEWS:62110-62113
/brlcad/branches/prep-cache/NEWS:68236-68933
+/brlcad/branches/stepsync/NEWS:77952-78215
/brlcad/branches/tcltk86/NEWS:68300-75257
\ No newline at end of property
Index: brlcad/trunk/bench
===================================================================
--- brlcad/trunk/bench 2021-02-08 04:44:44 UTC (rev 78220)
+++ brlcad/trunk/bench 2021-02-08 04:54:55 UTC (rev 78221)
Property changes on: brlcad/trunk/bench
___________________________________________________________________
Modified: svn:mergeinfo
## -7,4 +7,5 ##
/brlcad/branches/opencl/bench:65867-66137
/brlcad/branches/osg/bench:62110-62113
/brlcad/branches/prep-cache/bench:68236-68933
+/brlcad/branches/stepsync/bench:77952-78215
/brlcad/branches/tcltk86/bench:68300-75257
\ No newline at end of property
Index: brlcad/trunk/db
===================================================================
--- brlcad/trunk/db 2021-02-08 04:44:44 UTC (rev 78220)
+++ brlcad/trunk/db 2021-02-08 04:54:55 UTC (rev 78221)
Property changes on: brlcad/trunk/db
___________________________________________________________________
Modified: svn:mergeinfo
## -7,4 +7,5 ##
/brlcad/branches/opencl/db:65867-66137
/brlcad/branches/osg/db:62110-62113
/brlcad/branches/prep-cache/db:68236-68933
+/brlcad/branches/stepsync/db:77952-78215
/brlcad/branches/tcltk86/db:68300-75257
\ No newline at end of property
Index: brlcad/trunk/doc
===================================================================
--- brlcad/trunk/doc 2021-02-08 04:44:44 UTC (rev 78220)
+++ brlcad/trunk/doc 2021-02-08 04:54:55 UTC (rev 78221)
Property changes on: brlcad/trunk/doc
___________________________________________________________________
Modified: svn:mergeinfo
## -8,4 +8,5 ##
/brlcad/branches/opencl/doc:65867-66137
/brlcad/branches/osg/doc:62110-62113
/brlcad/branches/prep-cache/doc:68236-68933
+/brlcad/branches/stepsync/doc:77952-78215
/brlcad/branches/tcltk86/doc:68300-75257
\ No newline at end of property
Index: brlcad/trunk/include
===================================================================
--- brlcad/trunk/include 2021-02-08 04:44:44 UTC (rev 78220)
+++ brlcad/trunk/include 2021-02-08 04:54:55 UTC (rev 78221)
Property changes on: brlcad/trunk/include
___________________________________________________________________
Modified: svn:mergeinfo
## -9,4 +9,5 ##
/brlcad/branches/opencl/include:65867-66137
/brlcad/branches/osg/include:62110-62113
/brlcad/branches/prep-cache/include:68236-68933
+/brlcad/branches/stepsync/include:77952-78215
/brlcad/branches/tcltk86/include:68300-75257
\ No newline at end of property
Index: brlcad/trunk/regress
===================================================================
--- brlcad/trunk/regress 2021-02-08 04:44:44 UTC (rev 78220)
+++ brlcad/trunk/regress 2021-02-08 04:54:55 UTC (rev 78221)
Property changes on: brlcad/trunk/regress
___________________________________________________________________
Modified: svn:mergeinfo
## -9,4 +9,5 ##
/brlcad/branches/opencl/regress:65867-66137
/brlcad/branches/osg/regress:62110-62113
/brlcad/branches/prep-cache/regress:68236-68933
+/brlcad/branches/stepsync/regress:77952-78215
/brlcad/branches/tcltk86/regress:68300-75257
\ No newline at end of property
Modified: brlcad/trunk/src/conv/step/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/conv/step/CMakeLists.txt 2021-02-08 04:44:44 UTC (rev
78220)
+++ brlcad/trunk/src/conv/step/CMakeLists.txt 2021-02-08 04:54:55 UTC (rev
78221)
@@ -55,6 +55,8 @@
set(express_srcs
${SCHEMA_OUT_DIR}/Sdai${SCHEMA_NAME}.cc
${SCHEMA_OUT_DIR}/Sdai${SCHEMA_NAME}.init.cc
+ ${SCHEMA_OUT_DIR}/Sdai${SCHEMA_NAME}_unity_entities.cc
+ ${SCHEMA_OUT_DIR}/Sdai${SCHEMA_NAME}_unity_types.cc
${SCHEMA_OUT_DIR}/SdaiAll.cc
${SCHEMA_OUT_DIR}/compstructs.cc
${SCHEMA_OUT_DIR}/schema.cc
@@ -65,8 +67,9 @@
set(EXPRESS_OUTPUT
${express_srcs}
${SCHEMA_OUT_DIR}/Sdai${SCHEMA_NAME}.h
- ${SCHEMA_OUT_DIR}/Sdai${SCHEMA_NAME}Helpers.h
${SCHEMA_OUT_DIR}/Sdai${SCHEMA_NAME}Names.h
+ ${SCHEMA_OUT_DIR}/Sdai${SCHEMA_NAME}_unity_entities.h
+ ${SCHEMA_OUT_DIR}/Sdai${SCHEMA_NAME}_unity_types.h
${SCHEMA_OUT_DIR}/Sdaiclasses.h
${SCHEMA_OUT_DIR}/schema.h
)
Index: brlcad/trunk/src/libbu
===================================================================
--- brlcad/trunk/src/libbu 2021-02-08 04:44:44 UTC (rev 78220)
+++ brlcad/trunk/src/libbu 2021-02-08 04:54:55 UTC (rev 78221)
Property changes on: brlcad/trunk/src/libbu
___________________________________________________________________
Modified: svn:mergeinfo
## -2,4 +2,5 ##
/brlcad/branches/bioh/src/libbu:75720-75736,75860-75891,75894-75986,76088-76153
/brlcad/branches/brep-debug/src/libbu:69168,69927,69995-69996,70148-70149,70347-70349,70377,70526-70527,71006-71007,71009-71022,71046-71047,71049,71096-71100
/brlcad/branches/dm-fb-merge/src/libbu:75426-76198
+/brlcad/branches/stepsync/src/libbu:77952-78215
/brlcad/branches/tcltk86/src/libbu:68300-75257
\ No newline at end of property
Index: brlcad/trunk/src/libged/kill/kill.c
===================================================================
--- brlcad/trunk/src/libged/kill/kill.c 2021-02-08 04:44:44 UTC (rev 78220)
+++ brlcad/trunk/src/libged/kill/kill.c 2021-02-08 04:54:55 UTC (rev 78221)
Property changes on: brlcad/trunk/src/libged/kill/kill.c
___________________________________________________________________
Modified: svn:mergeinfo
## -1,7 +1,7 ##
/brlcad/branches/RELEASE/src/libged/kill/kill.c:57439,57447-57860,69901-69913,70323-70333,71915-72242,72525-72534,72826-72858,74376-74454,74964-75140,75372-75685,76001-76451,76693-76768,77107-77132,77145-77155
/brlcad/branches/analyze_cmd:76836-77221
/brlcad/branches/analyze_cmd/src/libged/kill/kill.c:76836-77221
-/brlcad/branches/bioh/src/libged/kill/kill.c:75720-75736,75740-75742,75860-75891,75894-75986,76088-76153,76354-76506,76577
+/brlcad/branches/bioh/src/libged/kill/kill.c:75720-75736,75740-75742,75860-75891,75894-75986,76088-76153,76354-76359,76366-76506,76577
/brlcad/branches/brep-debug/src/libged/kill/kill.c:61373,61375,61404,61427,61429,61470,61544,61567,61576,61999,62018,62094,62098,62107,62117,62406,62416-62519,62521-62584,62593-62614,62623,62658,62660-62674,62681-62771,62876,62901,62907,62910,62925,62928,62931-63025,63027,63051,63054-63056,63069,63071-63073,63122,63160-63161,63165,63171,63184,63187,63189-63190,63193-63196,63200,63202,63205-63210,63213,63219-63225,63232-63233,63236,63238,63338,63350-63353,63481,63618,63669,64173-64174,64176-64177,64229-64233,64242,64244,64360-64362,65165,65245,65249,65334,65833-65834,66370-66375,66931-66932,66934,67012-67015,67018-67019,67021-67022,67406,67740,67746-67748,67950,67952,68144-68145,68636,68640-68643,68820,69081,69109,69168,69206,69289,69346,69460-69461,69582-69583,69719-69721,69857-69859,69927,69995-69996,70148-70149,70347-70349,70377,70526-70527,71006-71007,71009-71022,71046-71047,71049,71096-71100
/brlcad/branches/bullet/src/libged/kill/kill.c:62518
/brlcad/branches/cmake/src/libged/kill/kill.c:43219
## -11,4 +11,5 ##
/brlcad/branches/opencl/src/libged/kill/kill.c:65867-66137
/brlcad/branches/osg/src/libged/kill/kill.c:62110-62113
/brlcad/branches/prep-cache/src/libged/kill/kill.c:68236-68933
+/brlcad/branches/stepsync/src/libged/kill/kill.c:77952-78215
/brlcad/branches/tcltk86/src/libged/kill/kill.c:68300-75257
\ No newline at end of property
Index: brlcad/trunk/src/libged/polyclip.cpp
===================================================================
--- brlcad/trunk/src/libged/polyclip.cpp 2021-02-08 04:44:44 UTC (rev
78220)
+++ brlcad/trunk/src/libged/polyclip.cpp 2021-02-08 04:54:55 UTC (rev
78221)
Property changes on: brlcad/trunk/src/libged/polyclip.cpp
___________________________________________________________________
Modified: svn:mergeinfo
## -1,7 +1,7 ##
/brlcad/branches/RELEASE/src/libged/polyclip/polyclip.cpp:57439,57447-57860,69901-69913,70323-70333,71915-72242,72525-72534,72826-72858,74376-74454,74964-75140,75372-75685
/brlcad/branches/RELEASE/src/libged/polyclip.cpp:57439,57447-57860,69901-69913,70323-70333,71915-72242,72525-72534,72826-72858,74376-74454,74964-75140,75372-75685,76001-76451
-/brlcad/branches/bioh/src/libged/polyclip/polyclip.cpp:75720-75736,75740-75742,75860-75891,75894-75986,76088-76153,76360-76365
-/brlcad/branches/bioh/src/libged/polyclip.cpp:75720-75736,75740-75742,75860-75891,75894-75986,76088-76153,76354-76365,76368-76376,76506
+/brlcad/branches/bioh/src/libged/polyclip/polyclip.cpp:75720-75736,75740-75742,75860-75891,75894-75986,76088-76153
+/brlcad/branches/bioh/src/libged/polyclip.cpp:76360-76365,76368-76376,76506
/brlcad/branches/brep-debug/src/libged/polyclip/polyclip.cpp:61373,61375,61404,61427,61429,61470,61544,61567,61576,61999,62018,62094,62098,62107,62117,62406,62416-62519,62521-62584,62593-62614,62623,62658,62660-62674,62681-62771,62876,62901,62907,62910,62925,62928,62931-63025,63027,63051,63054-63056,63069,63071-63073,63122,63160-63161,63165,63171,63184,63187,63189-63190,63193-63196,63200,63202,63205-63210,63213,63219-63225,63232-63233,63236,63238,63338,63350-63353,63481,63618,63669,64173-64174,64176-64177,64229-64233,64242,64244,64360-64362,65165,65245,65249,65334,65833-65834,66370-66375,66931-66932,66934,67012-67015,67018-67019,67021-67022,67406,67740,67746-67748,67950,67952,68144-68145,68636,68640-68643,68820,69081,69109,69168,69206,69289,69346,69460-69461,69582-69583,69719-69721,69857-69859,69927,69995-69996,70148-70149,70347-70349,70377,70526-70527,71006-71007,71009-71022,71046-71047,71049,71096-71100
/brlcad/branches/brep-debug/src/libged/polyclip.cpp:61373,61375,61404,61427,61429,61470,61544,61567,61576,61999,62018,62094,62098,62107,62117,62406,62416-62519,62521-62584,62593-62614,62623,62658,62660-62674,62681-62771,62876,62901,62907,62910,62925,62928,62931-63025,63027,63051,63054-63056,63069,63071-63073,63122,63160-63161,63165,63171,63184,63187,63189-63190,63193-63196,63200,63202,63205-63210,63213,63219-63225,63232-63233,63236,63238,63338,63350-63353,63481,63618,63669,64173-64174,64176-64177,64229-64233,64242,64244,64360-64362,65165,65245,65249,65334,65833-65834,66370-66375,66931-66932,66934,67012-67015,67018-67019,67021-67022,67406,67740,67746-67748,67950,67952,68144-68145,68636,68640-68643,68820,69081,69109,69168,69206,69289,69346,69460-69461,69582-69583,69719-69721,69857-69859,69927,69995-69996,70148-70149,70347-70349,70377,70526-70527,71006-71007,71009-71022,71046-71047,71049,71096-71100
/brlcad/branches/bullet/src/libged/polyclip/polyclip.cpp:62518
## -12,7 +12,6 ##
/brlcad/branches/dm-fb-merge/src/libged/polyclip.cpp:75426-76198
/brlcad/branches/gct/src/libged/polyclip/polyclip.cpp:62423-62425
/brlcad/branches/gct/src/libged/polyclip.cpp:62423-62425
-/brlcad/branches/gedplugins/src/libged/polyclip.cpp:76388-76465
/brlcad/branches/opencl/src/libged/polyclip/polyclip.cpp:65867-66137
/brlcad/branches/opencl/src/libged/polyclip.cpp:65867-66137
/brlcad/branches/osg/src/libged/polyclip/polyclip.cpp:62110-62113
## -19,6 +18,7 ##
/brlcad/branches/osg/src/libged/polyclip.cpp:62110-62113
/brlcad/branches/prep-cache/src/libged/polyclip/polyclip.cpp:68236-68933
/brlcad/branches/prep-cache/src/libged/polyclip.cpp:68236-68933
+/brlcad/branches/stepsync/src/libged/polyclip.cpp:77952-78215
/brlcad/branches/tcltk86/src/libged/polyclip/polyclip.cpp:68300-75257
/brlcad/branches/tcltk86/src/libged/polyclip.cpp:68300-75257
/brlcad/trunk/src/libged/polyclip.cpp:76160-76351
\ No newline at end of property
Index: brlcad/trunk/src/other
===================================================================
--- brlcad/trunk/src/other 2021-02-08 04:44:44 UTC (rev 78220)
+++ brlcad/trunk/src/other 2021-02-08 04:54:55 UTC (rev 78221)
Property changes on: brlcad/trunk/src/other
___________________________________________________________________
Modified: svn:mergeinfo
## -8,4 +8,5 ##
/brlcad/branches/opencl/src/other:65867-66137
/brlcad/branches/osg/src/other:62110-62113
/brlcad/branches/prep-cache/src/other:68236-68933
+/brlcad/branches/stepsync/src/other:77952-78220
/brlcad/branches/tcltk86/src/other:68300-75257
\ No newline at end of property
Modified: brlcad/trunk/src/other/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/CMakeLists.txt 2021-02-08 04:44:44 UTC (rev
78220)
+++ brlcad/trunk/src/other/CMakeLists.txt 2021-02-08 04:54:55 UTC (rev
78221)
@@ -771,6 +771,7 @@
mark_as_advanced(EXP2CXX_EXEC)
mark_as_advanced(EXP2CXX_EXECUTABLE_TARGET)
DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/stepcode/include/sc_cf.h.in")
+ DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/stepcode/include/sc_cf.h.gen")
DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/stepcode/include/sc_cf.h")
DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/stepcode/include/sc_version_string.h")
DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/stepcode/src/express/ExpParser_expparse/expparse.y")
Index: brlcad/trunk/src/other/stepcode
===================================================================
--- brlcad/trunk/src/other/stepcode 2021-02-08 04:44:44 UTC (rev 78220)
+++ brlcad/trunk/src/other/stepcode 2021-02-08 04:54:55 UTC (rev 78221)
Property changes on: brlcad/trunk/src/other/stepcode
___________________________________________________________________
Modified: svn:mergeinfo
## -8,5 +8,6 ##
/brlcad/branches/opencl/src/other/stepcode:65867-66137
/brlcad/branches/osg/src/other/stepcode:62110-62113
/brlcad/branches/prep-cache/src/other/stepcode:68236-68933
+/brlcad/branches/stepsync/src/other/stepcode:77952-78217,78219-78220
/brlcad/branches/tcltk86/src/other/stepcode:68300-75257
/brlcad/branches/thirdparty_rework/src/other/stepcode:75098-75163
\ No newline at end of property
Modified: brlcad/trunk/src/other/stepcode/AUTHORS
===================================================================
--- brlcad/trunk/src/other/stepcode/AUTHORS 2021-02-08 04:44:44 UTC (rev
78220)
+++ brlcad/trunk/src/other/stepcode/AUTHORS 2021-02-08 04:54:55 UTC (rev
78221)
@@ -5,21 +5,29 @@
In alphabetical order:
Bertucat, Roch (rbertucat)
Bowman, W. Keith (indianlarry)
+da Costa, Raphael Kubo (rakuco)
+DeGraw, Jason (jasondegraw)
Easterbrook, Zach (lainiwakurax)
Greenwald, Erik (erikg, erikgreenwald)
+Horler, Chris (cshorler)
Lanning, Craig (craigl64)
Loman, David (davidloman)
+McDonald, Rob (ramcdona)
+Mittal, Pulkit (hoiji09)
Morrison, Christopher Sean (sean, morrison, brlcad)
Paviot, Thomas (tpaviot)
Pictor, Mark (mpictor)
-Shah, Kesha (kesha)
+Reed, Nick (nickreed)
+Shah, Kesha (kesha, keshashah)
Thomas, Dawn (homovulgaris, madant)
Wouters, Dave (davyw)
Yapp, Clifford (starseeker)
Special thanks:
+Hunten, Keith (Lockheed Martin)
Lubbell, Joshua (NIST)
Stirk, Charlie (CostVision)
+Thurman, Tom (TRThurman)
Between 2005 and 2006, Stefan Richter worked to make SCL compatible with
modern ANSI/ISO C++, and modified the build system. His patches are at
Modified: brlcad/trunk/src/other/stepcode/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/stepcode/CMakeLists.txt 2021-02-08 04:44:44 UTC
(rev 78220)
+++ brlcad/trunk/src/other/stepcode/CMakeLists.txt 2021-02-08 04:54:55 UTC
(rev 78221)
@@ -1,4 +1,4 @@
-# C M A K E L I S T S . T X T F O R S C L
+# C M A K E L I S T S . T X T
#
# This file is Copyright (c) 2010 United States Government as
# represented by the U.S. Army Research Laboratory.
@@ -32,421 +32,208 @@
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# *******************************************************************
-# *** SC's CMakeLists.txt ***
+# *** STEPcode's CMakeLists.txt ***
# *******************************************************************
# This file contains the top level CMakeLists.txt logic for the
-# SC software package.
+# STEPcode software package.
project(SC)
-# SC version
-SET(SC_VERSION_MAJOR 0)
-if(NOT SC_IS_SUBBUILD)
- SET(SC_VERSION_MINOR 7-dev)
-else(NOT SC_IS_SUBBUILD)
- SET(SC_VERSION_MINOR 7)
-endif(NOT SC_IS_SUBBUILD)
-SET(SC_VERSION ${SC_VERSION_MAJOR}.${SC_VERSION_MINOR})
-
-# SC ABI version. SC_ABI_SOVERSION should be incremented
-# for each release introducing API incompatibilities
-SET(SC_ABI_SOVERSION 2)
-SET(SC_ABI_VERSION ${SC_ABI_SOVERSION}.0.0)
-
# Minimum required version of CMake
cmake_minimum_required(VERSION 3.12)
+if (POLICY CMP0077)
+ cmake_policy(SET CMP0077 OLD)
+endif (POLICY CMP0077)
-IF( NOT DEFINED INCLUDE_INSTALL_DIR )
- SET( INCLUDE_INSTALL_DIR include )
-ENDIF( NOT DEFINED INCLUDE_INSTALL_DIR )
+# SC version
+set(SC_VERSION_MAJOR 0)
+set(SC_VERSION_MINOR 9)
+set(SC_VERSION_PATCH 1)
+set(SC_VERSION ${SC_VERSION_MAJOR}.${SC_VERSION_MINOR}.${SC_VERSION_PATCH})
-IF( NOT DEFINED LIB_INSTALL_DIR )
- SET( LIB_INSTALL_DIR lib )
-ENDIF( NOT DEFINED LIB_INSTALL_DIR )
+# Set language standards
+set(CMAKE_C_EXTENSIONS OFF)
+set(CMAKE_C_STANDARD 11)
+set(CMAKE_C_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
-IF( NOT DEFINED BIN_INSTALL_DIR )
- SET( BIN_INSTALL_DIR bin )
-ENDIF( NOT DEFINED BIN_INSTALL_DIR )
-
-if(NOT DEFINED BIN_DIR)
- set(BIN_DIR bin)
-endif(NOT DEFINED BIN_DIR)
-
-if(NOT DEFINED LIB_DIR)
- set(LIB_DIR lib)
-endif(NOT DEFINED LIB_DIR)
-
-# Because the STEPcode headers are used in BRL-CAD, we have added some decl
code
-# to the headers for strict c89/c++98. Don't use it for the stepcode build
itself
-add_definitions(-DHAVE_DECL_FSEEKO)
-
-IF( NOT DEFINED SC_BUILD_TYPE )
- SET( SC_BUILD_TYPE "Debug" CACHE STRING "Build type" ) # By default set
debug build
-ENDIF( NOT DEFINED SC_BUILD_TYPE )
-IF(NOT SC_IS_SUBBUILD)
- SET(CMAKE_BUILD_TYPE ${SC_BUILD_TYPE} CACHE INTERNAL "Build type, immutable"
FORCE )
-ELSE(NOT SC_IS_SUBBUILD)
- SET(CMAKE_BUILD_TYPE ${SC_BUILD_TYPE} )
-ENDIF(NOT SC_IS_SUBBUILD)
-
-# build shared libs by default
-OPTION(SC_BUILD_SHARED_LIBS "Build shared libs" ON)
-
-# don't build static libs by default
-OPTION(SC_BUILD_STATIC_LIBS "Build static libs" OFF)
-
-OPTION(SC_PYTHON_GENERATOR "Compile exp2python" ON)
-OPTION(SC_CPP_GENERATOR "Compile exp2cxx" ON)
-
-OPTION(SC_MEMMGR_ENABLE_CHECKS "Enable sc_memmgr's memory leak detection" OFF)
-OPTION(SC_TRACE_FPRINTF "Enable extra comments in generated code so the code's
source in exp2cxx may be located" OFF)
-
-if(NOT DEFINED SC_SDAI_ADDITIONAL_EXES_SRCS )
- set( SC_SDAI_ADDITIONAL_EXES_SRCS "" CACHE STRING "Source files for
additional executables to be linked with SDAI libs" )
-endif(NOT DEFINED SC_SDAI_ADDITIONAL_EXES_SRCS )
-
-if( NOT DEFINED SC_BUILD_SCHEMAS )
- message( "** CMake variable SC_BUILD_SCHEMAS not set. Defaults to building
ALL schemas. This will take a while; see
http://stepcode.org/mw/index.php?title=STEPcode_CMake_variables#SC_BUILD_SCHEMAS";
)
- #this makes SC_BUILD_SCHEMAS show up in cmake-gui
- SET(SC_BUILD_SCHEMAS "ALL" CACHE string "Semicolon-separated list of paths
to EXPRESS schemas to be built" )
-endif( NOT DEFINED SC_BUILD_SCHEMAS )
-
# CMake derives much of its functionality from modules, typically
# stored in one directory - let CMake know where to find them.
-SET(SC_CMAKE_DIR "${SC_SOURCE_DIR}/cmake")
-if(NOT IS_SUBBUILD)
- SET(CMAKE_MODULE_PATH "${SC_CMAKE_DIR};${CMAKE_MODULE_PATH}")
-else(NOT IS_SUBBUILD)
- SET(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${SC_CMAKE_DIR}")
-endif(NOT IS_SUBBUILD)
+set(SC_CMAKE_DIR "${SC_SOURCE_DIR}/cmake")
+list(APPEND CMAKE_MODULE_PATH "${SC_CMAKE_DIR}")
-INCLUDE(${SC_CMAKE_DIR}/SC_Utils.cmake)
+# OpenBSD has its own naming conventions. Set a platform variable based on
+# the OS name so we can test for it succinctly.
+if ("${CMAKE_SYSTEM}" MATCHES ".*OpenBSD.*")
+ set(OPENBSD ON)
+endif ("${CMAKE_SYSTEM}" MATCHES ".*OpenBSD.*")
-# Save the current LC_ALL, LC_MESSAGES, and LANG environment variables and set
them
-# to "C" so things like date output are as expected
-SET(_orig_lc_all $ENV{LC_ALL})
-SET(_orig_lc_messages $ENV{LC_MESSAGES})
-SET(_orig_lang $ENV{LANG})
-IF(_orig_lc_all)
- SET(ENV{LC_ALL} C)
-ENDIF(_orig_lc_all)
-IF(_orig_lc_messages)
- SET(ENV{LC_MESSAGES} C)
-ENDIF(_orig_lc_messages)
-IF(_orig_lang)
- SET(ENV{LANG} C)
-ENDIF(_orig_lang)
-
-
#---------------------------------------------------------------------
-# Coverage option
-OPTION( SC_ENABLE_COVERAGE "Enable code coverage test" OFF )
-IF(SC_ENABLE_COVERAGE)
- SET(SC_ENABLE_TESTING ON CACHE BOOL "Testing enabled by coverage option"
FORCE)
- # build static libs, better coverage report
- SET(SC_BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared libs" FORCE )
- SET(SC_BUILD_STATIC_LIBS ON CACHE BOOL "Build static libs" FORCE )
- SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -fprofile-arcs -ftest-coverage" CACHE
STRING "Extra compile flags required by code coverage" FORCE)
- SET(CMAKE_C_FLAGS_DEBUG "-O0 -g -fprofile-arcs -ftest-coverage" CACHE STRING
"Extra compile flags required by code coverage" FORCE)
- SET(CMAKE_MODULE_LINKER_FLAGS_DEBUG "-fprofile-arcs -ftest-coverage" CACHE
STRING "Extra linker flags required by code coverage" FORCE)
- SET(SC_BUILD_TYPE "Debug" CACHE STRING "Build type required by testing
framework" FORCE)
- SET( SC_PYTHON_GENERATOR OFF ) #won't build with static libs
-ENDIF(SC_ENABLE_COVERAGE)
+# Set up various relative path variables and build output directories
+include(Path_Setup)
#---------------------------------------------------------------------
-# Testing option
-OPTION( SC_ENABLE_TESTING "Enable unittesting framework" OFF )
-IF(SC_ENABLE_TESTING)
- if( NOT DEFINED SC_BUILD_SCHEMAS )
- set( SC_BUILD_SCHEMAS "ALL" ) #test all schemas, unless otherwise specified
- endif()
- INCLUDE(CTest)
- ENABLE_TESTING()
-ENDIF(SC_ENABLE_TESTING)
+# The following logic is what allows binaries to run successfully in
+# the build directory AND install directory. Thanks to plplot for
+# identifying the necessity of setting CMAKE_INSTALL_NAME_DIR on OSX.
+# Documentation of these options is available at
+# http://www.cmake.org/Wiki/CMake_RPATH_handling
-#-----------------------------------------------------------------------------
-# Output directories.
-IF(NOT DEFINED CMAKE_LIBRARY_OUTPUT_DIRECTORY)
- SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${SC_BINARY_DIR}/lib CACHE INTERNAL
"Single output directory for building all libraries.")
-ENDIF(NOT DEFINED CMAKE_LIBRARY_OUTPUT_DIRECTORY)
-IF(NOT DEFINED CMAKE_ARCHIVE_OUTPUT_DIRECTORY)
- SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${SC_BINARY_DIR}/lib CACHE INTERNAL
"Single output directory for building all archives.")
-ENDIF(NOT DEFINED CMAKE_ARCHIVE_OUTPUT_DIRECTORY)
-IF(NOT DEFINED CMAKE_RUNTIME_OUTPUT_DIRECTORY)
- SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${SC_BINARY_DIR}/bin CACHE INTERNAL
"Single output directory for building all executables.")
-ENDIF(NOT DEFINED CMAKE_RUNTIME_OUTPUT_DIRECTORY)
+# use, i.e. don't skip the full RPATH for the build tree
+if(NOT DEFINED CMAKE_SKIP_BUILD_RPATH)
+ set(CMAKE_SKIP_BUILD_RPATH FALSE)
+endif()
-FOREACH(CFG_TYPE ${CMAKE_CONFIGURATION_TYPES})
- STRING(TOUPPER "${CFG_TYPE}" CFG_TYPE)
- IF(NOT DEFINED CMAKE_LIBRARY_OUTPUT_DIRECTORY_${CFG_TYPE})
- SET("CMAKE_LIBRARY_OUTPUT_DIRECTORY_${CFG_TYPE}" ${SC_BINARY_DIR}/lib
CACHE INTERNAL "Single output directory for building all libraries.")
- ENDIF(NOT DEFINED CMAKE_LIBRARY_OUTPUT_DIRECTORY_${CFG_TYPE})
- IF(NOT DEFINED CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${CFG_TYPE})
- SET("CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${CFG_TYPE}" ${SC_BINARY_DIR}/lib
CACHE INTERNAL "Single output directory for building all archives.")
- ENDIF(NOT DEFINED CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${CFG_TYPE})
- IF(NOT DEFINED CMAKE_RUNTIME_OUTPUT_DIRECTORY_${CFG_TYPE})
- SET("CMAKE_RUNTIME_OUTPUT_DIRECTORY_${CFG_TYPE}" ${SC_BINARY_DIR}/bin
CACHE INTERNAL "Single output directory for building all executables.")
- ENDIF(NOT DEFINED CMAKE_RUNTIME_OUTPUT_DIRECTORY_${CFG_TYPE})
-ENDFOREACH()
+# when building, don't use the install RPATH already
+# (but later on when installing)
+if(NOT DEFINED CMAKE_BUILD_WITH_INSTALL_RPATH)
+ set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+endif()
+# the RPATH/INSTALL_NAME_DIR to be used when installing
+if (NOT APPLE)
+ if(NOT DEFINED CMAKE_INSTALL_RPATH)
+ set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib:\$ORIGIN/../lib")
+ endif()
+endif(NOT APPLE)
+# On OSX, we need to set INSTALL_NAME_DIR instead of RPATH
+#
http://www.cmake.org/cmake/help/cmake-2-8-docs.html#variable:CMAKE_INSTALL_NAME_DIR
+if(NOT DEFINED CMAKE_INSTALL_NAME_DIR)
+ set(CMAKE_INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
+endif()
-#-----------------------------------------------------------------------------
-# Configure install locations.
+# add the automatically determined parts of the RPATH which point to
+# directories outside the build tree to the install RPATH
+if(NOT DEFINED CMAKE_INSTALL_RPATH_USE_LINK_PATH)
+ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+endif()
-# The location in which to install SC. Need a good Debug location
-# for Windows. Only do this if CMAKE_INSTALL_PREFIX hasn't been set
-# already, to try and allow parent builds (if any) some control.
-if(NOT SC_IS_SUBBUILD)
- IF(NOT WIN32)
- IF (${CMAKE_BUILD_TYPE} MATCHES "Debug")
- SET(SC_INSTALL_PREFIX "${SC_SOURCE_DIR}/../sc-install")
- ELSE()
- SET(SC_INSTALL_PREFIX "/usr/local")
- ENDIF()
- ENDIF(NOT WIN32)
- SET( SC_INSTALL_PREFIX ${SC_INSTALL_PREFIX} CACHE
- PATH "Install prefix prepended to target to create install location" )
- SET( CMAKE_INSTALL_PREFIX ${SC_INSTALL_PREFIX} CACHE INTERNAL "Prefix
prepended to install directories if target destination is not absolute,
immutable" FORCE )
-endif(NOT SC_IS_SUBBUILD)
-if(SC_SKIP_EXEC_INSTALL)
- set(SC_EXEC_NOINSTALL "NO_INSTALL")
-endif(SC_SKIP_EXEC_INSTALL)
+#---------------------------------------------------------------------
+# Build options
+option(BUILD_SHARED_LIBS "Build shared libraries" ON)
+option(BUILD_STATIC_LIBS "Build static libraries" OFF)
-OPTION(SC_BUILD_EXPRESS_ONLY "Only build express parser." OFF)
-MARK_AS_ADVANCED(SC_BUILD_EXPRESS_ONLY)
+option(SC_PYTHON_GENERATOR "Compile exp2python" ON)
+option(SC_CPP_GENERATOR "Compile exp2cxx" ON)
-# Take the sc config file template as the starting point for
-# sc_cf.h.in - scripts may need to append to the template, so
-# it is read into memory initially.
-SET(CONFIG_H_FILE ${SC_BINARY_DIR}/include/sc_cf.h.in)
-set_source_files_properties(${CONFIG_H_FILE} PROPERTIES GENERATED TRUE)
-set(CMAKE_CURRENT_PROJECT SC)
-define_property(GLOBAL PROPERTY SC_CONFIG_H_CONTENTS BRIEF_DOCS "config.h.in
contents" FULL_DOCS "config.h.in contents for SC project")
-if(NOT COMMAND CONFIG_H_APPEND)
- macro(CONFIG_H_APPEND PROJECT_NAME NEW_CONTENTS)
- if(PROJECT_NAME)
- get_property(${PROJECT_NAME}_CONFIG_H_CONTENTS GLOBAL PROPERTY
${PROJECT_NAME}_CONFIG_H_CONTENTS)
- set(${PROJECT_NAME}_CONFIG_H_FILE_CONTENTS
"${${PROJECT_NAME}_CONFIG_H_CONTENTS}${NEW_CONTENTS}")
- set_property(GLOBAL PROPERTY ${PROJECT_NAME}_CONFIG_H_CONTENTS
"${${PROJECT_NAME}_CONFIG_H_FILE_CONTENTS}")
- endif(PROJECT_NAME)
- endmacro(CONFIG_H_APPEND NEW_CONTENTS)
-endif(NOT COMMAND CONFIG_H_APPEND)
-file(READ ${SC_SOURCE_DIR}/include/sc_cf_cmake.h.in CONFIG_H_FILE_CONTENTS)
-CONFIG_H_APPEND(SC "${CONFIG_H_FILE_CONTENTS}")
+option(SC_MEMMGR_ENABLE_CHECKS "Enable sc_memmgr's memory leak detection" OFF)
+option(SC_TRACE_FPRINTF "Enable extra comments in generated code so the code's
source in exp2cxx may be located" OFF)
-# The Express parser uses the tools Perplex, RE2C and Lemon to generate code
-# from higher level inputs. Depending on available tools and options, the
-# SC build can either re-generate code as part of the build, or use cached
-# files that are ready for compilation.
-#
-# SC_GENERATE_LEXER_PARSER is the "high level" control a user sets to determine
-# how the SC build will interact (or not) with these tools. AUTO (the
-# default) means it will search for the necessary tools, and use them only if
-# everything is found. If not, it will fall back to the cached versions. If
-# this option is set to ON and the necessary tools are not found, the
-# configure step will fail. If it is set to OFF, SC will not even try to use
-# the generators and will instead use the cached sources.
-if(NOT SC_GENERATE_LEXER_PARSER)
- set(SC_GENERATE_LEXER_PARSER "AUTO" CACHE STRING "Use Perplex, RE2C and
Lemon to generate C source code.")
-else(NOT SC_GENERATE_LEXER_PARSER)
- string(TOUPPER "${SC_GENERATE_LEXER_PARSER}" SC_GENERATE_LEXER_PARSER)
-endif(NOT SC_GENERATE_LEXER_PARSER)
-set_property(CACHE SC_GENERATE_LEXER_PARSER PROPERTY STRINGS AUTO ON OFF)
-if (NOT "${SC_GENERATE_LEXER_PARSER}" STREQUAL "AUTO" AND NOT
"${SC_GENERATE_LEXER_PARSER}" STREQUAL "ON" AND NOT
"${SC_GENERATE_LEXER_PARSER}" STREQUAL "OFF")
- message(WARNING "Unknown value ${SC_GENERATE_LEXER_PARSER} supplied for
BRLCAD_WORD_SIZE - defaulting to AUTO")
- message(WARNING "Valid options are AUTO, ON and OFF")
- set(SC_GENERATE_LEXER_PARSER "AUTO" CACHE STRING "Use Perplex, RE2C and
Lemon to generate C source code.")
-endif (NOT "${SC_GENERATE_LEXER_PARSER}" STREQUAL "AUTO" AND NOT
"${SC_GENERATE_LEXER_PARSER}" STREQUAL "ON" AND NOT
"${SC_GENERATE_LEXER_PARSER}" STREQUAL "OFF")
+option(SC_ENABLE_COVERAGE "Enable code coverage test" OFF)
+if (SC_ENABLE_COVERAGE AND ${CMAKE_C_COMPILER_ID} STREQUAL "GNU")
+ set(CMAKE_C_FLAGS_DEBUG "-O0 -g -fprofile-arcs -ftest-coverage" CACHE STRING
"Extra compile flags required by code coverage" FORCE)
+ set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -fprofile-arcs -ftest-coverage" CACHE
STRING "Extra compile flags required by code coverage" FORCE)
+ set(CMAKE_MODULE_LINKER_FLAGS_DEBUG "-fprofile-arcs -ftest-coverage" CACHE
STRING "Extra linker flags required by code coverage" FORCE)
+endif (SC_ENABLE_COVERAGE AND ${CMAKE_C_COMPILER_ID} STREQUAL "GNU")
-# If the generators have not been turned off, we need to check for them
-if(NOT "${SC_GENERATE_LEXER_PARSER}" STREQUAL "OFF")
- find_package(LEMON)
- find_package(RE2C)
- find_package(PERPLEX)
- if(LEMON_EXECUTABLE AND LEMON_TEMPLATE AND PERPLEX_EXECUTABLE AND
PERPLEX_TEMPLATE AND RE2C_EXECUTABLE)
- # Templates may be anywhere - make sure we have a stable path
if a relative
- # path was specified at CMake time
- get_filename_component(lemon_template_fpath "${LEMON_TEMPLATE}"
ABSOLUTE)
- if(NOT "${lemon_template_fpath}" STREQUAL "${LEMON_TEMPLATE}")
- get_filename_component(LEMON_TEMPLATE
"${CMAKE_BINARY_DIR}/${LEMON_TEMPLATE}" ABSOLUTE)
- endif(NOT "${lemon_template_fpath}" STREQUAL
"${LEMON_TEMPLATE}")
- get_filename_component(perplex_template_fpath
"${PERPLEX_TEMPLATE}" ABSOLUTE)
- if(NOT "${perplex_template_fpath}" STREQUAL
"${PERPLEX_TEMPLATE}")
- get_filename_component(PERPLEX_TEMPLATE
"${CMAKE_BINARY_DIR}/${PERPLEX_TEMPLATE}" ABSOLUTE)
- endif(NOT "${perplex_template_fpath}" STREQUAL
"${PERPLEX_TEMPLATE}")
+option(SC_ENABLE_TESTING "Enable unittesting framework" OFF)
+if(SC_ENABLE_TESTING)
+ if(NOT DEFINED SC_BUILD_SCHEMAS)
+ set(SC_BUILD_SCHEMAS "ALL") #test all schemas, unless otherwise specified
+ endif()
+ include(CTest)
+endif(SC_ENABLE_TESTING)
- set(SC_GENERATE_LP_SOURCES 1)
- else(LEMON_EXECUTABLE AND LEMON_TEMPLATE AND PERPLEX_EXECUTABLE AND
PERPLEX_TEMPLATE AND RE2C_EXECUTABLE)
- if("${SC_GENERATE_LEXER_PARSER}" STREQUAL "ON")
- message(FATAL_ERROR "\nSC_GENERATE_LEXER_PARSER set to
ON, but one or more components of the Perplex/RE2C/Lemon toolchain were not
found.\n")
- else("${SC_GENERATE_LEXER_PARSER}" STREQUAL "ON")
- set(SC_GENERATE_LP_SOURCES 0)
- endif("${SC_GENERATE_LEXER_PARSER}" STREQUAL "ON")
- endif(LEMON_EXECUTABLE AND LEMON_TEMPLATE AND PERPLEX_EXECUTABLE AND
PERPLEX_TEMPLATE AND RE2C_EXECUTABLE)
-else(NOT "${SC_GENERATE_LEXER_PARSER}" STREQUAL "OFF")
- set(SC_GENERATE_LP_SOURCES 0)
-endif(NOT "${SC_GENERATE_LEXER_PARSER}" STREQUAL "OFF")
+# TODO - BRL-CAD is the only known user of this option, and it will be
+# transitioning to a new setup that won't need it - once that's done,
+# we should just remove this option.
+option(SC_SKIP_EXEC_INSTALL "Skip installing executables" OFF)
+mark_as_advanced(SC_SKIP_EXEC_INSTALL)
-INCLUDE(CheckLibraryExists)
-INCLUDE(CheckIncludeFile)
-INCLUDE(CheckFunctionExists)
-INCLUDE(CheckTypeSize)
-INCLUDE(CMakePushCheckState)
-INCLUDE(CheckCXXSourceRuns)
+# SC_ADDEXEC and SC_ADDLIB macros, dllimport/export, etc
+include(SC_Targets)
-CHECK_INCLUDE_FILE(ndir.h HAVE_NDIR_H)
-CHECK_INCLUDE_FILE(stdarg.h HAVE_STDARG_H)
-CHECK_INCLUDE_FILE(sys/stat.h HAVE_SYS_STAT_H)
-CHECK_INCLUDE_FILE(sys/param.h HAVE_SYS_PARAM_H)
-CHECK_INCLUDE_FILE(sysent.h HAVE_SYSENT_H)
-CHECK_INCLUDE_FILE(unistd.h HAVE_UNISTD_H)
-CHECK_INCLUDE_FILE(dirent.h HAVE_DIRENT_H)
-CHECK_INCLUDE_FILE(stdbool.h HAVE_STDBOOL_H)
-CHECK_INCLUDE_FILE(process.h HAVE_PROCESS_H)
-CHECK_INCLUDE_FILE(io.h HAVE_IO_H)
+# Macros related to paths
+include(SC_Paths)
-CHECK_FUNCTION_EXISTS(abs HAVE_ABS)
-CHECK_FUNCTION_EXISTS(memcpy HAVE_MEMCPY)
-CHECK_FUNCTION_EXISTS(memmove HAVE_MEMMOVE)
-CHECK_FUNCTION_EXISTS(getopt HAVE_GETOPT)
+# locale stuff
+include(SC_Locale)
-CHECK_TYPE_SIZE("ssize_t" SSIZE_T)
+# logic related to regenerating the lexer and parser source code
+include(SC_Regenerate)
-set( TEST_STD_THREAD "
-#include <iostream>
-#include <thread>
-void do_work() {
- std::cout << \"thread\" << std::endl;
-}
-int main() {
- std::thread t(do_work);
- t.join();
-}
-" )
-cmake_push_check_state()
- if( UNIX )
- set( CMAKE_REQUIRED_FLAGS "-pthread -std=c++0x" )
- else( UNIX )
- # vars probably need set for MSVC11, embarcadero, etc
- endif( UNIX )
- CHECK_CXX_SOURCE_RUNS( "${TEST_STD_THREAD}" HAVE_STD_THREAD ) #quotes are
*required*!
-cmake_pop_check_state()
+# create config headers sc_cf.h and sc_version_string.h
+include(SC_Config_Headers)
-# Now that all the tests are done, configure the sc_cf.h file:
-get_property(CONFIG_H_FILE_CONTENTS GLOBAL PROPERTY SC_CONFIG_H_CONTENTS)
-file(WRITE ${CONFIG_H_FILE} "${CONFIG_H_FILE_CONTENTS}")
-configure_file(${CONFIG_H_FILE}
${SC_BINARY_DIR}/${INCLUDE_INSTALL_DIR}/sc_cf.h)
+if(NOT DEFINED SC_SDAI_ADDITIONAL_EXES_SRCS)
+ set(SC_SDAI_ADDITIONAL_EXES_SRCS "" CACHE STRING "Source files for
additional executables to be linked with SDAI libs")
+endif(NOT DEFINED SC_SDAI_ADDITIONAL_EXES_SRCS)
+if(NOT DEFINED SC_BUILD_SCHEMAS)
+ list(APPEND CONFIG_END_MESSAGES
+ "** CMake variable SC_BUILD_SCHEMAS was not set. Defaults to building ALL
schemas, which will take a"
+ " while; see
http://stepcode.org/mw/index.php?title=STEPcode_CMake_variables#SC_BUILD_SCHEMAS";)
+#this makes SC_BUILD_SCHEMAS show up in cmake-gui
+ set(SC_BUILD_SCHEMAS "ALL" CACHE STRING "Semicolon-separated list of paths
to EXPRESS schemas to be built")
+endif(NOT DEFINED SC_BUILD_SCHEMAS)
+
if(NOT SC_IS_SUBBUILD)
- ################ create sc_version_string.h,
http://stackoverflow.com/questions/3780667
- # Using 'ver_string' instead of 'sc_version_string.h' is a trick to force the
- # command to always execute when the custom target is built. It works because
- # a file by that name never exists.
- configure_file(${SC_CMAKE_DIR}/sc_version_string.cmake
${SC_BINARY_DIR}/sc_version_string.cmake @ONLY)
- add_custom_target(version_string ALL DEPENDS ver_string )
- # creates sc_version_string.h using cmake script
- add_custom_command(OUTPUT ver_string
${CMAKE_CURRENT_BINARY_DIR}/${INCLUDE_INSTALL_DIR}/sc_version_string.h
- COMMAND ${CMAKE_COMMAND} -DSOURCE_DIR=${SC_SOURCE_DIR}
- -DBINARY_DIR=${SC_BINARY_DIR}
- -P ${SC_BINARY_DIR}/sc_version_string.cmake)
- # sc_version_string.h is a generated file
-
set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${INCLUDE_INSTALL_DIR}/sc_version_string.h
- PROPERTIES GENERATED TRUE
- HEADER_FILE_ONLY TRUE )
- ################
-else(NOT SC_IS_SUBBUILD)
- set(vstring "
-//sc_version_string.h - written by cmake. Changes will be lost!\n
-#ifndef SC_VERSION_STRING\n
-#define SC_VERSION_STRING\n\n
-const char* sc_version() {\n
-return \"${SC_VERSION}\";\n
-}\n\n
-#endif\n"
- )
+ list(APPEND CONFIG_END_MESSAGES
+ ".. Don't worry about any messages above about missing headers or failed
tests, as long as"
+ " you see 'Configuring done' below. Headers and features vary by
compiler."
+ ".. Generating step can take a while if you are building several schemas.")
+endif(NOT SC_IS_SUBBUILD)
-file(WRITE
- ${CMAKE_CURRENT_BINARY_DIR}/${INCLUDE_INSTALL_DIR}/sc_version_string.h.tmp
- "${vstring}")
-execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different
- ${CMAKE_CURRENT_BINARY_DIR}/${INCLUDE_INSTALL_DIR}/sc_version_string.h.tmp
- ${CMAKE_CURRENT_BINARY_DIR}/${INCLUDE_INSTALL_DIR}/sc_version_string.h)
-execute_process(COMMAND ${CMAKE_COMMAND} -E remove
- ${CMAKE_CURRENT_BINARY_DIR}/${INCLUDE_INSTALL_DIR}/sc_version_string.h.tmp)
+# create config headers sc_cf.h
+include(SC_Config_Headers)
-endif(NOT SC_IS_SUBBUILD)
+################
+
if(MSVC)
- # add_definitions( -Wall )
- add_definitions( -D__MSVC__ -D__WIN32__ )
# Disable warning for preferred usage of secure functions (example strcpy
should be strcpy_s, ...)
- add_definitions( -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS )
-elseif(BORLAND)
- add_definitions( -D__BORLAND__ -D__WIN32__ )
-else()
- add_definitions( -pedantic -W -Wall -Wundef -Wfloat-equal -Wshadow -Winline
-Wno-long-long )
+ add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS)
endif()
+if (${CMAKE_C_COMPILER_ID} STREQUAL "GNU" OR ${CMAKE_C_COMPILER_ID} STREQUAL
"Clang")
+ add_definitions(-pedantic -W -Wall -Wundef -Wfloat-equal -Wshadow -Winline
-Wno-long-long)
+endif()
include_directories(
${SC_SOURCE_DIR}/include
${SC_BINARY_DIR}/include
- )
+ )
-ADD_SUBDIRECTORY(src/base)
-ADD_SUBDIRECTORY(src/express)
-ADD_SUBDIRECTORY(src/exppp)
-ADD_SUBDIRECTORY(src/exp2cxx)
-ADD_SUBDIRECTORY(src/exp2python)
-ADD_SUBDIRECTORY(src/clstepcore)
-ADD_SUBDIRECTORY(src/cleditor)
-ADD_SUBDIRECTORY(src/cldai)
-ADD_SUBDIRECTORY(src/clutils)
-#if( NOT WIN32 ) # don't build cllazyfile on windows until export/import
macros are in place
-# ADD_SUBDIRECTORY( src/cllazyfile )
-#endif( NOT WIN32 )
-ADD_SUBDIRECTORY(include)
-ADD_SUBDIRECTORY(data)
-IF(SC_ENABLE_TESTING)
- ADD_SUBDIRECTORY( test )
-ENDIF(SC_ENABLE_TESTING)
-ADD_SUBDIRECTORY(doc)
+add_subdirectory(src/base)
+add_subdirectory(src/express)
+add_subdirectory(src/exppp)
+add_subdirectory(src/exp2cxx)
+add_subdirectory(src/exp2python)
+add_subdirectory(src/clstepcore)
+add_subdirectory(src/cleditor)
+add_subdirectory(src/cldai)
+add_subdirectory(src/clutils)
+add_subdirectory(src/cllazyfile)
+add_subdirectory(include)
+add_subdirectory(data)
+if(SC_ENABLE_TESTING)
+ add_subdirectory(test)
+endif(SC_ENABLE_TESTING)
+add_subdirectory(doc)
-# this is for testing - 'make core' builds everything that isn't generated
-add_custom_target( core )
-add_dependencies( core stepdai check-express stepeditor exp2cxx )
-
if(NOT SC_IS_SUBBUILD)
-
###############################################################################
- # SC Packaging
#
- # $make package
#
-
###############################################################################
+
#-----------------------------------------------------------------------------
+ # SC Packaging
+ # $make package
+ set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "STEPcode")
+ set(CPACK_SET_DESTDIR "ON")
+ set(CPACK_PACKAGE_VERSION_MAJOR ${SC_VERSION_MAJOR})
+ set(CPACK_PACKAGE_VERSION_MINOR ${SC_VERSION_MINOR})
+ set(CPACK_PACKAGE_NAME SC)
+ set(CPACK_PACKAGE_CONTACT "SC Developers <[email protected]>")
+ include(CPack)
+endif(NOT SC_IS_SUBBUILD)
- SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "STEPcode")
- SET(CPACK_SET_DESTDIR "ON")
- SET(CPACK_PACKAGE_VERSION_MAJOR ${SC_VERSION_MAJOR})
- SET(CPACK_PACKAGE_VERSION_MINOR ${SC_VERSION_MINOR})
- SET(CPACK_PACKAGE_NAME SC )
+# CONFIG_END_MESSAGES - list of messages to be printed after everything else
is done.
+# THIS MUST BE LAST to ensure that they are visible to the user without
scrolling.
+foreach(_msg ${CONFIG_END_MESSAGES})
+ message(STATUS "${_msg}")
+endforeach(_msg ${CONFIG_END_MESSAGES})
- SET(CPACK_PACKAGE_CONTACT "SC Developers <[email protected]>")
- INCLUDE(CPack)
-
-
########################################################################################
- # Uninstall code
#
- # From
http://www.cmake.org/Wiki/CMake_FAQ#Can_I_do_.22make_uninstall.22_with_CMake.3F
#
- #
######################################################################################
- configure_file(
- "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
- "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
- IMMEDIATE @ONLY)
-
- add_custom_target(uninstall
- COMMAND ${CMAKE_COMMAND} -P
${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
-
-endif(NOT SC_IS_SUBBUILD)
-
# Local Variables:
# tab-width: 8
# mode: cmake
Copied: brlcad/trunk/src/other/stepcode/CONTRIBUTING.md (from rev 78215,
brlcad/branches/stepsync/src/other/stepcode/CONTRIBUTING.md)
===================================================================
--- brlcad/trunk/src/other/stepcode/CONTRIBUTING.md
(rev 0)
+++ brlcad/trunk/src/other/stepcode/CONTRIBUTING.md 2021-02-08 04:54:55 UTC
(rev 78221)
@@ -0,0 +1,45 @@
+# How to contribute
+
+We love contributions!
+
+## Getting started
+
+* Create a github account if you haven't already, and fork the project
+* Create a new branch, using a branch name that gives an idea of what the
changes are about
+* One topic per commit; a number of small commits are better than one big one
+ * Do not introduce whitespace changes! (**Windows users:** `git config
--global core.autocrlf true`)
+ * Encouraged but not enforced: each commit should stand alone, in the sense
that the code should compile and run at that point.
+* One major topic per pull request. Commits that fix small things (typos,
formatting) are perfectly acceptable in a PR fixing a bug or adding a feature.
+ * Tests are good. Tests are required unless you're fixing something simple
or that was obviously broken.
+* Make your changes and push them to your GitHub repo
+* Once your branch is pushed, submit a pull request.
+* We'll look at the PR and either merge or add feedback. If there isn't any
activity within several days, send a message to the mailing list - `scl-dev` AT
`groups.google.com`.
+
+## Coding Standards
+
+SC's source has been reformatted with astyle. When making changes, try
+to match the current formatting. The main points are:
+
+ - compact (java-style) brackets:
+```C
+ if( a == 3 ) {
+ c = 5;
+ function( a, b );
+ } else {
+ somefunc();
+ }
+```
+ - indents are 4 spaces
+ - no tab characters
+ - line endings are LF (linux), not CRLF (windows)
+ - brackets around single-line conditionals
+ - spaces inside parentheses and around operators
+ - return type on the same line as the function name, unless that's
+ too long
+ - doxygen-style comments
+ (see http://www.stack.nl/~dimitri/doxygen/docblocks.html)
+
+If in doubt about a large patch, run astyle with the config file
+misc/astyle.cfg.
+Download astyle from http://sourceforge.net/projects/astyle/files/astyle/
+
Modified: brlcad/trunk/src/other/stepcode/COPYING
===================================================================
--- brlcad/trunk/src/other/stepcode/COPYING 2021-02-08 04:44:44 UTC (rev
78220)
+++ brlcad/trunk/src/other/stepcode/COPYING 2021-02-08 04:54:55 UTC (rev
78221)
@@ -1,108 +1,47 @@
-Modifications to the original NIST code are (C)opyright by their
-respective authors. Unless otherwise specified, they are copyright
-on the date those changes were committed to whichever repository
-they were committed to first (i.e. BRL-CAD on SourceForge.net,
-mpictor/StepClassLibrary or stepcode/stepcode on github).
+STEPcode is provided as a collective work under the 3-clause BSD
+license. As some portions are not subject to copyright in some
+jurisdictions, see INTENT.md for additional details regarding intent
+and history. See the AUTHORS file for a list of contributors and
+copyright holders.
-Modifications which were first commited to the repository on github
-are licensed under the 3-clause BSD license below. Changes committed
-to BRL-CAD either contain license information mentioning BRL-CAD
-near the top of the file, or are licensed under the same terms that
-NIST used.
+Code generated by STEPcode containing substantial parts of STEPcode
+complex enough to have copyright protection are subject to the terms
+of this license.
-********************************************************************
-3-clause BSD license:
+STEPcode acknowledgement and/or attribution is appreciated regardless
+of license or copyright status.
-Copyright (c) <date committed>, <copyright holder>
-All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- * Neither the name of the <organization> nor the
- names of its contributors may be used to endorse or promote products
- derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
********************************************************************
-
-
+ 3-Clause BSD License
********************************************************************
- ORIGINAL NIST TEXT FOLLOWS
-********************************************************************
-This software was produced by the National Institute of Standards and
-Technology (NIST), an agency of the U.S. government, and by statute is
-not subject to copyright in the United States. Recipients of this
-software assume all responsibility associated with its operation,
-modification, maintenance, and subsequent redistribution.
+Copyright (c) 2009-2019 STEPcode AUTHORS
+All rights reserved.
-Acknowledgements:
-The STEP Class Library (SCL) was developed by the Manufacturing
-Systems Integration Division at NIST to support testing of the
-Standard for the Exchange of Product Model Data (a.k.a STEP) and
-validation of STEP's emerging implementation specifications. Funding
-for the project has come from the Department of Commerce and the
-Department of Defense agencies including the Office of the Defense
-CALS (Continuous Acquisition and Life-Cycle Support) Executive and
-the Defense Advanced Research Projects Agency (DARPA). Recent
-enhancements were sponsored by the National Information Infrastructure
-Protocols Consortium and NIST's Systems Integration for Manufacturing
-Applications (SIMA) program.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
-/* ********************************************************************
- * D I S C L A I M E R
- * (February 6, 1992)
- *
- * There is no warranty for the NIST PDES Toolkit.
- * If the NIST PDES Toolkit
- * is modified by someone else and passed on, NIST wants
- * the Toolkit's recipients to know that what they have is not what NIST
- * distributed.
- *
- * Policies
- *
- * 1. Anyone may copy and distribute verbatim copies of the NIST PDES Toolkit
- * source code as received in any medium.
- *
- * 2. Anyone may modify your copy or copies of the NIST PDES Toolkit source
- * code or any portion of it, and copy and distribute such modifications
- * provided that all modifications are clearly associated with the entity
- * that performs the modifications.
- *
- * NO WARRANTY
- * ===========
- *
- * NIST PROVIDES ABSOLUTELY NO WARRANTY. THE NIST PDES TOOLKIT
- * IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- * THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS
- * WITH YOU. SHOULD ANY PORTION OF THE NIST PDES TOOLKIT PROVE DEFECTIVE,
- * YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
- *
- * IN NO EVENT WILL NIST BE LIABLE FOR DAMAGES,
- * INCLUDING ANY LOST PROFITS, LOST MONIES, OR OTHER SPECIAL,
- * INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR
- * INABILITY TO USE (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA
- * BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY THIRD PARTIES OR A
- * FAILURE OF THE PROGRAM TO OPERATE WITH PROGRAMS NOT DISTRIBUTED BY
- * NIST) THE PROGRAMS, EVEN IF YOU HAVE BEEN ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGES, OR FOR ANY CLAIM BY ANY OTHER PARTY.
- */
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+3. Neither the name of the copyright holder nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Modified: brlcad/trunk/src/other/stepcode/CTestConfig.cmake
===================================================================
--- brlcad/trunk/src/other/stepcode/CTestConfig.cmake 2021-02-08 04:44:44 UTC
(rev 78220)
+++ brlcad/trunk/src/other/stepcode/CTestConfig.cmake 2021-02-08 04:54:55 UTC
(rev 78221)
@@ -8,3 +8,11 @@
set(CTEST_DROP_SITE "my.cdash.org")
set(CTEST_DROP_LOCATION "/submit.php?project=StepClassLibrary")
set(CTEST_DROP_SITE_CDASH TRUE)
+
+# Local Variables:
+# tab-width: 8
+# mode: cmake
+# indent-tabs-mode: t
+# End:
+# ex: shiftwidth=2 tabstop=8
+
Copied: brlcad/trunk/src/other/stepcode/INTENT.md (from rev 78215,
brlcad/branches/stepsync/src/other/stepcode/INTENT.md)
===================================================================
--- brlcad/trunk/src/other/stepcode/INTENT.md (rev 0)
+++ brlcad/trunk/src/other/stepcode/INTENT.md 2021-02-08 04:54:55 UTC (rev
78221)
@@ -0,0 +1,102 @@
+## Licensing Intent
+
+The intent is that this software and documentation ("Project") should
+be treated as if it is licensed under the license(s) associated with
+the Project ("License") in the `COPYING` file. However, because some
+contributors work for the United States (U.S.) Federal Government, it
+is not that simple.
+
+The portions of this Project written by United States (U.S.) federal
+government employees within the scope of their federal employment are
+ineligible for copyright protection in the U.S.; this is generally
+understood to mean that these portions of the Project are placed in
+the public domain.
+
+In countries where copyright protection is available (which does not
+include the U.S.), contributions made by U.S. Federal government
+employees are released under the License. Merged contributions from
+private contributors are released under the License.
+
+## Background History
+
+STEPcode was originally developed as the STEP Class Libraries (SCL) by
+the U.S. National Institute of Standards and Technology (NIST). Prior
+to 2009, the U.S. Army Research Laboratory and members of the BRL-CAD
+open source community researched freely available open source options
+for ISO 10303 STEP support. Development had ceased, no open source
+community existed, the code was out of date in many regards, and
+additional work was needed to become production-ready, but SCL was
+found to be a usable reference implementation.
+
+Consulting with NIST and others circa 2009, the BRL-CAD community
+began efforts to take over SCL development, modernization, and code
+enhancements. The BRL-CAD community purchased licenses for the ISO
+10303 standard and began working to bring SCL up-to-date with the
+latest specification. By 2011, significant progress had been made,
+the project had garnered attention from others, and STEPcode was
+establishd as an independent project.
+
+## Original NIST License Text
+
+This software was [originally] produced by the National Institute of
+Standards and Technology (NIST), an agency of the U.S. government, and
+by statute is not subject to copyright in the United
+States. Recipients of this software assume all responsibility
+associated with its operation, modification, maintenance, and
+subsequent redistribution.
+
+Acknowledgements:
+The STEP Class Library (SCL) was developed by the Manufacturing
+Systems Integration Division at NIST to support testing of the
+Standard for the Exchange of Product Model Data (a.k.a STEP) and
+validation of STEP's emerging implementation specifications. Funding
+for the project has come from the Department of Commerce and the
+Department of Defense agencies including the Office of the Defense
+CALS (Continuous Acquisition and Life-Cycle Support) Executive and
+the Defense Advanced Research Projects Agency (DARPA). Recent
+enhancements [circa 1992] were sponsored by the National Information
Infrastructure
+Protocols Consortium and NIST's Systems Integration for Manufacturing
+Applications (SIMA) program.
+
+~~~~
+/* ********************************************************************
+ * D I S C L A I M E R
+ * (February 6, 1992)
+ *
+ * There is no warranty for the NIST PDES Toolkit.
+ * If the NIST PDES Toolkit
+ * is modified by someone else and passed on, NIST wants
+ * the Toolkit's recipients to know that what they have is not what NIST
+ * distributed.
+ *
+ * Policies
+ *
+ * 1. Anyone may copy and distribute verbatim copies of the NIST PDES Toolkit
+ * source code as received in any medium.
+ *
+ * 2. Anyone may modify your copy or copies of the NIST PDES Toolkit source
+ * code or any portion of it, and copy and distribute such modifications
+ * provided that all modifications are clearly associated with the entity
+ * that performs the modifications.
+ *
+ * NO WARRANTY
+ * ===========
+ *
+ * NIST PROVIDES ABSOLUTELY NO WARRANTY. THE NIST PDES TOOLKIT
+ * IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS
+ * WITH YOU. SHOULD ANY PORTION OF THE NIST PDES TOOLKIT PROVE DEFECTIVE,
+ * YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+ *
+ * IN NO EVENT WILL NIST BE LIABLE FOR DAMAGES,
+ * INCLUDING ANY LOST PROFITS, LOST MONIES, OR OTHER SPECIAL,
+ * INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR
+ * INABILITY TO USE (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA
+ * BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY THIRD PARTIES OR A
+ * FAILURE OF THE PROGRAM TO OPERATE WITH PROGRAMS NOT DISTRIBUTED BY
+ * NIST) THE PROGRAMS, EVEN IF YOU HAVE BEEN ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGES, OR FOR ANY CLAIM BY ANY OTHER PARTY.
+ */
+ ~~~~
\ No newline at end of file
Modified: brlcad/trunk/src/other/stepcode/NEWS
===================================================================
--- brlcad/trunk/src/other/stepcode/NEWS 2021-02-08 04:44:44 UTC (rev
78220)
+++ brlcad/trunk/src/other/stepcode/NEWS 2021-02-08 04:54:55 UTC (rev
78221)
@@ -1,5 +1,27 @@
STEPcode -- http://github.com/stepcode/stepcode -- http://stepcode.org
************************************************************************
+Release 0.8 (December, 2014)
+
+New since v0.7:
+* handle diamond inheritance, derived Attributes
+* rename fedex_python, fedex_plus to exp2py, exp2cxx
+* many changes to the pretty printer, due to use in reformatting draft
+ and IS schemas (Thanks Tom!)
+* parser was also changed due to errors caught while pretty printing
+ - we can be much more confident that the parser is correct now
+* fix incorrect quoting of timestamp in p21 header
+* fix various copy constructors and ShallowCopy() members
+* split generated code into many small files
+ - far easier to open generated code in editors
+ - support more compilers
+ - small files are combined (via #include statements) into a few
+ large files for faster "unitary" builds, if the compiler can handle it
+ - unitary builds are faster than the previous builds
+* most compiler warnings fixed
+* performance fixes and other changes from BRL-CAD
+* finally, all tests pass!
+
+************************************************************************
Release 0.7 (April, 2013)
New since v0.6:
@@ -154,7 +176,7 @@
makefiles which are addressed, as well as a new macro that is at
least required for gcc.
-Remaing problem: The p21 file scanner of SCL currently
+Remaining problem: The p21 file scanner of SCL currently
does not allow for comments within the parameter list of
data records. Only comments outside of data records are
accepted.
@@ -230,7 +252,7 @@
- Fixed the casting operator for the class representing EXPRESS
enumeration types. It was returning the last element of the enum type
-as the the default when the enum was unset. This choice predated enums
+as the default when the enum was unset. This choice predated enums
having an unset enum value. It now returns <enum_name>_unset as the
default when the enum is unset.
@@ -772,7 +794,7 @@
duplicated. This case of multiple inheritance may possibly be
avoided by modifying the EXPRESS schema by breaking some links in the
inheritance hierarchy. This will not have an adverse affect on the
-implemementation. The user may choose to use the current or previous
+implementation. The user may choose to use the current or previous
method of handling multiple inheritance. The current method is the
default behavior. The previous method is obtained by supplying the
-s (or -S) option with the exp2cxx code generator or the mkProbe
@@ -965,7 +987,7 @@
If there wasn't a value in the attribute previously, then the field will
contain just the type specifier, e.g., Str1() if Str1 is the type selected.
-If a value exists in the field, it is modified to accomodate the new
+If a value exists in the field, it is modified to accommodate the new
specifier. This means the following:
o If the value in the field starts with a single-quote ('), it is
assumed to be a string literal, and is completely wrapped in the new
Deleted: brlcad/trunk/src/other/stepcode/README
===================================================================
--- brlcad/trunk/src/other/stepcode/README 2021-02-08 04:44:44 UTC (rev
78220)
+++ brlcad/trunk/src/other/stepcode/README 2021-02-08 04:54:55 UTC (rev
78221)
@@ -1,57 +0,0 @@
-***********************************************************************
-STEPcode v0.7 -- stepcode.org, github.com/stepcode/stepcode
-
-* What is STEPcode? SC reads ISO10303-11 EXPRESS schemas and generates
- C++ source code that can read and write Part 21 files conforming
- to that schema. In addition to C++, SC includes experimental
- support for Python.
-
-* Renamed in April/May 2012: SC was formerly known as STEP Class
- Libraries, SCL for short. It was renamed because the name wasn't
- accurate: the class libraries make up only a part of the code.
-
-* Much of the work to update SC has been done by the developers of
- BRL-CAD, and SC (then STEP Class Library) was originally created at
- NIST in the 90's.
-
-* For information on changes version-by-version, see the NEWS file
-
-* Building and testing SCL - see the INSTALL file
-
-* For more details on the libraries and executables, see the wiki:
- http://github.com/stepcode/stepcode/wiki/About-STEPcode
-
-* For license details, see the COPYING file. Summary: 3-clause BSD.
-
-***********************************************************************
-
-***********************************************************************
-CODING STANDARDS
-
-SC's source has been reformatted with astyle. When making changes, try
-to match the current formatting. The main points are:
-
- - compact (java-style) brackets:
- if( a == 3 ) {
- c = 5;
- function( a, b );
- } else {
- somefunc( );
- }
- - indents are 4 spaces
- - no tab characters
- - line endings are LF (linux), not CRLF (windows)
- - brackets around single-line conditionals
- - spaces inside parentheses and around operators
- - return type on the same line as the function name, unless that's
- too long
- - doxygen-style comments
- (see http://www.stack.nl/~dimitri/doxygen/docblocks.html)
-
-If in doubt about a large patch, run astyle with the config file
-misc/astyle.cfg.
-Download astyle from http://sourceforge.net/projects/astyle/files/astyle/
-
-***********************************************************************
-
-For more info, see the wiki.
\ No newline at end of file
Copied: brlcad/trunk/src/other/stepcode/README.md (from rev 78215,
brlcad/branches/stepsync/src/other/stepcode/README.md)
===================================================================
--- brlcad/trunk/src/other/stepcode/README.md (rev 0)
+++ brlcad/trunk/src/other/stepcode/README.md 2021-02-08 04:54:55 UTC (rev
78221)
@@ -0,0 +1,66 @@
+ Travis-CI | AppVeyor CI
+:-------------:|:---------------:
+Linux, OSX (LLVM) | Windows (MSVC)
+[](https://travis-ci.org/stepcode/stepcode)
| [](https://ci.appveyor.com/project/mpictor/stepcode)
+
+***********************************************************************
+STEPcode v0.9 -- stepcode.org, github.com/stepcode/stepcode
+
+* What is STEPcode? SC reads ISO10303-11 EXPRESS schemas and generates
+ C++ source code that can read and write Part 21 files conforming
+ to that schema. In addition to C++, SC includes experimental
+ support for Python.
+
+* Renamed in April/May 2012: SC was formerly known as STEP Class
+ Libraries, SCL for short. It was renamed because the name wasn't
+ accurate: the class libraries make up only a part of the code.
+
+* Much of the work to update SC has been done by the developers of
+ BRL-CAD, and SC (then STEP Class Library) was originally created at
+ NIST in the 90's.
+
+* For information on changes version-by-version, see the NEWS file
+
+* Building and testing SCL - see the INSTALL file
+
+* For more details on the libraries and executables, see the wiki:
+ http://github.com/stepcode/stepcode/wiki/About-STEPcode
+
+* For license details, see the COPYING file. Summary: 3-clause BSD.
+
+***********************************************************************
+
+***********************************************************************
+CODING STANDARDS
+
+SC's source has been reformatted with astyle. When making changes, try
+to match the current formatting. The main points are:
+
+ - K&R (Kernighan & Ritchie) brackets:
+```C
+ int Foo(bool isBar)
+ {
+ if (isBar) {
+ bar();
+ return 1;
+ } else
+ return 0;
+ }
+```
+ - indents are 4 spaces
+ - no tab characters
+ - line endings are LF (linux), not CRLF (windows)
+ - brackets around single-line conditionals
+ - spaces inside parentheses and around operators
+ - return type on the same line as the function name, unless that's
+ too long
+ - doxygen-style comments
+ (see http://www.stack.nl/~dimitri/doxygen/docblocks.html)
+
+If in doubt about a large patch, run astyle with the config file
+misc/astyle.cfg.
+Download astyle from http://sourceforge.net/projects/astyle/files/astyle/
+
+***********************************************************************
+
+For more info, see the wiki.
Deleted: brlcad/trunk/src/other/stepcode/SC_VERSION.txt
===================================================================
--- brlcad/trunk/src/other/stepcode/SC_VERSION.txt 2021-02-08 04:44:44 UTC
(rev 78220)
+++ brlcad/trunk/src/other/stepcode/SC_VERSION.txt 2021-02-08 04:54:55 UTC
(rev 78221)
@@ -1 +0,0 @@
-0.7
Deleted: brlcad/trunk/src/other/stepcode/TODO
===================================================================
--- brlcad/trunk/src/other/stepcode/TODO 2021-02-08 04:44:44 UTC (rev
78220)
+++ brlcad/trunk/src/other/stepcode/TODO 2021-02-08 04:54:55 UTC (rev
78221)
@@ -1,4 +0,0 @@
-(from BRL-CAD)
-
-* verify/fix step parser generation with newer AP schemas, seems to be
- outputting invalid syntax.
Deleted: brlcad/trunk/src/other/stepcode/cmake/CheckCFileRuns.cmake
===================================================================
--- brlcad/trunk/src/other/stepcode/cmake/CheckCFileRuns.cmake 2021-02-08
04:44:44 UTC (rev 78220)
+++ brlcad/trunk/src/other/stepcode/cmake/CheckCFileRuns.cmake 2021-02-08
04:54:55 UTC (rev 78221)
@@ -1,84 +0,0 @@
-# - Check if the given C source code compiles and runs.
-# CHECK_C_SOURCE_RUNS(<code> <var>)
-# <code> - source code to try to compile
-# <var> - variable to store the result
-# (1 for success, empty for failure)
-# The following variables may be set before calling this macro to
-# modify the way the check is run:
-#
-# CMAKE_REQUIRED_FLAGS = string of compile command line flags
-# CMAKE_REQUIRED_DEFINITIONS = list of macros to define (-DFOO=bar)
-# CMAKE_REQUIRED_INCLUDES = list of include directories
-# CMAKE_REQUIRED_LIBRARIES = list of libraries to link
-
-#=============================================================================
-# Copyright 2006-2009 Kitware, Inc.
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-# (To distributed this file outside of CMake, substitute the full
-# License text for the above reference.)
-
-MACRO(CHECK_C_FILE_RUNS SOURCE VAR)
- IF("${VAR}" MATCHES "^${VAR}$")
- SET(MACRO_CHECK_FUNCTION_DEFINITIONS
- "-D${VAR} ${CMAKE_REQUIRED_FLAGS}")
- IF(CMAKE_REQUIRED_LIBRARIES)
- SET(CHECK_C_SOURCE_COMPILES_ADD_LIBRARIES
- "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}")
- ELSE(CMAKE_REQUIRED_LIBRARIES)
- SET(CHECK_C_SOURCE_COMPILES_ADD_LIBRARIES)
- ENDIF(CMAKE_REQUIRED_LIBRARIES)
- IF(CMAKE_REQUIRED_INCLUDES)
- SET(CHECK_C_SOURCE_COMPILES_ADD_INCLUDES
- "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}")
- ELSE(CMAKE_REQUIRED_INCLUDES)
- SET(CHECK_C_SOURCE_COMPILES_ADD_INCLUDES)
- ENDIF(CMAKE_REQUIRED_INCLUDES)
-
- MESSAGE(STATUS "Performing Test ${VAR}")
- TRY_RUN(${VAR}_EXITCODE ${VAR}_COMPILED
- ${CMAKE_BINARY_DIR}
- ${SOURCE}
- COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS}
${FILE_RUN_DEFINITIONS}
- CMAKE_FLAGS
-DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_FUNCTION_DEFINITIONS}
- -DCMAKE_SKIP_RPATH:BOOL=${CMAKE_SKIP_RPATH}
- "${CHECK_C_SOURCE_COMPILES_ADD_LIBRARIES}"
- "${CHECK_C_SOURCE_COMPILES_ADD_INCLUDES}"
- COMPILE_OUTPUT_VARIABLE OUTPUT)
- # if it did not compile make the return value fail code of 1
- IF(NOT ${VAR}_COMPILED)
- SET(${VAR}_EXITCODE 1)
- ENDIF(NOT ${VAR}_COMPILED)
- # if the return value was 0 then it worked
- IF("${${VAR}_EXITCODE}" EQUAL 0)
- SET(${VAR} 1 CACHE INTERNAL "Test ${VAR}")
- MESSAGE(STATUS "Performing Test ${VAR} - Success")
- FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
- "Performing C SOURCE FILE Test ${VAR} succeded with the following
output:\n"
- "${OUTPUT}\n"
- "Return value: ${${VAR}}\n"
- "Source file was:\n${SOURCE}\n")
- ELSE("${${VAR}_EXITCODE}" EQUAL 0)
- IF(CMAKE_CROSSCOMPILING AND "${${VAR}_EXITCODE}" MATCHES
"FAILED_TO_RUN")
- SET(${VAR} "${${VAR}_EXITCODE}")
- ELSE(CMAKE_CROSSCOMPILING AND "${${VAR}_EXITCODE}" MATCHES
"FAILED_TO_RUN")
- SET(${VAR} "" CACHE INTERNAL "Test ${VAR}")
- ENDIF(CMAKE_CROSSCOMPILING AND "${${VAR}_EXITCODE}" MATCHES
"FAILED_TO_RUN")
-
- MESSAGE(STATUS "Performing Test ${VAR} - Failed")
- FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
- "Performing C SOURCE FILE Test ${VAR} failed with the following
output:\n"
- "${OUTPUT}\n"
- "Return value: ${${VAR}_EXITCODE}\n"
- "Source file was:\n${SOURCE}\n")
-
- ENDIF("${${VAR}_EXITCODE}" EQUAL 0)
- ENDIF("${VAR}" MATCHES "^${VAR}$")
-ENDMACRO(CHECK_C_FILE_RUNS)
-
Modified: brlcad/trunk/src/other/stepcode/cmake/FindLEMON.cmake
===================================================================
--- brlcad/trunk/src/other/stepcode/cmake/FindLEMON.cmake 2021-02-08
04:44:44 UTC (rev 78220)
+++ brlcad/trunk/src/other/stepcode/cmake/FindLEMON.cmake 2021-02-08
04:54:55 UTC (rev 78221)
@@ -10,7 +10,7 @@
#
# Originally based off of FindBISON.cmake from Kitware's CMake distribution
#
-# Copyright (c) 2010-2016 United States Government as represented by
+# Copyright (c) 2010-2020 United States Government as represented by
# the U.S. Army Research Laboratory.
# Copyright 2009 Kitware, Inc.
# Copyright 2006 Tristan Carel
@@ -44,9 +44,35 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#=============================================================================
-find_program(LEMON_EXECUTABLE lemon DOC "path to the lemon executable")
+set(_LEMON_SEARCHES)
+
+# Search LEMON_ROOT first if it is set.
+if(LEMON_ROOT)
+ set(_LEMON_SEARCH_ROOT PATHS ${LEMON_ROOT} NO_DEFAULT_PATH)
+ list(APPEND _LEMON_SEARCHES _LEMON_SEARCH_ROOT)
+endif()
+
+# Normal search.
+set(_LEMON_x86 "(x86)")
+set(_LEMON_SEARCH_NORMAL
+ PATHS "$ENV{ProgramFiles}/lemon"
+ "$ENV{ProgramFiles${_LEMON_x86}}/lemon")
+unset(_LEMON_x86)
+list(APPEND _LEMON_SEARCHES _LEMON_SEARCH_NORMAL)
+
+set(LEMON_NAMES lemon)
+
+# Try each search configuration.
+foreach(search ${_LEMON_SEARCHES})
+ find_program(LEMON_EXECUTABLE lemon ${${search}} PATH_SUFFIXES bin)
+endforeach()
mark_as_advanced(LEMON_EXECUTABLE)
+foreach(search ${_LEMON_SEARCHES})
+ find_file(LEMON_TEMPLATE lempar.c ${${search}} PATH_SUFFIXES ${DATA_DIR}
${DATA_DIR}/lemon)
+endforeach()
+mark_as_advanced(LEMON_TEMPLATE)
+
if (LEMON_EXECUTABLE AND NOT LEMON_TEMPLATE)
# look for the template in share
if (DATA_DIR AND EXISTS "${DATA_DIR}/lemon/lempar.c")
@@ -113,6 +139,10 @@
CMAKE_PARSE_ARGUMENTS(${LVAR_PREFIX} ""
"OUT_SRC_FILE;OUT_HDR_FILE;WORKING_DIR;EXTRA_ARGS" "" ${ARGN})
endif(${ARGC} GREATER 3)
+ if (TARGET perplex_stage)
+ set(DEPS_TARGET perplex_stage)
+ endif (TARGET perplex_stage)
+
# Need a working directory
if("${${LVAR_PREFIX}_WORKING_DIR}" STREQUAL "")
set(${LVAR_PREFIX}_WORKING_DIR
"${CMAKE_CURRENT_BINARY_DIR}/${LVAR_PREFIX}")
@@ -160,8 +190,8 @@
add_custom_command(
OUTPUT ${LEMON_GEN_OUT} ${LEMON_GEN_SOURCE} ${LEMON_GEN_HEADER}
COMMAND ${CMAKE_COMMAND} -E copy ${lemon_in_file}
${${LVAR_PREFIX}_WORKING_DIR}/${INPUT_NAME}
- COMMAND ${LEMON_EXECUTABLE} -l -T${LEMON_TEMPLATE}
${${LVAR_PREFIX}_WORKING_DIR}/${INPUT_NAME} ${${LVAR_PREFIX}__EXTRA_ARGS}
- DEPENDS ${Input} ${LEMON_TEMPLATE} ${LEMON_EXECUTABLE_TARGET}
+ COMMAND ${LEMON_EXECUTABLE} -T${LEMON_TEMPLATE}
${${LVAR_PREFIX}_WORKING_DIR}/${INPUT_NAME} ${${LVAR_PREFIX}__EXTRA_ARGS}
+ DEPENDS ${Input} ${LEMON_EXECUTABLE_TARGET} ${DEPS_TARGET}
WORKING_DIRECTORY ${${LVAR_PREFIX}_WORKING_DIR}
COMMENT "[LEMON][${Name}] Building parser with ${LEMON_EXECUTABLE}"
)
@@ -171,7 +201,7 @@
add_custom_command(
OUTPUT ${${LVAR_PREFIX}_OUT_SRC_FILE}
COMMAND ${CMAKE_COMMAND} -E copy ${LEMON_GEN_SOURCE}
${${LVAR_PREFIX}_OUT_SRC_FILE}
- DEPENDS ${LemonInput} ${LEMON_EXECUTABLE_TARGET} ${LEMON_GEN_SOURCE}
+ DEPENDS ${LemonInput} ${LEMON_EXECUTABLE_TARGET} ${LEMON_GEN_SOURCE}
${DEPS_TARGET}
)
set(LEMON_${Name}_OUTPUTS ${${LVAR_PREFIX}_OUT_SRC_FILE}
${LEMON_${Name}_OUTPUTS})
endif(NOT "${${LVAR_PREFIX}_OUT_SRC_FILE}" STREQUAL "${LEMON_GEN_SOURCE}")
@@ -179,7 +209,7 @@
add_custom_command(
OUTPUT ${${LVAR_PREFIX}_OUT_HDR_FILE}
COMMAND ${CMAKE_COMMAND} -E copy ${LEMON_GEN_HEADER}
${${LVAR_PREFIX}_OUT_HDR_FILE}
- DEPENDS ${LemonInput} ${LEMON_EXECUTABLE_TARGET} ${LEMON_GEN_HEADER}
+ DEPENDS ${LemonInput} ${LEMON_EXECUTABLE_TARGET} ${LEMON_GEN_HEADER}
${DEPS_TARGET}
)
set(LEMON_${Name}_OUTPUTS ${${LVAR_PREFIX}_OUT_HDR_FILE}
${LEMON_${Name}_OUTPUTS})
endif(NOT "${${LVAR_PREFIX}_OUT_HDR_FILE}" STREQUAL "${LEMON_GEN_HEADER}")
Modified: brlcad/trunk/src/other/stepcode/cmake/FindPERPLEX.cmake
===================================================================
--- brlcad/trunk/src/other/stepcode/cmake/FindPERPLEX.cmake 2021-02-08
04:44:44 UTC (rev 78220)
+++ brlcad/trunk/src/other/stepcode/cmake/FindPERPLEX.cmake 2021-02-08
04:54:55 UTC (rev 78221)
@@ -10,7 +10,7 @@
#
# Originally based off of FindBISON.cmake from Kitware's CMake distribution
#
-# Copyright (c) 2010-2016 United States Government as represented by
+# Copyright (c) 2010-2020 United States Government as represented by
# the U.S. Army Research Laboratory.
# Copyright 2009 Kitware, Inc.
# Copyright 2006 Tristan Carel
@@ -44,9 +44,35 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#=============================================================================
-find_program(PERPLEX_EXECUTABLE perplex DOC "path to the perplex executable")
+set(_PERPLEX_SEARCHES)
+
+# Search PERPLEX_ROOT first if it is set.
+if(PERPLEX_ROOT)
+ set(_PERPLEX_SEARCH_ROOT PATHS ${PERPLEX_ROOT} NO_DEFAULT_PATH)
+ list(APPEND _PERPLEX_SEARCHES _PERPLEX_SEARCH_ROOT)
+endif()
+
+# Normal search.
+set(_PERPLEX_x86 "(x86)")
+set(_PERPLEX_SEARCH_NORMAL
+ PATHS "$ENV{ProgramFiles}/perplex"
+ "$ENV{ProgramFiles${_PERPLEX_x86}}/perplex")
+unset(_PERPLEX_x86)
+list(APPEND _PERPLEX_SEARCHES _PERPLEX_SEARCH_NORMAL)
+
+set(PERPLEX_NAMES perplex)
+
+# Try each search configuration.
+foreach(search ${_PERPLEX_SEARCHES})
+ find_program(PERPLEX_EXECUTABLE perplex ${${search}} PATH_SUFFIXES bin)
+endforeach()
mark_as_advanced(PERPLEX_EXECUTABLE)
+foreach(search ${_PERPLEX_SEARCHES})
+ find_file(PERPLEX_TEMPLATE perplex_template.c ${${search}} PATH_SUFFIXES
${DATA_DIR} ${DATA_DIR}/perplex)
+endforeach()
+mark_as_advanced(PERPLEX_TEMPLATE)
+
if(PERPLEX_EXECUTABLE AND NOT PERPLEX_TEMPLATE)
get_filename_component(perplex_path ${PERPLEX_EXECUTABLE} PATH)
if(perplex_path)
@@ -96,7 +122,7 @@
#
# Originally based off of FindBISON.cmake from Kitware's CMake distribution
#
-# Copyright (c) 2010-2016 United States Government as represented by
+# Copyright (c) 2010-2020 United States Government as represented by
# the U.S. Army Research Laboratory.
# Copyright 2009 Kitware, Inc.
# Copyright 2006 Tristan Carel
@@ -141,6 +167,10 @@
get_filename_component(IN_FILE_WE ${Input} NAME_WE)
set(PVAR_PREFIX ${Name}_${IN_FILE_WE})
+ if (TARGET perplex_stage)
+ set(DEP_TARGET perplex_stage)
+ endif (TARGET perplex_stage)
+
if(${ARGC} GREATER 3)
CMAKE_PARSE_ARGUMENTS(${PVAR_PREFIX} ""
"TEMPLATE;OUT_SRC_FILE;OUT_HDR_FILE;WORKING_DIR" "" ${ARGN})
endif(${ARGC} GREATER 3)
@@ -200,7 +230,7 @@
OUTPUT ${re2c_src} ${${PVAR_PREFIX}_OUT_HDR_FILE}
${${PVAR_PREFIX}_WORKING_DIR}/${IN_FILE}
COMMAND ${CMAKE_COMMAND} -E copy ${perplex_in_file}
${${PVAR_PREFIX}_WORKING_DIR}/${IN_FILE}
COMMAND ${PERPLEX_EXECUTABLE} -c -o ${re2c_src} -i
${${PVAR_PREFIX}_OUT_HDR_FILE} -t ${${PVAR_PREFIX}_TEMPLATE}
${${PVAR_PREFIX}_WORKING_DIR}/${IN_FILE}
- DEPENDS ${Input} ${${PVAR_PREFIX}_TEMPLATE} ${PERPLEX_EXECUTABLE_TARGET}
${RE2C_EXECUTABLE_TARGET}
+ DEPENDS ${Input} ${PERPLEX_EXECUTABLE_TARGET} ${RE2C_EXECUTABLE_TARGET}
${DEP_TARGET}
WORKING_DIRECTORY ${${PVAR_PREFIX}_WORKING_DIR}
COMMENT "[PERPLEX][${Name}] Generating re2c input with
${PERPLEX_EXECUTABLE}"
)
@@ -209,7 +239,7 @@
add_custom_command(
OUTPUT ${${PVAR_PREFIX}_OUT_SRC_FILE}
COMMAND ${RE2C_EXECUTABLE} --no-debug-info --no-generation-date -c -o
${${PVAR_PREFIX}_OUT_SRC_FILE} ${re2c_src}
- DEPENDS ${Input} ${re2c_src} ${${PVAR_PREFIX}_OUT_HDR_FILE}
${PERPLEX_EXECUTABLE_TARGET} ${RE2C_EXECUTABLE_TARGET}
+ DEPENDS ${Input} ${re2c_src} ${${PVAR_PREFIX}_OUT_HDR_FILE}
${PERPLEX_EXECUTABLE_TARGET} ${RE2C_EXECUTABLE_TARGET} ${DEP_TARGET}
WORKING_DIRECTORY ${${PVAR_PREFIX}_WORKING_DIR}
COMMENT "[RE2C][${Name}] Building scanner with ${RE2C_EXECUTABLE}"
)
@@ -217,7 +247,7 @@
add_custom_command(
OUTPUT ${${PVAR_PREFIX}_OUT_SRC_FILE}
COMMAND ${RE2C_EXECUTABLE} --no-generation-date -c -o
${${PVAR_PREFIX}_OUT_SRC_FILE} ${re2c_src}
- DEPENDS ${Input} ${re2c_src} ${${PVAR_PREFIX}_OUT_HDR_FILE}
${PERPLEX_EXECUTABLE_TARGET} ${RE2C_EXECUTABLE_TARGET}
+ DEPENDS ${Input} ${re2c_src} ${${PVAR_PREFIX}_OUT_HDR_FILE}
${PERPLEX_EXECUTABLE_TARGET} ${RE2C_EXECUTABLE_TARGET} ${DEP_TARGET}
WORKING_DIRECTORY ${${PVAR_PREFIX}_WORKING_DIR}
COMMENT "[RE2C][${Name}] Building scanner with ${RE2C_EXECUTABLE}"
)
Modified: brlcad/trunk/src/other/stepcode/cmake/FindRE2C.cmake
===================================================================
--- brlcad/trunk/src/other/stepcode/cmake/FindRE2C.cmake 2021-02-08
04:44:44 UTC (rev 78220)
+++ brlcad/trunk/src/other/stepcode/cmake/FindRE2C.cmake 2021-02-08
04:54:55 UTC (rev 78221)
@@ -3,7 +3,29 @@
#
#=============================================================================
-find_program(RE2C_EXECUTABLE re2c DOC "path to the re2c executable")
+set(_RE2C_SEARCHES)
+
+# Search RE2C_ROOT first if it is set.
+if(RE2C_ROOT)
+ set(_RE2C_SEARCH_ROOT PATHS ${RE2C_ROOT} NO_DEFAULT_PATH)
+ list(APPEND _RE2C_SEARCHES _RE2C_SEARCH_ROOT)
+endif()
+
+# Normal search.
+set(_RE2C_x86 "(x86)")
+set(_RE2C_SEARCH_NORMAL
+ PATHS "$ENV{ProgramFiles}/re2c"
+ "$ENV{ProgramFiles${_RE2C_x86}}/re2c")
+unset(_RE2C_x86)
+list(APPEND _RE2C_SEARCHES _RE2C_SEARCH_NORMAL)
+
+set(RE2C_NAMES re2c)
+
+# Try each search configuration.
+foreach(search ${_RE2C_SEARCHES})
+ find_program(RE2C_EXECUTABLE re2c ${${search}} PATH_SUFFIXES bin)
+endforeach()
+
mark_as_advanced(RE2C_EXECUTABLE)
include(FindPackageHandleStandardArgs)
@@ -42,7 +64,7 @@
# ====================================================================
#
#=============================================================================
-# Copyright (c) 2010-2016 United States Government as represented by
+# Copyright (c) 2010-2020 United States Government as represented by
# the U.S. Army Research Laboratory.
# Copyright 2009 Kitware, Inc.
# Copyright 2006 Tristan Carel
Deleted: brlcad/trunk/src/other/stepcode/cmake/Generated_Source_Utils.cmake
===================================================================
--- brlcad/trunk/src/other/stepcode/cmake/Generated_Source_Utils.cmake
2021-02-08 04:44:44 UTC (rev 78220)
+++ brlcad/trunk/src/other/stepcode/cmake/Generated_Source_Utils.cmake
2021-02-08 04:54:55 UTC (rev 78221)
@@ -1,67 +0,0 @@
-# Utility routines for managing generated files with CMake
-
-macro(MD5 filename md5sum)
- file(READ "${filename}" RAW_MD5_FILE)
- string(REGEX REPLACE "\r" "" STRIPPED_MD5_FILE "${RAW_MD5_FILE}")
- string(MD5 ${md5sum} "${STRIPPED_MD5_FILE}")
-endmacro(MD5)
-
-macro(FILEVAR filename var)
- string(REGEX REPLACE "[^a-zA-Z0-9]" "_" ${var} ${filename})
-endmacro(FILEVAR)
-
-macro(VERIFY_FILES filelist warn resultvar)
- set(${resultvar} 1)
- foreach(fileitem ${filelist})
- # Deal with absolute and relative paths a bit differently
- get_filename_component(ITEM_ABS_PATH "${fileitem}" ABSOLUTE)
- if("${fileitem}" STREQUAL "${ITEM_ABS_PATH}")
- set(filefullname "${fileitem}")
- else("${fileitem}" STREQUAL "${ITEM_ABS_PATH}")
- set(filefullname "${CURRENT_SOURCE_DIR}/${fileitem}")
- endif("${fileitem}" STREQUAL "${ITEM_ABS_PATH}")
- get_filename_component(filename "${fileitem}" NAME)
- # Got filename components sorted - proceed
- if(NOT EXISTS ${filefullname})
- message(FATAL_ERROR "Attempted to verify non-existant file
${filefullname}")
- endif(NOT EXISTS ${filefullname})
- FILEVAR(${filename} filevar)
- if(NOT baseline_${filevar}_md5)
- message(FATAL_ERROR "No baseline MD5 available for ${filename} -
baseline_${filevar}_md5 is not defined")
- endif(NOT baseline_${filevar}_md5)
- MD5(${filefullname} ${filevar}_md5)
- if(NOT "${${filevar}_md5}" STREQUAL "${baseline_${filevar}_md5}")
- if("${warn}" STREQUAL "1")
- message("\n${filename} differs from baseline: baseline md5 hash is
${baseline_${filevar}_md5} and current hash is ${${filevar}_md5}\n")
- endif("${warn}" STREQUAL "1")
- set(${resultvar} 0)
- endif(NOT "${${filevar}_md5}" STREQUAL "${baseline_${filevar}_md5}")
- endforeach(fileitem ${filelist})
-endmacro(VERIFY_FILES filelist resultvar)
-
-macro(WRITE_MD5_SUMS filelist outfile)
- foreach(fileitem ${filelist})
- # Deal with absolute and relative paths a bit differently
- get_filename_component(ITEM_ABS_PATH "${fileitem}" ABSOLUTE)
- if("${fileitem}" STREQUAL "${ITEM_ABS_PATH}")
- set(filefullname "${fileitem}")
- else("${fileitem}" STREQUAL "${ITEM_ABS_PATH}")
- set(filefullname "${CURRENT_SOURCE_DIR}/${fileitem}")
- endif("${fileitem}" STREQUAL "${ITEM_ABS_PATH}")
- get_filename_component(filename "${fileitem}" NAME)
- # Got filename components sorted - proceed
- if(NOT EXISTS ${filefullname})
- message(FATAL_ERROR "Attempted to get MD5 sum of non-existant file
${filefullname}")
- endif(NOT EXISTS ${filefullname})
- FILEVAR(${filename} filevar)
- MD5(${filefullname} ${filevar}_md5)
- file(APPEND ${outfile} "set(baseline_${filevar}_md5 ${${filevar}_md5})\n")
- endforeach(fileitem ${filelist})
-endmacro(WRITE_MD5_SUMS)
-
-# Local Variables:
-# tab-width: 8
-# mode: cmake
-# indent-tabs-mode: t
-# End:
-# ex: shiftwidth=2 tabstop=8
Copied: brlcad/trunk/src/other/stepcode/cmake/Path_Setup.cmake (from rev 78215,
brlcad/branches/stepsync/src/other/stepcode/cmake/Path_Setup.cmake)
===================================================================
--- brlcad/trunk/src/other/stepcode/cmake/Path_Setup.cmake
(rev 0)
+++ brlcad/trunk/src/other/stepcode/cmake/Path_Setup.cmake 2021-02-08
04:54:55 UTC (rev 78221)
@@ -0,0 +1,164 @@
+# Copyright (c) 2010-2020 United States Government as represented by
+# the U.S. Army Research Laboratory.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following
+# disclaimer in the documentation and/or other materials provided
+# with the distribution.
+#
+# 3. The name of the author may not be used to endorse or promote
+# products derived from this software without specific prior written
+# permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+#---------------------------------------------------------------------
+# Define relative install locations. Don't set these if they have already
+# been set by some other means (like a higher level CMakeLists.txt file
+# including this one).
+
+# The location in which to install BRL-CAD executables.
+if(NOT BIN_DIR)
+ set(BIN_DIR bin)
+endif(NOT BIN_DIR)
+
+# Define a relative path that will "reset" a path back to
+# the point before BIN_DIR was appended. This is primarily
+# useful when working with generator expressions
+unset(RBIN_DIR CACHE)
+set(LBIN_DIR "${BIN_DIR}")
+while (NOT "${LBIN_DIR}" STREQUAL "")
+ get_filename_component(LBDIR "${LBIN_DIR}" DIRECTORY)
+ set(LBIN_DIR "${LBDIR}")
+ if ("${RBIN_DIR}" STREQUAL "")
+ set(RBIN_DIR "..")
+ else ("${RBIN_DIR}" STREQUAL "")
+ set(RBIN_DIR "../${RBIN_DIR}")
+ endif ("${RBIN_DIR}" STREQUAL "")
+endwhile (NOT "${LBIN_DIR}" STREQUAL "")
+
+# The location in which to install BRL-CAD libraries.
+if(NOT LIB_DIR)
+ set(LIB_DIR lib)
+endif(NOT LIB_DIR)
+if(NOT LIBEXEC_DIR)
+ set(LIBEXEC_DIR libexec)
+endif(NOT LIBEXEC_DIR)
+
+# The location in which to install BRL-CAD header files.
+if(NOT INCLUDE_DIR)
+ set(INCLUDE_DIR include)
+endif(NOT INCLUDE_DIR)
+
+# The location in which to install BRL-CAD data files
+if(NOT DATA_DIR)
+ set(DATA_DIR share)
+endif(NOT DATA_DIR)
+
+# The location in which to install BRL-CAD documentation files
+if(NOT DOC_DIR)
+ set(DOC_DIR ${DATA_DIR}/doc)
+endif(NOT DOC_DIR)
+
+# The location in which to install BRL-CAD Manual pages
+if(NOT MAN_DIR)
+ set(MAN_DIR ${DATA_DIR}/man)
+endif(NOT MAN_DIR)
+
+# Make sure no absolute paths have been supplied to these variables
+set(INSTALL_DIRS BIN INCLUDE LIB LIBEXEC DATA MAN DOC)
+foreach(instdir ${INSTALL_DIRS})
+ get_filename_component(instdir_full ${${instdir}_DIR} ABSOLUTE)
+ if("${${instdir}_DIR}" STREQUAL "${instdir_full}")
+ message(FATAL_ERROR "Error - absolute path supplied for ${instdir}_DIR.
This path must be relative - e.g. \"bin\" instead of \"/usr/bin\"")
+ set(HAVE_INSTALL_DIR_FULL_PATH 1)
+ endif("${${instdir}_DIR}" STREQUAL "${instdir_full}")
+endforeach(instdir ${INSTALL_DIRS})
+
+#---------------------------------------------------------------------
+# Output directories - this is where built library and executable
+# files will be placed after building but prior to install. The
+# necessary variables change between single and multi configuration
+# build systems, so it is necessary to handle both cases on a
+# conditional basis.
+
+if(NOT CMAKE_CONFIGURATION_TYPES)
+ # If we're not doing multi-configuration, just set the three main
+ # variables to the correct values.
+ if(NOT DEFINED CMAKE_LIBRARY_OUTPUT_DIRECTORY)
+ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY
${${PROJECT_NAME}_BINARY_DIR}/${LIB_DIR} CACHE INTERNAL "Single output
directory for building all libraries.")
+ endif(NOT DEFINED CMAKE_LIBRARY_OUTPUT_DIRECTORY)
+ if(NOT DEFINED CMAKE_ARCHIVE_OUTPUT_DIRECTORY)
+ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY
${${PROJECT_NAME}_BINARY_DIR}/${LIB_DIR} CACHE INTERNAL "Single output
directory for building all archives.")
+ endif(NOT DEFINED CMAKE_ARCHIVE_OUTPUT_DIRECTORY)
+ if(NOT DEFINED CMAKE_RUNTIME_OUTPUT_DIRECTORY)
+ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY
${${PROJECT_NAME}_BINARY_DIR}/${BIN_DIR} CACHE INTERNAL "Single output
directory for building all executables.")
+ endif(NOT DEFINED CMAKE_RUNTIME_OUTPUT_DIRECTORY)
+else(NOT CMAKE_CONFIGURATION_TYPES)
+ # Multi-configuration is more difficult. Not only do we need to
+ # properly set the output directories, but we also need to
+ # identify the "toplevel" directory for each configuration so
+ # we can place files, documentation, etc. in the correct
+ # relative positions. Because files may be placed by CMake
+ # without a build target to put them in their proper relative build
+ # directory position using these paths, we must fully qualify them
+ # without using CMAKE_CFG_INTDIR.
+ #
+ # We define directories that may not be quite "standard"
+ # for a particular build tool - for example, native VS2010 projects use
+ # another directory to denote CPU type being compiled for - but CMake only
+ # supports multi-configuration setups having multiple configurations,
+ # not multiple compilers.
+ #
+ # One additional wrinkle we must watch for here is the case where
+ # a multi-configuration setup uses "." for its internal directory -
+ # if that's the case, we need to just set the various config output
+ # directories to the same value.
+ set(CFG_ROOT ${${PROJECT_NAME}_BINARY_DIR})
+ foreach(CFG_TYPE ${CMAKE_CONFIGURATION_TYPES})
+ if(NOT "${CMAKE_CFG_INTDIR}" STREQUAL ".")
+ set(CFG_ROOT ${${PROJECT_NAME}_BINARY_DIR}/${CFG_TYPE})
+ endif(NOT "${CMAKE_CFG_INTDIR}" STREQUAL ".")
+ string(TOUPPER "${CFG_TYPE}" CFG_TYPE_UPPER)
+ if(NOT DEFINED CMAKE_LIBRARY_OUTPUT_DIRECTORY_${CFG_TYPE_UPPER})
+ set("CMAKE_LIBRARY_OUTPUT_DIRECTORY_${CFG_TYPE_UPPER}"
${CFG_ROOT}/${LIB_DIR} CACHE INTERNAL "Single output directory for building
${CFG_TYPE} libraries.")
+ endif(NOT DEFINED CMAKE_LIBRARY_OUTPUT_DIRECTORY_${CFG_TYPE_UPPER})
+ if(NOT DEFINED CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${CFG_TYPE_UPPER})
+ set("CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${CFG_TYPE_UPPER}"
${CFG_ROOT}/${LIB_DIR} CACHE INTERNAL "Single output directory for building
${CFG_TYPE} archives.")
+ endif(NOT DEFINED CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${CFG_TYPE_UPPER})
+ if(NOT DEFINED CMAKE_RUNTIME_OUTPUT_DIRECTORY_${CFG_TYPE_UPPER})
+ set("CMAKE_RUNTIME_OUTPUT_DIRECTORY_${CFG_TYPE_UPPER}"
${CFG_ROOT}/${BIN_DIR} CACHE INTERNAL "Single output directory for building
${CFG_TYPE} executables.")
+ endif(NOT DEFINED CMAKE_RUNTIME_OUTPUT_DIRECTORY_${CFG_TYPE_UPPER})
+ if(NOT DEFINED CMAKE_BINARY_DIR_${CFG_TYPE_UPPER})
+ set("CMAKE_BINARY_DIR_${CFG_TYPE_UPPER}" ${CFG_ROOT} CACHE INTERNAL
"Toplevel binary dir for ${CFG_TYPE} building.")
+ endif(NOT DEFINED CMAKE_BINARY_DIR_${CFG_TYPE_UPPER})
+ if(NOT DEFINED ${PROJECT_NAME}_BINARY_DIR_${CFG_TYPE_UPPER})
+ set("${PROJECT_NAME}_BINARY_DIR_${CFG_TYPE_UPPER}" ${CFG_ROOT} CACHE
INTERNAL "Toplevel binary dir for ${CFG_TYPE} building.")
+ endif(NOT DEFINED ${PROJECT_NAME}_BINARY_DIR_${CFG_TYPE_UPPER})
+ endforeach()
+endif(NOT CMAKE_CONFIGURATION_TYPES)
+
+# Local Variables:
+# tab-width: 8
+# mode: cmake
+# indent-tabs-mode: t
+# End:
+# ex: shiftwidth=2 tabstop=8
Copied: brlcad/trunk/src/other/stepcode/cmake/SC_CXX_schema_macros.cmake (from
rev 78215,
brlcad/branches/stepsync/src/other/stepcode/cmake/SC_CXX_schema_macros.cmake)
===================================================================
--- brlcad/trunk/src/other/stepcode/cmake/SC_CXX_schema_macros.cmake
(rev 0)
+++ brlcad/trunk/src/other/stepcode/cmake/SC_CXX_schema_macros.cmake
2021-02-08 04:54:55 UTC (rev 78221)
@@ -0,0 +1,136 @@
+# macros to be used in the CMakeLists generated by the schema scanner
+
+# uses SC_GENERATE_CXX_ONESHOT - if true, files will only be generated once.
this is useful when debugging and modifying code, not otherwise. TODO: print a
warning when set
+if(NOT DEFINED SC_GENERATE_CXX_ONESHOT)
+ set(SC_GENERATE_CXX_ONESHOT FALSE)
+endif(NOT DEFINED SC_GENERATE_CXX_ONESHOT)
+
+# find all part 21 files in schema dir, add a test for each one
+macro(P21_TESTS sfile)
+ get_filename_component(SCHEMA_DIR ${sfile} PATH)
+ file(GLOB_RECURSE P21_FILES ${SCHEMA_DIR}/*.stp ${SCHEMA_DIR}/*.step
${SCHEMA_DIR}/*.p21 ${SCHEMA_DIR}/*.ifc)
+ foreach(TEST_FILE ${P21_FILES})
+ get_filename_component(FNAME ${TEST_FILE} NAME_WE)
+ add_test(NAME read_write_cpp_${PROJECT_NAME}_${FNAME}
+ WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+ COMMAND p21read_${PROJECT_NAME} ${TEST_FILE})
+ set_tests_properties(read_write_cpp_${PROJECT_NAME}_${FNAME} PROPERTIES
DEPENDS build_cpp_${PROJECT_NAME} LABELS cpp_schema_rw)
+ if(NOT WIN32)
+ add_test(NAME read_lazy_cpp_${PROJECT_NAME}_${FNAME}
+ WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+ COMMAND lazy_${PROJECT_NAME} ${TEST_FILE})
+ set_tests_properties(read_lazy_cpp_${PROJECT_NAME}_${FNAME} PROPERTIES
DEPENDS build_lazy_cpp_${PROJECT_NAME} LABELS cpp_schema_rw)
+ endif(NOT WIN32)
+ endforeach()
+endmacro(P21_TESTS sfile)
+
+# create p21read_sdai_*, lazy_sdai_*, any exes listed in
SC_SDAI_ADDITIONAL_EXES_SRCS
+macro(SCHEMA_EXES)
+ RELATIVE_PATH_TO_TOPLEVEL(${CMAKE_CURRENT_SOURCE_DIR}
RELATIVE_PATH_COMPONENT)
+ SC_ADDEXEC(p21read_${PROJECT_NAME} SOURCES
"${RELATIVE_PATH_COMPONENT}/src/test/p21read/p21read.cc" LINK_LIBRARIES
${PROJECT_NAME} stepdai stepcore stepeditor steputils base TESTABLE)
+ if(NOT WIN32)
+ SC_ADDEXEC(lazy_${PROJECT_NAME} SOURCES
"${RELATIVE_PATH_COMPONENT}/src/cllazyfile/lazy_test.cc" LINK_LIBRARIES
${PROJECT_NAME} steplazyfile stepdai stepcore stepeditor steputils base
TESTABLE)
+ endif(NOT WIN32)
+
+ #add user-defined executables
+ foreach(src ${SC_SDAI_ADDITIONAL_EXES_SRCS})
+ get_filename_component(name ${src} NAME_WE)
+ get_filename_component(path ${src} ABSOLUTE)
+ SC_ADDEXEC(${name}_${PROJECT_NAME} SOURCES ${src} LINK_LIBRARIES
${PROJECT_NAME} stepdai stepcore stepeditor steputils base TESTABLE)
+ #set_target_properties(${name}_${PROJECT_NAME} PROPERTIES COMPILE_FLAGS
"${${PROJECT_NAME}_COMPILE_FLAGS} -I${path}")
+ endforeach(src ${SC_SDAI_ADDITIONAL_EXES_SRCS})
+ENDMACRO(SCHEMA_EXES)
+
+
+# label the tests and set dependencies
+macro(SCHEMA_TESTS)
+ add_test(NAME generate_cpp_${PROJECT_NAME}
+ WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+ COMMAND ${CMAKE_COMMAND} --build .
+ --target generate_cpp_${PROJECT_NAME}
+ --config $<CONFIGURATION>)
+ set_tests_properties(generate_cpp_${PROJECT_NAME} PROPERTIES LABELS
cpp_schema_gen)
+ add_test(NAME build_cpp_${PROJECT_NAME}
+ WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+ COMMAND ${CMAKE_COMMAND} --build .
+ --target p21read_${PROJECT_NAME}
+ --config $<CONFIGURATION>)
+ set_tests_properties(build_cpp_${PROJECT_NAME} PROPERTIES DEPENDS
generate_cpp_${PROJECT_NAME} LABELS cpp_schema_build)
+ if(NOT WIN32)
+ add_test(NAME build_lazy_cpp_${PROJECT_NAME}
+ WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+ COMMAND ${CMAKE_COMMAND} --build .
+ --target lazy_${PROJECT_NAME}
+ --config $<CONFIGURATION>)
+ set_tests_properties(build_lazy_cpp_${PROJECT_NAME} PROPERTIES DEPENDS
build_cpp_${PROJECT_NAME} LABELS cpp_schema_build)
+ endif(NOT WIN32)
+endmacro(SCHEMA_TESTS)
+
+# SCHEMA_TARGETS macro -
+# expFile: path to express file
+# schemaName: name of the schema
+# sourceFiles: list of .cc and .h files
+#
+# create targets for the schema(s) in expFile
+# targets include gen_cxx_*, sdai_cxx_*, p21read_*, lazyp21_*, ...
+macro(SCHEMA_TARGETS expFile schemaName sourceFiles)
+ # schema scanner comes up with a short schema name for PROJECT() (which sets
${PROJECT_NAME})
+ message(STATUS "Will generate ${${PROJECT_NAME}_file_count} C++ files for
${PROJECT_NAME}.")
+
+ add_custom_target(generate_cpp_${PROJECT_NAME} DEPENDS exp2cxx ${expFile}
${sourceFiles} SOURCES ${sourceFiles})
+ # this calls a cmake script because it doesn't seem to be possible
+ # to divert stdout, stderr in cmake except via execute_process
+ add_custom_command(OUTPUT ${sourceFiles}
+ COMMAND ${CMAKE_COMMAND} -DEXE=\"$<TARGET_FILE:exp2cxx>\"
-DEXP=\"${expFile}\"
+ -DONESHOT=\"${SC_GENERATE_CXX_ONESHOT}\"
-DSDIR=\"${CMAKE_CURRENT_LIST_DIR}\"
+ -P ${SC_CMAKE_DIR}/SC_Run_exp2cxx.cmake
+ WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
+ COMMENT "[exp2cxx] Generating ${${PROJECT_NAME}_file_count} C++ files for
${PROJECT_NAME}."
+ )
+ include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR} ${SC_SOURCE_DIR}/src/cldai
${SC_SOURCE_DIR}/src/cleditor
+ ${SC_SOURCE_DIR}/src/clutils ${SC_SOURCE_DIR}/src/clstepcore
${SC_SOURCE_DIR}/src/base
+ ${SC_SOURCE_DIR}/src/base/judy/src
+ )
+ # if testing is enabled, "TESTABLE" sets property EXCLUDE_FROM_ALL and
prevents installation
+ if(BUILD_SHARED_LIBS)
+ SC_ADDLIB(${PROJECT_NAME} SHARED SOURCES ${sourceFiles} LINK_LIBRARIES
stepdai stepcore stepeditor steputils base TESTABLE)
+ add_dependencies(${PROJECT_NAME} generate_cpp_${PROJECT_NAME})
+ if(WIN32)
+ target_compile_definitions("${PROJECT_NAME}" PRIVATE
SC_SCHEMA_DLL_EXPORTS)
+ if(MSVC)
+ target_compile_options("${PROJECT_NAME}" PRIVATE "/bigobj")
+ endif()
+ endif()
+ # TODO - ideally we would avoid generating code that triggers this
warning, but figuring out
+ # how to do so is a non-trivial exercise. In the meantime, suppress the
(very verbose) warnings
+ # we get due to this issue so it doesn't mask other problems.
+ if(${CMAKE_C_COMPILER_ID} STREQUAL "GNU")
+ target_compile_options("${PROJECT_NAME}" PRIVATE
"-Wno-ignored-qualifiers")
+ endif()
+ endif()
+
+ if($CACHE{SC_BUILD_STATIC_LIBS})
+ SC_ADDLIB(${PROJECT_NAME}-static STATIC SOURCES ${sourceFiles}
LINK_LIBRARIES stepdai-static stepcore-static stepeditor-static
steputils-static base-static TESTABLE)
+ add_dependencies(${PROJECT_NAME}-static generate_cpp_${PROJECT_NAME})
+ target_compile_defines("${PROJECT_NAME}-static" PRIVATE SC_STATIC)
+ if(MSVC)
+ target_compile_options("${PROJECT_NAME}-static" PRIVATE "/bigobj")
+ endif()
+ endif()
+
+
+ SCHEMA_EXES()
+ SCHEMA_TESTS()
+ P21_TESTS(${expFile})
+ # TODO add test to verify that schema scanner output matches fedex_plus
output
+
+endmacro(SCHEMA_TARGETS expFile schemaName sourceFiles)
+
+# Local Variables:
+# tab-width: 8
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
