test files not committed

.appveyor.yml

@@ -1,169 +0,0 @@
-version: '{build}'
-
-# for Appveyor CI (windows)
-
-os: Windows Server 2012 R2
-
-clone_folder: c:\projects\STEPcode
-
-#grab zip instead of git clone
-shallow_clone: true
-platform: x64
-configuration: Debug
-
-# errors or couldn't be found by cmake
-#   - GENERATOR: "Visual Studio 9 2008"
-#     ARCH: 32
-#   - GENERATOR: "Visual Studio 10"
-#     ARCH: 32
-
-#no point in these without artifact support...
-#  - GENERATOR: "Visual Studio 11"
-    #ARCH: 32
-  #- GENERATOR: "Visual Studio 12"
-    #ARCH: 32
-
-environment:
-  matrix:
-  - GENERATOR: "Visual Studio 12 Win64"
-    ARCH: 64
-
-# build:
-#   parallel: true
-#   project: ALL_BUILD.vcxproj
-
-#appveyor limits compile/test to 30 minutes
-# to reduce time, only test schemas with files: ifc2x3, ap214e3, ap209
-
-build_script:
-- ps: |
-    cd c:\projects\STEPcode
-    mkdir build
-    cd build
-    cmake -version
-    grep --version
-    cmake .. -DSC_ENABLE_TESTING=ON -G"$env:GENERATOR" -DSC_BUILD_SCHEMAS="ifc2x3"
-    cmake --build . --config Debug --target tst_inverse_attr3
-
-#msbuld seems to provide no benefits, and I can't filter its output...
-#msbuild SC.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /p:Configuration=Debug /p:Platform=x64
-# /toolsversion:14.0 /p:PlatformToolset=v140
-
-test_script:
-  - cmd: echo inverse_attr3 test 100x
-  - cmd: cd c:\projects\STEPcode\build
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: echo 10
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: echo 20
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: echo 30
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: echo 40
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: echo 50
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: echo 60
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: echo 70
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: echo 80
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: echo 90
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: bin\tst_inverse_attr3 ..\test\p21\test_inverse_attr.p21
-  - cmd: echo 100
-  - cmd: echo done
-
-# - cmd: grep -niB20 "Test Failed" Testing/Temporary/LastTest.log
-
-# we could upload a compiled zip somewhere (see Appveyor artifact documentation)

.gitignore

@@ -1,3 +0,0 @@
-/build
-*.kdev4
-.kdev_include_paths

.travis.yml

@@ -1,8 +1,12 @@
-sudo: false
 language: cpp
 compiler:
   - clang
-script: mkdir build && cd build && cmake .. -DSC_ENABLE_TESTING=ON && make -j3 && ctest -j2 --output-on-failure
-os:
-  - linux
-  - osx
+script: mkdir build && cd build && cmake .. -DSC_ENABLE_TESTING=ON && make -j2 && make -j2 test
+branches:
+  only:
+    - master
+notifications:
+  irc: "chat.freenode.net#stepcode"
+  email: scl-dev@groups.google.com
+  on_success: change
+  on_failure: always

AUTHORS

@@ -5,26 +5,21 @@ http://brlcad.svn.sourceforge.net/viewvc/brlcad/brlcad/trunk/src/other/step/?vie
 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)
 Reed, Nick (nickreed)
-Shah, Kesha (kesha, keshashah)
+Shah, Kesha (kesha)
 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)

CMakeLists.txt

@@ -32,131 +32,427 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 # *******************************************************************
-# ***                 STEPcode's CMakeLists.txt                   ***
+# ***                   SC's CMakeLists.txt                      ***
 # *******************************************************************
 
 # This file contains the top level CMakeLists.txt logic for the
-# STEPcode software package.
+# SC software package.
 
-project(SC)
+PROJECT(SC)
 
 # SC version
-set(SC_VERSION_MAJOR 0)
-set(SC_VERSION_MINOR 7-dev)
-set(SC_VERSION ${SC_VERSION_MAJOR}.${SC_VERSION_MINOR})
+SET(SC_VERSION_MAJOR 0)
+SET(SC_VERSION_MINOR 7-dev)
+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)
+SET(SC_ABI_SOVERSION 2)
+SET(SC_ABI_VERSION ${SC_ABI_SOVERSION}.0.0)
 
 # Minimum required version of CMake
-cmake_minimum_required(VERSION 2.8.7)
-if(COMMAND CMAKE_POLICY)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.7)
+IF(COMMAND CMAKE_POLICY)
   CMAKE_POLICY(SET CMP0003 NEW)
-  if ("${CMAKE_VERSION}" VERSION_GREATER 2.99)
-    CMAKE_POLICY(SET CMP0026 OLD)
-  endif ("${CMAKE_VERSION}" VERSION_GREATER 2.99)
-endif(COMMAND CMAKE_POLICY)
+ENDIF(COMMAND CMAKE_POLICY)
+
+IF( NOT DEFINED INCLUDE_INSTALL_DIR )
+  SET( INCLUDE_INSTALL_DIR include )
+ENDIF( NOT DEFINED INCLUDE_INSTALL_DIR )
+
+IF( NOT DEFINED LIB_INSTALL_DIR )
+  SET( LIB_INSTALL_DIR lib )
+ENDIF( NOT DEFINED LIB_INSTALL_DIR )
+
+IF( NOT DEFINED BIN_INSTALL_DIR )
+  SET( BIN_INSTALL_DIR bin )
+ENDIF( NOT DEFINED BIN_INSTALL_DIR )
+
+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)
+
+# Define helper macro OPTION_WITH_DEFAULT
+MACRO( OPTION_WITH_DEFAULT OPTION_NAME OPTION_STRING OPTION_DEFAULT )
+  IF( NOT DEFINED ${OPTION_NAME} )
+    SET( ${OPTION_NAME} ${OPTION_DEFAULT} )
+  ENDIF( NOT DEFINED ${OPTION_NAME} )
+  OPTION( ${OPTION_NAME} "${OPTION_STRING}" ${${OPTION_NAME}} )
+ENDMACRO( OPTION_WITH_DEFAULT OPTION_NAME OPTION_STRING OPTION_DEFAULT )
+
+# build shared libs by default
+OPTION_WITH_DEFAULT(SC_BUILD_SHARED_LIBS "Build shared libs" ON )
+
+# don't build static libs by default
+OPTION_WITH_DEFAULT(SC_BUILD_STATIC_LIBS "Build static libs" OFF)
+
+OPTION_WITH_DEFAULT(SC_PYTHON_GENERATOR "Compile exp2python" ON)
+OPTION_WITH_DEFAULT(SC_CPP_GENERATOR "Compile exp2cxx" ON)
+
+OPTION_WITH_DEFAULT(SC_MEMMGR_ENABLE_CHECKS "Enable sc_memmgr's memory leak detection" OFF)
+OPTION_WITH_DEFAULT(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 )
+    set( SCHEMAS_WARNING TRUE )
+    #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")
+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)
+
+INCLUDE(${SC_CMAKE_DIR}/SC_Utils.cmake)
+
+# 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_WITH_DEFAULT( 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)
+
+#---------------------------------------------------------------------
+# Testing option
+OPTION_WITH_DEFAULT( 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
+
+# use, i.e. don't skip the full RPATH for the build tree
+set(CMAKE_SKIP_BUILD_RPATH  FALSE)
+
+# when building, don't use the install RPATH already
+# (but later on when installing)
+set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+
+# the RPATH/INSTALL_NAME_DIR to be used when installing
+if (NOT APPLE)
+  set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib:\$ORIGIN/../lib")
+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
+set(CMAKE_INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
+
+# add the automatically determined parts of the RPATH which point to
+# directories outside the build tree to the install RPATH
+set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+
+#-----------------------------------------------------------------------------
+# Output directories.
+# When this is a subbuild, assume that the parent project controls these
+IF( NOT SC_IS_SUBBUILD )
+  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)
+
+  FOREACH(CFG_TYPE ${CMAKE_CONFIGURATION_TYPES})
+    STRING(TOUPPER "${CFG_TYPE}" CFG_TYPE)
+    IF(NOT "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 "CMAKE_LIBRARY_OUTPUT_DIRECTORY_${CFG_TYPE}")
+    IF(NOT "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 "CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${CFG_TYPE}")
+    IF(NOT "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 "CMAKE_RUNTIME_OUTPUT_DIRECTORY_${CFG_TYPE}")
+  ENDFOREACH()
+ENDIF( NOT SC_IS_SUBBUILD )
+
+
+#-----------------------------------------------------------------------------
+# Configure install locations.
+
+# 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)
-  set(CMAKE_MODULE_PATH "${SC_CMAKE_DIR};${CMAKE_MODULE_PATH}")
-else(NOT SC_IS_SUBBUILD)
-  set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${SC_CMAKE_DIR}")
+  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)
 
-# testing and compilation options, build output dirs, install dirs, uninstall, package creation, etc
-include(${SC_CMAKE_DIR}/SC_Build_opts.cmake)
+OPTION(SC_BUILD_EXPRESS_ONLY "Only build express parser." OFF)
+MARK_AS_ADVANCED(SC_BUILD_EXPRESS_ONLY)
 
-# SC_ADDEXEC and SC_ADDLIB macros, dllimport/export, etc
-include(${SC_CMAKE_DIR}/SC_Targets.cmake)
+# 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}")
 
-# Macros related to paths
-include(${SC_CMAKE_DIR}/SC_Paths.cmake)
+# 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")
 
-# locale stuff
-include(${SC_CMAKE_DIR}/SC_Locale.cmake)
+# 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}")
 
-# logic related to regenerating the lexer and parser source code
-include(${SC_CMAKE_DIR}/SC_Regenerate.cmake)
+		if(NOT COMMAND LEMON_TARGET)
+			include(${SC_CMAKE_DIR}/LEMON_Util.cmake)
+		endif(NOT COMMAND LEMON_TARGET)
+		if(NOT COMMAND PERPLEX_TARGET)
+			include(${SC_CMAKE_DIR}/PERPLEX_Util.cmake)
+		endif(NOT COMMAND PERPLEX_TARGET)
+		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")
 
-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)
+INCLUDE(CheckLibraryExists)
+INCLUDE(CheckIncludeFile)
+INCLUDE(CheckFunctionExists)
+INCLUDE(CheckTypeSize)
+INCLUDE(CMakePushCheckState)
+INCLUDE(CheckCXXSourceRuns)
 
-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)
+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)
 
-if(NOT SC_IS_SUBBUILD)
-  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)
+CHECK_FUNCTION_EXISTS(abs HAVE_ABS)
+CHECK_FUNCTION_EXISTS(memcpy HAVE_MEMCPY)
+CHECK_FUNCTION_EXISTS(memmove HAVE_MEMMOVE)
+CHECK_FUNCTION_EXISTS(getopt HAVE_GETOPT)
 
-# create config headers sc_cf.h and sc_version_string.h
-include(${SC_CMAKE_DIR}/SC_Config_Headers.cmake)
+CHECK_TYPE_SIZE("ssize_t" SSIZE_T)
 
+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()
 
+# 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)
+
+################ 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 )
 ################
 
 if(MSVC)
-  add_definitions(-D__MSVC__ -D__WIN32__)
+  # 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)
+  add_definitions( -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS )
 elseif(BORLAND)
-  add_definitions(-D__BORLAND__ -D__WIN32__)
+  add_definitions( -D__BORLAND__ -D__WIN32__ )
 else()
-  add_definitions(-pedantic -W -Wall -Wundef -Wfloat-equal -Wshadow -Winline -Wno-long-long)
-  if(HAVE_NULLPTR)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-  endif(HAVE_NULLPTR)
+  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)
-add_subdirectory(src/cllazyfile)
-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)
+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)
 
-# 'make core' builds everything that isn't generated. for devs.
-add_custom_target(core)
-add_dependencies(core stepdai check-express stepeditor exp2cxx)
+if( SCHEMAS_WARNING )
+    message( "** CMake variable SC_BUILD_SCHEMAS was not set. Defaults to building ALL schemas, which will take a")
+    message("     while; see http://stepcode.org/mw/index.php?title=STEPcode_CMake_variables#SC_BUILD_SCHEMAS" )
+endif( SCHEMAS_WARNING )
+message( ".. Don't worry about any messages above about missing headers or failed tests, as long as\n    you see '-- Configuring done' below. Headers and features vary by compiler." )
 
-# 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})
+# this is for testing - 'make core' builds everything that isn't generated
+add_custom_target( core )
+add_dependencies( core stepdai check-express stepeditor exp2cxx )
 
-# Local Variables:
-# tab-width: 8
-# mode: cmake
-# indent-tabs-mode: t
-# End:
-# ex: shiftwidth=2 tabstop=8
+if(NOT SC_IS_SUBBUILD)
+  ###############################################################################
+  # 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 <scl-dev@googlegroups.com>")
+  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)

CONTRIBUTING.md

@@ -1,45 +0,0 @@
-# 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/
-

CTestConfig.cmake

@@ -8,11 +8,3 @@ set(CTEST_DROP_METHOD "http")
 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
-

NEWS

@@ -1,26 +1,4 @@
 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)
 

README

@@ -1,10 +1,5 @@
-   Travis-CI   |   AppVeyor CI
-:-------------:|:---------------:
-Linux, OSX (LLVM) | Windows (MSVC)
-[![Build Status](https://travis-ci.org/stepcode/stepcode.svg?branch=master)](https://travis-ci.org/stepcode/stepcode) | [![Build status](https://ci.appveyor.com/api/projects/status/3fbr9t9gfa812oqu?svg=true)](https://ci.appveyor.com/project/mpictor/stepcode)
-
 ***********************************************************************
-STEPcode v0.8 -- stepcode.org, github.com/stepcode/stepcode
+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
@@ -37,14 +32,12 @@ 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( );
-    }
-```
+        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)
@@ -61,4 +54,4 @@ Download astyle from http://sourceforge.net/projects/astyle/files/astyle/
 
 ***********************************************************************
 
-For more info, see the wiki.
+For more info, see the wiki.

SC_VERSION.txt

@@ -1 +1 @@
-0.8
+0.7

TODO

@@ -0,0 +1,6 @@
+(from BRL-CAD)
+
+* rewrite express parser to not require lex/yacc
+
+* verify/fix step parser generation with newer AP schemas, seems to be
+  outputting invalid syntax.

cmake/CheckCFileRuns.cmake

@@ -0,0 +1,84 @@
+# - 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)
+

cmake/FindLEMON.cmake

@@ -10,23 +10,23 @@
 #
 # Originally based off of FindBISON.cmake from Kitware's CMake distribution
 #
-# Copyright (c) 2010-2016 United States Government as represented by
+# Copyright (c) 2010-2012 United States Government as represented by
 #                the U.S. Army Research Laboratory.
 # Copyright 2009 Kitware, Inc.
 # Copyright 2006 Tristan Carel
 # 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.
-#
+# 
 # * The names of the authors may not be used to endorse or promote
 #   products derived from this software without specific prior written
 #   permission.
@@ -47,158 +47,21 @@
 find_program(LEMON_EXECUTABLE lemon DOC "path to the lemon executable")
 mark_as_advanced(LEMON_EXECUTABLE)
 
-if (LEMON_EXECUTABLE AND NOT LEMON_TEMPLATE)
-  # look for the template in share
-  if (DATA_DIR AND EXISTS "${DATA_DIR}/lemon/lempar.c")
-    set (LEMON_TEMPLATE "${DATA_DIR}/lemon/lempar.c")
-  elseif (EXISTS "share/lemon/lempar.c")
-    set (LEMON_TEMPLATE "share/lemon/lempar.c")
-  elseif (EXISTS "/usr/share/lemon/lempar.c")
-    set (LEMON_TEMPLATE "/usr/share/lemon/lempar.c")
-  endif (DATA_DIR AND EXISTS "${DATA_DIR}/lemon/lempar.c")
-endif (LEMON_EXECUTABLE AND NOT LEMON_TEMPLATE)
-
-if (LEMON_EXECUTABLE AND NOT LEMON_TEMPLATE)
-  # look for the template in bin dir
+if(LEMON_EXECUTABLE AND NOT LEMON_TEMPLATE)
   get_filename_component(lemon_path ${LEMON_EXECUTABLE} PATH)
-  if (lemon_path)
-    if (EXISTS ${lemon_path}/lempar.c)
-      set (LEMON_TEMPLATE "${lemon_path}/lempar.c")
-    endif (EXISTS ${lemon_path}/lempar.c)
-    if (EXISTS /usr/share/lemon/lempar.c)
-      set (LEMON_TEMPLATE "/usr/share/lemon/lempar.c")
-    endif (EXISTS /usr/share/lemon/lempar.c)
-  endif (lemon_path)
+  if(lemon_path)
+    set(LEMON_TEMPLATE "")
+    if(EXISTS ${lemon_path}/lempar.c)
+      set(LEMON_TEMPLATE "${lemon_path}/lempar.c")
+    endif(EXISTS ${lemon_path}/lempar.c)
+    if(EXISTS /usr/share/lemon/lempar.c)
+      set(LEMON_TEMPLATE "/usr/share/lemon/lempar.c")
+    endif(EXISTS /usr/share/lemon/lempar.c)
+  endif(lemon_path)
 endif(LEMON_EXECUTABLE AND NOT LEMON_TEMPLATE)
-
-if (LEMON_EXECUTABLE AND NOT LEMON_TEMPLATE)
-  # fallback
-  set (LEMON_TEMPLATE "lempar.c")
-  if (NOT EXISTS ${LEMON_TEMPLATE})
-    message(WARNING "Lemon's lempar.c template file could not be found automatically, set LEMON_TEMPLATE")
-  endif (NOT EXISTS ${LEMON_TEMPLATE})
-endif (LEMON_EXECUTABLE AND NOT LEMON_TEMPLATE)
-
-mark_as_advanced(LEMON_TEMPLATE)
-
 include(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(LEMON DEFAULT_MSG LEMON_EXECUTABLE LEMON_TEMPLATE)
-
-# Define the macro
-#  LEMON_TARGET(<Name> <LemonInput> <LemonSource> <LemonHeader>
-#		[<ArgString>])
-# which will create a custom rule to generate a parser. <LemonInput> is
-# the path to a lemon file. <LemonSource> is the desired name for the
-# generated source file. <LemonHeader> is the desired name for the
-# generated header which contains the token list. Anything in the optional
-# <ArgString> parameter is appended to the lemon command line.
-#
-#  ====================================================================
-#  Example:
-#
-#   find_package(LEMON)
-#   LEMON_TARGET(MyParser parser.y parser.c parser.h)
-#   add_executable(Foo main.cpp ${LEMON_MyParser_OUTPUTS})
-#  ====================================================================
-
-include(CMakeParseArguments)
-
-if(NOT COMMAND LEMON_TARGET)
-  macro(LEMON_TARGET Name Input)
-
-    get_filename_component(IN_FILE_WE ${Input} NAME_WE)
-    set(LVAR_PREFIX ${Name}_${IN_FILE_WE})
-
-    if(${ARGC} GREATER 3)
-      CMAKE_PARSE_ARGUMENTS(${LVAR_PREFIX} "" "OUT_SRC_FILE;OUT_HDR_FILE;WORKING_DIR;EXTRA_ARGS" "" ${ARGN})
-    endif(${ARGC} GREATER 3)
-
-    # Need a working directory
-    if("${${LVAR_PREFIX}_WORKING_DIR}" STREQUAL "")
-      set(${LVAR_PREFIX}_WORKING_DIR "${CMAKE_CURRENT_BINARY_DIR}/${LVAR_PREFIX}")
-    endif("${${LVAR_PREFIX}_WORKING_DIR}" STREQUAL "")
-    file(MAKE_DIRECTORY ${${LVAR_PREFIX}_WORKING_DIR})
-
-    # Output source file
-    if ("${${LVAR_PREFIX}_OUT_SRC_FILE}" STREQUAL "")
-      set(${LVAR_PREFIX}_OUT_SRC_FILE ${${LVAR_PREFIX}_WORKING_DIR}/${IN_FILE_WE}.c)
-    else ("${${LVAR_PREFIX}_OUT_SRC_FILE}" STREQUAL "")
-      get_filename_component(specified_out_dir ${${LVAR_PREFIX}_OUT_SRC_FILE} PATH)
-      if(NOT "${specified_out_dir}" STREQUAL "")
-	message(FATAL_ERROR "\nFull path specified for OUT_SRC_FILE - should be filename only.\n")
-      endif(NOT "${specified_out_dir}" STREQUAL "")
-      set(${LVAR_PREFIX}_OUT_SRC_FILE ${${LVAR_PREFIX}_WORKING_DIR}/${${LVAR_PREFIX}_OUT_SRC_FILE})
-    endif ("${${LVAR_PREFIX}_OUT_SRC_FILE}" STREQUAL "")
-
-    # Output header file
-    if ("${${LVAR_PREFIX}_OUT_HDR_FILE}" STREQUAL "")
-      set(${LVAR_PREFIX}_OUT_HDR_FILE ${${LVAR_PREFIX}_WORKING_DIR}/${IN_FILE_WE}.h)
-    else ("${${LVAR_PREFIX}_OUT_HDR_FILE}" STREQUAL "")
-      get_filename_component(specified_out_dir ${${LVAR_PREFIX}_OUT_HDR_FILE} PATH)
-      if(NOT "${specified_out_dir}" STREQUAL "")
-	message(FATAL_ERROR "\nFull path specified for OUT_HDR_FILE - should be filename only.\n")
-      endif(NOT "${specified_out_dir}" STREQUAL "")
-      set(${LVAR_PREFIX}_OUT_HDR_FILE ${${LVAR_PREFIX}_WORKING_DIR}/${${LVAR_PREFIX}_OUT_HDR_FILE})
-    endif ("${${LVAR_PREFIX}_OUT_HDR_FILE}" STREQUAL "")
-
-    # input file
-    get_filename_component(in_full ${Input} ABSOLUTE)
-    if("${in_full}" STREQUAL "${Input}")
-      set(lemon_in_file ${Input})
-    else("${in_full}" STREQUAL "${Input}")
-      set(lemon_in_file "${CMAKE_CURRENT_SOURCE_DIR}/${Input}")
-    endif("${in_full}" STREQUAL "${Input}")
-
-
-    # names of lemon output files will be based on the name of the input file
-    set(LEMON_GEN_SOURCE ${${LVAR_PREFIX}_WORKING_DIR}/${IN_FILE_WE}.c)
-    set(LEMON_GEN_HEADER ${${LVAR_PREFIX}_WORKING_DIR}/${IN_FILE_WE}.h)
-    set(LEMON_GEN_OUT ${${LVAR_PREFIX}_WORKING_DIR}/${IN_FILE_WE}.out)
-
-    # copy input to bin directory and run lemon
-    get_filename_component(INPUT_NAME ${Input} NAME)
-    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} -T${LEMON_TEMPLATE} ${${LVAR_PREFIX}_WORKING_DIR}/${INPUT_NAME} ${${LVAR_PREFIX}__EXTRA_ARGS}
-      DEPENDS ${Input} ${LEMON_TEMPLATE} ${LEMON_EXECUTABLE_TARGET}
-      WORKING_DIRECTORY ${${LVAR_PREFIX}_WORKING_DIR}
-      COMMENT "[LEMON][${Name}] Building parser with ${LEMON_EXECUTABLE}"
-      )
-
-    # rename generated outputs
-    if(NOT "${${LVAR_PREFIX}_OUT_SRC_FILE}" STREQUAL "${LEMON_GEN_SOURCE}")
-      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}
-	)
-      set(LEMON_${Name}_OUTPUTS ${${LVAR_PREFIX}_OUT_SRC_FILE} ${LEMON_${Name}_OUTPUTS})
-    endif(NOT "${${LVAR_PREFIX}_OUT_SRC_FILE}" STREQUAL "${LEMON_GEN_SOURCE}")
-    if(NOT "${${LVAR_PREFIX}_OUT_HDR_FILE}" STREQUAL "${LEMON_GEN_HEADER}")
-      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}
-	)
-      set(LEMON_${Name}_OUTPUTS ${${LVAR_PREFIX}_OUT_HDR_FILE} ${LEMON_${Name}_OUTPUTS})
-    endif(NOT "${${LVAR_PREFIX}_OUT_HDR_FILE}" STREQUAL "${LEMON_GEN_HEADER}")
-
-    set(LEMON_${Name}_OUTPUTS ${LEMON_${Name}_OUTPUTS} ${LEMON_GEN_OUT})
-
-    # make sure we clean up generated output and copied input
-    set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES "${LEMON_${Name}_OUTPUTS}")
-    set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES "${${LVAR_PREFIX}_WORKING_DIR}/${INPUT_NAME}")
-
-    # macro ran successfully
-    set(LEMON_${Name}_DEFINED TRUE)
-
-    set(LEMON_${Name}_SRC ${${LVAR_PREFIX}_OUT_SRC_FILE})
-    set(LEMON_${Name}_HDR ${${LVAR_PREFIX}_OUT_HDR_FILE})
-    set(LEMON_${Name}_INCLUDE_DIR ${${LVAR_PREFIX}_WORKING_DIR})
-
-  endmacro(LEMON_TARGET)
-endif(NOT COMMAND LEMON_TARGET)
+mark_as_advanced(LEMON_TEMPLATE)
 
 #============================================================
 # FindLEMON.cmake ends here

cmake/FindPERPLEX.cmake

@@ -10,23 +10,23 @@
 #
 # Originally based off of FindBISON.cmake from Kitware's CMake distribution
 #
-# Copyright (c) 2010-2016 United States Government as represented by
+# Copyright (c) 2010-2012 United States Government as represented by
 #                the U.S. Army Research Laboratory.
 # Copyright 2009 Kitware, Inc.
 # Copyright 2006 Tristan Carel
 # 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.
-#
+# 
 # * The names of the authors may not be used to endorse or promote
 #   products derived from this software without specific prior written
 #   permission.
@@ -68,187 +68,6 @@ include(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(PERPLEX DEFAULT_MSG PERPLEX_EXECUTABLE PERPLEX_TEMPLATE)
 mark_as_advanced(PERPLEX_TEMPLATE)
 
-# Defines two macros - PERPLEX_TARGET, which takes perplex inputs and
-# runs both perplex and re2c to generate C source code/headers, and
-# ADD_PERPLEX_LEMON_DEPENDENCY which is used to set up dependencies between
-# scanner and parser targets when necessary.
-#
-# #====================================================================
-#  Example:
-#
-#   find_package(LEMON)
-#   find_package(RE2C)
-#   find_package(PERPLEX)
-#
-#   LEMON_TARGET(MyParser parser.y "${CMAKE_CURRENT_BINARY_DIR}/parser.cpp")
-#   PERPLEX_TARGET(MyScanner scanner.re  "${CMAKE_CURRENT_BINARY_DIR}/scanner.cpp" "${CMAKE_CURRENT_BINARY_DIR}/scanner_header.hpp")
-#   ADD_PERPLEX_LEMON_DEPENDENCY(MyScanner MyParser)
-#
-#   include_directories("${CMAKE_CURRENT_BINARY_DIR}")
-#   add_executable(Foo
-#      Foo.cc
-#      ${LEMON_MyParser_OUTPUTS}
-#      ${PERPLEX_MyScanner_OUTPUTS}
-#   )
-#  ====================================================================
-#
-#=============================================================================
-#
-# Originally based off of FindBISON.cmake from Kitware's CMake distribution
-#
-# Copyright (c) 2010-2016 United States Government as represented by
-#                the U.S. Army Research Laboratory.
-# Copyright 2009 Kitware, Inc.
-# Copyright 2006 Tristan Carel
-# 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.
-#
-# * The names of the authors may not 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.
-#=============================================================================
-
-#============================================================
-# PERPLEX_TARGET (public macro)
-#============================================================
-
-include(CMakeParseArguments)
-
-if(NOT COMMAND PERPLEX_TARGET)
-  macro(PERPLEX_TARGET Name Input)
-    get_filename_component(IN_FILE_WE ${Input} NAME_WE)
-    set(PVAR_PREFIX ${Name}_${IN_FILE_WE})
-
-    if(${ARGC} GREATER 3)
-      CMAKE_PARSE_ARGUMENTS(${PVAR_PREFIX} "" "TEMPLATE;OUT_SRC_FILE;OUT_HDR_FILE;WORKING_DIR" "" ${ARGN})
-    endif(${ARGC} GREATER 3)
-
-    # Need a working directory
-    if("${${PVAR_PREFIX}_WORKING_DIR}" STREQUAL "")
-      set(${PVAR_PREFIX}_WORKING_DIR "${CMAKE_CURRENT_BINARY_DIR}/${PVAR_PREFIX}")
-    endif("${${PVAR_PREFIX}_WORKING_DIR}" STREQUAL "")
-    file(MAKE_DIRECTORY ${${PVAR_PREFIX}_WORKING_DIR})
-
-    # Set up intermediate and final output names
-
-    # Output source file
-    if ("${${PVAR_PREFIX}_OUT_SRC_FILE}" STREQUAL "")
-      set(${PVAR_PREFIX}_OUT_SRC_FILE ${${PVAR_PREFIX}_WORKING_DIR}/${IN_FILE_WE}.c)
-    else ("${${PVAR_PREFIX}_OUT_SRC_FILE}" STREQUAL "")
-      get_filename_component(specified_out_dir ${${PVAR_PREFIX}_OUT_SRC_FILE} PATH)
-      if(NOT "${specified_out_dir}" STREQUAL "")
-	message(FATAL_ERROR "\nFull path specified for OUT_SRC_FILE - should be filename only.\n")
-      endif(NOT "${specified_out_dir}" STREQUAL "")
-      set(${PVAR_PREFIX}_OUT_SRC_FILE ${${PVAR_PREFIX}_WORKING_DIR}/${${PVAR_PREFIX}_OUT_SRC_FILE})
-    endif ("${${PVAR_PREFIX}_OUT_SRC_FILE}" STREQUAL "")
-
-    # Output header file
-    if ("${${PVAR_PREFIX}_OUT_HDR_FILE}" STREQUAL "")
-      set(${PVAR_PREFIX}_OUT_HDR_FILE ${${PVAR_PREFIX}_WORKING_DIR}/${IN_FILE_WE}.h)
-    else ("${${PVAR_PREFIX}_OUT_HDR_FILE}" STREQUAL "")
-      get_filename_component(specified_out_dir ${${PVAR_PREFIX}_OUT_HDR_FILE} PATH)
-      if(NOT "${specified_out_dir}" STREQUAL "")
-	message(FATAL_ERROR "\nFull path specified for OUT_HDR_FILE - should be filename only.\n")
-      endif(NOT "${specified_out_dir}" STREQUAL "")
-      set(${PVAR_PREFIX}_OUT_HDR_FILE ${${PVAR_PREFIX}_WORKING_DIR}/${${PVAR_PREFIX}_OUT_HDR_FILE})
-    endif ("${${PVAR_PREFIX}_OUT_HDR_FILE}" STREQUAL "")
-
-    # input file
-    get_filename_component(in_full ${Input} ABSOLUTE)
-    if("${in_full}" STREQUAL "${Input}")
-      set(perplex_in_file ${Input})
-    else("${in_full}" STREQUAL "${Input}")
-      set(perplex_in_file "${CMAKE_CURRENT_SOURCE_DIR}/${Input}")
-    endif("${in_full}" STREQUAL "${Input}")
-
-    # Intermediate file
-    set(re2c_src "${${PVAR_PREFIX}_WORKING_DIR}/${IN_FILE_WE}.re")
-
-    # Make sure we have a template
-    if ("${${PVAR_PREFIX}_TEMPLATE}" STREQUAL "")
-      if(PERPLEX_TEMPLATE)
-	set(${PVAR_PREFIX}_TEMPLATE ${PERPLEX_TEMPLATE})
-      else(PERPLEX_TEMPLATE)
-	message(FATAL_ERROR "\nNo Perplex template file specified - please specify the file using the PERPLEX_TEMPLATE variable:\ncmake .. -DPERPLEX_TEMPLATE=/path/to/template_file.c\n")
-      endif(PERPLEX_TEMPLATE)
-    endif ("${${PVAR_PREFIX}_TEMPLATE}" STREQUAL "")
-
-    get_filename_component(IN_FILE ${Input} NAME)
-    add_custom_command(
-      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}
-      WORKING_DIRECTORY ${${PVAR_PREFIX}_WORKING_DIR}
-      COMMENT "[PERPLEX][${Name}] Generating re2c input with ${PERPLEX_EXECUTABLE}"
-      )
-
-    if(NOT DEBUGGING_GENERATED_SOURCES)
-      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}
-	WORKING_DIRECTORY ${${PVAR_PREFIX}_WORKING_DIR}
-	COMMENT "[RE2C][${Name}] Building scanner with ${RE2C_EXECUTABLE}"
-	)
-    else(NOT DEBUGGING_GENERATED_SOURCES)
-      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}
-	WORKING_DIRECTORY ${${PVAR_PREFIX}_WORKING_DIR}
-	COMMENT "[RE2C][${Name}] Building scanner with ${RE2C_EXECUTABLE}"
-	)
-    endif(NOT DEBUGGING_GENERATED_SOURCES)
-
-    set(PERPLEX_${Name}_DEFINED TRUE)
-    set(PERPLEX_${Name}_SRC ${${PVAR_PREFIX}_OUT_SRC_FILE})
-    set(PERPLEX_${Name}_HDR ${${PVAR_PREFIX}_OUT_HDR_FILE})
-    set(PERPLEX_${Name}_INCLUDE_DIR ${${PVAR_PREFIX}_WORKING_DIR})
-  endmacro(PERPLEX_TARGET)
-endif(NOT COMMAND PERPLEX_TARGET)
-
-#============================================================
-# ADD_PERPLEX_LEMON_DEPENDENCY (public macro)
-#============================================================
-if(NOT COMMAND ADD_PERPLEX_LEMON_DEPENDENCY)
-  macro(ADD_PERPLEX_LEMON_DEPENDENCY PERPLEXTarget LemonTarget)
-
-    if(NOT PERPLEX_${PERPLEXTarget}_SRC)
-      message(SEND_ERROR "PERPLEX target `${PERPLEXTarget}' does not exists.")
-    endif()
-
-    if(NOT LEMON_${LemonTarget}_HDR)
-      message(SEND_ERROR "Lemon target `${LemonTarget}' does not exists.")
-    endif()
-
-    set_source_files_properties(${PERPLEX_${PERPLEXTarget}_SRC}
-      PROPERTIES OBJECT_DEPENDS ${LEMON_${LemonTarget}_HDR})
-  endmacro(ADD_PERPLEX_LEMON_DEPENDENCY)
-endif(NOT COMMAND ADD_PERPLEX_LEMON_DEPENDENCY)
-
 #============================================================
 # FindPERPLEX.cmake ends here
 

cmake/FindRE2C.cmake

@@ -8,138 +8,3 @@ mark_as_advanced(RE2C_EXECUTABLE)
 
 include(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(RE2C DEFAULT_MSG RE2C_EXECUTABLE)
-
-# Provide a macro to generate custom build rules:
-
-# RE2C_TARGET(Name RE2CInput RE2COutput [COMPILE_FLAGS <string>])
-# which creates a custom command  to generate the <RE2COutput> file from
-# the <RE2CInput> file.  If  COMPILE_FLAGS option is specified, the next
-# parameter is added to the re2c  command line. Name is an alias used to
-# get  details of  this custom  command.
-
-# This module also defines a macro:
-#  ADD_RE2C_LEMON_DEPENDENCY(RE2CTarget LemonTarget)
-# which  adds the  required dependency  between a  scanner and  a parser
-# where  <RE2CTarget>  and <LemonTarget>  are  the  first parameters  of
-# respectively RE2C_TARGET and LEMON_TARGET macros.
-#
-#  ====================================================================
-#  Example:
-#
-#   find_package(LEMON)
-#   find_package(RE2C)
-#
-#   LEMON_TARGET(MyParser parser.y "${CMAKE_CURRENT_BINARY_DIR}/parser.cpp")
-#   RE2C_TARGET(MyScanner scanner.re  "${CMAKE_CURRENT_BINARY_DIR}/scanner.cpp")
-#   ADD_RE2C_LEMON_DEPENDENCY(MyScanner MyParser)
-#
-#   include_directories("${CMAKE_CURRENT_BINARY_DIR}")
-#   add_executable(Foo
-#      Foo.cc
-#      ${LEMON_MyParser_OUTPUTS}
-#      ${RE2C_MyScanner_OUTPUTS}
-#   )
-#  ====================================================================
-#
-#=============================================================================
-# Copyright (c) 2010-2016 United States Government as represented by
-#                the U.S. Army Research Laboratory.
-# Copyright 2009 Kitware, Inc.
-# Copyright 2006 Tristan Carel
-# 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.
-#
-# * The names of the authors may not 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.
-#=============================================================================
-
-#============================================================
-# RE2C_TARGET (public macro)
-#============================================================
-#
-# TODO - rework this macro to make use of CMakeParseArguments, see
-# http://www.cmake.org/pipermail/cmake/2012-July/051309.html
-if(NOT COMMAND RE2C_TARGET)
-  macro(RE2C_TARGET Name Input Output)
-    set(RE2C_TARGET_usage "RE2C_TARGET(<Name> <Input> <Output> [COMPILE_FLAGS <string>]")
-    if(${ARGC} GREATER 3)
-      if(${ARGC} EQUAL 5)
-	if("${ARGV3}" STREQUAL "COMPILE_FLAGS")
-	  set(RE2C_EXECUTABLE_opts  "${ARGV4}")
-	  SEPARATE_ARGUMENTS(RE2C_EXECUTABLE_opts)
-	else()
-	  message(SEND_ERROR ${RE2C_TARGET_usage})
-	endif()
-      else()
-	message(SEND_ERROR ${RE2C_TARGET_usage})
-      endif()
-    endif()
-
-    add_custom_command(OUTPUT ${Output}
-      COMMAND ${RE2C_EXECUTABLE}
-      ARGS ${RE2C_EXECUTABLE_opts} -o${Output} ${Input}
-      DEPENDS ${Input} ${RE2C_EXECUTABLE_TARGET}
-      COMMENT "[RE2C][${Name}] Building scanner with ${RE2C_EXECUTABLE}"
-      WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
-
-    set(RE2C_${Name}_DEFINED TRUE)
-    set(RE2C_${Name}_OUTPUTS ${Output})
-    set(RE2C_${Name}_INPUT ${Input})
-    set(RE2C_${Name}_COMPILE_FLAGS ${RE2C_EXECUTABLE_opts})
-    set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES "${Output}")
-  endmacro(RE2C_TARGET)
-endif(NOT COMMAND RE2C_TARGET)
-#============================================================
-
-#============================================================
-# ADD_RE2C_LEMON_DEPENDENCY (public macro)
-#============================================================
-#
-if(NOT COMMAND ADD_RE2C_LEMON_DEPENDENCY)
-  macro(ADD_RE2C_LEMON_DEPENDENCY RE2CTarget LemonTarget)
-
-    if(NOT RE2C_${RE2CTarget}_OUTPUTS)
-      message(SEND_ERROR "RE2C target `${RE2CTarget}' does not exists.")
-    endif()
-
-    if(NOT LEMON_${LemonTarget}_HDR)
-      message(SEND_ERROR "Lemon target `${LemonTarget}' does not exists.")
-    endif()
-
-    set_source_files_properties(${RE2C_${RE2CTarget}_OUTPUTS}
-      PROPERTIES OBJECT_DEPENDS ${LEMON_${LemonTarget}_HDR})
-  endmacro(ADD_RE2C_LEMON_DEPENDENCY)
-endif(NOT COMMAND ADD_RE2C_LEMON_DEPENDENCY)
-#============================================================
-
-# RE2C_Util.cmake ends here
-
-# Local Variables:
-# tab-width: 8
-# mode: cmake
-# indent-tabs-mode: t
-# End:
-# ex: shiftwidth=2 tabstop=8

cmake/Generated_Source_Utils.cmake

@@ -32,7 +32,7 @@ macro(VERIFY_FILES filelist warn resultvar)
     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")
+      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}")
@@ -59,6 +59,20 @@ macro(WRITE_MD5_SUMS filelist outfile)
   endforeach(fileitem ${filelist})
 endmacro(WRITE_MD5_SUMS)
 
+
+macro(GET_GENERATOR_EXEC_VERSIONS)
+  # Read lemon version
+  execute_process(COMMAND ${LEMON_EXECUTABLE} -x OUTPUT_VARIABLE lemon_version)
+  string(REPLACE "Lemon version " "" lemon_version "${lemon_version}")
+  string(STRIP "${lemon_version}" lemon_version)
+  # Read re2c version
+  execute_process(COMMAND ${RE2C_EXECUTABLE} -V OUTPUT_VARIABLE re2c_version)
+  string(STRIP "${re2c_version}" re2c_version)
+  # Read perplex version
+  execute_process(COMMAND ${PERPLEX_EXECUTABLE} -v OUTPUT_VARIABLE perplex_version)
+  string(STRIP "${perplex_version}" perplex_version)
+endmacro(GET_GENERATOR_EXEC_VERSIONS)
+
 # Local Variables:
 # tab-width: 8
 # mode: cmake

cmake/LEMON_Util.cmake

@@ -0,0 +1,146 @@
+# Defines the macro
+#  LEMON_TARGET(<Name> <LemonInput> <LemonSource> <LemonHeader>
+#		[<ArgString>])
+# which will create a custom rule to generate a parser. <LemonInput> is
+# the path to a lemon file. <LemonSource> is the desired name for the
+# generated source file. <LemonHeader> is the desired name for the
+# generated header which contains the token list. Anything in the optional
+# <ArgString> parameter is appended to the lemon command line.
+#
+#  ====================================================================
+#  Example:
+#
+#   find_package(LEMON)
+#   LEMON_TARGET(MyParser parser.y parser.c parser.h)
+#   add_executable(Foo main.cpp ${LEMON_MyParser_OUTPUTS})
+#  ====================================================================
+#
+#=============================================================================
+#
+# Originally based off of FindBISON.cmake from Kitware's CMake distribution
+#
+# Copyright (c) 2010-2012 United States Government as represented by
+#                the U.S. Army Research Laboratory.
+# Copyright 2009 Kitware, Inc.
+# Copyright 2006 Tristan Carel
+# 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.
+# 
+# * The names of the authors may not 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.
+#=============================================================================
+
+#============================================================
+# LEMON_TARGET (public macro)
+#============================================================
+#
+macro(LEMON_TARGET Name LemonInput LemonSource LemonHeader)
+  if(NOT ${ARGC} EQUAL 4 AND NOT ${ARGC} EQUAL 5)
+    message(SEND_ERROR "Usage")
+  else()
+    get_filename_component(LemonInputFull ${LemonInput}  ABSOLUTE)
+    get_filename_component(LemonSourceFull ${LemonSource} ABSOLUTE)
+    get_filename_component(LemonHeaderFull ${LemonHeader} ABSOLUTE)
+
+    if(NOT ${LemonInput} STREQUAL ${LemonInputFull})
+      set(LEMON_${Name}_INPUT "${CMAKE_CURRENT_BINARY_DIR}/${LemonInput}")
+    else(NOT ${LemonInput} STREQUAL ${LemonInputFull})
+      set(LEMON_${Name}_INPUT "${LemonInput}")
+    endif(NOT ${LemonInput} STREQUAL ${LemonInputFull})
+
+    if(NOT ${LemonSource} STREQUAL ${LemonSourceFull})
+      set(LEMON_${Name}_OUTPUT_SOURCE "${CMAKE_CURRENT_BINARY_DIR}/${LemonSource}")
+    else(NOT ${LemonSource} STREQUAL ${LemonSourceFull})
+      set(LEMON_${Name}_OUTPUT_SOURCE "${LemonSource}")
+    endif(NOT ${LemonSource} STREQUAL ${LemonSourceFull})
+
+    if(NOT ${LemonHeader} STREQUAL ${LemonHeaderFull})
+      set(LEMON_${Name}_OUTPUT_HEADER "${CMAKE_CURRENT_BINARY_DIR}/${LemonHeader}")
+    else(NOT ${LemonHeader} STREQUAL ${LemonHeaderFull})
+      set(LEMON_${Name}_OUTPUT_HEADER "${LemonHeader}")
+    endif(NOT ${LemonHeader} STREQUAL ${LemonHeaderFull})
+
+    set(LEMON_${Name}_EXTRA_ARGS    "${ARGV4}")
+
+    # get input name minus path
+    get_filename_component(INPUT_NAME "${LemonInput}" NAME)
+    set(LEMON_BIN_INPUT ${CMAKE_CURRENT_BINARY_DIR}/${INPUT_NAME})
+
+    # names of lemon output files will be based on the name of the input file
+    string(REGEX REPLACE "^(.*)(\\.[^.]*)$" "\\1.c"   LEMON_GEN_SOURCE "${INPUT_NAME}")
+    string(REGEX REPLACE "^(.*)(\\.[^.]*)$" "\\1.h"   LEMON_GEN_HEADER "${INPUT_NAME}")
+    string(REGEX REPLACE "^(.*)(\\.[^.]*)$" "\\1.out" LEMON_GEN_OUT    "${INPUT_NAME}")
+
+    # copy input to bin directory and run lemon
+    add_custom_command(
+      OUTPUT ${LEMON_GEN_OUT} ${LEMON_GEN_SOURCE} ${LEMON_GEN_HEADER}
+      COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/${LemonInput} ${LEMON_BIN_INPUT}
+      COMMAND ${LEMON_EXECUTABLE} ${INPUT_NAME} ${LEMON_${Name}_EXTRA_ARGS}
+      DEPENDS ${LemonInput} ${LEMON_TEMPLATE} ${LEMON_EXECUTABLE_TARGET}
+      COMMENT "[LEMON][${Name}] Building parser with ${LEMON_EXECUTABLE}"
+      )
+
+    # rename generated outputs
+    if(NOT "${LemonSource}" STREQUAL "${LEMON_GEN_SOURCE}")
+      add_custom_command(
+	OUTPUT ${LemonSource} 
+	COMMAND ${CMAKE_COMMAND} -E copy ${LEMON_GEN_SOURCE} ${LemonSource}
+	DEPENDS ${LemonInput} ${LEMON_EXECUTABLE_TARGET} ${LEMON_GEN_SOURCE} 
+	)
+      set(LEMON_${Name}_OUTPUTS ${LemonSource} ${LEMON_${Name}_OUTPUTS})
+    endif(NOT "${LemonSource}" STREQUAL "${LEMON_GEN_SOURCE}")
+    if(NOT "${LemonHeader}" STREQUAL "${LEMON_GEN_HEADER}")
+      add_custom_command(
+	OUTPUT ${LemonHeader}
+	COMMAND ${CMAKE_COMMAND} -E copy ${LEMON_GEN_HEADER} ${LemonHeader}
+	DEPENDS ${LemonInput} ${LEMON_EXECUTABLE_TARGET} ${LEMON_GEN_HEADER} 
+	)
+      set(LEMON_${Name}_OUTPUTS ${LemonHeader} ${LEMON_${Name}_OUTPUTS})
+    endif(NOT "${LemonHeader}" STREQUAL "${LEMON_GEN_HEADER}")
+
+    set(LEMON_${Name}_OUTPUTS ${LEMON_GEN_OUT} ${LemonSource} ${LemonHeader})
+
+    # make sure we clean up generated output and copied input
+    if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
+      set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES "${LEMON_${Name}_OUTPUTS}") 
+    else("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
+      set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES "${LEMON_${Name}_OUTPUTS};${LEMON_BIN_INPUT}") 
+    endif("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
+
+    # macro ran successfully
+    set(LEMON_${Name}_DEFINED TRUE)
+  endif(NOT ${ARGC} EQUAL 4 AND NOT ${ARGC} EQUAL 5)
+endmacro(LEMON_TARGET)
+#
+#============================================================
+# LEMON_Utils.cmake ends here
+
+# Local Variables:
+# tab-width: 8
+# mode: cmake
+# indent-tabs-mode: t
+# End:
+# ex: shiftwidth=2 tabstop=8

cmake/PERPLEX_Util.cmake

@@ -0,0 +1,134 @@
+# Defines two macros - PERPLEX_TARGET, which takes perplex inputs and
+# runs both perplex and re2c to generate C source code/headers, and 
+# ADD_PERPLEX_LEMON_DEPENDENCY which is used to set up dependencies between
+# scanner and parser targets when necessary.
+#
+# #====================================================================
+#  Example:
+#
+#   find_package(LEMON)
+#   find_package(RE2C)
+#   find_package(PERPLEX)
+#
+#   LEMON_TARGET(MyParser parser.y ${CMAKE_CURRENT_BINARY_DIR}/parser.cpp
+#   PERPLEX_TARGET(MyScanner scanner.re  ${CMAKE_CURRENT_BINARY_DIR}/scanner.cpp ${CMAKE_CURRENT_BINARY_DIR}/scanner_header.hpp)
+#   ADD_PERPLEX_LEMON_DEPENDENCY(MyScanner MyParser)
+#
+#   include_directories(${CMAKE_CURRENT_BINARY_DIR})
+#   add_executable(Foo
+#      Foo.cc
+#      ${LEMON_MyParser_OUTPUTS}
+#      ${PERPLEX_MyScanner_OUTPUTS}
+#   )
+#  ====================================================================
+# 
+#=============================================================================
+#
+# Originally based off of FindBISON.cmake from Kitware's CMake distribution
+#
+# Copyright (c) 2010-2012 United States Government as represented by
+#                the U.S. Army Research Laboratory.
+# Copyright 2009 Kitware, Inc.
+# Copyright 2006 Tristan Carel
+# 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.
+# 
+# * The names of the authors may not 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.
+#=============================================================================
+
+#============================================================
+# PERPLEX_TARGET (public macro)
+#============================================================
+macro(PERPLEX_TARGET Name Input OutputSrc OutputHeader)
+  if(${ARGC} GREATER 4)
+    set(Template ${ARGV4})
+  else(${ARGC} GREATER 4)
+    if(PERPLEX_TEMPLATE)
+      set(Template ${PERPLEX_TEMPLATE})
+    else(PERPLEX_TEMPLATE)
+      message(FATAL_ERROR "\nNo Perplex template file specifed - please specify the file using the PERPLEX_TEMPLATE variable:\ncmake .. -DPERPLEX_TEMPLATE=/path/to/template_file.c\n")
+    endif(PERPLEX_TEMPLATE)
+  endif(${ARGC} GREATER 4)
+
+  get_filename_component(OutputName ${OutputSrc} NAME)
+  set(re2c_src "${CMAKE_CURRENT_BINARY_DIR}/${OutputName}.re")
+
+  add_custom_command(
+    OUTPUT ${re2c_src} ${OutputHeader}
+    COMMAND ${PERPLEX_EXECUTABLE} -c -o ${re2c_src} -i ${OutputHeader} -t ${Template} ${Input}
+    DEPENDS ${Input} ${Template} ${PERPLEX_EXECUTABLE_TARGET} ${RE2C_EXECUTABLE_TARGET}
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+    COMMENT "[PERPLEX][${Name}] Generating re2c input with ${PERPLEX_EXECUTABLE}"
+    )
+  if(NOT DEBUGGING_GENERATED_SOURCES)
+    add_custom_command(
+      OUTPUT ${OutputSrc}
+      COMMAND ${RE2C_EXECUTABLE} --no-debug-info --no-generation-date -c -o ${OutputSrc} ${re2c_src}
+      DEPENDS ${Input} ${re2c_src} ${OutputHeader} ${PERPLEX_EXECUTABLE_TARGET} ${RE2C_EXECUTABLE_TARGET}
+      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+      COMMENT "[RE2C][${Name}] Building scanner with ${RE2C_EXECUTABLE}"
+      )
+  else(NOT DEBUGGING_GENERATED_SOURCES)
+    add_custom_command(
+      OUTPUT ${OutputSrc}
+      COMMAND ${RE2C_EXECUTABLE} --no-generation-date -c -o ${OutputSrc} ${re2c_src}
+      DEPENDS ${Input} ${re2c_src} ${OutputHeader} ${PERPLEX_EXECUTABLE_TARGET} ${RE2C_EXECUTABLE_TARGET}
+      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+      COMMENT "[RE2C][${Name}] Building scanner with ${RE2C_EXECUTABLE}"
+      )
+  endif(NOT DEBUGGING_GENERATED_SOURCES)
+  set(PERPLEX_${Name}_DEFINED TRUE)
+  set(PERPLEX_${Name}_OUTPUTS ${OutputSrc})
+  set(PERPLEX_${Name}_INPUT ${Input})
+endmacro(PERPLEX_TARGET)
+
+#============================================================
+# ADD_PERPLEX_LEMON_DEPENDENCY (public macro)
+#============================================================
+macro(ADD_PERPLEX_LEMON_DEPENDENCY PERPLEXTarget LemonTarget)
+
+  if(NOT PERPLEX_${PERPLEXTarget}_OUTPUTS)
+    message(SEND_ERROR "PERPLEX target `${PERPLEXTarget}' does not exists.")
+  endif()
+
+  if(NOT LEMON_${LemonTarget}_OUTPUT_HEADER)
+    message(SEND_ERROR "Lemon target `${LemonTarget}' does not exists.")
+  endif()
+
+  set_source_files_properties(${PERPLEX_${PERPLEXTarget}_OUTPUTS}
+    PROPERTIES OBJECT_DEPENDS ${LEMON_${LemonTarget}_OUTPUT_HEADER})
+endmacro(ADD_PERPLEX_LEMON_DEPENDENCY)
+
+#============================================================
+# PERPLEX_Utils.cmake ends here
+
+# Local Variables:
+# tab-width: 8
+# mode: cmake
+# indent-tabs-mode: t
+# End:
+# ex: shiftwidth=2 tabstop=8

cmake/SC_Build_opts.cmake

@@ -1,174 +0,0 @@
-# BIN and LIB directories
-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)
-
-# testing and compilation options, build output dirs, install dirs, etc
-# included by root CMakeLists
-
-if(NOT DEFINED INCLUDE_INSTALL_DIR)
-  set(INCLUDE_INSTALL_DIR include)
-endif(NOT DEFINED INCLUDE_INSTALL_DIR)
-
-if(NOT DEFINED LIB_INSTALL_DIR)
-  set(LIB_INSTALL_DIR lib)
-endif(NOT DEFINED LIB_INSTALL_DIR)
-
-if(NOT DEFINED BIN_INSTALL_DIR)
-  set(BIN_INSTALL_DIR bin)
-endif(NOT DEFINED BIN_INSTALL_DIR)
-
-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)
-
-# Define helper macro OPTION_WITH_DEFAULT
-macro(OPTION_WITH_DEFAULT OPTION_NAME OPTION_STRING OPTION_DEFAULT)
-  if(NOT DEFINED ${OPTION_NAME})
-    set(${OPTION_NAME} ${OPTION_DEFAULT})
-  endif(NOT DEFINED ${OPTION_NAME})
-  option(${OPTION_NAME} "${OPTION_STRING}" ${${OPTION_NAME}})
-endmacro(OPTION_WITH_DEFAULT OPTION_NAME OPTION_STRING OPTION_DEFAULT)
-
-# build shared libs by default
-OPTION_WITH_DEFAULT(SC_BUILD_SHARED_LIBS "Build shared libs" ON)
-
-# don't build static libs by default
-OPTION_WITH_DEFAULT(SC_BUILD_STATIC_LIBS "Build static libs" OFF)
-
-OPTION_WITH_DEFAULT(SC_PYTHON_GENERATOR "Compile exp2python" ON)
-OPTION_WITH_DEFAULT(SC_CPP_GENERATOR "Compile exp2cxx" ON)
-
-OPTION_WITH_DEFAULT(SC_MEMMGR_ENABLE_CHECKS "Enable sc_memmgr's memory leak detection" OFF)
-OPTION_WITH_DEFAULT(SC_TRACE_FPRINTF "Enable extra comments in generated code so the code's source in exp2cxx may be located" OFF)
-
-# Should we use C++11?
-OPTION_WITH_DEFAULT(SC_ENABLE_CXX11 "Build with C++ 11 features" ON)
-
-# Get version from git
-OPTION_WITH_DEFAULT(SC_GIT_VERSION "Build using version from git" ON)
-
-option(SC_BUILD_EXPRESS_ONLY "Only build express parser." OFF)
-mark_as_advanced(SC_BUILD_EXPRESS_ONLY)
-
-#---------------------------------------------------------------------
-# Coverage option
-OPTION_WITH_DEFAULT(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)
-
-#---------------------------------------------------------------------
-# Testing option
-OPTION_WITH_DEFAULT(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)
-
-#---------------------------------------------------------------------
-# Executable install option
-OPTION_WITH_DEFAULT(SC_SKIP_EXEC_INSTALL "Skip installing executables" OFF)
-if(SC_SKIP_EXEC_INSTALL)
-  set(SC_EXEC_NOINSTALL "NO_INSTALL")
-endif(SC_SKIP_EXEC_INSTALL)
-
-#---------------------------------------------------------------------
-# 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
-
-# use, i.e. don't skip the full RPATH for the build tree
-set(CMAKE_SKIP_BUILD_RPATH  FALSE)
-
-# when building, don't use the install RPATH already
-# (but later on when installing)
-set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
-
-# the RPATH/INSTALL_NAME_DIR to be used when installing
-if (NOT APPLE)
-  set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib:\$ORIGIN/../lib")
-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
-set(CMAKE_INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
-
-# add the automatically determined parts of the RPATH which point to
-# directories outside the build tree to the install RPATH
-set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-
-# When this is a subbuild, assume that the parent project controls all of the following
-#======================================================================================
-if(NOT SC_IS_SUBBUILD)
-
-  # Output directories. In a separate file so it can be used by the schema scanner CMake as well.
-  include(${SC_CMAKE_DIR}/SC_Outdirs.cmake)
-
-  #-----------------------------------------------------------------------------
-  # Configure install locations. Only do this if CMAKE_INSTALL_PREFIX hasn't
-  # been set already, to try and allow parent builds (if any) some control.
-  #
-  # Need a good Debug location for Windows.
-  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)
-
-  #-----------------------------------------------------------------------------
-  # 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 <scl-dev@googlegroups.com>")
-  include(CPack)
-
-  #-----------------------------------------------------------------------------
-  # Uninstall target
-  # 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
-# indent-tabs-mode: t
-# End:
-# ex: shiftwidth=2 tabstop=8
-

cmake/SC_CXX_schema_macros.cmake

@@ -1,115 +0,0 @@
-# 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} "${RELATIVE_PATH_COMPONENT}/src/test/p21read/p21read.cc" "${PROJECT_NAME};stepdai;stepcore;stepeditor;steputils;base" "TESTABLE")
-  #add_dependencies(p21read_${PROJECT_NAME} version_string)
-  if(NOT WIN32)
-    SC_ADDEXEC(lazy_${PROJECT_NAME} "${RELATIVE_PATH_COMPONENT}/src/cllazyfile/lazy_test.cc" "${PROJECT_NAME};steplazyfile;stepdai;stepcore;stepeditor;steputils;base" "TESTABLE")
-    #add_dependencies(lazy_${PROJECT_NAME} version_string)
-  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} "${src}" "${PROJECT_NAME};stepdai;stepcore;stepeditor;steputils;base" "TESTABLE")
-    add_dependencies(${name}_${PROJECT_NAME} version_string)
-    #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
-  SC_ADDLIB(${PROJECT_NAME} "${sourceFiles}" "stepdai;stepcore;stepeditor;steputils;base" "TESTABLE")
-  add_dependencies(${PROJECT_NAME} generate_cpp_${PROJECT_NAME})
-
-  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
-# mode: cmake
-# indent-tabs-mode: t
-# End:
-# ex: shiftwidth=2 tabstop=8
-

cmake/SC_Config_Headers.cmake

@@ -1,133 +0,0 @@
-# create sc_cf.h and sc_version_string.h
-
-# 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}")
-
-include(CheckLibraryExists)
-include(CheckIncludeFile)
-include(CheckFunctionExists)
-include(CheckTypeSize)
-include(CMakePushCheckState)
-include(CheckCXXSourceRuns)
-
-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)
-
-CHECK_FUNCTION_EXISTS(abs HAVE_ABS)
-CHECK_FUNCTION_EXISTS(memcpy HAVE_MEMCPY)
-CHECK_FUNCTION_EXISTS(memmove HAVE_MEMMOVE)
-CHECK_FUNCTION_EXISTS(getopt HAVE_GETOPT)
-
-CHECK_TYPE_SIZE("ssize_t" SSIZE_T)
-
-if(SC_ENABLE_CXX11)
-  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++11" )
-  else( UNIX )
-    # vars probably need set for embarcadero, etc
-  endif( UNIX )
-  CHECK_CXX_SOURCE_RUNS( "${TEST_STD_THREAD}" HAVE_STD_THREAD )   #quotes are *required*!
-  cmake_pop_check_state()
-
-  set( TEST_STD_CHRONO "
-#include <iostream>
-#include <chrono>
-int main() {
-std::chrono::seconds sec(1);
-std::cout << \"1s is \"<< std::chrono::duration_cast<std::chrono::milliseconds>(sec).count() << \" ms\" << std::endl;
-}
-  " )
-  cmake_push_check_state()
-  if( UNIX )
-    set( CMAKE_REQUIRED_FLAGS "-std=c++11" )
-  else( UNIX )
-    # vars probably need set for embarcadero, etc
-  endif( UNIX )
-  CHECK_CXX_SOURCE_RUNS( "${TEST_STD_CHRONO}" HAVE_STD_CHRONO )   #quotes are *required*!
-  cmake_pop_check_state()
-
-  set( TEST_NULLPTR "
-#include <cstddef>
-std::nullptr_t f() {return nullptr;}
-int main() {return !(f() == f());}
-  " )
-  cmake_push_check_state()
-  if( UNIX )
-    set( CMAKE_REQUIRED_FLAGS "-std=c++11" )
-  else( UNIX )
-    # vars probably need set for embarcadero, etc
-  endif( UNIX )
-  CHECK_CXX_SOURCE_RUNS( "${TEST_NULLPTR}" HAVE_NULLPTR )   #quotes are *required*!
-  cmake_pop_check_state()
-endif(SC_ENABLE_CXX11)
-
-# 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)
-
-# ------------------------
-
-# 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.
-if(SC_GIT_VERSION)
-  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
-    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
-else(SC_GIT_VERSION)
-  set(VER_HDR "
-  #ifndef SC_VERSION_STRING
-  #define SC_VERSION_STRING
-  static char sc_version[512] = {\"${SC_VERSION}\"};
-  #endif"
-  )
-  file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${INCLUDE_INSTALL_DIR}/sc_version_string.h "${VER_HDR}")
-endif(SC_GIT_VERSION)
-set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${INCLUDE_INSTALL_DIR}/sc_version_string.h
-  PROPERTIES GENERATED TRUE
-  HEADER_FILE_ONLY TRUE )
-
-# Local Variables:
-# tab-width: 8
-# mode: cmake
-# indent-tabs-mode: t
-# End:
-# ex: shiftwidth=2 tabstop=8
-

cmake/SC_Locale.cmake

@@ -1,22 +0,0 @@
-# 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)
-
-# Local Variables:
-# tab-width: 8
-# mode: cmake
-# indent-tabs-mode: t
-# End:
-# ex: shiftwidth=2 tabstop=8
-

cmake/SC_Outdirs.cmake

@@ -1,30 +0,0 @@
-# in its own file so that it can be used by the schema scanner as well
-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)
-foreach(CFG_TYPE ${CMAKE_CONFIGURATION_TYPES})
-  string(TOUPPER "${CFG_TYPE}" CFG_TYPE)
-  if(NOT "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 "CMAKE_LIBRARY_OUTPUT_DIRECTORY_${CFG_TYPE}")
-  if(NOT "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 "CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${CFG_TYPE}")
-  if(NOT "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 "CMAKE_RUNTIME_OUTPUT_DIRECTORY_${CFG_TYPE}")
-endforeach()
-
-# Local Variables:
-# tab-width: 8
-# mode: cmake
-# indent-tabs-mode: t
-# End:
-# ex: shiftwidth=2 tabstop=8
-

cmake/SC_Paths.cmake

@@ -1,93 +0,0 @@
-macro(REVERSE_PATH in_path out_path drive_path)
-  set(reversed_path)
-  set(tmp_subpath "${in_path}")
-  while(NOT "${tmp_subpath}" STREQUAL "" AND NOT "${tmp_subpath}" STREQUAL "/")
-      get_filename_component(piece "${tmp_subpath}" NAME)
-      get_filename_component(tmp_subpath "${tmp_subpath}" PATH)
-      if(piece)
-	set(reversed_path "${reversed_path}/${piece}")
-      else(piece)
-	set(${drive_path} ${tmp_subpath})
-	set(tmp_subpath)
-      endif(piece)
-  endwhile(NOT "${tmp_subpath}" STREQUAL "" AND NOT "${tmp_subpath}" STREQUAL "/")
-  set("${out_path}" "${reversed_path}")
-endmacro(REVERSE_PATH)
-
-macro(GET_COMMON_ROOT_PATH dir1 dir2 common_subpath)
-  get_filename_component(testpath "${dir1}" REALPATH)
-  set(dir1_rev)
-  set(dir2_rev)
-  REVERSE_PATH("${dir1}" dir1_rev drive_name_1)
-  REVERSE_PATH("${dir2}" dir2_rev drive_name_2)
-  if("${drive_name_1}" STREQUAL "${drive_name_2}")
-    set(component_same 1)
-    set(${common_subpath})
-    while(component_same)
-      get_filename_component(piece1 "${dir1_rev}" NAME)
-      get_filename_component(dir1_rev "${dir1_rev}" PATH)
-      get_filename_component(piece2 "${dir2_rev}" NAME)
-      get_filename_component(dir2_rev "${dir2_rev}" PATH)
-      if("${piece1}" STREQUAL "${piece2}")
-	set(${common_subpath} "${${common_subpath}}/${piece1}")
-      else("${piece1}" STREQUAL "${piece2}")
-	set(component_same 0)
-      endif("${piece1}" STREQUAL "${piece2}")
-    endwhile(component_same)
-    if(drive_name_1)
-      set(${common_subpath} "${drive_name_1}${${common_subpath}}")
-      string(REPLACE "//" "/" ${common_subpath} "${${common_subpath}}")
-    endif(drive_name_1)
-  endif("${drive_name_1}" STREQUAL "${drive_name_2}")
-endmacro(GET_COMMON_ROOT_PATH)
-
-
-macro(RELATIVE_PATH_TO_TOPLEVEL current_dir rel_path)
-  set(common_root_path)
-  GET_COMMON_ROOT_PATH("${SC_SOURCE_DIR}" "${current_dir}" common_root_path)
-  string(REPLACE "${common_root_path}" "" subpath "${current_dir}")
-  string(REPLACE "${common_root_path}" "" needed_src_path "${SC_SOURCE_DIR}")
-  string(REGEX REPLACE "^/" "" subpath "${subpath}")
-  string(REGEX REPLACE "^/" "" needed_src_path "${needed_src_path}")
-  string(LENGTH "${subpath}" PATH_LENGTH)
-  if(PATH_LENGTH GREATER 0)
-    set(${rel_path} "..")
-    get_filename_component(subpath "${subpath}" PATH)
-    string(LENGTH "${subpath}" PATH_LENGTH)
-    while(PATH_LENGTH GREATER 0)
-      set(${rel_path} "${${rel_path}}/..")
-      get_filename_component(subpath "${subpath}" PATH)
-      string(LENGTH "${subpath}" PATH_LENGTH)
-    endwhile(PATH_LENGTH GREATER 0)
-  endif(PATH_LENGTH GREATER 0)
-  set(${rel_path} "${${rel_path}}/${needed_src_path}")
-  string(REPLACE "//" "/" ${rel_path} "${${rel_path}}")
-endmacro(RELATIVE_PATH_TO_TOPLEVEL current_dir rel_path)
-
-macro(LOCATE_SCHEMA SCHEMA_FILE _res_var)
-  if(EXISTS "${CMAKE_BINARY_DIR}/${SCHEMA_FILE}")  #is it a path relative to build dir?
-    set(${_res_var} "${CMAKE_BINARY_DIR}/${SCHEMA_FILE}")
-  elseif(EXISTS "${SC_SOURCE_DIR}/data/${SCHEMA_FILE}")  # path relative to STEPcode/data?
-    set(${_res_var} "${SC_SOURCE_DIR}/data/${SCHEMA_FILE}")
-  elseif(EXISTS ${SCHEMA_FILE}) # already an absolute path
-    set(${_res_var} ${SCHEMA_FILE})
-  else()
-    message(FATAL_ERROR "Cannot find ${CMAKE_BINARY_DIR}/${SCHEMA_FILE} or ${SC_SOURCE_DIR}/data/${SCHEMA_FILE}/*.exp or ${SCHEMA_FILE}")
-  endif()
-
-  if(IS_DIRECTORY ${${_res_var}}) #if it is a dir, look for one .exp file inside
-    file(GLOB ${_res_var} ${${_res_var}}/*.exp)
-  endif()
-
-  if(NOT EXISTS ${${_res_var}})
-    message(FATAL_ERROR "Expected one express file. Found '${${_res_var}}' instead.")
-  endif()
-endmacro(LOCATE_SCHEMA SCHEMA_FILE _res_var)
-
-# Local Variables:
-# tab-width: 8
-# mode: cmake
-# indent-tabs-mode: t
-# End:
-# ex: shiftwidth=2 tabstop=8
-

cmake/SC_Regenerate.cmake

@@ -1,62 +0,0 @@
-# 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 DEFINED SC_GENERATE_LEXER_PARSER)
-  set(SC_GENERATE_LEXER_PARSER "AUTO" CACHE STRING "Use Perplex, RE2C and Lemon to generate C source code.")
-  set(_verbosity "QUIET")
-else(NOT DEFINED SC_GENERATE_LEXER_PARSER)
-  string(TOUPPER "${SC_GENERATE_LEXER_PARSER}" SC_GENERATE_LEXER_PARSER)
-endif(NOT DEFINED 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 SC_GENERATE_LEXER_PARSER - 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")
-
-# 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 ${_verbosity})
-  find_package(RE2C ${_verbosity})
-  find_package(PERPLEX ${_verbosity})
-  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}")
-
-    set(SC_GENERATE_LP_SOURCES 1)
-    message(".. Found perplex, re2c, and lemon - can regenerate lexer/parser if necessary")
-  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")
-
-# Local Variables:
-# tab-width: 8
-# mode: cmake
-# indent-tabs-mode: t
-# End:
-# ex: shiftwidth=2 tabstop=8
-

cmake/SC_Run_exp2cxx.cmake

@@ -1,25 +0,0 @@
-
-# if oneshot is true, don't run exp2cxx if source files exist. if schema.cc exists, assume others do
-if(ONESHOT AND EXISTS "${SDIR}/schema.cc")
-  message("WARNING: SC_GENERATE_CXX_ONESHOT is enabled. If generated code has been modified, it will NOT be rewritten!")
-  message("This is ONLY for debugging STEPcode internals!")
-else()
-  execute_process(COMMAND ${EXE} ${EXP}
-    WORKING_DIRECTORY ${SDIR}
-    RESULT_VARIABLE _res
-    OUTPUT_FILE exp2cxx_stdout.txt
-    ERROR_FILE exp2cxx_stderr.txt
-   )
-  if(NOT "${_res}" STREQUAL "0")
-    message(FATAL_ERROR "${EXE} reported an error for ${EXP}.\nsee exp2cxx_stdout.txt and exp2cxx_stderr.txt in ${SDIR} for details.")
-  endif(NOT "${_res}" STREQUAL "0")
-  # TODO count number of lines in stdout/stderr and tell user?
-endif()
-
-# Local Variables:
-# tab-width: 8
-# mode: cmake
-# indent-tabs-mode: t
-# End:
-# ex: shiftwidth=2 tabstop=8
-

cmake/SC_Targets.cmake

@@ -1,155 +0,0 @@
-
-# set compile definitions for dll exports on windows
-macro(DEFINE_DLL_EXPORTS libname)
-  if(MSVC OR BORLAND)
-    if(${libname} MATCHES "sdai_.*")
-      set(export "SC_SCHEMA_DLL_EXPORTS")
-    else()
-      string(REGEX REPLACE "lib" "" shortname "${libname}")
-      string(REGEX REPLACE "step" "" LOWERCORE "${shortname}")
-      string(TOUPPER ${LOWERCORE} UPPER_CORE)
-      set(export "SC_${UPPER_CORE}_DLL_EXPORTS")
-    endif()
-    set_property(TARGET ${libname} APPEND PROPERTY COMPILE_DEFINITIONS "${export}")
-  endif(MSVC OR BORLAND)
-endmacro(DEFINE_DLL_EXPORTS libname)
-
-# set compile definitions for dll imports on windows
-macro(DEFINE_DLL_IMPORTS tgt libs)
-  if(MSVC OR BORLAND)
-    set(imports "")
-    foreach(lib ${libs})
-      string(REGEX REPLACE "lib" "" shortname "${lib}")
-      string(REGEX REPLACE "step" "" LOWERCORE "${shortname}")
-      string(TOUPPER ${LOWERCORE} UPPER_CORE)
-      list(APPEND imports "SC_${UPPER_CORE}_DLL_IMPORTS")
-    endforeach(lib ${libs})
-    set_property(TARGET ${tgt} APPEND PROPERTY COMPILE_DEFINITIONS "${imports}")
-  endif(MSVC OR BORLAND)
-endmacro(DEFINE_DLL_IMPORTS tgt libs)
-
-#SC_ADDEXEC(execname "source files" "linked libs" ["TESTABLE"] ["NO_INSTALL"])
-macro(SC_ADDEXEC execname srcslist libslist)
-
-  string(TOUPPER "${execname}" EXECNAME_UPPER)
-  if(${ARGC} GREATER 3)
-    CMAKE_PARSE_ARGUMENTS(${EXECNAME_UPPER} "NO_INSTALL;TESTABLE" "" "" ${ARGN})
-  endif(${ARGC} GREATER 3)
-
-  add_executable(${execname} ${srcslist})
-  target_link_libraries(${execname} ${libslist})
-  DEFINE_DLL_IMPORTS(${execname} "${libslist}")  #add import definitions for all libs that the executable is linked to
-  if(NOT ${EXECNAME_UPPER}_NO_INSTALL AND NOT ${EXECNAME_UPPER}_TESTABLE)
-    install(TARGETS ${execname}
-      RUNTIME DESTINATION ${BIN_DIR}
-      LIBRARY DESTINATION ${LIB_DIR}
-      ARCHIVE DESTINATION ${LIB_DIR}
-      )
-  endif(NOT ${EXECNAME_UPPER}_NO_INSTALL AND NOT ${EXECNAME_UPPER}_TESTABLE)
-  if(NOT SC_ENABLE_TESTING AND ${EXECNAME_UPPER}_TESTABLE)
-    set_target_properties( ${execname} PROPERTIES EXCLUDE_FROM_ALL ON )
-  endif(NOT SC_ENABLE_TESTING AND ${EXECNAME_UPPER}_TESTABLE)
-
-  # Enable extra compiler flags if local executables and/or global options dictate
-  set(LOCAL_COMPILE_FLAGS "")
-  foreach(extraarg ${ARGN})
-    if(${extraarg} MATCHES "STRICT" AND SC-ENABLE_STRICT)
-      set(LOCAL_COMPILE_FLAGS "${LOCAL_COMPILE_FLAGS} ${STRICT_FLAGS}")
-    endif(${extraarg} MATCHES "STRICT" AND SC-ENABLE_STRICT)
-  endforeach(extraarg ${ARGN})
-  if(LOCAL_COMPILE_FLAGS)
-    set_target_properties(${execname} PROPERTIES COMPILE_FLAGS ${LOCAL_COMPILE_FLAGS})
-  endif(LOCAL_COMPILE_FLAGS)
-
-endmacro(SC_ADDEXEC execname srcslist libslist)
-
-#SC_ADDLIB(libname "source files" "linked libs" ["TESTABLE"] ["NO_INSTALL"] ["SO_SRCS ..."] ["STATIC_SRCS ..."])
-macro(SC_ADDLIB libname srcslist libslist)
-
-  string(TOUPPER "${libname}" LIBNAME_UPPER)
-  if(${ARGC} GREATER 3)
-    CMAKE_PARSE_ARGUMENTS(${LIBNAME_UPPER} "NO_INSTALL;TESTABLE" "" "SO_SRCS;STATIC_SRCS" ${ARGN})
-  endif(${ARGC} GREATER 3)
-
-  string(REGEX REPLACE "-framework;" "-framework " libslist "${libslist1}")
-  if(SC_BUILD_SHARED_LIBS)
-    add_library(${libname} SHARED ${srcslist} ${${LIBNAME_UPPER}_SO_SRCS})
-    DEFINE_DLL_EXPORTS(${libname})
-    if(NOT "${libs}" MATCHES "NONE")
-      target_link_libraries(${libname} ${libslist})
-      DEFINE_DLL_IMPORTS(${libname} "${libslist}")
-    endif(NOT "${libs}" MATCHES "NONE")
-    set_target_properties(${libname} PROPERTIES VERSION ${SC_ABI_VERSION} SOVERSION ${SC_ABI_SOVERSION})
-    if(NOT ${LIBNAME_UPPER}_NO_INSTALL AND NOT ${LIBNAME_UPPER}_TESTABLE)
-      install(TARGETS ${libname}
-	RUNTIME DESTINATION ${BIN_DIR}
-	LIBRARY DESTINATION ${LIB_DIR}
-	ARCHIVE DESTINATION ${LIB_DIR}
-	)
-    endif(NOT ${LIBNAME_UPPER}_NO_INSTALL AND NOT ${LIBNAME_UPPER}_TESTABLE)
-    if(NOT SC_ENABLE_TESTING AND ${LIBNAME_UPPER}_TESTABLE)
-      set_target_properties( ${libname} PROPERTIES EXCLUDE_FROM_ALL ON )
-    endif(NOT SC_ENABLE_TESTING AND ${LIBNAME_UPPER}_TESTABLE)
-    if(APPLE)
-      set_target_properties(${libname} PROPERTIES LINK_FLAGS "-flat_namespace -undefined suppress")
-    endif(APPLE)
-  endif(SC_BUILD_SHARED_LIBS)
-  if(SC_BUILD_STATIC_LIBS)
-    if(NOT SC_BUILD_SHARED_LIBS)
-      set(staticlibname "${libname}")
-    else()
-      set(staticlibname "${libname}-static")
-    endif(NOT SC_BUILD_SHARED_LIBS)
-    add_library(${staticlibname} STATIC ${srcslist} ${${LIBNAME_UPPER}_STATIC_SRCS})
-    DEFINE_DLL_EXPORTS(${staticlibname})
-    if(NOT ${libs} MATCHES "NONE")
-      target_link_libraries(${staticlibname} "${libslist}")
-      DEFINE_DLL_IMPORTS(${staticlibname} ${libslist})
-    endif(NOT ${libs} MATCHES "NONE")
-    if(NOT WIN32)
-      set_target_properties(${staticlibname} PROPERTIES OUTPUT_NAME "${libname}")
-    endif(NOT WIN32)
-    if(WIN32)
-      # We need the lib prefix on win32, so add it even if our add_library
-      # wrapper function has removed it due to the target name - see
-      # http://www.cmake.org/Wiki/CMake_FAQ#How_do_I_make_my_shared_and_static_libraries_have_the_same_root_name.2C_but_different_suffixes.3F
-      set_target_properties(${staticlibname} PROPERTIES PREFIX "lib")
-    endif(WIN32)
-    if(NOT ${LIBNAME_UPPER}_NO_INSTALL AND NOT ${LIBNAME_UPPER}_TESTABLE)
-      install(TARGETS ${libname}-static
-	RUNTIME DESTINATION ${BIN_DIR}
-	LIBRARY DESTINATION ${LIB_DIR}
-	ARCHIVE DESTINATION ${LIB_DIR}
-	)
-    endif(NOT ${LIBNAME_UPPER}_NO_INSTALL AND NOT ${LIBNAME_UPPER}_TESTABLE)
-    if(NOT SC_ENABLE_TESTING AND ${LIBNAME_UPPER}_TESTABLE)
-      set_target_properties( ${libname}-static PROPERTIES EXCLUDE_FROM_ALL ON )
-    endif(NOT SC_ENABLE_TESTING AND ${LIBNAME_UPPER}_TESTABLE)
-    if(APPLE)
-      set_target_properties(${staticlibname} PROPERTIES LINK_FLAGS "-flat_namespace -undefined suppress")
-    endif(APPLE)
-  endif(SC_BUILD_STATIC_LIBS)
-  # Enable extra compiler flags if local libraries and/or global options dictate
-  set(LOCAL_COMPILE_FLAGS "")
-  foreach(extraarg ${ARGN})
-    if(${extraarg} MATCHES "STRICT" AND SC-ENABLE_STRICT)
-      set(LOCAL_COMPILE_FLAGS "${LOCAL_COMPILE_FLAGS} ${STRICT_FLAGS}")
-    endif(${extraarg} MATCHES "STRICT" AND SC-ENABLE_STRICT)
-  endforeach(extraarg ${ARGN})
-  if(LOCAL_COMPILE_FLAGS)
-    if(BUILD_SHARED_LIBS)
-      set_target_properties(${libname} PROPERTIES COMPILE_FLAGS ${LOCAL_COMPILE_FLAGS})
-    endif(BUILD_SHARED_LIBS)
-    if(BUILD_STATIC_LIBS)
-      set_target_properties(${staticlibname} PROPERTIES COMPILE_FLAGS ${LOCAL_COMPILE_FLAGS})
-    endif(BUILD_STATIC_LIBS)
-  endif(LOCAL_COMPILE_FLAGS)
-endmacro(SC_ADDLIB libname srcslist libslist)
-
-# Local Variables:
-# tab-width: 8
-# mode: cmake
-# indent-tabs-mode: t
-# End:
-# ex: shiftwidth=2 tabstop=8
-

cmake/SC_Utils.cmake

@@ -0,0 +1,138 @@
+
+# set compile definitions for dll exports on windows
+MACRO(DEFINE_DLL_EXPORTS libname)
+    IF( MSVC OR BORLAND )
+        if( ${libname} MATCHES "sdai_.*" )
+            set( export "SC_SCHEMA_DLL_EXPORTS" )
+        else()
+            STRING(REGEX REPLACE "lib" "" shortname "${libname}")
+            STRING(REGEX REPLACE "step" "" LOWERCORE "${shortname}")
+            STRING(TOUPPER ${LOWERCORE} UPPER_CORE)
+            set( export "SC_${UPPER_CORE}_DLL_EXPORTS" )
+        endif()
+        get_target_property(defs ${libname} COMPILE_DEFINITIONS )
+        if( defs ) #if no properties, ${defs} will be defs-NOTFOUND which CMake interprets as false
+            set( defs "${defs};${export}")
+        else( defs )
+            set( defs "${export}")
+        endif( defs )
+        set_target_properties(${libname} PROPERTIES COMPILE_DEFINITIONS "${defs}" )
+    ENDIF( MSVC OR BORLAND )
+ENDMACRO(DEFINE_DLL_EXPORTS libname)
+
+# set compile definitions for dll imports on windows
+MACRO( DEFINE_DLL_IMPORTS tgt libs )
+    IF( MSVC OR BORLAND )
+        get_target_property(defs ${tgt} COMPILE_DEFINITIONS )
+        if( NOT defs ) #if no properties, ${defs} will be defs-NOTFOUND which CMake interprets as false
+            set( defs "")
+        endif( NOT defs )
+        foreach( lib ${libs} )
+            STRING(REGEX REPLACE "lib" "" shortname "${lib}")
+            STRING(REGEX REPLACE "step" "" LOWERCORE "${shortname}")
+            STRING(TOUPPER ${LOWERCORE} UPPER_CORE)
+            list( APPEND defs "SC_${UPPER_CORE}_DLL_IMPORTS" )
+        endforeach( lib ${libs} )
+        if( DEFINED defs )
+            if( defs )
+                set_target_properties( ${tgt} PROPERTIES COMPILE_DEFINITIONS "${defs}" )
+            endif( defs )
+        endif( DEFINED defs )
+    ENDIF( MSVC OR BORLAND )
+ENDMACRO( DEFINE_DLL_IMPORTS tgt libs )
+
+#EXCLUDE_OR_INSTALL(target destination ARGV3)
+# installs ${target} in ${destination} unless testing is enabled AND ${arg_3} == "TESTABLE",
+# in which case the EXCLUDE_FROM_ALL property is set for testing.
+# EXCLUDE_FROM_ALL cannot be set on targets that are to be installed,
+# so either test the target or install it - but not both
+MACRO(EXCLUDE_OR_INSTALL target dest arg_3 )
+    if( NOT ( ( SC_ENABLE_TESTING ) AND ( "${arg_3}" STREQUAL "TESTABLE" ) ) )
+        INSTALL(TARGETS ${target} DESTINATION ${dest})
+    else( NOT ( ( SC_ENABLE_TESTING ) AND ( "${arg_3}" STREQUAL "TESTABLE" ) ) )
+        set_target_properties( ${target} PROPERTIES EXCLUDE_FROM_ALL ON )
+    endif( NOT ( ( SC_ENABLE_TESTING ) AND ( "${arg_3}" STREQUAL "TESTABLE" ) ) )
+ENDMACRO(EXCLUDE_OR_INSTALL target dest arg_3 )
+
+#SC_ADDEXEC( execname "source files" "linked libs" ["TESTABLE"] ["MSVC flag" ...])
+# optional 4th argument of "TESTABLE", passed to EXCLUDE_OR_INSTALL macro
+# optional args can also be used by MSVC-specific code, but it looks like these two uses
+# will not conflict because the MSVC args must contain "STRICT"
+MACRO(SC_ADDEXEC execname srcslist libslist)
+    add_executable(${execname} ${srcslist})
+    target_link_libraries(${execname} ${libslist})
+    DEFINE_DLL_IMPORTS(${execname} "${libslist}")  #add import definitions for all libs that the executable is linked to
+    EXCLUDE_OR_INSTALL( ${execname} "bin" "${ARGV3}" )
+    # Enable extra compiler flags if local executables and/or global options dictate
+    SET(LOCAL_COMPILE_FLAGS "")
+    FOREACH(extraarg ${ARGN})
+        IF(${extraarg} MATCHES "STRICT" AND SC-ENABLE_STRICT)
+            SET(LOCAL_COMPILE_FLAGS "${LOCAL_COMPILE_FLAGS} ${STRICT_FLAGS}")
+        ENDIF(${extraarg} MATCHES "STRICT" AND SC-ENABLE_STRICT)
+    ENDFOREACH(extraarg ${ARGN})
+    IF(LOCAL_COMPILE_FLAGS)
+        SET_TARGET_PROPERTIES(${execname} PROPERTIES COMPILE_FLAGS ${LOCAL_COMPILE_FLAGS})
+    ENDIF(LOCAL_COMPILE_FLAGS)
+ENDMACRO(SC_ADDEXEC execname srcslist libslist)
+
+#SC_ADDLIB( libname "source files" "linked libs" ["TESTABLE"] ["MSVC flag" ...])
+# optional 4th argument of "TESTABLE", passed to EXCLUDE_OR_INSTALL macro
+# optional args can also be used by MSVC-specific code, but it looks like these two uses
+# will not conflict because the MSVC args must contain "STRICT"
+MACRO(SC_ADDLIB libname srcslist libslist)
+  STRING(REGEX REPLACE "-framework;" "-framework " libslist "${libslist1}")
+  IF(SC_BUILD_SHARED_LIBS)
+      add_library(${libname} SHARED ${srcslist})
+      DEFINE_DLL_EXPORTS(${libname})
+      if(NOT "${libs}" MATCHES "NONE")
+          target_link_libraries(${libname} ${libslist})
+          DEFINE_DLL_IMPORTS(${libname} "${libslist}" )
+      endif(NOT "${libs}" MATCHES "NONE")
+      SET_TARGET_PROPERTIES(${libname} PROPERTIES VERSION ${SC_ABI_VERSION} SOVERSION ${SC_ABI_SOVERSION} )
+      EXCLUDE_OR_INSTALL( ${libname} "lib" "${ARGV3}" )
+    if(APPLE)
+        set_target_properties(${libname} PROPERTIES LINK_FLAGS "-flat_namespace -undefined suppress")
+    endif(APPLE)
+  ENDIF(SC_BUILD_SHARED_LIBS)
+  IF(SC_BUILD_STATIC_LIBS AND NOT MSVC)
+      if( NOT SC_BUILD_SHARED_LIBS )
+        set( staticlibname "${libname}" )
+      else()
+        set( staticlibname "${libname}-static" )
+      endif( NOT SC_BUILD_SHARED_LIBS )
+      add_library(${staticlibname} STATIC ${srcslist})
+      DEFINE_DLL_EXPORTS(${staticlibname})
+      if(NOT ${libs} MATCHES "NONE")
+          target_link_libraries(${staticlibname} "${libslist}")
+          DEFINE_DLL_IMPORTS(${staticlibname} ${libslist} )
+      endif(NOT ${libs} MATCHES "NONE")
+      IF(NOT WIN32)
+          SET_TARGET_PROPERTIES(${staticlibname} PROPERTIES OUTPUT_NAME "${libname}")
+      ENDIF(NOT WIN32)
+      IF(WIN32)
+          # We need the lib prefix on win32, so add it even if our add_library
+          # wrapper function has removed it due to the target name - see
+          # http://www.cmake.org/Wiki/CMake_FAQ#How_do_I_make_my_shared_and_static_libraries_have_the_same_root_name.2C_but_different_suffixes.3F
+          SET_TARGET_PROPERTIES(${staticlibname} PROPERTIES PREFIX "lib")
+      ENDIF(WIN32)
+      EXCLUDE_OR_INSTALL( ${staticlibname} "lib" "${ARGV3}" )
+    if(APPLE)
+        set_target_properties(${staticlibname} PROPERTIES LINK_FLAGS "-flat_namespace -undefined suppress")
+    endif(APPLE)
+  ENDIF(SC_BUILD_STATIC_LIBS AND NOT MSVC)
+  # Enable extra compiler flags if local libraries and/or global options dictate
+  SET(LOCAL_COMPILE_FLAGS "")
+  FOREACH(extraarg ${ARGN})
+      IF(${extraarg} MATCHES "STRICT" AND SC-ENABLE_STRICT)
+          SET(LOCAL_COMPILE_FLAGS "${LOCAL_COMPILE_FLAGS} ${STRICT_FLAGS}")
+      ENDIF(${extraarg} MATCHES "STRICT" AND SC-ENABLE_STRICT)
+  ENDFOREACH(extraarg ${ARGN})
+  IF(LOCAL_COMPILE_FLAGS)
+      IF(BUILD_SHARED_LIBS)
+          SET_TARGET_PROPERTIES(${libname} PROPERTIES COMPILE_FLAGS ${LOCAL_COMPILE_FLAGS})
+      ENDIF(BUILD_SHARED_LIBS)
+      IF(BUILD_STATIC_LIBS AND NOT MSVC)
+          SET_TARGET_PROPERTIES(${staticlibname} PROPERTIES COMPILE_FLAGS ${LOCAL_COMPILE_FLAGS})
+      ENDIF(BUILD_STATIC_LIBS AND NOT MSVC)
+  ENDIF(LOCAL_COMPILE_FLAGS)
+ENDMACRO(SC_ADDLIB libname srcslist libslist)

cmake/manage_generated.cmake.in

@@ -0,0 +1,102 @@
+# Inherit the parent CMake setting
+set(CURRENT_SOURCE_DIR "@CMAKE_CURRENT_SOURCE_DIR@")
+set(LEMON_EXECUTABLE "@LEMON_EXECUTABLE@")
+set(RE2C_EXECUTABLE "@RE2C_EXECUTABLE@")
+set(PERPLEX_EXECUTABLE "@PERPLEX_EXECUTABLE@")
+set(SYNC_SCRIPT "@SYNC_SCRIPT@")
+set(SYNC_TARGET_NAME "@SYNC_TARGET_NAME@")
+set(DEBUGGING_GENERATED_SOURCES "@DEBUGGING_GENERATED_SOURCES@")
+
+if(NOT DEBUGGING_GENERATED_SOURCES)
+  # Include the file the provides the baseline against which
+  # current files will be compared
+  include("@BASELINE_INFORMATION_FILE@")
+
+  # Define a variety of convenience routines
+  include("@PROJECT_CMAKE_DIR@/Generated_Source_Utils.cmake")
+
+  # The following need to be checked:
+  #
+  # 1.  baseline input MD5 hashes against the current input
+  #     hashes.  If the cached sources were generated using
+  #     inputs other than the current inputs, note they are
+  #     out of sync but don't stop.  Templates used by perplex
+  #     and lemon are part of this group.
+  #
+  # 2.  baseline cached source MD5 hashes against current
+  #     cached source MD5 hashes.  Making sure no changes
+  #     have been made to the generated sources.  If the
+  #     cached sources need to be updated (see #1, for example)
+  #     their MD5 hashes need to be updated at the same time.
+  #
+  # 3.  MD5 hashes of output generated by the tools against
+  #     the MD5 hashes of the equalivent cached sources, if
+  #     a) the tool versions are the same b) the input MD5
+  #     hash comparisions were the same and c) the baseline
+  #     test from #2 passed.  This is done to detect platform
+  #     differences in output sources, but is only valid if
+  #     the input files are in their "pristine" state and the
+  #     toolchain is equalivent to that used for the baseline.
+
+  # Individually verify all of the files in question.
+  set(input_files "@INPUT_FILELIST@")
+  VERIFY_FILES("${input_files}" 0 input_unchanged)
+  set(template_files "@TEMPLATE_FILELIST@")
+  VERIFY_FILES("${template_files}" 1 templates_unchanged)
+  set(cached_files "@CACHED_FILELIST@")
+  VERIFY_FILES("${cached_files}" 1 cached_unchanged)
+  if(cached_unchanged)
+      message( "Cached generated source code has not been modified.")
+  else()
+    message(FATAL_ERROR "Cached generated sources do not match the MD5 hashes present in /home/mark/step/sc/src/express/generated/verification_info.cmake - if updating cached sources, remember that the build enforces the requirement that associated MD5 hashes in /home/mark/step/sc/src/express/generated/verification_info.cmake are current as well.  Cached generated sources should not be directly edited.")
+  endif(cached_unchanged)
+
+  GET_GENERATOR_EXEC_VERSIONS()
+
+  if("${lemon_version}" VERSION_EQUAL "${baseline_lemon_version}" AND "${perplex_version}" VERSION_EQUAL "${baseline_perplex_version}" AND "${re2c_version}" VERSION_EQUAL "${baseline_re2c_version}")
+    set(tool_versions_equal 1)
+  else()
+    set(tool_versions_equal 0)
+  endif()
+
+  if(NOT input_unchanged)
+    if(templates_unchanged AND tool_versions_equal)
+      message("Input files changed - syncing cached outputs")
+      execute_process(COMMAND ${CMAKE_COMMAND} -P ${SYNC_SCRIPT} OUTPUT_VARIABLE output) 
+    else(templates_unchanged AND tool_versions_equal)
+      if(NOT templates_unchanged AND NOT tool_versions_equal)
+	message("Input files have been updated, but templates and current tool versions do not match those previously used to generate cached sources.  Automatic syncing will not proceed.")
+	message("To force syncing, use the build target ${SYNC_TARGET_NAME}")
+      else(NOT templates_unchanged AND NOT tool_versions_equal)
+	if(NOT templates_unchanged)
+	  message("Input files have been updated, but templates do not match those previously used to generate cached sources.  Automatic syncing will not proceed.")
+	  message("To force syncing, use the build target ${SYNC_TARGET_NAME}")
+	endif(NOT templates_unchanged)
+	if(NOT tool_versions_equal)
+	  message("Input files have been updated, but tool versions do not match those previously used to generate cached sources.  Automatic syncing will not proceed.")
+	  message("To force syncing, use the build target ${SYNC_TARGET_NAME}")
+	endif(NOT tool_versions_equal)
+      endif(NOT templates_unchanged AND NOT tool_versions_equal)
+    endif(templates_unchanged AND tool_versions_equal)
+  else(NOT input_unchanged)
+    if(templates_unchanged AND cached_unchanged AND tool_versions_equal)
+      # Under these conditions, the uncached generated output should be equal to the cached files.
+      # Check if it is - a difference here may indicate a platform-specific behavior in one of the
+      # generators.
+      set(build_files "@BUILD_OUTPUT_FILELIST@")
+      VERIFY_FILES("${build_files}" 1 platform_unchanged)
+      if(NOT platform_unchanged)
+	message("Note: give these build inputs and tools, source files should be identical to generated files.  Differences were still observed - possible indiciation of platform-specific generator behavior.")
+      endif(NOT platform_unchanged)
+    endif(templates_unchanged AND cached_unchanged AND tool_versions_equal)
+  endif(NOT input_unchanged)
+else(NOT DEBUGGING_GENERATED_SOURCES)
+  message("\nNote: DEBUGGING_GENERATED_SOURCES is enabled - generated outputs will contain configuration-specific debugging information, so syncing cached output files is not possible.  To restore normal behavior, disable DEBUGGING_GENERATED_SOURCES.\n")
+endif(NOT DEBUGGING_GENERATED_SOURCES)
+
+# Local Variables:
+# tab-width: 8
+# mode: cmake
+# indent-tabs-mode: t
+# End:
+# ex: shiftwidth=2 tabstop=8

cmake/md5_gen.cmake.in

@@ -1,35 +0,0 @@
-# Inherit the parent CMake setting
-set(CURRENT_SOURCE_DIR @CMAKE_CURRENT_SOURCE_DIR@)
-set(CURRENT_BINARY_DIR @CMAKE_CURRENT_BINARY_DIR@)
-
-# Define a variety of convenience routines
-include(@PROJECT_CMAKE_DIR@/Generated_Source_Utils.cmake)
-
-# The following steps are executed to sync generated sources:
-#
-# 1.  Create a new verification_info.cmake file and populate
-#     it with the MD5 sums for current files.
-#
-# 2.  Overwrite the original cached verification_info.cmake
-#     and generated files with the new ones.  If LOCKED_SOURCE_DIR
-#     is ON, this step will not be carried out - instead, an
-#     informational message with manual updating instructions
-#     will be printed.
-
-set(new_info_file "${CURRENT_BINARY_DIR}/verification_info.cmake")
-
-
-file(WRITE ${new_info_file} "# Autogenerated verification information\n")
-
-# Handle input files
-set(input_files "@MD5_FILELIST@")
-WRITE_MD5_SUMS("${input_files}" "${new_info_file}")
-
-message("New verification file created: ${new_info_file}")
-
-# Local Variables:
-# tab-width: 8
-# mode: cmake
-# indent-tabs-mode: t
-# End:
-# ex: shiftwidth=2 tabstop=8

cmake/md5_verify.cmake.in

@@ -1,30 +0,0 @@
-# Inherit the parent CMake setting
-set(DEBUGGING_GENERATED_SOURCES @DEBUGGING_GENERATED_SOURCES@)
-set(CURRENT_SOURCE_DIR "@CMAKE_CURRENT_SOURCE_DIR@")
-
-# Include the file the provides the baseline against which
-# current files will be compared
-
-  include("@BASELINE_INFORMATION_FILE@")
-
-  # Define a variety of convenience routines
-  include("@PROJECT_CMAKE_DIR@/Generated_Source_Utils.cmake")
-
-  # Individually verify all of the files in question.
-  set(filelist "@MD5_FILELIST@")
-  VERIFY_FILES("${filelist}" 1 srcs_pass)
-  if(NOT srcs_pass)
-    if(NOT DEBUGGING_GENERATED_SOURCES)
-      message(FATAL_ERROR "Sources have been modified and md5 sums have not been updated.  This generally indicates either\n   a) an input file has been modified but generated files have not been updated, or\n   b) genenerated files have been edited directly.\nTo clear the error:\n  a) Copy the new generated sources from the build directory to the generated/ sources directory, use the <target>_md5gen build target to create a new verifictation_info.cmake file, and copy verfication_info.cmake to generated/ as well.\n  b) install Perplex/Re2C/LEMON and make the changes to the input file rather than the generated file.\nNote:\n  If this is a debugging situation where multiple sequential tests must be conducted, temporarily set the variable DEBUGGING_GENERATED_SOURCES to ON during the CMake configure to disable this check.\nThis measure is necessary to ensure that compilations using either Perplex/Re2C/LEMON generation or the cached outputs of those tools produce consistent results.")
-    else(NOT DEBUGGING_GENERATED_SOURCES)
-      message(WARNING "Note: Sources have been modified and md5 sums have not been updated - build failure condition temporarily overridden by DEBUGGING_GENERATED_SOURCES setting.")
-    endif(NOT DEBUGGING_GENERATED_SOURCES)
-  endif(NOT srcs_pass)
-
-
-# Local Variables:
-# tab-width: 8
-# mode: cmake
-# indent-tabs-mode: t
-# End:
-# ex: shiftwidth=2 tabstop=8

cmake/sc_version_string.cmake

@@ -1,15 +1,11 @@
 # creates sc_version_string.h, which defines sc_version()
 # sc_version() returns a pretty commit description and a build timestamp.
 
-# only update the file if the git commit has changed, because whenever the file is updated files including the header must rebuild
-# parallel rebuilds can result in race conditions and failures, particularly when running ctest in parallel
-
 # http://stackoverflow.com/questions/3780667
 # http://www.cmake.org/pipermail/cmake/2009-February/027014.html
 
-set(SC_IS_SUBBUILD "@SC_IS_SUBBUILD@")
 
-set(SC_VERSION_HEADER "${BINARY_DIR}/include/sc_version_string.h")
+set(SC_IS_SUBBUILD "@SC_IS_SUBBUILD@")
 
 #---------- find commit id ------------------
 #use git for a pretty commit id
@@ -17,63 +13,68 @@ set(SC_VERSION_HEADER "${BINARY_DIR}/include/sc_version_string.h")
 #create a tag with 'git tag <name>' and 'git push --tags'
 #if git can't be found, uses contents of SC_VERSION.txt
 
-set(VERS_FILE ${SOURCE_DIR}/SC_VERSION.txt)
-if(EXISTS ${SOURCE_DIR}/.git)
-  find_package(Git QUIET)
-  if(GIT_FOUND)
-    execute_process(COMMAND ${GIT_EXECUTABLE} describe --tags WORKING_DIRECTORY ${SOURCE_DIR}
-      RESULT_VARIABLE res_var OUTPUT_VARIABLE GIT_COMMIT_ID)
-    if(NOT ${res_var} EQUAL 0)
-      file(READ ${VERS_FILE} GIT_COMMIT_ID LIMIT 255)
-      if(NOT SC_IS_SUBBUILD)
-	message(WARNING "Git failed (probably no tags in repo). Build will contain revision info from ${VERS_FILE}.")
-      endif(NOT SC_IS_SUBBUILD)
-    endif()
-  else(GIT_FOUND)
-    file(READ ${VERS_FILE} GIT_COMMIT_ID LIMIT 255)
+set(VERS_FILE ${SOURCE_DIR}/SC_VERSION.txt )
+if( EXISTS ${SOURCE_DIR}/.git )
+    find_package(Git QUIET)
+    if(GIT_FOUND)
+        execute_process(COMMAND ${GIT_EXECUTABLE} describe --tags WORKING_DIRECTORY ${SOURCE_DIR}
+                        RESULT_VARIABLE res_var OUTPUT_VARIABLE GIT_COMMIT_ID )
+        if( NOT ${res_var} EQUAL 0 )
+            file( READ ${VERS_FILE} GIT_COMMIT_ID LIMIT 255 )
+        if(NOT SC_IS_SUBBUILD)
+              message( WARNING "Git failed (probably no tags in repo). Build will contain revision info from ${VERS_FILE}." )
+        endif(NOT SC_IS_SUBBUILD)
+        endif()
+    else(GIT_FOUND)
+        file( READ ${VERS_FILE} GIT_COMMIT_ID LIMIT 255 )
     if(NOT SC_IS_SUBBUILD)
-      message(WARNING "Git not found. Build will contain revision info from ${VERS_FILE}.")
+          message( WARNING "Git not found. Build will contain revision info from ${VERS_FILE}." )
     endif(NOT SC_IS_SUBBUILD)
-  endif(GIT_FOUND)
+    endif(GIT_FOUND)
 else()
-  file(READ ${VERS_FILE} GIT_COMMIT_ID LIMIT 255)
-  if(NOT SC_IS_SUBBUILD)
-    message(WARNING "Git failed ('.git' not found). Build will contain revision info from ${VERS_FILE}.")
-  endif(NOT SC_IS_SUBBUILD)
+    file( READ ${VERS_FILE} GIT_COMMIT_ID LIMIT 255 )
+    if(NOT SC_IS_SUBBUILD)
+      message( WARNING "Git failed ('.git' not found). Build will contain revision info from ${VERS_FILE}." )
+    endif(NOT SC_IS_SUBBUILD)
 endif()
-string(REPLACE "\n" "" GIT_COMMIT_ID ${GIT_COMMIT_ID})
+string( REPLACE "\n" "" GIT_COMMIT_ID ${GIT_COMMIT_ID} )
 
 #-------------- date and time ---------------
 #once cmake_minimum_required is >= 2.8.11, we can use TIMESTAMP:
-#string(TIMESTAMP date_time_string)
+#string( TIMESTAMP date_time_string )
 
-set(header_string "/* sc_version_string.h - written by cmake. Changes will be lost! */\n"
-  "#ifndef SC_VERSION_STRING\n"
-  "#define SC_VERSION_STRING\n\n"
-  "/*\n** The git commit id looks like \"test-1-g5e1fb47\", where test is the\n"
-  "** name of the last tagged git revision, 1 is the number of commits since that tag,\n"
-  "** 'g' is unknown, and 5e1fb47 is the first 7 chars of the git sha1 commit id.\n"
-  "*/\n\n"
-  "static char sc_version[512] = {\n"
-  "    \"git commit id: ${GIT_COMMIT_ID}\"\n"
-  "}\;\n\n"
-  "#endif\n"
- )
+if( UNIX )
+  execute_process( COMMAND date "+%d %b %Y %H:%M" OUTPUT_VARIABLE date_time_string OUTPUT_STRIP_TRAILING_WHITESPACE )
+elseif( WIN32 )
+  execute_process( COMMAND cmd /c date /t OUTPUT_VARIABLE currentDate OUTPUT_STRIP_TRAILING_WHITESPACE )
+  execute_process( COMMAND cmd /c time /t OUTPUT_VARIABLE currentTime OUTPUT_STRIP_TRAILING_WHITESPACE )
+  set ( date_time_string "${currentDate} ${currentTime}" )
+else()
+  set( date_time_string "\" __DATE__ \" \" __TIME__ \" " )
+  if( NOT SC_IS_SUBBUILD )
+    message( STATUS "Unknown platform - using date from preprocessor" )
+  endif( NOT SC_IS_SUBBUILD )
+endif()
 
-#don't update the file unless somethig changed
-string(RANDOM tmpsuffix)
-file(WRITE ${SC_VERSION_HEADER}.${tmpsuffix} ${header_string})
-execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SC_VERSION_HEADER}.${tmpsuffix} ${SC_VERSION_HEADER})
-execute_process(COMMAND ${CMAKE_COMMAND} -E remove ${SC_VERSION_HEADER}.${tmpsuffix})
+set( header_string "/* sc_version_string.h - written by cmake. Changes will be lost! */\n"
+             "#ifndef SC_VERSION_STRING\n"
+             "#define SC_VERSION_STRING\n\n"
+             "/*\n** The git commit id looks like \"test-1-g5e1fb47\", where test is the\n"
+             "** name of the last tagged git revision, 1 is the number of commits since that tag,\n"
+             "** 'g' is unknown, and 5e1fb47 is the first 7 chars of the git sha1 commit id.\n"
+             "** timestamp is created from date/time commands on known platforms, and uses\n"
+             "** preprocessor macros elsewhere.\n*/\n\n"
+             "static char sc_version[512] = {\n"
+             "    \"git commit id: ${GIT_COMMIT_ID}, build timestamp ${date_time_string}\"\n"
+             "}\;\n\n"
+             "#endif\n"
+   )
 
+file(WRITE sc_version_string.h.txt ${header_string} )
+# copy the file to the final header only if the version changes
+# reduces needless rebuilds
+execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different
+                        sc_version_string.h.txt ${BINARY_DIR}/include/sc_version_string.h)
 if(NOT SC_IS_SUBBUILD)
   message("-- sc_version_string.h is up-to-date.")
 endif(NOT SC_IS_SUBBUILD)
-
-# Local Variables:
-# tab-width: 8
-# mode: cmake
-# indent-tabs-mode: t
-# End:
-# ex: shiftwidth=2 tabstop=8
-

cmake/schema_scanner/CMakeLists.txt

@@ -1,77 +0,0 @@
-project(SC_SUBPROJECT_SCHEMA_SCANNER)
-cmake_minimum_required(VERSION 2.8.7)
-
-if(NOT ("${CALLED_FROM}" STREQUAL "STEPCODE_CMAKELISTS" AND DEFINED SC_ROOT AND DEFINED SC_BUILDDIR))
-  message(" ${CALLED_FROM}  ${SC_ROOT} ${SC_BUILDDIR}")
-  message(FATAL_ERROR "This is not a truly independent project; it should be built during the STEPcode configuration stage.")
-endif()
-
-# SC_ROOT: SC root dir
-# SC_BUILDDIR: SC build dir, so generated headers can be found
-
-set(CMAKE_BUILD_TYPE Debug)
-
-# set all target location variables so that MSVC will put the executable the same place as other compilers
-set(SC_BINARY_DIR ${SC_BUILDDIR})
-include(${CMAKE_CURRENT_SOURCE_DIR}/../SC_Outdirs.cmake)
-
-set(schema_scanner_src
-  ${SC_ROOT}/src/base/sc_mkdir.c
-  ${SC_ROOT}/src/exp2cxx/genCxxFilenames.c
-  ${SC_ROOT}/src/exp2cxx/class_strings.c
-  ${SC_ROOT}/src/express/generated/expparse.c
-  ${SC_ROOT}/src/express/generated/expscan.c
-  ${SC_ROOT}/src/express/alg.c
-  ${SC_ROOT}/src/express/caseitem.c
-  ${SC_ROOT}/src/express/dict.c
-  ${SC_ROOT}/src/express/entity.c
-  ${SC_ROOT}/src/express/error.c
-  ${SC_ROOT}/src/express/exp_kw.c
-  ${SC_ROOT}/src/express/expr.c
-  ${SC_ROOT}/src/express/express.c
-  ${SC_ROOT}/src/express/hash.c
-  ${SC_ROOT}/src/express/lexact.c
-  ${SC_ROOT}/src/express/linklist.c
-  ${SC_ROOT}/src/express/memory.c
-  ${SC_ROOT}/src/express/object.c
-  ${SC_ROOT}/src/express/info.c
-  ${SC_ROOT}/src/express/resolve.c
-  ${SC_ROOT}/src/express/schema.c
-  ${SC_ROOT}/src/express/scope.c
-  ${SC_ROOT}/src/express/stmt.c
-  ${SC_ROOT}/src/express/symbol.c
-  ${SC_ROOT}/src/express/type.c
-  ${SC_ROOT}/src/express/variable.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/schemaScanner.cc
- )
-
-include_directories(
-  ${SC_ROOT}/include/
-  ${SC_ROOT}/src/express/
-  ${SC_ROOT}/src/express/generated
-  ${SC_ROOT}/src/base
-  ${SC_ROOT}/src/exp2cxx
-  ${SC_BUILDDIR}/include
- )
-
-if(MSVC)
-  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)
-endif()
-
-add_definitions(-DSCHEMA_SCANNER)
-
-add_executable(schema_scanner ${schema_scanner_src})
-
-# Local Variables:
-# tab-width: 8
-# mode: cmake
-# indent-tabs-mode: t
-# End:
-# ex: shiftwidth=2 tabstop=8
-

cmake/schema_scanner/README

@@ -1,10 +0,0 @@
-README for STEPcode schema scanner
---------------
-
-The files in this directory are for a schema scanner executable, built by CMake during the configuration stage.
-
-This scanner is used to determine the file names that exp2cxx will use. In CMake, all file names must be known before
-configuration finishes - so it is necessary to parse the schemas early.
-
-This appears to be a standalone project to CMake, but it is intended to be built only as part of STEPcode. It is configured,
-built, and executed during the configuration stage of STEPcode.

cmake/schema_scanner/schemaScanner.cc

@@ -1,336 +0,0 @@
-
-/** \file schemaScanner.cc
- * This file, along with part of libexpress, are compiled (at configure time)
- * into a static executable. This executable is a schema scanner that is used
- * by CMake to determine what files exp2cxx will create. Otherwise, we'd need
- * to use a few huge files - there is no other way to tell CMake what the
- * generated files will be called.
- */
-
-/* WARNING
- * If you modify this file, you must re-run cmake. It doesn't seem to be possible
- * to re-run cmake automatically, as CMake's configure_file() gets confused by
- * the '${' and '}' in writeLists() below.
- */
-
-extern "C" {
-#  include "expparse.h"
-#  include "expscan.h"
-#  include "express/scope.h"
-#  include "genCxxFilenames.h"
-#  include "sc_mkdir.h"
-
-#  include <string.h>
-
-#  if defined( _WIN32 ) || defined ( __WIN32__ )
-#    include <direct.h>
-#    define getcwd _getcwd
-#  else
-#    include <unistd.h>
-#  endif
-}
-
-#include <string>
-#include <sstream>
-#include <iomanip>
-#include <fstream>
-#include <iostream>
-
-int multiple_inheritance = 0;
-
-using std::string;
-using std::stringstream;
-using std::endl;
-using std::ofstream;
-using std::cerr;
-using std::cout;
-
-/** \return true for types that exp2cxx won't generate code for */
-bool notGenerated( const Type t ) {
-    switch( TYPEget_body( t )->type ) {
-        case integer_:
-        case real_:
-        case string_:
-        case binary_:
-        case boolean_:
-        case number_:
-        case logical_:
-        case aggregate_:
-        case bag_:
-        case set_:
-        case list_:
-        case array_:
-            return true;
-        default:
-            break;
-    }
-    /* from addRenameTypedefs() in multpass.c - check for renamed
-     * enums and selects - exp2cxx prints typedefs for them */
-    if( ( TYPEis_enumeration( t ) || TYPEis_select( t ) ) && ( TYPEget_head( t ) ) ) {
-            return true;
-    }
-    return false;
-}
-
-/** \return a short name for the schema
- * this name is intended to be unique, but no special care is put into its generation
- * the official schema name seems most likely to not be unique, but it is generally the longest
- *
- * picks the shortest of:
- *  * the name of the dir containing the file (if in sc/data),
- *  * the name of the file containing the schema (minus extension),
- *  * the official name of the schema, passed in arg 'longName'
- *
- * TODO: maybe also consider an acronym, such that 'test_array_bounds_expr' becomes 'tabe', 'TABE', 'T_A_B_E', or similar
- */
-string makeShortName( const char * longName ) {
-    //input_filename is path to file. we will extract dir name and file name from it.
-    string dirname = input_filename, filename = input_filename, schname = longName;
-    const char slash = '/';
-
-    //for filename, get rid of dir name(s), if any, as well as the extension
-    size_t sl = filename.rfind( slash );
-    if( sl != string::npos ) {
-        filename.erase( 0, sl + 1 );
-    }
-    size_t dot = filename.rfind( '.' );
-    if( dot != string::npos ) {
-        filename.erase( dot );
-    }
-
-    //for dirname, get rid of the filename and ensure it's in data/
-    sl = dirname.rfind( slash );
-    if( sl != string::npos ) {
-        dirname.erase( sl );
-    }
-    const char * dat = "data";
-    size_t data = dirname.find( dat );
-    if( ( data == string::npos ) || ( dirname[ data + strlen( dat ) ] != slash ) ) {
-        //doesn't contain 'data/'. clear it so it'll be ignored.
-        dirname.clear();
-    } else {
-        //get rid of all but last dir name
-        dirname.erase( 0, dirname.rfind( slash ) + 1 );
-    }
-
-    //use dir name if it's at least 3 chars and shorter than file name
-    //length requirement gets rid of short, undescriptive dir names - including '.' and '..'
-    if( ( dirname.size() > 2 ) && ( dirname.size() < filename.size() ) ) {
-        filename = dirname;
-    }
-    if( strlen( longName ) < filename.size() ) {
-        filename = longName;
-    }
-    filename.insert( 0, "sdai_" );
-    return filename;
-}
-
-/** write a CMakeLists.txt file for the schema; print its directory to stdout for CMake's add_subdirectory() command */
-void writeLists( const char * schemaName, stringstream & eh, stringstream & ei, int ecount,
-                                           stringstream & th, stringstream & ti, int tcount ) {
-    string shortName = makeShortName( schemaName );
-    if( mkDirIfNone( shortName.c_str() ) < 0 ) {
-        cerr << "Error creating directory " << shortName << " at " << __FILE__ << ":" << __LINE__;
-        perror( 0 );
-        exit( EXIT_FAILURE );
-    }
-    size_t nameLen = strlen( schemaName );
-    string schema_upper( nameLen, char() );
-    for( size_t i = 0; i < nameLen; ++i) {
-        schema_upper[i] = toupper(schemaName[i]);
-    }
-    string cmListsPath = shortName;
-    cmListsPath += "/CMakeLists.txt";
-    ofstream cmLists;
-    cmLists.open( cmListsPath.c_str() );
-    if( !cmLists.good() ) {
-        cerr << "error opening file " << cmListsPath << " - exiting." << endl;
-        exit( EXIT_FAILURE );
-    }
-    cmLists << "# -----  GENERATED FILE  -----" << endl;
-    cmLists << "# -----   Do not edit!   -----" << endl << endl;
-
-    cmLists << "# schema name: " << schemaName << endl;
-    cmLists << "# (short name: " << shortName << ")" << endl;
-    cmLists << "# " << ecount << " entities, " << tcount << " types" << endl << endl;
-
-    cmLists << "# targets, logic, etc are within a set of macros shared by all schemas" << endl;
-    cmLists << "include(${SC_CMAKE_DIR}/SC_CXX_schema_macros.cmake)" << endl;
-
-    // * 2 for headers, + 10 other files
-    cmLists << "set(" << shortName << "_file_count " << ( ( ecount + tcount ) * 2 ) + 10 << ")" << endl << endl;
-
-
-    cmLists << "PROJECT(" << shortName << ")" << endl;
-    cmLists << "# list headers so they can be installed - entity, type, misc" << endl;
-
-    cmLists << "set(" << shortName << "_entity_hdrs" << endl;
-    cmLists << eh.str();
-    cmLists << "   )" << endl << endl;
-
-    cmLists << "set(" << shortName << "_type_hdrs" << endl;
-    cmLists << th.str();
-    cmLists << "   )" << endl << endl;
-
-    cmLists << "set(" << shortName << "_misc_hdrs" << endl;
-    cmLists << "     Sdaiclasses.h   schema.h" << endl;
-    cmLists << "     Sdai" << schema_upper << "Names.h" << endl;
-    cmLists << "     Sdai" << schema_upper << ".h" << endl;
-    cmLists << "   )" << endl << endl;
-
-    cmLists << "# install all headers" << endl;
-    cmLists << "set(all_headers ${" << shortName << "_entity_hdrs} ${" << shortName << "_type_hdrs} ${" << shortName << "_misc_hdrs})" << endl;
-    cmLists << "foreach( header_file ${all_headers} )" << endl;
-    cmLists << "  set(curr_dir)" << endl;
-    cmLists << "  get_filename_component(curr_dir ${header_file} PATH)" << endl;
-    cmLists << "  get_filename_component(curr_name ${header_file} NAME)" << endl;
-    cmLists << "  if (curr_dir)" << endl;
-    cmLists << "    install( FILES ${header_file} DESTINATION \"include/schemas/" << shortName << "/${curr_dir}\" )" << endl;
-    cmLists << "  else (curr_dir)" << endl;
-    cmLists << "    install( FILES ${header_file} DESTINATION \"include/schemas/" << shortName << "\" )" << endl;
-    cmLists << "  endif (curr_dir)" << endl;
-    cmLists << "endforeach()" << endl;
-
-    cmLists << "# implementation files - 3 lists" << endl << endl;
-
-    cmLists << "# unity build: #include small .cc files to reduce the number" << endl;
-    cmLists << "# of translation units that must be compiled" << endl;
-    cmLists << "if(SC_UNITY_BUILD)" << endl << "  # turns off include statements within type and entity .cc's - the unity T.U.'s include a unity header" << endl;
-    cmLists << "  add_definitions( -DSC_SDAI_UNITY_BUILD)" << endl;
-    cmLists << "  set(" << shortName << "_entity_impls Sdai" << schema_upper << "_unity_entities.cc)" << endl;
-    cmLists << "  set(" << shortName << "_type_impls Sdai" << schema_upper << "_unity_types.cc)" << endl;
-    cmLists << "else(SC_UNITY_BUILD)" << endl;
-    cmLists << "  set(" << shortName << "_entity_impls" << endl;
-    cmLists << ei.str();
-    cmLists << "   )" << endl << endl;
-
-    cmLists << "  set(" << shortName << "_type_impls" << endl;
-    cmLists << ti.str();
-    cmLists << "   )" << endl;
-    cmLists << "endif(SC_UNITY_BUILD)" << endl << endl;
-
-    cmLists << "set( " << shortName << "_misc_impls" << endl;
-    cmLists << "     SdaiAll.cc    compstructs.cc    schema.cc" << endl;
-    cmLists << "     Sdai" << schema_upper << ".cc" << endl;
-    cmLists << "     Sdai" << schema_upper << ".init.cc   )" << endl << endl;
-
-    cmLists << "set(schema_target_files ${" << shortName << "_entity_impls} " << "${" << shortName << "_type_impls} " << "${" << shortName << "_misc_impls})" << endl;
-    cmLists << "SCHEMA_TARGETS(\"" << input_filename << "\" \"" << schemaName << "\"" << endl;
-    cmLists << "                 \"${schema_target_files}\")" << endl;
-
-    cmLists.close();
-
-    char pwd[BUFSIZ] = {0};
-    if( getcwd( pwd, BUFSIZ ) ) {
-        cout << pwd << "/" << shortName << endl;
-    } else {
-        cerr << "Error encountered by getcwd() for " << shortName << " - exiting. Error was ";
-        perror( 0 );
-        exit( EXIT_FAILURE );
-    }
-}
-
-void printSchemaFilenames( Schema sch ){
-    const int numColumns = 2;
-    const int colWidth = 75;
-    const char * tab = "     ";
-
-    stringstream typeHeaders, typeImpls, entityHeaders, entityImpls;
-    typeHeaders << tab;
-    typeImpls << tab;
-    entityHeaders << tab;
-    entityImpls << tab;
-
-    int ecount = 0, tcount = 0;
-
-    DictionaryEntry de;
-    Generic x;
-    filenames_t fn;
-    DICTdo_init( sch->symbol_table, &de );
-    while( 0 != ( x = DICTdo( &de ) ) ) {
-        switch( DICT_type ) {
-            case OBJ_ENTITY:
-                fn = getEntityFilenames( ( Entity ) x );
-                entityHeaders << std::left << std::setw( colWidth ) << fn.header << " ";
-                entityImpls << std::left << std::setw( colWidth ) << fn.impl << " ";
-                ++ecount;
-                if( ( ecount % numColumns ) == 0 ) {
-                    // columns
-                    entityHeaders << endl << tab;
-                    entityImpls << endl << tab;
-                }
-                break;
-            case OBJ_TYPE: {
-                Type t = ( Type ) x;
-                if( TYPEis_enumeration( t ) && ( TYPEget_head( t ) ) ) {
-                    /* t is a renamed enum type, for which exp2cxx
-                     * will print a typedef in an existing file */
-                    break;
-                }
-                if( notGenerated( t ) ) {
-                    /* skip builtin types */
-                    break;
-                }
-                fn = getTypeFilenames( t );
-                typeHeaders << std::left << std::setw( colWidth ) << fn.header << " ";
-                typeImpls << std::left << std::setw( colWidth ) << fn.impl << " ";
-                ++tcount;
-                if( ( tcount % numColumns ) == 0 ) {
-                    typeHeaders << endl << tab;
-                    typeImpls << endl << tab;
-                }
-                break;
-            }
-            /* case OBJ_FUNCTION:
-             *            case OBJ_PROCEDURE:
-             *            case OBJ_RULE: */
-            default:
-                /* ignore everything else */
-                /* TODO: if DEBUG is defined, print the names of these to stderr */
-                break;
-        }
-    }
-    //write the CMakeLists.txt
-    writeLists( sch->symbol.name, entityHeaders, entityImpls, ecount, typeHeaders, typeImpls, tcount );
-}
-
-int main( int argc, char ** argv ) {
-    /* TODO init globals! */
-
-    Schema schema;
-    DictionaryEntry de;
-    /* copied from fedex.c */
-    Express model;
-    if( ( argc != 2 ) || ( strlen( argv[1] ) < 1 ) ) {
-        fprintf( stderr, "\nUsage: %s file.exp\nOutput: a CMakeLists.txt to build the schema,", argv[0] );
-        fprintf( stderr, " containing file names for entities, types, etc\n" );
-        fprintf( stderr, "also prints (to stdout) the absolute path to the directory CMakeLists.txt was created in\n" );
-        exit( EXIT_FAILURE );
-    }
-    EXPRESSprogram_name = argv[0];
-    input_filename = argv[1];
-
-    EXPRESSinitialize();
-
-    model = EXPRESScreate();
-    EXPRESSparse( model, ( FILE * )0, input_filename );
-    if( ERRORoccurred ) {
-        EXPRESSdestroy( model );
-        exit( EXIT_FAILURE );
-    }
-    EXPRESSresolve( model );
-    if( ERRORoccurred ) {
-        int result = EXPRESS_fail( model );
-        EXPRESScleanup();
-        EXPRESSdestroy( model );
-        exit( result );
-    }
-
-    DICTdo_type_init( model->symbol_table, &de, OBJ_SCHEMA );
-    while( 0 != ( schema = ( Schema )DICTdo( &de ) ) ) {
-        printSchemaFilenames( schema );
-    }
-
-    EXPRESSdestroy( model );
-    exit( EXIT_SUCCESS );
-}

cmake/schema_scanner/schemaScanner.cmake

@@ -1,110 +0,0 @@
-# this file should be included from data/CMakeLists.txt
-#
-# at configure time, this builds a small program
-# which will parse express schemas to determine
-# what files exp2cxx will create for that schema.
-#
-# The SCHEMA_CMLIST macro is to be used to run this
-# program. It will set variables for schema name(s),
-# headers, and implementation files.
-
-# in a unity build, many small .cc files are #included to create a few large translation units
-# this makes compilation faster, but sometimes runs into compiler limitations
-if(NOT DEFINED SC_UNITY_BUILD)
-  if(BORLAND)
-    message( STATUS "Will not do unity build for this compiler. (SC_UNITY_BUILD=FALSE)")
-    set(SC_UNITY_BUILD FALSE)
-  else()
-    message( STATUS "Assuming compiler is capable of unity build. (SC_UNITY_BUILD=TRUE)")
-    set(SC_UNITY_BUILD TRUE)
-  endif(BORLAND)
-  message( STATUS "Override by setting SC_UNITY_BUILD; TRUE will result in faster build times but *huge* translation units and higher memory use in compilation.")
-else(NOT DEFINED SC_UNITY_BUILD)
-  message( STATUS "Respecting user-defined SC_UNITY_BUILD value of ${SC_UNITY_BUILD}.")
-endif(NOT DEFINED SC_UNITY_BUILD)
-
-
-# --- variables ---
-# SC_ROOT: SC root dir
-# SC_BUILDDIR: SC build dir, so generated headers can be found
-# SCANNER_SRC_DIR: dir this file is in
-# SCANNER_OUT_DIR: location of binary, same dir as SC uses
-# SCANNER_BUILD_DIR: location scanner is built
-
-set(SCANNER_SRC_DIR ${SC_CMAKE_DIR}/schema_scanner)
-set(SCANNER_BUILD_DIR ${SC_BINARY_DIR}/schema_scanner CACHE INTERNAL "location for scanner build, config files (copied schemas)")
-set(SCANNER_OUT_DIR ${SC_BINARY_DIR}/bin CACHE INTERNAL "location for schema_scanner executable")
-
-#write a cmake file for the cache. the alternative is a very long
-# command line - and the command line can't have newlines in it
-set(initial_scanner_cache ${SCANNER_BUILD_DIR}/initial_scanner_cache.cmake)
-file(WRITE ${initial_scanner_cache} "
-set(SC_ROOT \"${SC_SOURCE_DIR}\" CACHE STRING \"root dir\")
-set(SC_BUILDDIR \"${SC_BINARY_DIR}\" CACHE PATH \"build dir\")
-set(CALLED_FROM \"STEPCODE_CMAKELISTS\" CACHE STRING \"verification\")
-set(CMAKE_BUILD_TYPE \"Debug\" CACHE STRING \"build type\")
-set(CMAKE_C_COMPILER \"${CMAKE_C_COMPILER}\" CACHE STRING \"compiler\")
-set(CMAKE_CXX_COMPILER \"${CMAKE_CXX_COMPILER}\" CACHE STRING \"compiler\")
-")
-
-message( STATUS "Compiling schema scanner...")
-
-execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${SC_BINARY_DIR}/schemas)
-execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${SCANNER_BUILD_DIR})
-execute_process(COMMAND ${CMAKE_COMMAND} -C ${initial_scanner_cache} ${SCANNER_SRC_DIR} -G ${CMAKE_GENERATOR}
-                 WORKING_DIRECTORY ${SCANNER_BUILD_DIR}
-                 TIMEOUT 60
-                 OUTPUT_VARIABLE _ss_config_out
-                 RESULT_VARIABLE _ss_config_stat
-                 ERROR_VARIABLE _ss_config_err
-               )
-if(NOT ${_ss_config_stat} STREQUAL "0")
-  message(FATAL_ERROR "Scanner config status: ${_ss_config_stat}. stdout:\n${_ss_config_out}\nstderr:\n${_ss_config_err}")
-endif(NOT ${_ss_config_stat} STREQUAL "0")
-execute_process(COMMAND ${CMAKE_COMMAND} --build ${SCANNER_BUILD_DIR} --config Debug --clean-first
-                 WORKING_DIRECTORY ${SCANNER_BUILD_DIR}
-                 TIMEOUT 120 # should take far less than 2m
-                 OUTPUT_VARIABLE _ss_build_out
-                 RESULT_VARIABLE _ss_build_stat
-                 ERROR_VARIABLE _ss_build_err
-              )
-if(NOT ${_ss_build_stat} STREQUAL "0")
-  message(FATAL_ERROR "Scanner build status: ${_ss_build_stat}. stdout:\n${_ss_build_out}\nstderr:\n${_ss_build_err}")
-endif(NOT ${_ss_build_stat} STREQUAL "0")
-
-message( STATUS "Schema scanner built. Running it...")
-
-# not sure if it makes sense to install this or not...
-if(WIN32)
-	install(PROGRAMS ${SCANNER_OUT_DIR}/schema_scanner.exe DESTINATION ${BIN_INSTALL_DIR})
-else(WIN32)
-	install(PROGRAMS ${SCANNER_OUT_DIR}/schema_scanner DESTINATION ${BIN_INSTALL_DIR})
-endif(WIN32)
-
-# macro SCHEMA_CMLIST
-# runs the schema scanner on one express file, creating a CMakeLists.txt file for each schema found. Those files are added via add_subdirectory().
-#
-# SCHEMA_FILE - path to the schema
-# TODO should we have a result variable to return schema name(s) found?
-macro(SCHEMA_CMLIST SCHEMA_FILE)
-  execute_process(COMMAND ${SCANNER_OUT_DIR}/schema_scanner ${SCHEMA_FILE}
-                   WORKING_DIRECTORY ${SC_BINARY_DIR}/schemas
-                   RESULT_VARIABLE _ss_stat
-                   OUTPUT_VARIABLE _ss_out
-                   ERROR_VARIABLE _ss_err
-                )
-  if(NOT "${_ss_stat}" STREQUAL "0")
-    #check size of output, put in file if large?
-    message(FATAL_ERROR "Schema scan for '${SCHEMA_FILE}'\nexited with error code '${_ss_stat}'\nstdout:\n${_ss_out}\nstderr:\n${_ss_err}\n")
-  endif(NOT "${_ss_stat}" STREQUAL "0")
-  # scanner output format: each line contains an absolute path. each path is a dir containing a CMakeLists for one schema
-  # there will usually be a single line of output, but it is not illegal for multiple schemas to exist in one .exp file
-  string(STRIP "${_ss_out}" _ss_stripped)
-  string(REGEX REPLACE "\\\n" ";" _list ${_ss_stripped})
-  foreach(_dir ${_list})
-    add_subdirectory(${_dir} ${_dir}) #specify source and binary dirs as the same
-  endforeach(_dir ${_ss_out})
-  # configure_file forces cmake to run again if the schema has been modified
-  #if multiple schemas in one file, _schema is the last one printed.
-  configure_file(${SCHEMA_FILE} ${SCANNER_BUILD_DIR}/${_schema})
-endmacro(SCHEMA_CMLIST SCHEMA_FILE)

cmake/sync_generated.cmake.in

@@ -69,8 +69,8 @@ if(NOT DEBUGGING_GENERATED_SOURCES)
     endforeach(outf ${output_files})
   endif(NOT LOCKED_SOURCE_DIR)
 
-else(NOT DEBUGGING_GENERATED_SOURCES)
-
+else (NOT DEBUGGING_GENERATED_SOURCES)
+  
   message("\nNote: DEBUGGING_GENERATED_SOURCES is enabled - generated outputs will contain configuration-specific debugging information, so syncing cached output files is not possible.  To restore normal behavior, disable DEBUGGING_GENERATED_SOURCES.\n") 
 
 endif(NOT DEBUGGING_GENERATED_SOURCES)

cmake/verify_generated.cmake.in

@@ -0,0 +1,39 @@
+# Inherit the parent CMake setting
+set(DEBUGGING_GENERATED_SOURCES @DEBUGGING_GENERATED_SOURCES@)
+set(CURRENT_SOURCE_DIR @CMAKE_CURRENT_SOURCE_DIR@)
+
+# Include the file the provides the baseline against which
+# current files will be compared
+if(NOT DEBUGGING_GENERATED_SOURCES)
+
+  include(@BASELINE_INFORMATION_FILE@)
+
+  # Define a variety of convenience routines
+  include(@PROJECT_CMAKE_DIR@/Generated_Source_Utils.cmake)
+
+  # Individually verify all of the files in question.
+  set(filelist "@CACHED_FILELIST@")
+  VERIFY_FILES("${filelist}" 1 srcs_pass)
+  if( srcs_pass)
+    message( "Generated source code has not been modified.")
+  else(srcs_pass)
+    message(FATAL_ERROR "Generated sources have been modified.  These files should never be modified directly except when debugging faulty output from the generators - changes to lexer and parser logic should be made to the generator input files.  If this is a debugging situation, set the variable DEBUGGING_GENERATED_SOURCES to ON during the CMake configure.")
+  endif(srcs_pass)
+
+  # If we got by that test, see if it looks like these 
+  # sources came from the current input files.  It's not
+  # a failure condition if they didn't, but warn about it.
+  set(filelist "@INPUT_FILELIST@")
+  VERIFY_FILES("${filelist}" 0 inputs_same)
+  if(NOT inputs_same)
+    message("Note: cached generated sources are not in sync with input files.")
+  endif(NOT inputs_same)
+
+endif(NOT DEBUGGING_GENERATED_SOURCES)
+
+# Local Variables:
+# tab-width: 8
+# mode: cmake
+# indent-tabs-mode: t
+# End:
+# ex: shiftwidth=2 tabstop=8

ctest_matrix.cmake

@@ -1,11 +1,11 @@
 # run_ctest.cmake
 # `ctest -S run_ctest.cmake`
 
-set(CTEST_SOURCE_DIRECTORY .)
-set(CTEST_BINARY_DIRECTORY build_matrix)
-set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
-set(CTEST_MEMORYCHECK_COMMAND /usr/bin/valgrind)
-set(CTEST_INITIAL_CACHE "
+set( CTEST_SOURCE_DIRECTORY . )
+set( CTEST_BINARY_DIRECTORY build_matrix )
+set( CTEST_CMAKE_GENERATOR "Unix Makefiles" )
+set( CTEST_MEMORYCHECK_COMMAND /usr/bin/valgrind )
+set( CTEST_INITIAL_CACHE "
 SITE:STRING=${CTEST_SITE}
 BUILDNAME:STRING=${CTEST_BUILD_NAME}
 SC_ENABLE_TESTING:BOOL=ON
@@ -15,19 +15,11 @@ SC_BUILD_TYPE:STRING=Debug
 
 ctest_start(matrix)
 ctest_empty_binary_directory(${CTEST_BINARY_DIRECTORY})
-ctest_configure(BUILD "${CTEST_BINARY_DIRECTORY}" OPTIONS -DSC_ENABLE_TESTING=ON)
-ctest_build(BUILD "${CTEST_BINARY_DIRECTORY}")
+ctest_configure( BUILD "${CTEST_BINARY_DIRECTORY}" OPTIONS -DSC_ENABLE_TESTING=ON )
+ctest_build( BUILD "${CTEST_BINARY_DIRECTORY}" )
 message("running tests")
-ctest_test(BUILD "${CTEST_BINARY_DIRECTORY}" INCLUDE_LABEL "cpp_schema_....*")
+ctest_test( BUILD "${CTEST_BINARY_DIRECTORY}" INCLUDE_LABEL "cpp_schema_....*" )
 
 message("running python script")
-execute_process(COMMAND python ../misc/wiki-scripts/update-matrix.py
-                 WORKING_DIRECTORY ${CTEST_BINARY_DIRECTORY})
-
-# Local Variables:
-# tab-width: 8
-# mode: cmake
-# indent-tabs-mode: t
-# End:
-# ex: shiftwidth=2 tabstop=8
-
+execute_process( COMMAND python ../misc/wiki-scripts/update-matrix.py
+                 WORKING_DIRECTORY ${CTEST_BINARY_DIRECTORY} )

data/CMakeLists.txt

@@ -1,36 +1,181 @@
 # To build one or more schemas, configure with
 # 'cmake -DSC_BUILD_SCHEMAS="path/to/schema.exp;path/to/schema2.exp"
-# you can specify a schema in 3 ways:
-#  * path relative to build dir
-#  * path relative to sc/data (this dir)
-#  * absolute path
-#
-# cmake goes through the above options in order until it finds one
-# that exists. if ${path} is a dir, cmake expects to find a single
-# .exp file inside, which it uses. otherwise, ${path} is assumed to
-# be an express file.
 
-if(NOT "${SC_BUILD_SCHEMAS}" STREQUAL "")
-  include(${SC_CMAKE_DIR}/schema_scanner/schemaScanner.cmake)
-  foreach(src ${SC_SDAI_ADDITIONAL_EXES_SRCS})
-    get_filename_component(name ${src} NAME_WE)
-    message(STATUS "Additional SDAI executable: ${name}")
-  endforeach(src ${SC_SDAI_ADDITIONAL_EXES_SRCS})
+MACRO(RELATIVE_PATH_TO_TOPLEVEL current_dir rel_path)
+       string(REPLACE "${SC_SOURCE_DIR}" "" subpath "${current_dir}")
+       string(REGEX REPLACE "^/" "" subpath "${subpath}")
+       string(LENGTH "${subpath}" PATH_LENGTH)
+       if(PATH_LENGTH GREATER 0)
+               set(${rel_path} "..")
+               get_filename_component(subpath "${subpath}" PATH)
+               string(LENGTH "${subpath}" PATH_LENGTH)
+               while(PATH_LENGTH GREATER 0)
+                       set(${rel_path} "${${rel_path}}/..")
+                       get_filename_component(subpath "${subpath}" PATH)
+                       string(LENGTH "${subpath}" PATH_LENGTH)
+               endwhile(PATH_LENGTH GREATER 0)
+       endif(PATH_LENGTH GREATER 0)
+ENDMACRO(RELATIVE_PATH_TO_TOPLEVEL current_dir rel_path)
 
-  if(SC_BUILD_SCHEMAS STREQUAL "ALL")
-    file(GLOB_RECURSE SC_BUILD_SCHEMAS ${SC_SOURCE_DIR}/data/*.exp)
-  endif()
-  foreach(FILE ${SC_BUILD_SCHEMAS})
-    # figure out an absolute path to the file
-    LOCATE_SCHEMA(${FILE} abspath)
-    SCHEMA_CMLIST(${abspath})
-  endforeach()
-endif(NOT "${SC_BUILD_SCHEMAS}" STREQUAL "")
+# This function runs fedex on one express file. The generated source goes in a dir
+# in the build dir, and it is compiled into a library. A p21read executable is
+# compiled and linked to the lib. p21read is used to test the lib.
+FUNCTION(BUILD_A_SCHEMA SCHEMA_FILE)
+    if( EXISTS "${CMAKE_BINARY_DIR}/${SCHEMA_FILE}" )  #is it a path relative to build dir?
+        set( SCHEMA_FILE "${CMAKE_BINARY_DIR}/${SCHEMA_FILE}" )
+    elseif( EXISTS "${SC_SOURCE_DIR}/data/${SCHEMA_FILE}" )  # path relative to STEPcode/data?
+        set( SCHEMA_FILE "${SC_SOURCE_DIR}/data/${SCHEMA_FILE}" )
+    elseif( NOT EXISTS ${SCHEMA_FILE} ) # absolute path
+        message( FATAL_ERROR "Cannot find ${CMAKE_BINARY_DIR}/${SCHEMA_FILE} or ${SC_SOURCE_DIR}/data/${SCHEMA_FILE} or ${SCHEMA_FILE}" )
+    endif()
 
-# Local Variables:
-# tab-width: 8
-# mode: cmake
-# indent-tabs-mode: t
-# End:
-# ex: shiftwidth=2 tabstop=8
+    if( IS_DIRECTORY ${SCHEMA_FILE} ) #if it is a dir, look for one .exp file inside
+        file(GLOB SCHEMA_FILE ${SCHEMA_FILE}/*.exp )
+    endif()
 
+    if( NOT EXISTS ${SCHEMA_FILE} )
+        message(FATAL_ERROR "Expected one express file. Found '${SCHEMA_FILE}' instead.")
+    endif()
+
+    # read the schema name from a line like 'SCHEMA AUTOMOTIVE_DESIGN;'
+    file(STRINGS ${SCHEMA_FILE} SCHEMA_STATEMENT LIMIT_COUNT 1 REGEX "^SCHEMA .*")
+    string(REGEX REPLACE "^SCHEMA \(.*\)\;$" "\\1" SCHEMA_N ${SCHEMA_STATEMENT} )
+    string(TOUPPER ${SCHEMA_N} SCHEMA_LONG_NAME) #exp2cxx always uses upper case for file names
+    get_filename_component( SCHEMA_SN ${SCHEMA_FILE} NAME )
+    string( REGEX REPLACE "\(.*\).[Ee][Xx][Pp]" "\\1" SCHEMA_SHORT_NAME ${SCHEMA_SN} )
+
+    project( sdai_${SCHEMA_SHORT_NAME} )
+    message( STATUS "Generating code for ${SCHEMA_SHORT_NAME}.")
+    set( SCHEMA_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/${SCHEMA_SHORT_NAME} )
+
+    #the names of the files that will be generated
+    set( FEDEX_HEADERS ${SCHEMA_OUTPUT_DIR}/Sdaiclasses.h ${SCHEMA_OUTPUT_DIR}/schema.h
+                       ${SCHEMA_OUTPUT_DIR}/Sdai${SCHEMA_LONG_NAME}.h )
+    set( FEDEX_OUT ${SCHEMA_OUTPUT_DIR}/compstructs.cc ${SCHEMA_OUTPUT_DIR}/schema.cc
+                   ${SCHEMA_OUTPUT_DIR}/Sdai${SCHEMA_LONG_NAME}.cc ${SCHEMA_OUTPUT_DIR}/SdaiAll.cc
+                   ${SCHEMA_OUTPUT_DIR}/Sdai${SCHEMA_LONG_NAME}.init.cc ${FEDEX_HEADERS} )
+
+    install( FILES ${FEDEX_HEADERS} DESTINATION include/${SCHEMA_SHORT_NAME} )
+
+    # *cannot* use include_directories() because the includes keep piling up - if building
+    # multiple schemas, each one will use the include dirs from all previous schemas. Since
+    # one header (schema.h) is always named the same, this will not work. only workaround
+    # seems to be set_target_properties( <target> PROPERTIES COMPILE_FLAGS <flags> )
+    set( ${PROJECT_NAME}_COMPILE_FLAGS "-I${CMAKE_CURRENT_SOURCE_DIR} -I${SC_SOURCE_DIR}/src/cldai -I${SC_SOURCE_DIR}/src/cleditor -I${SC_SOURCE_DIR}/src/clutils -I${SCHEMA_OUTPUT_DIR} -I${SC_SOURCE_DIR}/src/clstepcore -I${SC_SOURCE_DIR}/src/base" )
+
+    add_custom_command( OUTPUT ${SCHEMA_OUTPUT_DIR}
+                        COMMAND ${CMAKE_COMMAND} ARGS -E make_directory ${SCHEMA_OUTPUT_DIR}
+                        COMMENT "Creating ${SCHEMA_OUTPUT_DIR} for schema ${SCHEMA_SHORT_NAME}")
+    add_custom_command( OUTPUT ${FEDEX_OUT}
+                        COMMAND exp2cxx ARGS ${SCHEMA_FILE}
+                        DEPENDS ${SCHEMA_FILE} ${SCHEMA_OUTPUT_DIR}
+                        WORKING_DIRECTORY ${SCHEMA_OUTPUT_DIR}
+                        COMMENT "Running exp2cxx for ${SCHEMA_SHORT_NAME}..."
+                        VERBATIM )
+    add_custom_target( generate_cpp_${SCHEMA_SHORT_NAME} DEPENDS ${FEDEX_OUT} SOURCES ${FEDEX_OUT} )
+
+    if( SC_ENABLE_COVERAGE AND NOT SC_COVER_SCHEMAS )
+      # Coverage will always be sparse on schema libs. Compiling the libs with the -fprofile-arcs and
+      # -ftest-coverage is extremely slow. We can avoid that by temporarily changing build type to release.
+      set( PREV_BUILD_TYPE ${CMAKE_BUILD_TYPE} )
+      set( CMAKE_BUILD_TYPE "Release" )
+    endif( SC_ENABLE_COVERAGE AND NOT SC_COVER_SCHEMAS )
+
+    # if testing is enabled, "TESTABLE" sets property EXCLUDE_FROM_ALL and prevents installation
+    SC_ADDLIB( ${PROJECT_NAME} "${FEDEX_OUT}" "stepdai;stepcore;stepeditor;steputils;base" "TESTABLE" )
+    add_dependencies( ${PROJECT_NAME} generate_cpp_${SCHEMA_SHORT_NAME} )
+    set_target_properties( ${PROJECT_NAME} PROPERTIES COMPILE_FLAGS
+                           ${${PROJECT_NAME}_COMPILE_FLAGS} )
+    if( TARGET ${PROJECT_NAME}-static )
+      set_target_properties( ${PROJECT_NAME}-static PROPERTIES COMPILE_FLAGS
+                             ${${PROJECT_NAME}_COMPILE_FLAGS} )
+    endif( TARGET ${PROJECT_NAME}-static )
+
+    if( SC_ENABLE_COVERAGE AND NOT SC_COVER_SCHEMAS )
+      set( CMAKE_BUILD_TYPE ${PREV_BUILD_TYPE} )
+    endif( SC_ENABLE_COVERAGE AND NOT SC_COVER_SCHEMAS )
+
+    add_test( NAME generate_cpp_${SCHEMA_SHORT_NAME}
+              WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+              COMMAND ${CMAKE_COMMAND} --build .
+                                       --target generate_cpp_${SCHEMA_SHORT_NAME}
+                                       --config $<CONFIGURATION> )
+    add_test( NAME build_cpp_${PROJECT_NAME}
+              WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+              COMMAND ${CMAKE_COMMAND} --build .
+                                       --target p21read_${PROJECT_NAME}
+                                       --config $<CONFIGURATION> )
+   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> )
+   endif(NOT WIN32)
+
+    # label the tests and set dependencies
+    set_tests_properties( generate_cpp_${SCHEMA_SHORT_NAME} PROPERTIES LABELS cpp_schema_gen )
+   if(NOT WIN32)
+    set_tests_properties( build_lazy_cpp_${PROJECT_NAME} build_cpp_${PROJECT_NAME} PROPERTIES DEPENDS generate_cpp_${SCHEMA_SHORT_NAME} LABELS cpp_schema_build )
+   endif(NOT WIN32)
+
+   RELATIVE_PATH_TO_TOPLEVEL(${CMAKE_CURRENT_SOURCE_DIR} RELATIVE_PATH_COMPONENT)
+   SC_ADDEXEC( p21read_${PROJECT_NAME} "${RELATIVE_PATH_COMPONENT}/src/test/p21read/p21read.cc" "${PROJECT_NAME};base" "TESTABLE" )
+   if(NOT WIN32)
+    SC_ADDEXEC( lazy_${PROJECT_NAME} "${RELATIVE_PATH_COMPONENT}/src/cllazyfile/lazy_test.cc" "${PROJECT_NAME};steplazyfile;stepeditor" "TESTABLE" )
+   endif(NOT WIN32)
+    add_dependencies( p21read_${PROJECT_NAME} version_string )
+   if(NOT WIN32)
+    add_dependencies( lazy_${PROJECT_NAME} version_string )
+   endif(NOT WIN32)
+    set_target_properties( p21read_${PROJECT_NAME} PROPERTIES COMPILE_FLAGS
+                           ${${PROJECT_NAME}_COMPILE_FLAGS} )
+   if(NOT WIN32)
+    set_target_properties( lazy_${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "${${PROJECT_NAME}_COMPILE_FLAGS} -I${SC_SOURCE_DIR}/src/base/judy/src" )
+   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} "${src}" "${PROJECT_NAME};base" "TESTABLE" )
+        add_dependencies( ${name}_${PROJECT_NAME} version_string )
+        set_target_properties( ${name}_${PROJECT_NAME} PROPERTIES COMPILE_FLAGS
+                               "${${PROJECT_NAME}_COMPILE_FLAGS} -I${path}" )
+    endforeach( src ${SC_SDAI_ADDITIONAL_EXES_SRCS} )
+
+    #find all part 21 files in schema dir, add a test for each one
+    get_filename_component( SCHEMA_DIR ${SCHEMA_FILE} 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_${SCHEMA_SHORT_NAME}_${FNAME}
+                  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+                  COMMAND p21read_${PROJECT_NAME} ${TEST_FILE} )
+        set_tests_properties( read_write_cpp_${SCHEMA_SHORT_NAME}_${FNAME} PROPERTIES DEPENDS build_cpp_${PROJECT_NAME} LABELS cpp_schema_rw )
+       if(NOT WIN32)
+        add_test( NAME read_lazy_cpp_${SCHEMA_SHORT_NAME}_${FNAME}
+                  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+                  COMMAND lazy_${PROJECT_NAME} ${TEST_FILE} )
+        set_tests_properties( read_lazy_cpp_${SCHEMA_SHORT_NAME}_${FNAME} PROPERTIES DEPENDS build_lazy_cpp_${PROJECT_NAME} LABELS cpp_schema_rw )
+       endif(NOT WIN32)
+    endforeach()
+
+ENDFUNCTION(BUILD_A_SCHEMA)
+
+#----------------------------------------------------------------------------------------------------
+
+if( DEFINED SC_BUILD_SCHEMAS )
+    foreach( src ${SC_SDAI_ADDITIONAL_EXES_SRCS} )
+        get_filename_component( name ${src} NAME_WE )
+        message( STATUS "Additional SDAI executable: ${name}" )
+    endforeach( src ${SC_SDAI_ADDITIONAL_EXES_SRCS} )
+
+    if( SC_BUILD_SCHEMAS STREQUAL "ALL" )
+        file( GLOB_RECURSE SC_BUILD_SCHEMAS ${SC_SOURCE_DIR}/data/*.exp )
+    endif()
+    foreach( ap ${SC_BUILD_SCHEMAS} )
+        BUILD_A_SCHEMA( ${ap} )
+    endforeach()
+endif()

data/ap203/ap203.exp

@@ -1,6 +1,6 @@
 (* This is a MODIFIED version of AP203 Amd. 1.
    The change was to remove a useless IF...ELSE...ENDIF statement that always evaluated
-   the same way. Statements in the branch that were never executed caused problems with
+   the same way. Statements in the branch that was never executed caused problems with
    libexpress, and it was easier to modify the schema than to come up with a generic
    fix for libexpress. This change does *not* affect the behavior of the schema.
 
@@ -14,9 +14,6 @@
 SCHEMA config_control_design;
 
   CONSTANT
-(* FIXME: gcc error on next statement with c99/POSIX:
-     Syntax error: "(" unexpected
-*)
   dummy_gri : geometric_representation_item := representation_item('') ||
                  geometric_representation_item();
   dummy_tri : topological_representation_item := representation_item('')

data/cd209/ATS1-out.stp

@@ -217,7 +217,7 @@ ISOTROPIC_SYMMETRIC_TENSOR2_3D(0.));
 #637538433= FEA_PARAMETRIC_POINT('',(1.,0.,0.));
 #637538435= PARAMETRIC_REPRESENTATION_CONTEXT(
 'parametric_representation_context','parametric');
-#637538439= CURVE_3D_ELEMENT_DESCRIPTOR(.LINEAR_ORDER.,'LINEAR_CURVE.CROD',((
+#637538439= CURVE_3D_ELEMENT_DESCRIPTOR(.LINEAR.,'LINEAR_CURVE.CROD',((
 ENUMERATED_CURVE_ELEMENT_PURPOSE(.AXIAL.)),(
 ENUMERATED_CURVE_ELEMENT_PURPOSE(.TORSION.))));
 #637538443= CURVE_3D_ELEMENT_PROPERTY('PROD.1','',(#637538445),(

data/cd209/ATS10-out.stp

@@ -784,7 +784,7 @@ ISOTROPIC_SYMMETRIC_TENSOR2_3D(0.));
 );
 #637539490= PARAMETRIC_REPRESENTATION_CONTEXT(
 'parametric_representation_context','parametric');
-#637539494= VOLUME_3D_ELEMENT_DESCRIPTOR(.LINEAR_ORDER.,'LINEAR_WEDGE.CPENTA',
+#637539494= VOLUME_3D_ELEMENT_DESCRIPTOR(.LINEAR.,'LINEAR_WEDGE.CPENTA',
 (ENUMERATED_VOLUME_ELEMENT_PURPOSE(.STRESS_DISPLACEMENT.)),.WEDGE.);
 #637539496= VOLUME_3D_ELEMENT_REPRESENTATION('367',(#637539489),
 #637539490,(#637539284,#637539280,#637539252,#637539424,#637539420,
@@ -1074,7 +1074,7 @@ ISOTROPIC_SYMMETRIC_TENSOR2_3D(0.));
 #637539781= VOLUME_3D_ELEMENT_REPRESENTATION('272',(#637539489),
 #637539490,(#637538832,#637538864,#637539000,#637538976),#637538282,
 #637539784,#637539460);
-#637539784= VOLUME_3D_ELEMENT_DESCRIPTOR(.LINEAR_ORDER.,
+#637539784= VOLUME_3D_ELEMENT_DESCRIPTOR(.LINEAR.,
 'LINEAR_TETRAHEDRON.CTETRA',(ENUMERATED_VOLUME_ELEMENT_PURPOSE(
 .STRESS_DISPLACEMENT.)),.TETRAHEDRON.);
 #637539786= VOLUME_3D_ELEMENT_REPRESENTATION('271',(#637539489),
@@ -1797,7 +1797,7 @@ ISOTROPIC_SYMMETRIC_TENSOR2_3D(0.));
 #637540503= VOLUME_3D_ELEMENT_REPRESENTATION('32',(#637539489),
 #637539490,(#637538500,#637538504,#637538524,#637538520,#637538560,
 #637538564,#637538584,#637538580),#637538282,#637540506,#637539460);
-#637540506= VOLUME_3D_ELEMENT_DESCRIPTOR(.LINEAR_ORDER.,
+#637540506= VOLUME_3D_ELEMENT_DESCRIPTOR(.LINEAR.,
 'LINEAR_HEXAHEDRON.CHEXA',(ENUMERATED_VOLUME_ELEMENT_PURPOSE(
 .STRESS_DISPLACEMENT.)),.HEXAHEDRON.);
 #637540508= VOLUME_3D_ELEMENT_REPRESENTATION('31',(#637539489),

data/cd209/ATS10Mod0-out.stp

@@ -784,7 +784,7 @@ ISOTROPIC_SYMMETRIC_TENSOR2_3D(0.));
 );
 #637539488= PARAMETRIC_REPRESENTATION_CONTEXT(
 'parametric_representation_context','parametric');
-#637539492= VOLUME_3D_ELEMENT_DESCRIPTOR(.LINEAR_ORDER.,'LINEAR_WEDGE.CPENTA',
+#637539492= VOLUME_3D_ELEMENT_DESCRIPTOR(.LINEAR.,'LINEAR_WEDGE.CPENTA',
 (ENUMERATED_VOLUME_ELEMENT_PURPOSE(.STRESS_DISPLACEMENT.)),.WEDGE.);
 #637539494= VOLUME_3D_ELEMENT_REPRESENTATION('367',(#637539487),
 #637539488,(#637539282,#637539278,#637539250,#637539422,#637539418,
@@ -1074,7 +1074,7 @@ ISOTROPIC_SYMMETRIC_TENSOR2_3D(0.));
 #637539779= VOLUME_3D_ELEMENT_REPRESENTATION('272',(#637539487),
 #637539488,(#637538830,#637538862,#637538998,#637538974),#637538280,
 #637539782,#637539458);
-#637539782= VOLUME_3D_ELEMENT_DESCRIPTOR(.LINEAR_ORDER.,
+#637539782= VOLUME_3D_ELEMENT_DESCRIPTOR(.LINEAR.,
 'LINEAR_TETRAHEDRON.CTETRA',(ENUMERATED_VOLUME_ELEMENT_PURPOSE(
 .STRESS_DISPLACEMENT.)),.TETRAHEDRON.);
 #637539784= VOLUME_3D_ELEMENT_REPRESENTATION('271',(#637539487),
@@ -1797,7 +1797,7 @@ ISOTROPIC_SYMMETRIC_TENSOR2_3D(0.));
 #637540501= VOLUME_3D_ELEMENT_REPRESENTATION('32',(#637539487),
 #637539488,(#637538498,#637538502,#637538522,#637538518,#637538558,
 #637538562,#637538582,#637538578),#637538280,#637540504,#637539458);
-#637540504= VOLUME_3D_ELEMENT_DESCRIPTOR(.LINEAR_ORDER.,
+#637540504= VOLUME_3D_ELEMENT_DESCRIPTOR(.LINEAR.,
 'LINEAR_HEXAHEDRON.CHEXA',(ENUMERATED_VOLUME_ELEMENT_PURPOSE(
 .STRESS_DISPLACEMENT.)),.HEXAHEDRON.);
 #637540506= VOLUME_3D_ELEMENT_REPRESENTATION('31',(#637539487),

data/cd209/ATS10Mod0-outresult.stp

@@ -784,7 +784,7 @@ ISOTROPIC_SYMMETRIC_TENSOR2_3D(0.));
 );
 #637539490= PARAMETRIC_REPRESENTATION_CONTEXT(
 'parametric_representation_context','parametric');
-#637539494= VOLUME_3D_ELEMENT_DESCRIPTOR(.LINEAR_ORDER.,'LINEAR_WEDGE.CPENTA',
+#637539494= VOLUME_3D_ELEMENT_DESCRIPTOR(.LINEAR.,'LINEAR_WEDGE.CPENTA',
 (ENUMERATED_VOLUME_ELEMENT_PURPOSE(.STRESS_DISPLACEMENT.)),.WEDGE.);
 #637539496= VOLUME_3D_ELEMENT_LOCATION_POINT_VARIABLE_VALUES(#637539497,
 #637539487,.F.,(#637539499,#637539504,#637539509,#637539514,#637539519,
@@ -5698,7 +5698,7 @@ ANISOTROPIC_SYMMETRIC_TENSOR2_3D((3.419102,7.558704,4.948215,-9.982081,
 #637542876= VOLUME_3D_ELEMENT_REPRESENTATION('272',(#637539489),
 #637539490,(#637538832,#637538864,#637539000,#637538976),#637538282,
 #637542879,#637539460);
-#637542879= VOLUME_3D_ELEMENT_DESCRIPTOR(.LINEAR_ORDER.,
+#637542879= VOLUME_3D_ELEMENT_DESCRIPTOR(.LINEAR.,
 'LINEAR_TETRAHEDRON.CTETRA',(ENUMERATED_VOLUME_ELEMENT_PURPOSE(
 .STRESS_DISPLACEMENT.)),.TETRAHEDRON.);
 #637542881= VOLUME_3D_ELEMENT_LOCATION_POINT_VARIABLE_VALUES(#637539497,
@@ -15071,7 +15071,7 @@ ANISOTROPIC_SYMMETRIC_TENSOR2_3D((167.411,-189.9718,-234.8069,113.0858,
 #637549373= VOLUME_3D_ELEMENT_REPRESENTATION('32',(#637539489),
 #637539490,(#637538500,#637538504,#637538524,#637538520,#637538560,
 #637538564,#637538584,#637538580),#637538282,#637549376,#637539460);
-#637549376= VOLUME_3D_ELEMENT_DESCRIPTOR(.LINEAR_ORDER.,
+#637549376= VOLUME_3D_ELEMENT_DESCRIPTOR(.LINEAR.,
 'LINEAR_HEXAHEDRON.CHEXA',(ENUMERATED_VOLUME_ELEMENT_PURPOSE(
 .STRESS_DISPLACEMENT.)),.HEXAHEDRON.);
 #637549378= VOLUME_3D_ELEMENT_LOCATION_POINT_VARIABLE_VALUES(#637539497,

data/cd209/ATS1Mod0-out.stp

@@ -217,7 +217,7 @@ ISOTROPIC_SYMMETRIC_TENSOR2_3D(0.));
 #637538431= FEA_PARAMETRIC_POINT('',(1.,0.,0.));
 #637538433= PARAMETRIC_REPRESENTATION_CONTEXT(
 'parametric_representation_context','parametric');
-#637538437= CURVE_3D_ELEMENT_DESCRIPTOR(.LINEAR_ORDER.,'LINEAR_CURVE.CROD',((
+#637538437= CURVE_3D_ELEMENT_DESCRIPTOR(.LINEAR.,'LINEAR_CURVE.CROD',((
 ENUMERATED_CURVE_ELEMENT_PURPOSE(.AXIAL.)),(
 ENUMERATED_CURVE_ELEMENT_PURPOSE(.TORSION.))));
 #637538441= CURVE_3D_ELEMENT_PROPERTY('PROD.1','',(#637538443),(

data/cd209/ATS1Mod0-outresult.stp

@@ -217,7 +217,7 @@ ISOTROPIC_SYMMETRIC_TENSOR2_3D(0.));
 #637538433= FEA_PARAMETRIC_POINT('',(1.,0.,0.));
 #637538435= PARAMETRIC_REPRESENTATION_CONTEXT(
 'parametric_representation_context','parametric');
-#637538439= CURVE_3D_ELEMENT_DESCRIPTOR(.LINEAR_ORDER.,'LINEAR_CURVE.CROD',((
+#637538439= CURVE_3D_ELEMENT_DESCRIPTOR(.LINEAR.,'LINEAR_CURVE.CROD',((
 ENUMERATED_CURVE_ELEMENT_PURPOSE(.AXIAL.)),(
 ENUMERATED_CURVE_ELEMENT_PURPOSE(.TORSION.))));
 #637538443= CURVE_3D_ELEMENT_PROPERTY('PROD.1','',(#637538445),(

data/cd209/ATS2-out.stp

@@ -217,7 +217,7 @@ ISOTROPIC_SYMMETRIC_TENSOR2_3D(0.));
 #637538433= FEA_PARAMETRIC_POINT('',(1.,0.,0.));
 #637538435= PARAMETRIC_REPRESENTATION_CONTEXT(
 'parametric_representation_context','parametric');
-#637538439= CURVE_3D_ELEMENT_DESCRIPTOR(.LINEAR_ORDER.,'LINEAR_CURVE.CBAR*',((
+#637538439= CURVE_3D_ELEMENT_DESCRIPTOR(.LINEAR.,'LINEAR_CURVE.CBAR*',((
 ENUMERATED_CURVE_ELEMENT_PURPOSE(.AXIAL.)),(
 ENUMERATED_CURVE_ELEMENT_PURPOSE(.Y_Y_BENDING.),
 ENUMERATED_CURVE_ELEMENT_PURPOSE(.Z_Z_BENDING.)),(

data/cd209/ATS2Mod0-out.stp

@@ -217,7 +217,7 @@ ISOTROPIC_SYMMETRIC_TENSOR2_3D(0.));
 #637538431= FEA_PARAMETRIC_POINT('',(1.,0.,0.));
 #637538433= PARAMETRIC_REPRESENTATION_CONTEXT(
 'parametric_representation_context','parametric');
-#637538437= CURVE_3D_ELEMENT_DESCRIPTOR(.LINEAR_ORDER.,'LINEAR_CURVE.CBAR*',((
+#637538437= CURVE_3D_ELEMENT_DESCRIPTOR(.LINEAR.,'LINEAR_CURVE.CBAR*',((
 ENUMERATED_CURVE_ELEMENT_PURPOSE(.AXIAL.)),(
 ENUMERATED_CURVE_ELEMENT_PURPOSE(.Y_Y_BENDING.),
 ENUMERATED_CURVE_ELEMENT_PURPOSE(.Z_Z_BENDING.)),(

data/cd209/ATS2Mod0-outresult.stp

@@ -217,7 +217,7 @@ ISOTROPIC_SYMMETRIC_TENSOR2_3D(0.));
 #637538433= FEA_PARAMETRIC_POINT('',(1.,0.,0.));
 #637538435= PARAMETRIC_REPRESENTATION_CONTEXT(
 'parametric_representation_context','parametric');
-#637538439= CURVE_3D_ELEMENT_DESCRIPTOR(.LINEAR_ORDER.,'LINEAR_CURVE.CBAR*',((
+#637538439= CURVE_3D_ELEMENT_DESCRIPTOR(.LINEAR.,'LINEAR_CURVE.CBAR*',((
 ENUMERATED_CURVE_ELEMENT_PURPOSE(.AXIAL.)),(
 ENUMERATED_CURVE_ELEMENT_PURPOSE(.Y_Y_BENDING.),
 ENUMERATED_CURVE_ELEMENT_PURPOSE(.Z_Z_BENDING.)),(

data/cd209/ATS3-out.stp

@@ -346,7 +346,7 @@ ISOTROPIC_SYMMETRIC_TENSOR2_3D(0.));
 #637538689= PARAMETRIC_SURFACE_3D_ELEMENT_COORDINATE_SYSTEM('',1,0.);
 #637538690= PARAMETRIC_REPRESENTATION_CONTEXT(
 'parametric_representation_context','parametric');
-#637538694= SURFACE_3D_ELEMENT_DESCRIPTOR(.LINEAR_ORDER.,
+#637538694= SURFACE_3D_ELEMENT_DESCRIPTOR(.LINEAR.,
 'LINEAR_TRIANGLE.CTRIA3',((ENUMERATED_SURFACE_ELEMENT_PURPOSE(
 .MEMBRANE_DIRECT.),ENUMERATED_SURFACE_ELEMENT_PURPOSE(.MEMBRANE_SHEAR.))
 ,(ENUMERATED_SURFACE_ELEMENT_PURPOSE(.BENDING_DIRECT.),
@@ -503,7 +503,7 @@ UNSPECIFIED_VALUE(.UNSPECIFIED.),UNSPECIFIED_VALUE(.UNSPECIFIED.));
 #637538690,(#637538456,#637538460,#637538504,#637538500),#637538282,
 #637538847,#637538699,#637538660);
 #637538845= PARAMETRIC_SURFACE_3D_ELEMENT_COORDINATE_SYSTEM('',1,0.);
-#637538847= SURFACE_3D_ELEMENT_DESCRIPTOR(.LINEAR_ORDER.,
+#637538847= SURFACE_3D_ELEMENT_DESCRIPTOR(.LINEAR.,
 'LINEAR_QUADRILATERAL.CQUAD4',((ENUMERATED_SURFACE_ELEMENT_PURPOSE(
 .MEMBRANE_DIRECT.),ENUMERATED_SURFACE_ELEMENT_PURPOSE(.MEMBRANE_SHEAR.))
 ,(ENUMERATED_SURFACE_ELEMENT_PURPOSE(.BENDING_DIRECT.),

data/cd209/ATS3Mod0-out.stp

@@ -346,7 +346,7 @@ ISOTROPIC_SYMMETRIC_TENSOR2_3D(0.));
 #637538687= PARAMETRIC_SURFACE_3D_ELEMENT_COORDINATE_SYSTEM('',1,0.);
 #637538688= PARAMETRIC_REPRESENTATION_CONTEXT(
 'parametric_representation_context','parametric');
-#637538692= SURFACE_3D_ELEMENT_DESCRIPTOR(.LINEAR_ORDER.,
+#637538692= SURFACE_3D_ELEMENT_DESCRIPTOR(.LINEAR.,
 'LINEAR_TRIANGLE.CTRIA3',((ENUMERATED_SURFACE_ELEMENT_PURPOSE(
 .MEMBRANE_DIRECT.),ENUMERATED_SURFACE_ELEMENT_PURPOSE(.MEMBRANE_SHEAR.))
 ,(ENUMERATED_SURFACE_ELEMENT_PURPOSE(.BENDING_DIRECT.),
@@ -503,7 +503,7 @@ UNSPECIFIED_VALUE(.UNSPECIFIED.),UNSPECIFIED_VALUE(.UNSPECIFIED.));
 #637538688,(#637538454,#637538458,#637538502,#637538498),#637538280,
 #637538845,#637538697,#637538658);
 #637538843= PARAMETRIC_SURFACE_3D_ELEMENT_COORDINATE_SYSTEM('',1,0.);
-#637538845= SURFACE_3D_ELEMENT_DESCRIPTOR(.LINEAR_ORDER.,
+#637538845= SURFACE_3D_ELEMENT_DESCRIPTOR(.LINEAR.,
 'LINEAR_QUADRILATERAL.CQUAD4',((ENUMERATED_SURFACE_ELEMENT_PURPOSE(
 .MEMBRANE_DIRECT.),ENUMERATED_SURFACE_ELEMENT_PURPOSE(.MEMBRANE_SHEAR.))
 ,(ENUMERATED_SURFACE_ELEMENT_PURPOSE(.BENDING_DIRECT.),

data/cd209/ATS3Mod0-outresult.stp

@@ -346,7 +346,7 @@ ISOTROPIC_SYMMETRIC_TENSOR2_3D(0.));
 #637538689= PARAMETRIC_SURFACE_3D_ELEMENT_COORDINATE_SYSTEM('',1,0.);
 #637538690= PARAMETRIC_REPRESENTATION_CONTEXT(
 'parametric_representation_context','parametric');
-#637538694= SURFACE_3D_ELEMENT_DESCRIPTOR(.LINEAR_ORDER.,
+#637538694= SURFACE_3D_ELEMENT_DESCRIPTOR(.LINEAR.,
 'LINEAR_TRIANGLE.CTRIA3',((ENUMERATED_SURFACE_ELEMENT_PURPOSE(
 .MEMBRANE_DIRECT.),ENUMERATED_SURFACE_ELEMENT_PURPOSE(.MEMBRANE_SHEAR.))
 ,(ENUMERATED_SURFACE_ELEMENT_PURPOSE(.BENDING_DIRECT.),
@@ -1375,7 +1375,7 @@ ANISOTROPIC_SYMMETRIC_TENSOR2_3D((-500.0138,-127.7892,0.,25.74217,0.,0.)
 #637538690,(#637538456,#637538460,#637538504,#637538500),#637538282,
 #637539434,#637538699,#637538660);
 #637539432= PARAMETRIC_SURFACE_3D_ELEMENT_COORDINATE_SYSTEM('',1,0.);
-#637539434= SURFACE_3D_ELEMENT_DESCRIPTOR(.LINEAR_ORDER.,
+#637539434= SURFACE_3D_ELEMENT_DESCRIPTOR(.LINEAR.,
 'LINEAR_QUADRILATERAL.CQUAD4',((ENUMERATED_SURFACE_ELEMENT_PURPOSE(
 .MEMBRANE_DIRECT.),ENUMERATED_SURFACE_ELEMENT_PURPOSE(.MEMBRANE_SHEAR.))
 ,(ENUMERATED_SURFACE_ELEMENT_PURPOSE(.BENDING_DIRECT.),

data/cd209/ATS4-out.stp

@@ -719,7 +719,7 @@ ISOTROPIC_SYMMETRIC_TENSOR2_3D(0.));
 );
 #637539370= PARAMETRIC_REPRESENTATION_CONTEXT(
 'parametric_representation_context','parametric');
-#637539374= VOLUME_3D_ELEMENT_DESCRIPTOR(.LINEAR_ORDER.,'LINEAR_WEDGE.CPENTA',
+#637539374= VOLUME_3D_ELEMENT_DESCRIPTOR(.LINEAR.,'LINEAR_WEDGE.CPENTA',
 (ENUMERATED_VOLUME_ELEMENT_PURPOSE(.STRESS_DISPLACEMENT.)),.WEDGE.);
 #637539376= VOLUME_3D_ELEMENT_REPRESENTATION('367',(#637539369),
 #637539370,(#637538804,#637539184,#637539160,#637538924,#637539304,
@@ -1009,7 +1009,7 @@ ISOTROPIC_SYMMETRIC_TENSOR2_3D(0.));
 #637539661= VOLUME_3D_ELEMENT_REPRESENTATION('272',(#637539369),
 #637539370,(#637538800,#637538548,#637538944,#637538572),#637538282,
 #637539664,#637539340);
-#637539664= VOLUME_3D_ELEMENT_DESCRIPTOR(.LINEAR_ORDER.,
+#637539664= VOLUME_3D_ELEMENT_DESCRIPTOR(.LINEAR.,
 'LINEAR_TETRAHEDRON.CTETRA',(ENUMERATED_VOLUME_ELEMENT_PURPOSE(
 .STRESS_DISPLACEMENT.)),.TETRAHEDRON.);
 #637539666= VOLUME_3D_ELEMENT_REPRESENTATION('271',(#637539369),
@@ -1732,7 +1732,7 @@ ISOTROPIC_SYMMETRIC_TENSOR2_3D(0.));
 #637540383= VOLUME_3D_ELEMENT_REPRESENTATION('32',(#637539369),
 #637539370,(#637538500,#637538504,#637538524,#637538520,#637538560,
 #637538564,#637538584,#637538580),#637538282,#637540386,#637539340);
-#637540386= VOLUME_3D_ELEMENT_DESCRIPTOR(.LINEAR_ORDER.,
+#637540386= VOLUME_3D_ELEMENT_DESCRIPTOR(.LINEAR.,
 'LINEAR_HEXAHEDRON.CHEXA',(ENUMERATED_VOLUME_ELEMENT_PURPOSE(
 .STRESS_DISPLACEMENT.)),.HEXAHEDRON.);
 #637540388= VOLUME_3D_ELEMENT_REPRESENTATION('31',(#637539369),

data/cd209/ATS4Mod0-out.stp

@@ -719,7 +719,7 @@ ISOTROPIC_SYMMETRIC_TENSOR2_3D(0.));
 );
 #637539368= PARAMETRIC_REPRESENTATION_CONTEXT(
 'parametric_representation_context','parametric');
-#637539372= VOLUME_3D_ELEMENT_DESCRIPTOR(.LINEAR_ORDER.,'LINEAR_WEDGE.CPENTA',
+#637539372= VOLUME_3D_ELEMENT_DESCRIPTOR(.LINEAR.,'LINEAR_WEDGE.CPENTA',
 (ENUMERATED_VOLUME_ELEMENT_PURPOSE(.STRESS_DISPLACEMENT.)),.WEDGE.);
 #637539374= VOLUME_3D_ELEMENT_REPRESENTATION('367',(#637539367),
 #637539368,(#637538802,#637539182,#637539158,#637538922,#637539302,
@@ -1009,7 +1009,7 @@ ISOTROPIC_SYMMETRIC_TENSOR2_3D(0.));
 #637539659= VOLUME_3D_ELEMENT_REPRESENTATION('272',(#637539367),
 #637539368,(#637538798,#637538546,#637538942,#637538570),#637538280,
 #637539662,#637539338);
-#637539662= VOLUME_3D_ELEMENT_DESCRIPTOR(.LINEAR_ORDER.,
+#637539662= VOLUME_3D_ELEMENT_DESCRIPTOR(.LINEAR.,
 'LINEAR_TETRAHEDRON.CTETRA',(ENUMERATED_VOLUME_ELEMENT_PURPOSE(
 .STRESS_DISPLACEMENT.)),.TETRAHEDRON.);
 #637539664= VOLUME_3D_ELEMENT_REPRESENTATION('271',(#637539367),
@@ -1732,7 +1732,7 @@ ISOTROPIC_SYMMETRIC_TENSOR2_3D(0.));
 #637540381= VOLUME_3D_ELEMENT_REPRESENTATION('32',(#637539367),
 #637539368,(#637538498,#637538502,#637538522,#637538518,#637538558,
 #637538562,#637538582,#637538578),#637538280,#637540384,#637539338);
-#637540384= VOLUME_3D_ELEMENT_DESCRIPTOR(.LINEAR_ORDER.,
+#637540384= VOLUME_3D_ELEMENT_DESCRIPTOR(.LINEAR.,
 'LINEAR_HEXAHEDRON.CHEXA',(ENUMERATED_VOLUME_ELEMENT_PURPOSE(
 .STRESS_DISPLACEMENT.)),.HEXAHEDRON.);
 #637540386= VOLUME_3D_ELEMENT_REPRESENTATION('31',(#637539367),

data/cd209/ATS4Mod0-outresult.stp

@@ -719,7 +719,7 @@ ISOTROPIC_SYMMETRIC_TENSOR2_3D(0.));
 );
 #637539370= PARAMETRIC_REPRESENTATION_CONTEXT(
 'parametric_representation_context','parametric');
-#637539374= VOLUME_3D_ELEMENT_DESCRIPTOR(.LINEAR_ORDER.,'LINEAR_WEDGE.CPENTA',
+#637539374= VOLUME_3D_ELEMENT_DESCRIPTOR(.LINEAR.,'LINEAR_WEDGE.CPENTA',
 (ENUMERATED_VOLUME_ELEMENT_PURPOSE(.STRESS_DISPLACEMENT.)),.WEDGE.);
 #637539376= VOLUME_3D_ELEMENT_LOCATION_POINT_VARIABLE_VALUES(#637539377,
 #637539367,.F.,(#637539379,#637539384,#637539389,#637539394,#637539399,
@@ -5633,7 +5633,7 @@ ANISOTROPIC_SYMMETRIC_TENSOR2_3D((3.419102,7.558704,4.948215,-9.982081,
 #637542756= VOLUME_3D_ELEMENT_REPRESENTATION('272',(#637539369),
 #637539370,(#637538800,#637538548,#637538944,#637538572),#637538282,
 #637542759,#637539340);
-#637542759= VOLUME_3D_ELEMENT_DESCRIPTOR(.LINEAR_ORDER.,
+#637542759= VOLUME_3D_ELEMENT_DESCRIPTOR(.LINEAR.,
 'LINEAR_TETRAHEDRON.CTETRA',(ENUMERATED_VOLUME_ELEMENT_PURPOSE(
 .STRESS_DISPLACEMENT.)),.TETRAHEDRON.);
 #637542761= VOLUME_3D_ELEMENT_LOCATION_POINT_VARIABLE_VALUES(#637539377,
@@ -15006,7 +15006,7 @@ ANISOTROPIC_SYMMETRIC_TENSOR2_3D((167.411,-189.9718,-234.8069,113.0858,
 #637549253= VOLUME_3D_ELEMENT_REPRESENTATION('32',(#637539369),
 #637539370,(#637538500,#637538504,#637538524,#637538520,#637538560,
 #637538564,#637538584,#637538580),#637538282,#637549256,#637539340);
-#637549256= VOLUME_3D_ELEMENT_DESCRIPTOR(.LINEAR_ORDER.,
+#637549256= VOLUME_3D_ELEMENT_DESCRIPTOR(.LINEAR.,
 'LINEAR_HEXAHEDRON.CHEXA',(ENUMERATED_VOLUME_ELEMENT_PURPOSE(
 .STRESS_DISPLACEMENT.)),.HEXAHEDRON.);
 #637549258= VOLUME_3D_ELEMENT_LOCATION_POINT_VARIABLE_VALUES(#637539377,

data/cd209/ATS7-out.stp

@@ -687,7 +687,7 @@ SI_UNIT($,.DEGREE_CELSIUS.)THERMODYNAMIC_TEMPERATURE_UNIT());
 #637539350= PARAMETRIC_SURFACE_3D_ELEMENT_COORDINATE_SYSTEM('',1,0.);
 #637539351= PARAMETRIC_REPRESENTATION_CONTEXT(
 'parametric_representation_context','parametric');
-#637539355= SURFACE_3D_ELEMENT_DESCRIPTOR(.QUADRATIC_ORDER.,
+#637539355= SURFACE_3D_ELEMENT_DESCRIPTOR(.QUADRATIC.,
 'QUADRATIC_QUADRILATERAL.CQUAD8',((ENUMERATED_SURFACE_ELEMENT_PURPOSE(
 .MEMBRANE_DIRECT.),ENUMERATED_SURFACE_ELEMENT_PURPOSE(.MEMBRANE_SHEAR.))
 ,(ENUMERATED_SURFACE_ELEMENT_PURPOSE(.BENDING_DIRECT.),
@@ -896,7 +896,7 @@ ISOTROPIC_SYMMETRIC_TENSOR2_3D(0.));
 #637539351,(#637538532,#637538372,#637538328,#637539004,#637538744,
 #637539008),#637538282,#637539515,#637539360,#637539363);
 #637539513= PARAMETRIC_SURFACE_3D_ELEMENT_COORDINATE_SYSTEM('',1,0.);
-#637539515= SURFACE_3D_ELEMENT_DESCRIPTOR(.QUADRATIC_ORDER.,
+#637539515= SURFACE_3D_ELEMENT_DESCRIPTOR(.QUADRATIC.,
 'QUADRATIC_TRIANGLE.CTRIA6',((ENUMERATED_SURFACE_ELEMENT_PURPOSE(
 .MEMBRANE_DIRECT.),ENUMERATED_SURFACE_ELEMENT_PURPOSE(.MEMBRANE_SHEAR.))
 ,(ENUMERATED_SURFACE_ELEMENT_PURPOSE(.BENDING_DIRECT.),

data/cd209/ATS7Mod0-out.stp

@@ -687,7 +687,7 @@ SI_UNIT($,.DEGREE_CELSIUS.)THERMODYNAMIC_TEMPERATURE_UNIT());
 #637539348= PARAMETRIC_SURFACE_3D_ELEMENT_COORDINATE_SYSTEM('',1,0.);
 #637539349= PARAMETRIC_REPRESENTATION_CONTEXT(
 'parametric_representation_context','parametric');
-#637539353= SURFACE_3D_ELEMENT_DESCRIPTOR(.QUADRATIC_ORDER.,
+#637539353= SURFACE_3D_ELEMENT_DESCRIPTOR(.QUADRATIC.,
 'QUADRATIC_QUADRILATERAL.CQUAD8',((ENUMERATED_SURFACE_ELEMENT_PURPOSE(
 .MEMBRANE_DIRECT.),ENUMERATED_SURFACE_ELEMENT_PURPOSE(.MEMBRANE_SHEAR.))
 ,(ENUMERATED_SURFACE_ELEMENT_PURPOSE(.BENDING_DIRECT.),
@@ -896,7 +896,7 @@ ISOTROPIC_SYMMETRIC_TENSOR2_3D(0.));
 #637539349,(#637538530,#637538370,#637538326,#637539002,#637538742,
 #637539006),#637538280,#637539513,#637539358,#637539361);
 #637539511= PARAMETRIC_SURFACE_3D_ELEMENT_COORDINATE_SYSTEM('',1,0.);
-#637539513= SURFACE_3D_ELEMENT_DESCRIPTOR(.QUADRATIC_ORDER.,
+#637539513= SURFACE_3D_ELEMENT_DESCRIPTOR(.QUADRATIC.,
 'QUADRATIC_TRIANGLE.CTRIA6',((ENUMERATED_SURFACE_ELEMENT_PURPOSE(
 .MEMBRANE_DIRECT.),ENUMERATED_SURFACE_ELEMENT_PURPOSE(.MEMBRANE_SHEAR.))
 ,(ENUMERATED_SURFACE_ELEMENT_PURPOSE(.BENDING_DIRECT.),

data/cd209/ATS7Mod0-outresult.stp

@@ -687,7 +687,7 @@ SI_UNIT($,.DEGREE_CELSIUS.)THERMODYNAMIC_TEMPERATURE_UNIT());
 #637539350= PARAMETRIC_SURFACE_3D_ELEMENT_COORDINATE_SYSTEM('',1,0.);
 #637539351= PARAMETRIC_REPRESENTATION_CONTEXT(
 'parametric_representation_context','parametric');
-#637539355= SURFACE_3D_ELEMENT_DESCRIPTOR(.QUADRATIC_ORDER.,
+#637539355= SURFACE_3D_ELEMENT_DESCRIPTOR(.QUADRATIC.,
 'QUADRATIC_QUADRILATERAL.CQUAD8',((ENUMERATED_SURFACE_ELEMENT_PURPOSE(
 .MEMBRANE_DIRECT.),ENUMERATED_SURFACE_ELEMENT_PURPOSE(.MEMBRANE_SHEAR.))
 ,(ENUMERATED_SURFACE_ELEMENT_PURPOSE(.BENDING_DIRECT.),
@@ -3640,7 +3640,7 @@ ANISOTROPIC_SYMMETRIC_TENSOR2_3D((-783.8278,3524.98,0.,-750.8163,0.,0.))
 #637539351,(#637538532,#637538372,#637538328,#637539004,#637538744,
 #637539008),#637538282,#637541306,#637539360,#637539363);
 #637541304= PARAMETRIC_SURFACE_3D_ELEMENT_COORDINATE_SYSTEM('',1,0.);
-#637541306= SURFACE_3D_ELEMENT_DESCRIPTOR(.QUADRATIC_ORDER.,
+#637541306= SURFACE_3D_ELEMENT_DESCRIPTOR(.QUADRATIC.,
 'QUADRATIC_TRIANGLE.CTRIA6',((ENUMERATED_SURFACE_ELEMENT_PURPOSE(
 .MEMBRANE_DIRECT.),ENUMERATED_SURFACE_ELEMENT_PURPOSE(.MEMBRANE_SHEAR.))
 ,(ENUMERATED_SURFACE_ELEMENT_PURPOSE(.BENDING_DIRECT.),

data/cd209/ATS8-out.stp

@@ -2587,7 +2587,7 @@ SI_UNIT($,.DEGREE_CELSIUS.)THERMODYNAMIC_TEMPERATURE_UNIT());
 );
 #637542839= PARAMETRIC_REPRESENTATION_CONTEXT(
 'parametric_representation_context','parametric');
-#637542843= VOLUME_3D_ELEMENT_DESCRIPTOR(.QUADRATIC_ORDER.,
+#637542843= VOLUME_3D_ELEMENT_DESCRIPTOR(.QUADRATIC.,
 'QUADRATIC_WEDGE.CPENTA',(ENUMERATED_VOLUME_ELEMENT_PURPOSE(
 .STRESS_DISPLACEMENT.)),.WEDGE.);
 #637542845= ELEMENT_MATERIAL('MAT1.1','Fea Material',(#637542847,
@@ -3104,7 +3104,7 @@ ISOTROPIC_SYMMETRIC_TENSOR2_3D(0.));
 #637539964,#637539780,#637539832,#637539836,#637539820,#637539928,
 #637539980,#637539984,#637539968,#637542834,#637542834,#637542834,
 #637542834,#637542834,#637542834),#637538282,#637543160,#637542845);
-#637543160= VOLUME_3D_ELEMENT_DESCRIPTOR(.QUADRATIC_ORDER.,
+#637543160= VOLUME_3D_ELEMENT_DESCRIPTOR(.QUADRATIC.,
 'QUADRATIC_HEXAHEDRON.CHEXA',(ENUMERATED_VOLUME_ELEMENT_PURPOSE(
 .STRESS_DISPLACEMENT.)),.HEXAHEDRON.);
 #637543162= VOLUME_3D_ELEMENT_REPRESENTATION('31',(#637542838),
@@ -3301,7 +3301,7 @@ ISOTROPIC_SYMMETRIC_TENSOR2_3D(0.));
 #637542839,(#637538588,#637538612,#637538708,#637538592,#637540000,
 #637540004,#637540008,#637539988,#637539992,#637539996),#637538282,
 #637543262,#637542845);
-#637543262= VOLUME_3D_ELEMENT_DESCRIPTOR(.QUADRATIC_ORDER.,
+#637543262= VOLUME_3D_ELEMENT_DESCRIPTOR(.QUADRATIC.,
 'QUADRATIC_TETRAHEDRON.CTETRA',(ENUMERATED_VOLUME_ELEMENT_PURPOSE(
 .STRESS_DISPLACEMENT.)),.TETRAHEDRON.);
 #637543264= VOLUME_3D_ELEMENT_REPRESENTATION('34',(#637542838),

data/cd209/ATS8Mod0-out.stp

@@ -2587,7 +2587,7 @@ SI_UNIT($,.DEGREE_CELSIUS.)THERMODYNAMIC_TEMPERATURE_UNIT());
 );
 #637542837= PARAMETRIC_REPRESENTATION_CONTEXT(
 'parametric_representation_context','parametric');
-#637542841= VOLUME_3D_ELEMENT_DESCRIPTOR(.QUADRATIC_ORDER.,
+#637542841= VOLUME_3D_ELEMENT_DESCRIPTOR(.QUADRATIC.,
 'QUADRATIC_WEDGE.CPENTA',(ENUMERATED_VOLUME_ELEMENT_PURPOSE(
 .STRESS_DISPLACEMENT.)),.WEDGE.);
 #637542843= ELEMENT_MATERIAL('MAT1.1','Fea Material',(#637542845,
@@ -3104,7 +3104,7 @@ ISOTROPIC_SYMMETRIC_TENSOR2_3D(0.));
 #637539962,#637539778,#637539830,#637539834,#637539818,#637539926,
 #637539978,#637539982,#637539966,#637542832,#637542832,#637542832,
 #637542832,#637542832,#637542832),#637538280,#637543158,#637542843);
-#637543158= VOLUME_3D_ELEMENT_DESCRIPTOR(.QUADRATIC_ORDER.,
+#637543158= VOLUME_3D_ELEMENT_DESCRIPTOR(.QUADRATIC.,
 'QUADRATIC_HEXAHEDRON.CHEXA',(ENUMERATED_VOLUME_ELEMENT_PURPOSE(
 .STRESS_DISPLACEMENT.)),.HEXAHEDRON.);
 #637543160= VOLUME_3D_ELEMENT_REPRESENTATION('31',(#637542836),
@@ -3301,7 +3301,7 @@ ISOTROPIC_SYMMETRIC_TENSOR2_3D(0.));
 #637542837,(#637538586,#637538610,#637538706,#637538590,#637539998,
 #637540002,#637540006,#637539986,#637539990,#637539994),#637538280,
 #637543260,#637542843);
-#637543260= VOLUME_3D_ELEMENT_DESCRIPTOR(.QUADRATIC_ORDER.,
+#637543260= VOLUME_3D_ELEMENT_DESCRIPTOR(.QUADRATIC.,
 'QUADRATIC_TETRAHEDRON.CTETRA',(ENUMERATED_VOLUME_ELEMENT_PURPOSE(
 .STRESS_DISPLACEMENT.)),.TETRAHEDRON.);
 #637543262= VOLUME_3D_ELEMENT_REPRESENTATION('34',(#637542836),

data/cd209/ATS8Mod0-outresult.stp

@@ -2587,7 +2587,7 @@ SI_UNIT($,.DEGREE_CELSIUS.)THERMODYNAMIC_TEMPERATURE_UNIT());
 );
 #637542839= PARAMETRIC_REPRESENTATION_CONTEXT(
 'parametric_representation_context','parametric');
-#637542843= VOLUME_3D_ELEMENT_DESCRIPTOR(.QUADRATIC_ORDER.,
+#637542843= VOLUME_3D_ELEMENT_DESCRIPTOR(.QUADRATIC.,
 'QUADRATIC_WEDGE.CPENTA',(ENUMERATED_VOLUME_ELEMENT_PURPOSE(
 .STRESS_DISPLACEMENT.)),.WEDGE.);
 #637542845= ELEMENT_MATERIAL('MAT1.1','Fea Material',(#637542847,
@@ -7728,7 +7728,7 @@ ANISOTROPIC_SYMMETRIC_TENSOR2_3D((-11.57079,-8.150762,34.35221,-7.068575
 #637539964,#637539780,#637539832,#637539836,#637539820,#637539928,
 #637539980,#637539984,#637539968,#637542834,#637542834,#637542834,
 #637542834,#637542834,#637542834),#637538282,#637546255,#637542845);
-#637546255= VOLUME_3D_ELEMENT_DESCRIPTOR(.QUADRATIC_ORDER.,
+#637546255= VOLUME_3D_ELEMENT_DESCRIPTOR(.QUADRATIC.,
 'QUADRATIC_HEXAHEDRON.CHEXA',(ENUMERATED_VOLUME_ELEMENT_PURPOSE(
 .STRESS_DISPLACEMENT.)),.HEXAHEDRON.);
 #637546257= VOLUME_3D_ELEMENT_LOCATION_POINT_VARIABLE_VALUES(#637542873,
@@ -9927,7 +9927,7 @@ ANISOTROPIC_SYMMETRIC_TENSOR2_3D((-2814.943,159.5768,445.0004,-196.6884,
 #637542839,(#637538588,#637538612,#637538708,#637538592,#637540000,
 #637540004,#637540008,#637539988,#637539992,#637539996),#637538282,
 #637547664,#637542845);
-#637547664= VOLUME_3D_ELEMENT_DESCRIPTOR(.QUADRATIC_ORDER.,
+#637547664= VOLUME_3D_ELEMENT_DESCRIPTOR(.QUADRATIC.,
 'QUADRATIC_TETRAHEDRON.CTETRA',(ENUMERATED_VOLUME_ELEMENT_PURPOSE(
 .STRESS_DISPLACEMENT.)),.TETRAHEDRON.);
 #637547666= VOLUME_3D_ELEMENT_LOCATION_POINT_VARIABLE_VALUES(#637542873,

doc/CMakeLists.txt

@@ -1,20 +1,12 @@
-set(sc_MANS
-  man/man1/fedex.1
-  man/man1/exp2cxx.1
-  )
+SET(sc_MANS
+    man/man1/fedex.1
+    man/man1/exp2cxx.1
+)
 
 if(NOT DEFINED MAN_DIR)
   set(MAN_DIR share/man)
 endif(NOT DEFINED MAN_DIR)
 
-if(NOT WIN32)
-  install(FILES ${sc_MANS} DESTINATION ${MAN_DIR}/man1)
-endif(NOT WIN32)
-
-# Local Variables:
-# tab-width: 8
-# mode: cmake
-# indent-tabs-mode: t
-# End:
-# ex: shiftwidth=2 tabstop=8
-
+IF(NOT WIN32)
+  INSTALL(FILES ${sc_MANS} DESTINATION ${MAN_DIR}/man1)
+ENDIF(NOT WIN32)

doc/Doxyfile

@@ -1,4 +1,4 @@
-# Doxyfile 1.7.6.1
+# Doxyfile 1.7.4
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project
@@ -22,23 +22,22 @@
 
 DOXYFILE_ENCODING      = UTF-8
 
-# The PROJECT_NAME tag is a single word (or sequence of words) that should 
-# identify the project. Note that if you do not use Doxywizard you need 
-# to put quotes around the project name if it contains spaces.
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
+# by quotes) that should identify the project.
 
-PROJECT_NAME           = SC
+PROJECT_NAME           = scl
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number. 
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 0.8
+PROJECT_NUMBER         = 3.2
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description 
 # for a project that appears at the top of each page and should give viewer 
 # a quick idea about the purpose of the project. Keep the description short.
 
-PROJECT_BRIEF          = STEPcode
+PROJECT_BRIEF          = "STEPcode"
 
 # With the PROJECT_LOGO tag one can specify an logo or icon that is 
 # included in the documentation. The maximum height of the logo should not 
@@ -52,7 +51,7 @@ PROJECT_LOGO           =
 # If a relative path is entered, it will be relative to the location 
 # where doxygen was started. If left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = /mnt/raid/mark/sc-doxygen
+OUTPUT_DIRECTORY       = .
 
 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
 # 4096 sub-directories (in 2 levels) under the output directory of each output 
@@ -205,13 +204,6 @@ TAB_SIZE               = 8
 
 ALIASES                = 
 
-# This tag can be used to specify a number of word-keyword mappings (TCL only). 
-# A mapping has the form "name=value". For example adding 
-# "class=itcl::class" will allow you to use the command class in the 
-# itcl::class meaning.
-
-TCL_SUBST              = 
-
 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C 
 # sources only. Doxygen will then generate output that is more tailored for C. 
 # For instance, some of the names that are used will be different. The list 
@@ -301,15 +293,6 @@ SUBGROUPING            = YES
 
 INLINE_GROUPED_CLASSES = NO
 
-# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and 
-# unions with only public data fields will be shown inline in the documentation 
-# of the scope in which they are defined (i.e. file, namespace, or group 
-# documentation), provided this scope is documented. If set to NO (the default), 
-# structs, classes, and unions are shown on a separate page (for HTML and Man 
-# pages) or section (for LaTeX and RTF).
-
-INLINE_SIMPLE_STRUCTS  = NO
-
 # When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum 
 # is documented as struct, union, or enum with the name of the typedef. So 
 # typedef struct TypeS {} TypeT, will appear in the documentation as a struct 
@@ -332,21 +315,10 @@ TYPEDEF_HIDES_STRUCT   = NO
 # a logarithmic scale so increasing the size by one will roughly double the 
 # memory usage. The cache size is given by this formula: 
 # 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, 
-# corresponding to a cache size of 2^16 = 65536 symbols.
+# corresponding to a cache size of 2^16 = 65536 symbols
 
 SYMBOL_CACHE_SIZE      = 0
 
-# Similar to the SYMBOL_CACHE_SIZE the size of the symbol lookup cache can be 
-# set using LOOKUP_CACHE_SIZE. This cache is used to resolve symbols given 
-# their name and scope. Since this can be an expensive process and often the 
-# same symbol appear multiple times in the code, doxygen keeps a cache of 
-# pre-resolved symbols. If the cache is too small doxygen will become slower. 
-# If the cache is too large, memory is wasted. The cache size is given by this 
-# formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range is 0..9, the default is 0, 
-# corresponding to a cache size of 2^16 = 65536 symbols.
-
-LOOKUP_CACHE_SIZE      = 0
-
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
@@ -366,7 +338,7 @@ EXTRACT_PRIVATE        = NO
 # If the EXTRACT_STATIC tag is set to YES all static members of a file 
 # will be included in the documentation.
 
-EXTRACT_STATIC         = YES
+EXTRACT_STATIC         = NO
 
 # If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) 
 # defined locally in source files will be included in the documentation. 
@@ -587,16 +559,6 @@ FILE_VERSION_FILTER    =
 
 LAYOUT_FILE            = 
 
-# The CITE_BIB_FILES tag can be used to specify one or more bib files 
-# containing the references data. This must be a list of .bib files. The 
-# .bib extension is automatically appended if omitted. Using this command 
-# requires the bibtex tool to be installed. See also 
-# http://en.wikipedia.org/wiki/BibTeX for more info. For LaTeX the style 
-# of the bibliography can be controlled using LATEX_BIB_STYLE. To use this 
-# feature you need bibtex and perl available in the search path.
-
-CITE_BIB_FILES         = 
-
 #---------------------------------------------------------------------------
 # configuration options related to warning and progress messages
 #---------------------------------------------------------------------------
@@ -659,8 +621,7 @@ WARN_LOGFILE           =
 
 INPUT                  = src \
                          include \
-                         build/src/express \
-                         build/include
+                         build/src/express
 
 # This tag can be used to specify the character encoding of the source files 
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is 
@@ -716,16 +677,13 @@ FILE_PATTERNS          = *.c \
 
 RECURSIVE              = YES
 
-# The EXCLUDE tag can be used to specify files and/or directories that should be 
+# The EXCLUDE tag can be used to specify files and/or directories that should 
 # excluded from the INPUT source files. This way you can easily exclude a 
-# subdirectory from a directory tree whose root is specified with the INPUT tag. 
-# Note that relative paths are relative to the directory from which doxygen is 
-# run.
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
 
-EXCLUDE                = .git \
-                         cmake/
+EXCLUDE                = 
 
-# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or 
+# The EXCLUDE_SYMLINKS tag can be used select whether or not files or 
 # directories that are symbolic links (a Unix file system feature) are excluded 
 # from the input.
 
@@ -815,7 +773,7 @@ FILTER_SOURCE_PATTERNS =
 # Note: To get rid of all source code in the generated output, make sure also 
 # VERBATIM_HEADERS is set to NO.
 
-SOURCE_BROWSER         = YES
+SOURCE_BROWSER         = NO
 
 # Setting the INLINE_SOURCES tag to YES will include the body 
 # of functions and classes directly in the documentation.
@@ -907,13 +865,13 @@ HTML_FILE_EXTENSION    = .html
 
 # The HTML_HEADER tag can be used to specify a personal HTML header for 
 # each generated HTML page. If it is left blank doxygen will generate a 
-# standard header. Note that when using a custom header you are responsible  
+# standard header. Note that when using a custom header you are responsible 
 # for the proper inclusion of any scripts and style sheets that doxygen 
 # needs, which is dependent on the configuration options used. 
-# It is advised to generate a default header using "doxygen -w html 
+# It is adviced to generate a default header using "doxygen -w html 
 # header.html footer.html stylesheet.css YourConfigFile" and then modify 
 # that header. Note that the header is subject to change so you typically 
-# have to redo this when upgrading to a newer version of doxygen or when 
+# have to redo this when upgrading to a newer version of doxygen or when
 # changing the value of configuration settings such as GENERATE_TREEVIEW!
 
 HTML_HEADER            = 
@@ -929,7 +887,7 @@ HTML_FOOTER            =
 # fine-tune the look of the HTML output. If the tag is left blank doxygen 
 # will generate a default style sheet. Note that doxygen will try to copy 
 # the style sheet file to the HTML output directory, so don't put your own 
-# style sheet in the HTML output directory as well, or it will be erased!
+# stylesheet in the HTML output directory as well, or it will be erased!
 
 HTML_STYLESHEET        = 
 
@@ -943,7 +901,7 @@ HTML_STYLESHEET        =
 HTML_EXTRA_FILES       = 
 
 # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. 
-# Doxygen will adjust the colors in the style sheet and background images 
+# Doxygen will adjust the colors in the stylesheet and background images 
 # according to this color. Hue is specified as an angle on a colorwheel, 
 # see http://en.wikipedia.org/wiki/Hue for more information. 
 # For instance the value 0 represents red, 60 is yellow, 120 is green, 
@@ -1138,26 +1096,12 @@ GENERATE_ECLIPSEHELP   = NO
 
 ECLIPSE_DOC_ID         = org.doxygen.Project
 
-# The DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) 
-# at top of each HTML page. The value NO (the default) enables the index and 
-# the value YES disables it. Since the tabs have the same information as the 
-# navigation tree you can set this option to NO if you already set 
-# GENERATE_TREEVIEW to YES.
+# The DISABLE_INDEX tag can be used to turn on/off the condensed index at 
+# top of each HTML page. The value NO (the default) enables the index and 
+# the value YES disables it.
 
 DISABLE_INDEX          = NO
 
-# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index 
-# structure should be generated to display hierarchical information. 
-# If the tag value is set to YES, a side panel will be generated 
-# containing a tree-like index structure (just like the one that 
-# is generated for HTML Help). For this to work a browser that supports 
-# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser). 
-# Windows users are probably better off using the HTML help feature. 
-# Since the tree basically has the same information as the tab index you 
-# could consider to set DISABLE_INDEX to NO when enabling this option.
-
-GENERATE_TREEVIEW      = YES
-
 # The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values 
 # (range [0,1..20]) that doxygen will group on one line in the generated HTML 
 # documentation. Note that a value of 0 will completely suppress the enum 
@@ -1165,6 +1109,16 @@ GENERATE_TREEVIEW      = YES
 
 ENUM_VALUES_PER_LINE   = 4
 
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index 
+# structure should be generated to display hierarchical information. 
+# If the tag value is set to YES, a side panel will be generated 
+# containing a tree-like index structure (just like the one that 
+# is generated for HTML Help). For this to work a browser that supports 
+# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser). 
+# Windows users are probably better off using the HTML help feature.
+
+GENERATE_TREEVIEW      = YES
+
 # By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories, 
 # and Class Hierarchy pages using a tree view instead of an ordered list.
 
@@ -1217,11 +1171,6 @@ USE_MATHJAX            = NO
 
 MATHJAX_RELPATH        = http://www.mathjax.org/mathjax
 
-# The MATHJAX_EXTENSIONS tag can be used to specify one or MathJax extension 
-# names that should be enabled during MathJax rendering.
-
-MATHJAX_EXTENSIONS     = 
-
 # When the SEARCHENGINE tag is enabled doxygen will generate a search box 
 # for the HTML output. The underlying search engine uses javascript 
 # and DHTML and should work on any modern browser. Note that when using 
@@ -1230,7 +1179,7 @@ MATHJAX_EXTENSIONS     =
 # typically be disabled. For large projects the javascript based search engine 
 # can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
 
-SEARCHENGINE           = YES
+SEARCHENGINE           = NO
 
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be 
 # implemented using a PHP enabled web server instead of at the web client 
@@ -1335,12 +1284,6 @@ LATEX_HIDE_INDICES     = NO
 
 LATEX_SOURCE_CODE      = NO
 
-# The LATEX_BIB_STYLE tag can be used to specify the style to use for the 
-# bibliography, e.g. plainnat, or ieeetr. The default style is "plain". See 
-# http://en.wikipedia.org/wiki/BibTeX for more info.
-
-LATEX_BIB_STYLE        = plain
-
 #---------------------------------------------------------------------------
 # configuration options related to the RTF output
 #---------------------------------------------------------------------------
@@ -1372,7 +1315,7 @@ COMPACT_RTF            = NO
 
 RTF_HYPERLINKS         = NO
 
-# Load style sheet definitions from file. Syntax is similar to doxygen's 
+# Load stylesheet definitions from file. Syntax is similar to doxygen's 
 # config file, i.e. a series of assignments. You only have to provide 
 # replacements, missing definitions are set to their default value.
 
@@ -1642,30 +1585,32 @@ HAVE_DOT               = YES
 
 DOT_NUM_THREADS        = 0
 
-# By default doxygen will use the Helvetica font for all dot files that 
-# doxygen generates. When you want a differently looking font you can specify 
-# the font name using DOT_FONTNAME. You need to make sure dot is able to find 
-# the font, which can be done by putting it in a standard location or by setting 
-# the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the 
-# directory containing the font.
+# By default doxygen will write a font called Helvetica to the output 
+# directory and reference it in all dot files that doxygen generates. 
+# When you want a differently looking font you can specify the font name 
+# using DOT_FONTNAME. You need to make sure dot is able to find the font, 
+# which can be done by putting it in a standard location or by setting the 
+# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory 
+# containing the font.
 
-DOT_FONTNAME           = Roboto
+DOT_FONTNAME           = FreeSans
 
 # The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. 
 # The default size is 10pt.
 
 DOT_FONTSIZE           = 10
 
-# By default doxygen will tell dot to use the Helvetica font. 
-# If you specify a different font using DOT_FONTNAME you can use DOT_FONTPATH to 
-# set the path where dot can find it.
+# By default doxygen will tell dot to use the output directory to look for the 
+# FreeSans.ttf font (which doxygen will put there itself). If you specify a 
+# different font using DOT_FONTNAME you can set the path where dot 
+# can find it using this tag.
 
 DOT_FONTPATH           = 
 
 # If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen 
 # will generate a graph for each documented class showing the direct and 
 # indirect inheritance relations. Setting this tag to YES will force the 
-# CLASS_DIAGRAMS tag to NO.
+# the CLASS_DIAGRAMS tag to NO.
 
 CLASS_GRAPH            = YES
 
@@ -1736,21 +1681,10 @@ DIRECTORY_GRAPH        = YES
 
 # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images 
 # generated by dot. Possible values are svg, png, jpg, or gif. 
-# If left blank png will be used. If you choose svg you need to set 
-# HTML_FILE_EXTENSION to xhtml in order to make the SVG files 
-# visible in IE 9+ (other browsers do not have this requirement).
+# If left blank png will be used.
 
 DOT_IMAGE_FORMAT       = png
 
-# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to 
-# enable generation of interactive SVG images that allow zooming and panning. 
-# Note that this requires a modern browser other than Internet Explorer. 
-# Tested and working are Firefox, Chrome, Safari, and Opera. For IE 9+ you 
-# need to set HTML_FILE_EXTENSION to xhtml in order to make the SVG files 
-# visible. Older versions of IE do not have SVG support.
-
-INTERACTIVE_SVG        = NO
-
 # The tag DOT_PATH can be used to specify the path where the dot tool can be 
 # found. If left blank, it is assumed the dot tool can be found in the path.
 
@@ -1801,7 +1735,7 @@ DOT_TRANSPARENT        = NO
 # makes dot run faster, but since only newer versions of dot (>1.8.10) 
 # support this, this feature is disabled by default.
 
-DOT_MULTI_TARGETS      = YES
+DOT_MULTI_TARGETS      = NO
 
 # If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will 
 # generate a legend page explaining the meaning of the various boxes and 

example/ap203min/CMakeLists.txt

@@ -5,91 +5,87 @@
 # freely copied in part or in full for any purpose.  No acknowledgment is required
 # for the use of this file.
 #
-project(AP203Minimum)
-cmake_minimum_required(VERSION 2.8)
+PROJECT( AP203Minimum )
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 
 # Set STEPCODE_ROOT_DIR to point to the root of the STEPcode source tree.
-if(NOT DEFINED STEPCODE_ROOT_DIR)
-  message(FATAL_ERROR "STEPCODE_ROOT_DIR is not defined! Set via cmake-gui or on command line:\n    cmake .. -DSTEPCODE_ROOT_DIR=/path/to/sc")
-endif(NOT DEFINED STEPCODE_ROOT_DIR)
+if( NOT DEFINED STEPCODE_ROOT_DIR )
+  message( FATAL_ERROR "STEPCODE_ROOT_DIR is not defined! Set via cmake-gui or on command line:\n    cmake .. -DSTEPCODE_ROOT_DIR=/path/to/sc" )
+endif( NOT DEFINED STEPCODE_ROOT_DIR )
 
 # STEPCODE_ROOT_DIR is relative or absolute path?
-if(EXISTS "${CMAKE_BINARY_DIR}/${STEPCODE_ROOT_DIR}/SC_VERSION.txt")
-  set(STEPCODE_ROOT_DIR "${CMAKE_BINARY_DIR}/${STEPCODE_ROOT_DIR}")
-  message("** STEPCODE_ROOT_DIR is a relative path; converted to absolute path: ${STEPCODE_ROOT_DIR}.")
+if( EXISTS "${CMAKE_BINARY_DIR}/${STEPCODE_ROOT_DIR}/SC_VERSION.txt" )
+  set( STEPCODE_ROOT_DIR "${CMAKE_BINARY_DIR}/${STEPCODE_ROOT_DIR}" )
+  message( "** STEPCODE_ROOT_DIR is a relative path; converted to absolute path: ${STEPCODE_ROOT_DIR}." )
 else()
-  if(NOT EXISTS "${STEPCODE_ROOT_DIR}/SC_VERSION.txt")
-    message(FATAL_ERROR "****  Cannot locate STEPCODE_ROOT_DIR - try an absolute path.")
-  endif(NOT EXISTS "${STEPCODE_ROOT_DIR}/SC_VERSION.txt")
-endif(EXISTS "${CMAKE_BINARY_DIR}/${STEPCODE_ROOT_DIR}/SC_VERSION.txt")
+  if( NOT EXISTS "${STEPCODE_ROOT_DIR}/SC_VERSION.txt" )
+    message( FATAL_ERROR "****  Cannot locate STEPCODE_ROOT_DIR - try an absolute path." )
+  endif( NOT EXISTS "${STEPCODE_ROOT_DIR}/SC_VERSION.txt" )
+endif( EXISTS "${CMAKE_BINARY_DIR}/${STEPCODE_ROOT_DIR}/SC_VERSION.txt" )
 
 
 # Use STEPcode as library, but build from this build process.
-set(SC_IS_SUBBUILD TRUE)
+set( SC_IS_SUBBUILD TRUE )
 
 # Build type, DEBUG or RELEASE
-if(NOT DEFINED CMAKE_BUILD_TYPE)
-  set(CMAKE_BUILD_TYPE Debug)
-endif(NOT DEFINED CMAKE_BUILD_TYPE)
-set(SC_BUILD_TYPE ${CMAKE_BUILD_TYPE})
+if( NOT DEFINED CMAKE_BUILD_TYPE )
+  set( CMAKE_BUILD_TYPE Debug )
+endif( NOT DEFINED CMAKE_BUILD_TYPE )
+set( SC_BUILD_TYPE ${CMAKE_BUILD_TYPE} )
 
 # Path to STEPcode
-set(STEPCODE_BUILD_DIR ${CMAKE_BINARY_DIR}/sc CACHE PATH "STEPcode build subdir")
+set( STEPCODE_BUILD_DIR ${CMAKE_BINARY_DIR}/sc CACHE PATH "STEPcode build subdir" )
 
 # STEP schema to build and link against.
-set(SCHEMA ap203)
-set(SC_BUILD_SCHEMAS ${SCHEMA} CACHE INTERNAL "Schema, internal, immutable" FORCE)
+set( SCHEMA ap203 )
+set( SC_BUILD_SCHEMAS ${SCHEMA} CACHE INTERNAL "Schema, internal, immutable" FORCE )
 
 # Parse out schema name and library.
-set(SCHEMA_PATH "${STEPCODE_ROOT_DIR}/data/${SCHEMA}/*.exp")
-file(GLOB SCHEMA_FILE "${SCHEMA_PATH}")
+set( SCHEMA_PATH "${STEPCODE_ROOT_DIR}/data/${SCHEMA}/*.exp" )
+file( GLOB SCHEMA_FILE "${SCHEMA_PATH}" )
 
-if(NOT EXISTS ${SCHEMA_FILE})
-  message(FATAL_ERROR "Cannot find the schema; cannot continue. Looked for ${SCHEMA_PATH} from ${CMAKE_CURRENT_LIST_DIR}")
-endif(NOT EXISTS ${SCHEMA_FILE})
+if( NOT EXISTS ${SCHEMA_FILE} )
+  message( FATAL_ERROR "Cannot find the schema; cannot continue. Looked for ${SCHEMA_PATH} from ${CMAKE_CURRENT_LIST_DIR}" )
+endif( NOT EXISTS ${SCHEMA_FILE} )
 
 
-get_filename_component(SCHEMA_SN ${SCHEMA_FILE} NAME)
-string(REGEX REPLACE "\(.*\).[Ee][Xx][Pp]" "sdai_\\1" SCHEMA_LINK_NAME ${SCHEMA_SN})
-set(STEPCODE_LIBRARIES base stepcore stepeditor stepdai steputils ${SCHEMA_LINK_NAME})
+get_filename_component( SCHEMA_SN ${SCHEMA_FILE} NAME )
+string( REGEX REPLACE "\(.*\).[Ee][Xx][Pp]" "\\1" SCHEMA_LINK_NAME ${SCHEMA_SN} )
+set( STEPCODE_LIBRARIES base stepcore stepeditor stepdai steputils sdai_${SCHEMA_LINK_NAME} )
 
 # Add STEPCode project to CMake build.
-add_subdirectory(${STEPCODE_ROOT_DIR} "${CMAKE_CURRENT_BINARY_DIR}/sc" EXCLUDE_FROM_ALL)
+add_subdirectory( ${STEPCODE_ROOT_DIR} "${CMAKE_CURRENT_BINARY_DIR}/sc" EXCLUDE_FROM_ALL )
 
 # Set up STEPcode include directories.
-set(STEPCODE_INCLUDE_DIR
-  ${STEPCODE_ROOT_DIR}/src/base
-  ${STEPCODE_ROOT_DIR}/src/clstepcore
-  ${STEPCODE_ROOT_DIR}/src/cldai
-  ${STEPCODE_ROOT_DIR}/src/clutils
-  ${STEPCODE_ROOT_DIR}/src/cleditor
-  ${STEPCODE_BUILD_DIR}/include
-  ${STEPCODE_ROOT_DIR}/include
-  ${CMAKE_BINARY_DIR}
-  ${STEPCODE_BUILD_DIR}/schemas/${SCHEMA_LINK_NAME}
- )
+set( STEPCODE_INCLUDE_DIR
+${STEPCODE_ROOT_DIR}/src/base
+${STEPCODE_ROOT_DIR}/src/clstepcore
+${STEPCODE_ROOT_DIR}/src/cldai
+${STEPCODE_ROOT_DIR}/src/clutils
+${STEPCODE_ROOT_DIR}/src/cleditor
+${STEPCODE_BUILD_DIR}/include
+${STEPCODE_ROOT_DIR}/include
+${CMAKE_BINARY_DIR}
+)
 
 # Reset sane values for build destination.  Otherwise, everything ends up in ${CMAKE_BINARY_DIR}/sc
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+set( CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib )
+set( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin )
 
 include_directories(
-  ${STEPCODE_INCLUDE_DIR}
- )
+${STEPCODE_INCLUDE_DIR}
+)
 
 # Application sources and headers
-set(SRCS ap203min.cpp)
+set( SRCS
+ap203min.cpp
+)
 
-set(HDRS )
+set( HDRS
+)
 
-add_executable(${PROJECT_NAME} ${SRCS} ${HDRS})
+add_executable( ${PROJECT_NAME} ${SRCS} ${HDRS} )
 
-target_link_libraries(${PROJECT_NAME} ${STEPCODE_LIBRARIES})
-
-# Local Variables:
-# tab-width: 8
-# mode: cmake
-# indent-tabs-mode: t
-# End:
-# ex: shiftwidth=2 tabstop=8
+target_link_libraries( ${PROJECT_NAME} ${STEPCODE_LIBRARIES} )
 
+set_target_properties( ${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "-I${STEPCODE_BUILD_DIR}/data/${SCHEMA_LINK_NAME}" )

example/ap203min/ExternalProjectBuild/CMakeLists.txt

@@ -1,80 +0,0 @@
-#
-# CMakeLists.txt for AP203 Minimum
-#
-#  This file is released to the public domain.  Any part of this file may be
-# freely copied in part or in full for any purpose.  No acknowledgment is required
-# for the use of this file.
-#
-project(AP203Minimum)
-cmake_minimum_required(VERSION 2.8)
-
-INCLUDE( ExternalProject )
-
-set(CMAKE_MODULE_PATH ${AP203Minimum_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
-
-INCLUDE( External_STEPCode )
-
-#####
-# Variables ideally set by FindSTEPCode.cmake
-
-IF(NOT WIN32)
-	set( STEPCODE_LIBRARIES
-	${STEPCODE_INSTALL_DIR}/lib/libbase.a
-	${STEPCODE_INSTALL_DIR}/lib/libstepcore.a
-	${STEPCODE_INSTALL_DIR}/lib/libstepeditor.a
-	${STEPCODE_INSTALL_DIR}/lib/libstepdai.a
-	${STEPCODE_INSTALL_DIR}/lib/libsteputils.a
-	${STEPCODE_INSTALL_DIR}/lib/libsdai_ap203.a
-	)
-ELSE()
-	set( STEPCODE_LIBRARIES
-	${STEPCODE_INSTALL_DIR}/lib/libbase.lib
-	${STEPCODE_INSTALL_DIR}/lib/libstepcore.lib
-	${STEPCODE_INSTALL_DIR}/lib/libstepeditor.lib
-	${STEPCODE_INSTALL_DIR}/lib/libstepdai.lib
-	${STEPCODE_INSTALL_DIR}/lib/libsteputils.lib
-	${STEPCODE_INSTALL_DIR}/lib/libsdai_ap203.lib
-	${STEPCODE_INSTALL_DIR}/lib/libexpress.lib
-	${STEPCODE_INSTALL_DIR}/lib/libexppp.lib
-	shlwapi.lib
-	)
-ENDIF()
-
-MESSAGE( STATUS "STEPCODE_INSTALL_DIR: " ${STEPCODE_INSTALL_DIR} )
-
-set( STEPCODE_INCLUDE_DIR
-${STEPCODE_INSTALL_DIR}/include/stepcode
-${STEPCODE_INSTALL_DIR}/include/stepcode/base
-${STEPCODE_INSTALL_DIR}/include/stepcode/clstepcore
-${STEPCODE_INSTALL_DIR}/include/stepcode/cldai
-${STEPCODE_INSTALL_DIR}/include/stepcode/clutils
-${STEPCODE_INSTALL_DIR}/include/stepcode/cleditor
-${STEPCODE_INSTALL_DIR}/include/schemas/sdai_ap203
-)
-
-# End of variables ideally set by FindSTEPCode.cmake
-######
-
-
-include_directories(
-    ${STEPCODE_INCLUDE_DIR}
-)
-
-set(SRCS ../ap203min.cpp)
-
-set(HDRS )
-
-add_executable( ${PROJECT_NAME} ${SRCS} ${HDRS})
-
-add_dependencies( ${PROJECT_NAME} STEPCODE )
-
-target_link_libraries( ${PROJECT_NAME} 
-    ${STEPCODE_LIBRARIES}
-)
-
-# Local Variables:
-# tab-width: 8
-# mode: cmake
-# indent-tabs-mode: t
-# End:
-# ex: shiftwidth=2 tabstop=8

example/ap203min/ExternalProjectBuild/cmake/External_STEPCode.cmake

@@ -1,29 +0,0 @@
-ExternalProject_Add( STEPCODE
-	URL ${CMAKE_CURRENT_SOURCE_DIR}/../../..
-	CMAKE_ARGS -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-		-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-		-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
-		-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
-		-DSC_BUILD_TYPE=Debug
-		-DSC_BUILD_SCHEMAS=ap203/ap203.exp
-		-DSC_BUILD_STATIC_LIBS=ON
-		-DSC_PYTHON_GENERATOR=OFF
-		-DSC_INSTALL_PREFIX:PATH=<INSTALL_DIR>
-)
-ExternalProject_Get_Property( STEPCODE SOURCE_DIR )
-ExternalProject_Get_Property( STEPCODE BINARY_DIR )
-ExternalProject_Get_Property( STEPCODE INSTALL_DIR )
-
-IF( NOT WIN32 )
-	SET( STEPCODE_INSTALL_DIR ${SOURCE_DIR}/../sc-install )
-ELSE()
-	SET( STEPCODE_INSTALL_DIR ${INSTALL_DIR} )
-ENDIF()
-
-SET( STEPCODE_BINARY_DIR ${BINARY_DIR} )
-
-# SC CMake does not honor -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
-# Consequently, force Debug so it installs in ../sc-install directory
-# instead of /usr/local/lib.
-#
-# SC's own programs fail to build with -DSC_BUILD_SHARED_LIBS=OFF

example/ap203min/ap203min.cpp

@@ -49,6 +49,10 @@
 //  $./AP203Minimum
 //  AP203Minimum    outfile.stp
 
+
+extern void
+SchemaInit( class Registry & );
+
 #include <STEPfile.h>
 #include <sdai.h>
 #include <STEPattribute.h>

include/CMakeLists.txt

@@ -1,4 +1,4 @@
-set(express_HDRS
+SET(express_HDRS
   express/alg.h
   express/basic.h
   express/caseitem.h
@@ -20,29 +20,21 @@ set(express_HDRS
   express/symbol.h
   express/type.h
   express/variable.h
-  )
+)
 install(FILES ${express_HDRS}
-  DESTINATION ${INCLUDE_INSTALL_DIR}/stepcode/express)
+	DESTINATION ${INCLUDE_INSTALL_DIR}/stepcode/express)
 
-set(exppp_HDRS
+SET(exppp_HDRS
   exppp/exppp.h
-  )
+)
 install(FILES ${exppp_HDRS}
-  DESTINATION ${INCLUDE_INSTALL_DIR}/stepcode/exppp)
+	DESTINATION ${INCLUDE_INSTALL_DIR}/stepcode/exppp)
 
 install(FILES ordered_attrs.h
-  sc_export.h
-  sc_stdbool.h
-  DESTINATION ${INCLUDE_INSTALL_DIR}/stepcode)
+              sc_export.h
+              sc_stdbool.h
+	DESTINATION ${INCLUDE_INSTALL_DIR}/stepcode)
 
 install(FILES ${SC_BINARY_DIR}/${INCLUDE_INSTALL_DIR}/sc_cf.h
-  ${SC_BINARY_DIR}/${INCLUDE_INSTALL_DIR}/sc_version_string.h
-  DESTINATION ${INCLUDE_INSTALL_DIR}/stepcode)
-
-# Local Variables:
-# tab-width: 8
-# mode: cmake
-# indent-tabs-mode: t
-# End:
-# ex: shiftwidth=2 tabstop=8
-
+	${SC_BINARY_DIR}/${INCLUDE_INSTALL_DIR}/sc_version_string.h
+	DESTINATION ${INCLUDE_INSTALL_DIR}/stepcode)

include/express/alg.h

@@ -69,7 +69,7 @@ struct tag {
 
 /** location of fulltext of algorithm in source file */
 struct FullText {
-    const char * filename;
+    char * filename;
     unsigned int start, end;
 };
 

include/express/error.h

@@ -83,7 +83,7 @@ typedef struct Error_Warning_ {
 /********************/
 
 extern SC_EXPRESS_EXPORT bool __ERROR_buffer_errors;
-extern SC_EXPRESS_EXPORT const char * current_filename;
+extern SC_EXPRESS_EXPORT char * current_filename;
 
 /* flag to remember whether non-warning errors have occurred */
 extern SC_EXPRESS_EXPORT bool ERRORoccurred;

include/express/exp_kw.h

@@ -1,127 +0,0 @@
-#ifndef EXP_KW_H
-#define EXP_KW_H
-
-#include "sc_export.h"
-
-extern SC_EXPRESS_EXPORT char * KW_ABS;
-extern SC_EXPRESS_EXPORT char * KW_ABSTRACT;
-extern SC_EXPRESS_EXPORT char * KW_ACOS;
-extern SC_EXPRESS_EXPORT char * KW_AGGREGATE;
-extern SC_EXPRESS_EXPORT char * KW_ALIAS;
-extern SC_EXPRESS_EXPORT char * KW_AND;
-extern SC_EXPRESS_EXPORT char * KW_ANDOR;
-extern SC_EXPRESS_EXPORT char * KW_ARRAY;
-extern SC_EXPRESS_EXPORT char * KW_AS;
-extern SC_EXPRESS_EXPORT char * KW_ASIN;
-extern SC_EXPRESS_EXPORT char * KW_ATAN;
-extern SC_EXPRESS_EXPORT char * KW_BAG;
-extern SC_EXPRESS_EXPORT char * KW_BEGIN;
-extern SC_EXPRESS_EXPORT char * KW_BINARY;
-extern SC_EXPRESS_EXPORT char * KW_BLENGTH;
-extern SC_EXPRESS_EXPORT char * KW_BOOLEAN;
-extern SC_EXPRESS_EXPORT char * KW_BY;
-extern SC_EXPRESS_EXPORT char * KW_CASE;
-extern SC_EXPRESS_EXPORT char * KW_CONST_E;
-extern SC_EXPRESS_EXPORT char * KW_CONSTANT;
-extern SC_EXPRESS_EXPORT char * KW_CONTEXT;
-extern SC_EXPRESS_EXPORT char * KW_COS;
-extern SC_EXPRESS_EXPORT char * KW_DERIVE;
-extern SC_EXPRESS_EXPORT char * KW_DIV;
-extern SC_EXPRESS_EXPORT char * KW_ELSE;
-extern SC_EXPRESS_EXPORT char * KW_END;
-extern SC_EXPRESS_EXPORT char * KW_END_ALIAS;
-extern SC_EXPRESS_EXPORT char * KW_END_CASE;
-extern SC_EXPRESS_EXPORT char * KW_END_CONSTANT;
-extern SC_EXPRESS_EXPORT char * KW_END_CONTEXT;
-extern SC_EXPRESS_EXPORT char * KW_END_ENTITY;
-extern SC_EXPRESS_EXPORT char * KW_END_FUNCTION;
-extern SC_EXPRESS_EXPORT char * KW_END_IF;
-extern SC_EXPRESS_EXPORT char * KW_END_LOCAL;
-extern SC_EXPRESS_EXPORT char * KW_END_MODEL;
-extern SC_EXPRESS_EXPORT char * KW_END_PROCEDURE;
-extern SC_EXPRESS_EXPORT char * KW_END_REPEAT;
-extern SC_EXPRESS_EXPORT char * KW_END_RULE;
-extern SC_EXPRESS_EXPORT char * KW_END_SCHEMA;
-extern SC_EXPRESS_EXPORT char * KW_END_TYPE;
-extern SC_EXPRESS_EXPORT char * KW_ENTITY;
-extern SC_EXPRESS_EXPORT char * KW_ENUMERATION;
-extern SC_EXPRESS_EXPORT char * KW_ESCAPE;
-extern SC_EXPRESS_EXPORT char * KW_EXISTS;
-extern SC_EXPRESS_EXPORT char * KW_EXP;
-extern SC_EXPRESS_EXPORT char * KW_FALSE;
-extern SC_EXPRESS_EXPORT char * KW_FIXED;
-extern SC_EXPRESS_EXPORT char * KW_FOR;
-extern SC_EXPRESS_EXPORT char * KW_FORMAT;
-extern SC_EXPRESS_EXPORT char * KW_FROM;
-extern SC_EXPRESS_EXPORT char * KW_FUNCTION;
-extern SC_EXPRESS_EXPORT char * KW_GENERIC;
-extern SC_EXPRESS_EXPORT char * KW_HIBOUND;
-extern SC_EXPRESS_EXPORT char * KW_HIINDEX;
-extern SC_EXPRESS_EXPORT char * KW_IF;
-extern SC_EXPRESS_EXPORT char * KW_IN;
-extern SC_EXPRESS_EXPORT char * KW_INCLUDE;
-extern SC_EXPRESS_EXPORT char * KW_INSERT;
-extern SC_EXPRESS_EXPORT char * KW_INTEGER;
-extern SC_EXPRESS_EXPORT char * KW_INVERSE;
-extern SC_EXPRESS_EXPORT char * KW_LENGTH;
-extern SC_EXPRESS_EXPORT char * KW_LIKE;
-extern SC_EXPRESS_EXPORT char * KW_LIST;
-extern SC_EXPRESS_EXPORT char * KW_LOBOUND;
-extern SC_EXPRESS_EXPORT char * KW_LOCAL;
-extern SC_EXPRESS_EXPORT char * KW_LOG;
-extern SC_EXPRESS_EXPORT char * KW_LOG10;
-extern SC_EXPRESS_EXPORT char * KW_LOG2;
-extern SC_EXPRESS_EXPORT char * KW_LOGICAL;
-extern SC_EXPRESS_EXPORT char * KW_LOINDEX;
-extern SC_EXPRESS_EXPORT char * KW_MOD;
-extern SC_EXPRESS_EXPORT char * KW_MODEL;
-extern SC_EXPRESS_EXPORT char * KW_NOT;
-extern SC_EXPRESS_EXPORT char * KW_NUMBER;
-extern SC_EXPRESS_EXPORT char * KW_NVL;
-extern SC_EXPRESS_EXPORT char * KW_ODD;
-extern SC_EXPRESS_EXPORT char * KW_OF;
-extern SC_EXPRESS_EXPORT char * KW_ONEOF;
-extern SC_EXPRESS_EXPORT char * KW_OPTIONAL;
-extern SC_EXPRESS_EXPORT char * KW_OR;
-extern SC_EXPRESS_EXPORT char * KW_OTHERWISE;
-extern SC_EXPRESS_EXPORT char * KW_PI;
-extern SC_EXPRESS_EXPORT char * KW_PROCEDURE;
-extern SC_EXPRESS_EXPORT char * KW_QUERY;
-extern SC_EXPRESS_EXPORT char * KW_REAL;
-extern SC_EXPRESS_EXPORT char * KW_REFERENCE;
-extern SC_EXPRESS_EXPORT char * KW_REMOVE;
-extern SC_EXPRESS_EXPORT char * KW_REPEAT;
-extern SC_EXPRESS_EXPORT char * KW_RETURN;
-extern SC_EXPRESS_EXPORT char * KW_ROLESOF;
-extern SC_EXPRESS_EXPORT char * KW_RULE;
-extern SC_EXPRESS_EXPORT char * KW_SCHEMA;
-extern SC_EXPRESS_EXPORT char * KW_SELECT;
-extern SC_EXPRESS_EXPORT char * KW_SELF;
-extern SC_EXPRESS_EXPORT char * KW_SET;
-extern SC_EXPRESS_EXPORT char * KW_SIN;
-extern SC_EXPRESS_EXPORT char * KW_SIZEOF;
-extern SC_EXPRESS_EXPORT char * KW_SKIP;
-extern SC_EXPRESS_EXPORT char * KW_SQRT;
-extern SC_EXPRESS_EXPORT char * KW_STRING;
-extern SC_EXPRESS_EXPORT char * KW_SUBTYPE;
-extern SC_EXPRESS_EXPORT char * KW_SUPERTYPE;
-extern SC_EXPRESS_EXPORT char * KW_TAN;
-extern SC_EXPRESS_EXPORT char * KW_THEN;
-extern SC_EXPRESS_EXPORT char * KW_TO;
-extern SC_EXPRESS_EXPORT char * KW_TRUE;
-extern SC_EXPRESS_EXPORT char * KW_TYPE;
-extern SC_EXPRESS_EXPORT char * KW_TYPEOF;
-extern SC_EXPRESS_EXPORT char * KW_UNIQUE;
-extern SC_EXPRESS_EXPORT char * KW_UNKNOWN;
-extern SC_EXPRESS_EXPORT char * KW_UNTIL;
-extern SC_EXPRESS_EXPORT char * KW_USE;
-extern SC_EXPRESS_EXPORT char * KW_USEDIN;
-extern SC_EXPRESS_EXPORT char * KW_VALUE;
-extern SC_EXPRESS_EXPORT char * KW_VALUE_IN;
-extern SC_EXPRESS_EXPORT char * KW_VALUE_UNIQUE;
-extern SC_EXPRESS_EXPORT char * KW_VAR;
-extern SC_EXPRESS_EXPORT char * KW_WHERE;
-extern SC_EXPRESS_EXPORT char * KW_WHILE;
-extern SC_EXPRESS_EXPORT char * KW_XOR;
-
-#endif /* EXP_KW_H */

include/express/express.h

@@ -115,6 +115,127 @@ extern SC_EXPRESS_EXPORT Error ERROR_warn_small_real;
 extern SC_EXPRESS_EXPORT struct Scope_ * FUNC_NVL;
 extern SC_EXPRESS_EXPORT struct Scope_ * FUNC_USEDIN;
 
+extern SC_EXPRESS_EXPORT char * KW_ABS;
+extern SC_EXPRESS_EXPORT char * KW_ABSTRACT;
+extern SC_EXPRESS_EXPORT char * KW_ACOS;
+extern SC_EXPRESS_EXPORT char * KW_AGGREGATE;
+extern SC_EXPRESS_EXPORT char * KW_ALIAS;
+extern SC_EXPRESS_EXPORT char * KW_AND;
+extern SC_EXPRESS_EXPORT char * KW_ANDOR;
+extern SC_EXPRESS_EXPORT char * KW_ARRAY;
+extern SC_EXPRESS_EXPORT char * KW_AS;
+extern SC_EXPRESS_EXPORT char * KW_ASIN;
+extern SC_EXPRESS_EXPORT char * KW_ATAN;
+extern SC_EXPRESS_EXPORT char * KW_BAG;
+extern SC_EXPRESS_EXPORT char * KW_BEGIN;
+extern SC_EXPRESS_EXPORT char * KW_BINARY;
+extern SC_EXPRESS_EXPORT char * KW_BLENGTH;
+extern SC_EXPRESS_EXPORT char * KW_BOOLEAN;
+extern SC_EXPRESS_EXPORT char * KW_BY;
+extern SC_EXPRESS_EXPORT char * KW_CASE;
+extern SC_EXPRESS_EXPORT char * KW_CONST_E;
+extern SC_EXPRESS_EXPORT char * KW_CONSTANT;
+extern SC_EXPRESS_EXPORT char * KW_CONTEXT;
+extern SC_EXPRESS_EXPORT char * KW_COS;
+extern SC_EXPRESS_EXPORT char * KW_DERIVE;
+extern SC_EXPRESS_EXPORT char * KW_DIV;
+extern SC_EXPRESS_EXPORT char * KW_ELSE;
+extern SC_EXPRESS_EXPORT char * KW_END;
+extern SC_EXPRESS_EXPORT char * KW_END_ALIAS;
+extern SC_EXPRESS_EXPORT char * KW_END_CASE;
+extern SC_EXPRESS_EXPORT char * KW_END_CONSTANT;
+extern SC_EXPRESS_EXPORT char * KW_END_CONTEXT;
+extern SC_EXPRESS_EXPORT char * KW_END_ENTITY;
+extern SC_EXPRESS_EXPORT char * KW_END_FUNCTION;
+extern SC_EXPRESS_EXPORT char * KW_END_IF;
+extern SC_EXPRESS_EXPORT char * KW_END_LOCAL;
+extern SC_EXPRESS_EXPORT char * KW_END_MODEL;
+extern SC_EXPRESS_EXPORT char * KW_END_PROCEDURE;
+extern SC_EXPRESS_EXPORT char * KW_END_REPEAT;
+extern SC_EXPRESS_EXPORT char * KW_END_RULE;
+extern SC_EXPRESS_EXPORT char * KW_END_SCHEMA;
+extern SC_EXPRESS_EXPORT char * KW_END_TYPE;
+extern SC_EXPRESS_EXPORT char * KW_ENTITY;
+extern SC_EXPRESS_EXPORT char * KW_ENUMERATION;
+extern SC_EXPRESS_EXPORT char * KW_ESCAPE;
+extern SC_EXPRESS_EXPORT char * KW_EXISTS;
+extern SC_EXPRESS_EXPORT char * KW_EXP;
+extern SC_EXPRESS_EXPORT char * KW_FALSE;
+extern SC_EXPRESS_EXPORT char * KW_FIXED;
+extern SC_EXPRESS_EXPORT char * KW_FOR;
+extern SC_EXPRESS_EXPORT char * KW_FORMAT;
+extern SC_EXPRESS_EXPORT char * KW_FROM;
+extern SC_EXPRESS_EXPORT char * KW_FUNCTION;
+extern SC_EXPRESS_EXPORT char * KW_GENERIC;
+extern SC_EXPRESS_EXPORT char * KW_HIBOUND;
+extern SC_EXPRESS_EXPORT char * KW_HIINDEX;
+extern SC_EXPRESS_EXPORT char * KW_IF;
+extern SC_EXPRESS_EXPORT char * KW_IN;
+extern SC_EXPRESS_EXPORT char * KW_INCLUDE;
+extern SC_EXPRESS_EXPORT char * KW_INSERT;
+extern SC_EXPRESS_EXPORT char * KW_INTEGER;
+extern SC_EXPRESS_EXPORT char * KW_INVERSE;
+extern SC_EXPRESS_EXPORT char * KW_LENGTH;
+extern SC_EXPRESS_EXPORT char * KW_LIKE;
+extern SC_EXPRESS_EXPORT char * KW_LIST;
+extern SC_EXPRESS_EXPORT char * KW_LOBOUND;
+extern SC_EXPRESS_EXPORT char * KW_LOCAL;
+extern SC_EXPRESS_EXPORT char * KW_LOG;
+extern SC_EXPRESS_EXPORT char * KW_LOG10;
+extern SC_EXPRESS_EXPORT char * KW_LOG2;
+extern SC_EXPRESS_EXPORT char * KW_LOGICAL;
+extern SC_EXPRESS_EXPORT char * KW_LOINDEX;
+extern SC_EXPRESS_EXPORT char * KW_MOD;
+extern SC_EXPRESS_EXPORT char * KW_MODEL;
+extern SC_EXPRESS_EXPORT char * KW_NOT;
+extern SC_EXPRESS_EXPORT char * KW_NUMBER;
+extern SC_EXPRESS_EXPORT char * KW_NVL;
+extern SC_EXPRESS_EXPORT char * KW_ODD;
+extern SC_EXPRESS_EXPORT char * KW_OF;
+extern SC_EXPRESS_EXPORT char * KW_ONEOF;
+extern SC_EXPRESS_EXPORT char * KW_OPTIONAL;
+extern SC_EXPRESS_EXPORT char * KW_OR;
+extern SC_EXPRESS_EXPORT char * KW_OTHERWISE;
+extern SC_EXPRESS_EXPORT char * KW_PI;
+extern SC_EXPRESS_EXPORT char * KW_PROCEDURE;
+extern SC_EXPRESS_EXPORT char * KW_QUERY;
+extern SC_EXPRESS_EXPORT char * KW_REAL;
+extern SC_EXPRESS_EXPORT char * KW_REFERENCE;
+extern SC_EXPRESS_EXPORT char * KW_REMOVE;
+extern SC_EXPRESS_EXPORT char * KW_REPEAT;
+extern SC_EXPRESS_EXPORT char * KW_RETURN;
+extern SC_EXPRESS_EXPORT char * KW_ROLESOF;
+extern SC_EXPRESS_EXPORT char * KW_RULE;
+extern SC_EXPRESS_EXPORT char * KW_SCHEMA;
+extern SC_EXPRESS_EXPORT char * KW_SELECT;
+extern SC_EXPRESS_EXPORT char * KW_SELF;
+extern SC_EXPRESS_EXPORT char * KW_SET;
+extern SC_EXPRESS_EXPORT char * KW_SIN;
+extern SC_EXPRESS_EXPORT char * KW_SIZEOF;
+extern SC_EXPRESS_EXPORT char * KW_SKIP;
+extern SC_EXPRESS_EXPORT char * KW_SQRT;
+extern SC_EXPRESS_EXPORT char * KW_STRING;
+extern SC_EXPRESS_EXPORT char * KW_SUBTYPE;
+extern SC_EXPRESS_EXPORT char * KW_SUPERTYPE;
+extern SC_EXPRESS_EXPORT char * KW_TAN;
+extern SC_EXPRESS_EXPORT char * KW_THEN;
+extern SC_EXPRESS_EXPORT char * KW_TO;
+extern SC_EXPRESS_EXPORT char * KW_TRUE;
+extern SC_EXPRESS_EXPORT char * KW_TYPE;
+extern SC_EXPRESS_EXPORT char * KW_TYPEOF;
+extern SC_EXPRESS_EXPORT char * KW_UNIQUE;
+extern SC_EXPRESS_EXPORT char * KW_UNKNOWN;
+extern SC_EXPRESS_EXPORT char * KW_UNTIL;
+extern SC_EXPRESS_EXPORT char * KW_USE;
+extern SC_EXPRESS_EXPORT char * KW_USEDIN;
+extern SC_EXPRESS_EXPORT char * KW_VALUE;
+extern SC_EXPRESS_EXPORT char * KW_VALUE_IN;
+extern SC_EXPRESS_EXPORT char * KW_VALUE_UNIQUE;
+extern SC_EXPRESS_EXPORT char * KW_VAR;
+extern SC_EXPRESS_EXPORT char * KW_WHERE;
+extern SC_EXPRESS_EXPORT char * KW_WHILE;
+extern SC_EXPRESS_EXPORT char * KW_XOR;
+
 /******************************/
 /* macro function definitions */
 /******************************/
@@ -134,9 +255,11 @@ extern SC_EXPRESS_EXPORT void     EXPRESSparse      PROTO( ( Express, FILE *, ch
 extern SC_EXPRESS_EXPORT void     EXPRESSinitialize PROTO( ( void ) );
 extern SC_EXPRESS_EXPORT void     EXPRESScleanup    PROTO( ( void ) );
 extern SC_EXPRESS_EXPORT void     EXPRESSresolve    PROTO( ( Express ) );
-extern SC_EXPRESS_EXPORT int      EXPRESS_fail( Express model );
-extern SC_EXPRESS_EXPORT int      EXPRESS_succeed( Express model );
+extern SC_EXPRESS_EXPORT char  *  EXPRESSversion    PROTO( ( void ) );
+extern SC_EXPRESS_EXPORT int      EXPRESS_fail      PROTO( ( Express ) );
+extern SC_EXPRESS_EXPORT int      EXPRESS_succeed   PROTO( ( Express ) );
 extern                   void     EXPRESSinit_init  PROTO( ( void ) );
+extern SC_EXPRESS_EXPORT void     EXPRESSusage( int _exit ); /**< exit unless _exit is non-zero */
 extern SC_EXPRESS_EXPORT void     build_complex( Express );
 
 #endif /*EXPRESS_H*/

include/express/info.h

@@ -1,14 +0,0 @@
-#ifndef INFO_H
-#define INFO_H
-
-#include "sc_export.h"
-/** \file info.h
- * informative functions that were in express.c/express.h
- */
-
-extern SC_EXPRESS_EXPORT char * EXPRESSversion( void );
-
-/** print usage message, then exit if _exit is non-zero */
-extern SC_EXPRESS_EXPORT void EXPRESSusage( int _exit );
-
-#endif /* INFO_H */

include/express/lexact.h

@@ -58,7 +58,7 @@ typedef struct Scan_Buffer {
 #endif
     char  * savedPos;
     FILE  * file;
-    const char  *  filename;
+    char  *  filename;
     bool readEof;
     int lineno;
     int bol;

include/express/linklist.h

@@ -129,8 +129,6 @@ extern SC_EXPRESS_EXPORT void LISTinitialize PROTO( ( void ) );
 extern SC_EXPRESS_EXPORT void LISTcleanup PROTO( ( void ) );
 extern SC_EXPRESS_EXPORT Linked_List LISTcreate PROTO( ( void ) );
 extern SC_EXPRESS_EXPORT Linked_List LISTcopy PROTO( ( Linked_List ) );
-extern SC_EXPRESS_EXPORT void LISTsort PROTO( ( Linked_List, int (*comp)(void*, void*) ) );
-extern SC_EXPRESS_EXPORT void LISTswap PROTO( ( Link, Link ) );
 extern SC_EXPRESS_EXPORT Generic  LISTadd_first PROTO( ( Linked_List, Generic ) );
 extern SC_EXPRESS_EXPORT Generic  LISTadd_last PROTO( ( Linked_List, Generic ) );
 extern SC_EXPRESS_EXPORT Generic  LISTadd_after PROTO( ( Linked_List, Link, Generic ) );

include/express/symbol.h

@@ -59,7 +59,7 @@ typedef struct Symbol_ Symbol;
 
 struct Symbol_ {
     char * name;
-    const char * filename;
+    char * filename;
     int line;
     char resolved;
 };
@@ -89,6 +89,6 @@ extern SC_EXPRESS_EXPORT struct freelist_head SYMBOL_fl;
 /***********************/
 
 extern SC_EXPRESS_EXPORT void SYMBOLinitialize PROTO( ( void ) );
-SC_EXPRESS_EXPORT Symbol * SYMBOLcreate( char * name, int line, const char * filename );
+SC_EXPRESS_EXPORT Symbol * SYMBOLcreate( char * name, int line, char * filename );
 
 #endif    /*  SYMBOL_H  */

include/express/type.h

@@ -164,7 +164,6 @@ struct TypeBody_ {
                                    *   element = expression [ ':' repetition ] .
                                    * TODO exp2cxx and exp2py do not use this! Are all use cases handled by libexppp?
                                    */
-        unsigned var        : 1; /** denotes variable marked 'VAR' - i.e. one where changes are propagated back to the caller */
         unsigned encoded    : 1; /**< encoded string */
     } flags;
     Type base;      /**< underlying base type if any can also contain true type if this type is a type reference */

include/express/variable.h

@@ -76,11 +76,10 @@ typedef struct Variable_ * Variable;
 /***************************/
 
 struct Variable_ {
-    Expression  name;        /**< Symbol is inside of 'name' */
+    Expression  name;    /**< Symbol is inside of 'name' */
     Type        type;
     Expression  initializer; /**< or 'derived' */
-    int         offset;      /**< used for attr order in Entitys, and for decl order in LOCAL vars. these two uses should never conflict! */
-    int         idx;         /**< used in exp2cxx to simplify calculation of attrDescriptor names in generated code */
+    int         offset;
 
     struct {
         unsigned int optional    : 1; /**< OPTIONAL keyword */

include/sc_cf_cmake.h.in

@@ -24,7 +24,5 @@
 #cmakedefine HAVE_SSIZE_T 1
 
 #cmakedefine HAVE_STD_THREAD 1
-#cmakedefine HAVE_STD_CHRONO 1
-#cmakedefine HAVE_NULLPTR 1
 
 #endif /* SCL_CF_H */

include/sc_stdbool.h

@@ -34,7 +34,7 @@ typedef int _Bool;
  * and version 15.00.30729.01, which comes with Visual C++ 2008, do not
  * define _Bool.
  */
-#if defined(_MSC_VER) && _MSC_VER<1800
+#if defined(_MSC_VER)
 typedef int _Bool;
 #endif
 

lcov.cmake

@@ -1,15 +1,15 @@
 # lcov.cmake
 # `ctest -S lcov.cmake`
 
-if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
-  message(FATAL_ERROR "LCOV is Linux-only")
-endif(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+if( NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Linux" )
+  message( FATAL_ERROR "LCOV is Linux-only" )
+endif( NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Linux" )
 
-set(CTEST_SOURCE_DIRECTORY .)
-set(CTEST_BINARY_DIRECTORY build_lcov)
-set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
-set(CTEST_MEMORYCHECK_COMMAND /usr/bin/valgrind)
-set(CTEST_INITIAL_CACHE "
+set( CTEST_SOURCE_DIRECTORY . )
+set( CTEST_BINARY_DIRECTORY build_lcov )
+set( CTEST_CMAKE_GENERATOR "Unix Makefiles" )
+set( CTEST_MEMORYCHECK_COMMAND /usr/bin/valgrind )
+set( CTEST_INITIAL_CACHE "
 SITE:STRING=${CTEST_SITE}
 BUILDNAME:STRING=${CTEST_BUILD_NAME}
 SC_ENABLE_TESTING:BOOL=ON
@@ -18,50 +18,42 @@ SC_BUILD_SCHEMAS:STRING=ALL
 SC_BUILD_TYPE:STRING=Debug
 ")
 
-set(LCOV_OUT "${CTEST_BINARY_DIRECTORY}/lcov_html")
+set( LCOV_OUT "${CTEST_BINARY_DIRECTORY}/lcov_html" )
 
 ctest_start(lcov)
 ctest_empty_binary_directory(${CTEST_BINARY_DIRECTORY})
 message("configuring...")
-ctest_configure(BUILD "${CTEST_BINARY_DIRECTORY}" OPTIONS "-DSC_BUILD_SCHEMAS=ALL;-DSC_ENABLE_COVERAGE=ON;-SC_PYTHON_GENERATOR=OFF")
+ctest_configure( BUILD "${CTEST_BINARY_DIRECTORY}" OPTIONS "-DSC_BUILD_SCHEMAS=ALL;-DSC_ENABLE_COVERAGE=ON;-SC_PYTHON_GENERATOR=OFF" )
 message("lcov: resetting counters...")
-execute_process(COMMAND lcov -z -d .
-  WORKING_DIRECTORY ${CTEST_BINARY_DIRECTORY} OUTPUT_QUIET)
+execute_process( COMMAND lcov -z -d .
+                 WORKING_DIRECTORY ${CTEST_BINARY_DIRECTORY} OUTPUT_QUIET )
 
 # copy files so lcov won't complain
-execute_process(COMMAND ${CMAKE_COMMAND} -E copy src/express/expparse.y ${CTEST_BINARY_DIRECTORY}/src/express/CMakeFiles/express.dir)
-execute_process(COMMAND ${CMAKE_COMMAND} -E copy src/express/expscan.l ${CTEST_BINARY_DIRECTORY}/src/express/CMakeFiles/express.dir)
+execute_process( COMMAND ${CMAKE_COMMAND} -E copy src/express/expparse.y ${CTEST_BINARY_DIRECTORY}/src/express/CMakeFiles/express.dir )
+execute_process( COMMAND ${CMAKE_COMMAND} -E copy src/express/expscan.l ${CTEST_BINARY_DIRECTORY}/src/express/CMakeFiles/express.dir )
 
 message("building...")
-ctest_build(BUILD "${CTEST_BINARY_DIRECTORY}")
+ctest_build( BUILD "${CTEST_BINARY_DIRECTORY}" )
 
 message("running tests...")
-ctest_test(BUILD "${CTEST_BINARY_DIRECTORY}" PARALLEL_LEVEL 1)
+ctest_test( BUILD "${CTEST_BINARY_DIRECTORY}" PARALLEL_LEVEL 1 )
 
-message("analyzing profiling data using lcov...")
-execute_process(COMMAND lcov -c -d . -o stepcode.lcov
-  WORKING_DIRECTORY ${CTEST_BINARY_DIRECTORY} OUTPUT_QUIET ERROR_QUIET)
+message( "analyzing profiling data using lcov..." )
+execute_process( COMMAND lcov -c -d . -o stepcode.lcov
+                 WORKING_DIRECTORY ${CTEST_BINARY_DIRECTORY} OUTPUT_QUIET ERROR_QUIET )
 
 message("removing system headers...")
-execute_process(COMMAND lcov -r stepcode.lcov "/usr/include/*" -o stepcode_no_usr.lcov
-  WORKING_DIRECTORY ${CTEST_BINARY_DIRECTORY} OUTPUT_QUIET ERROR_QUIET)
-execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${LCOV_OUT})
+execute_process( COMMAND lcov -r stepcode.lcov "/usr/include/*" -o stepcode_no_usr.lcov
+                 WORKING_DIRECTORY ${CTEST_BINARY_DIRECTORY} OUTPUT_QUIET ERROR_QUIET )
+execute_process( COMMAND ${CMAKE_COMMAND} -E make_directory ${LCOV_OUT} )
 
-message("creating html files...")
-execute_process(COMMAND genhtml ../stepcode_no_usr.lcov
-  WORKING_DIRECTORY ${LCOV_OUT} OUTPUT_QUIET ERROR_QUIET)
+message( "creating html files..." )
+execute_process( COMMAND genhtml ../stepcode_no_usr.lcov
+                 WORKING_DIRECTORY ${LCOV_OUT} OUTPUT_QUIET ERROR_QUIET )
 
-message("html files are located in ${LCOV_OUT}")
-execute_process(COMMAND ${CMAKE_COMMAND} -E tar czf ${LCOV_OUT}.tgz ${LCOV_OUT} WORKING_DIRECTORY ${CTEST_SOURCE_DIRECTORY})
+message( "html files are located in ${LCOV_OUT}" )
+execute_process( COMMAND ${CMAKE_COMMAND} -E tar czf ${LCOV_OUT}.tgz ${LCOV_OUT} WORKING_DIRECTORY ${CTEST_SOURCE_DIRECTORY} )
 
-message("tarball at ${LCOV_OUT}.tgz")
-
-message("================================================ Success! ================================================")
-
-# Local Variables:
-# tab-width: 8
-# mode: cmake
-# indent-tabs-mode: t
-# End:
-# ex: shiftwidth=2 tabstop=8
+message( "tarball at ${LCOV_OUT}.tgz" )
 
+message( "================================================ Success! ================================================" )

misc/summarize-appveyor-log.go

@@ -1,330 +0,0 @@
-//summarize MSVC errors from an appveyor log
-// compile with 'go build summarize-appveyor-log.go'
-// takes 0 or 1 args; with 0, gets log from latest
-// build. with 1, uses that file as raw json-like log
-package main
-
-import (
-	"bufio"
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-	"os"
-	"regexp"
-	"sort"
-	"strings"
-)
-
-const (
-	headerKey = "Authorization"
-	headerVal = "Bearer %s"
-	projUrl   = "https://ci.appveyor.com/api/projects/mpictor/stepcode"
-	//"https://ci.appveyor.com/api/buildjobs/2rjxdv1rnb8jcg8y/log"
-	logUrl     = "https://ci.appveyor.com/api/buildjobs/%s/log"
-	consoleUrl = "https://ci.appveyor.com/api/buildjobs/%s/console"
-)
-
-func main() {
-	var rawlog io.ReadCloser
-	var build string
-	var err error
-	if len(os.Args) == 2 {
-		rawlog, build, err = processArgv()
-	} else {
-		rawlog, build, err = getLog()
-	}
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "ERROR: %s\n", err)
-		return
-	}
-	defer rawlog.Close()
-	log := decodeConsole(rawlog)
-	warns, errs := countMessages(log)
-	fi, err := os.Create(fmt.Sprintf("appveyor-%s.smy", build))
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "ERROR: %s\n", err)
-		return
-	}
-	printMessages("error", errs, fi)
-	printMessages("warning", warns, fi)
-
-	fmt.Printf("done\n")
-
-}
-
-/* categorizes warnings and errors based upon the MSVC message number (i.e. C4244)
- * the regex will match lines like
-c:\projects\stepcode\src\base\sc_benchmark.h(45): warning C4251: 'benchmark::descr' : class 'std::basic_string<char,std::char_traits<char>,std::allocator<char>>' needs to have dll-interface to be used by clients of class 'benchmark' [C:\projects\STEPcode\build\src\base\base.vcxproj]
-[00:03:48] C:\projects\STEPcode\src\base\sc_benchmark.cc(61): warning C4244: '=' : conversion from 'SIZE_T' to 'long', possible loss of data [C:\projects\STEPcode\build\src\base\base.vcxproj]*
-*/
-func countMessages(log []string) (warns, errs map[string][]string) {
-	warns = make(map[string][]string)
-	errs = make(map[string][]string)
-	fname := " *(.*)"            // $1
-	fline := `(?:\((\d+)\)| ): ` // $2 - either line number in parenthesis or a space, followed by a colon
-	msgNr := `([A-Z]+\d+): `     // $3 - C4251, LNK2005, etc
-	msgTxt := `([^\[]*) `        // $4
-	tail := `\[[^\[\]]*\]`
-	warnRe := regexp.MustCompile(fname + fline + `warning ` + msgNr + msgTxt + tail)
-	errRe := regexp.MustCompile(fname + fline + `(?:fatal )?error ` + msgNr + msgTxt + tail)
-	for _, line := range log {
-		if warnRe.MatchString(line) {
-			key := warnRe.ReplaceAllString(line, "$3")
-			path := strings.ToLower(warnRe.ReplaceAllString(line, "$1:$2"))
-			arr := warns[key]
-			if arr == nil {
-				arr = make([]string, 5)
-				//detailed text as first string in array
-				text := warnRe.ReplaceAllString(line, "$4")
-				arr[0] = fmt.Sprintf("%s", text)
-			}
-			//eliminate duplicates
-			match := false
-			for _, l := range arr {
-				if l == path {
-					match = true
-				}
-			}
-			if !match {
-				warns[key] = append(arr, path)
-			}
-		} else if errRe.MatchString(line) {
-			key := errRe.ReplaceAllString(line, "$3")
-			path := strings.ToLower(errRe.ReplaceAllString(line, "$1:$2"))
-			arr := errs[key]
-			if arr == nil {
-				arr = make([]string, 5)
-				//detailed text as first string in array
-				text := errRe.ReplaceAllString(line, "$4")
-				arr[0] = fmt.Sprintf("%s", text)
-			}
-			//eliminate duplicates
-			match := false
-			for _, l := range arr {
-				if l == path {
-					match = true
-				}
-			}
-			if !match {
-				errs[key] = append(arr, path)
-			}
-		}
-	}
-	return
-}
-
-func printMessages(typ string, m map[string][]string, w io.Writer) {
-	//sort keys
-	keys := make([]string, 0, len(m))
-	for key := range m {
-		keys = append(keys, key)
-	}
-	sort.Strings(keys)
-	for _, k := range keys {
-		for i, l := range m[k] {
-			//first string is an example,  not a location
-			if i == 0 {
-				fmt.Fprintf(w, "%s %s (i.e. \"%s\")\n", typ, k, l)
-			} else if len(l) > 1 { //not sure where blank lines are coming from...
-				fmt.Fprintf(w, "  >> %s\n", l)
-			}
-		}
-	}
-}
-
-//structs from http://json2struct.mervine.net/
-
-//{"values":[{"i":0,"t":"Specify a project or solution file. The directory does not contain a project or solution file.\r\n","dt":"00:00:04","bg":12,"fg":15}]}
-type AppVeyorConsoleLines struct {
-	Values []struct {
-		I        int    `json:"i"`
-		Text     string `json:"t"`
-		DateTime string `json:"dt"`
-		BgColor  int    `json:"bg"`
-		FgColor  int    `json:"fg"`
-	}
-}
-type AppVeyorBuild struct {
-	Build struct {
-		/*BuildNumber int `json:"buildNumber"`*/
-		Version string `json:"version"`
-		Jobs    []struct {
-			JobID string `json:"jobId"`
-		} `json:"jobs"`
-	} `json:"build"`
-}
-
-func splitAppend(log *[]string, blob string) {
-	//blob = strings.Replace(blob,"\r\n", "\n",-1)
-	blob = strings.Replace(blob, "\\", "/", -1)
-	r := strings.NewReader(blob)
-	unwrapScanner := bufio.NewScanner(r)
-	for unwrapScanner.Scan() {
-		txt := unwrapScanner.Text()
-		//fmt.Printf("%s\n", txt)
-		*log = append(*log, txt)
-	}
-}
-
-//calculate length of string without escape chars
-// func escapeLen(s string)(l int) {
-// 	//s = strings.Replace(s,"\\\\", "/",-1)
-// 	s = strings.Replace(s,"\\\"", "",-1)
-// 	s = strings.Replace(s,"\r\n", "RN",-1)
-// 	return len(s)
-// }
-
-
-//decode the almost-JSON console data from appveyor
-func decodeConsole(r io.Reader) (log []string) {
-	wrapper := Wrap(r)
-	dec := json.NewDecoder(wrapper)
-	var consoleLines AppVeyorConsoleLines
-	var err error
-	var txtBlob string
-	err = dec.Decode(&consoleLines)
-	if err == io.EOF {
-		err = nil
-	}
-	if err == nil {
-		for _, l := range consoleLines.Values {
-			txtBlob += l.Text
-			//el := escapeLen(l.Text)
-			//something inserts newlines at 229 chars (+\n\r == 231) (found in CMake output)
-			lenTwoThreeOne := len(l.Text) == 231
-			if lenTwoThreeOne {
-				txtBlob = strings.TrimSuffix(txtBlob, "\r\n")
-			}
-			//something else starts new log lines at 1024 chars without inserting newlines (found in CTest error output)
-			if len(l.Text) != 1024 && !lenTwoThreeOne {
-				//fmt.Printf("sa for l %d, el %d\n", len(l.Text),el)
-				splitAppend(&log, txtBlob)
-				txtBlob = ""
-			}
-		}
-	} else {
-		fmt.Printf("decode err %s\n", err)
-	}
-	if len(txtBlob) > 0 {
-		splitAppend(&log, txtBlob)
-	}
-	return
-}
-
-func processArgv() (log io.ReadCloser, build string, err error) {
-	fname := os.Args[1]
-	if len(fname) < 14 {
-		err = fmt.Errorf("Name arg '%s' too short. Run as '%s appveyor-NNN.log'", fname, os.Args[0])
-		return
-	}
-	buildRe := regexp.MustCompile(`appveyor-(.+).log`)
-	build = buildRe.ReplaceAllString(fname, "$1")
-	if len(build) == 0 {
-		err = fmt.Errorf("No build id in %s", fname)
-		return
-	}
-	log, err = os.Open(fname)
-	return
-}
-
-func getLog() (log io.ReadCloser, build string, err error) {
-	client := &http.Client{}
-	req, err := http.NewRequest("GET", projUrl, nil)
-	if err != nil {
-		return
-	}
-	apikey := os.Getenv("APPVEYOR_API_KEY")
-	//api key isn't necessary for read-only queries on public projects
-	if len(apikey) > 0 {
-		req.Header.Add(headerKey, fmt.Sprintf(headerVal, apikey))
-	} //else {
-	//	fmt.Printf("Env var APPVEYOR_API_KEY is not set.")
-	//}
-	resp, err := client.Do(req)
-	if err != nil {
-		return
-	}
-
-	build, job := decodeProjInfo(resp.Body)
-	fmt.Printf("build #%s, jobId %s\n", build, job)
-	resp, err = http.Get(fmt.Sprintf(consoleUrl, job))
-	if err != nil {
-		return
-	}
-	logName := fmt.Sprintf("appveyor-%s.log", build)
-	fi, err := os.Create(logName)
-	if err != nil {
-		return
-	}
-	_, err = io.Copy(fi, resp.Body)
-	if err != nil {
-		return
-	}
-	log, err = os.Open(logName)
-	if err != nil {
-		log = nil
-	}
-	return
-}
-
-func decodeProjInfo(r io.Reader) (vers string, job string) {
-	dec := json.NewDecoder(r)
-	var av AppVeyorBuild
-	err := dec.Decode(&av)
-	if err != io.EOF && err != nil {
-		fmt.Printf("err %s\n", err)
-		return
-	}
-	if len(av.Build.Jobs) != 1 {
-		return
-	}
-	vers = av.Build.Version
-	job = av.Build.Jobs[0].JobID
-	return
-}
-
-//wrap a reader, modifying content to make the json decoder happy
-//only tested with data from appveyor console
-type jsonWrapper struct {
-	source io.Reader
-	begin  bool
-	end    bool
-}
-
-func Wrap(r io.Reader) *jsonWrapper {
-	return &jsonWrapper{
-		source: r,
-		begin:  true,
-	}
-}
-
-// func nonNeg(n int) (int) {
-// 	if n < 0 {
-// 		return 0
-// 	}
-// 	return n
-// }
-
-func (w *jsonWrapper) Read(p []byte) (n int, err error) {
-	if w.end {
-		return 0, io.EOF
-	}
-	if w.begin {
-		w.begin = false
-		n = copy(p, []byte(`{"values":[`))
-	}
-	m, err := w.source.Read(p[n:])
-	n += m
-	if err == io.EOF {
-		w.end = true
-		if n < len(p) {
-			n = copy(p, []byte(`{"dummy":"data"}]}`))
-		} else {
-			err = fmt.Errorf("No room to terminate JSON struct with '}'\n")
-		}
-	}
-	return
-}
-
-// kate: indent-width 8; space-indent off; replace-tabs off; replace-tabs-save off; replace-trailing-space-save on; remove-trailing-space on; tab-intent on; tab-width 8; show-tabs off;

run_ctest.cmake

@@ -1,11 +1,11 @@
 # run_ctest.cmake
 # `ctest -S run_ctest.cmake`
 
-set(CTEST_SOURCE_DIRECTORY .)
-set(CTEST_BINARY_DIRECTORY build_ctest)
-set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
-set(CTEST_MEMORYCHECK_COMMAND /usr/bin/valgrind)
-set(CTEST_INITIAL_CACHE "
+set( CTEST_SOURCE_DIRECTORY . )
+set( CTEST_BINARY_DIRECTORY build_ctest )
+set( CTEST_CMAKE_GENERATOR "Unix Makefiles" )
+set( CTEST_MEMORYCHECK_COMMAND /usr/bin/valgrind )
+set( CTEST_INITIAL_CACHE "
 SITE:STRING=${CTEST_SITE}
 BUILDNAME:STRING=${CTEST_BUILD_NAME}
 SC_ENABLE_TESTING:BOOL=ON
@@ -14,11 +14,11 @@ SC_BUILD_TYPE:STRING=Debug
 
 
 
-if(EXISTS "../.SC_CTEST_PREFS.cmake")
-  include("../.SC_CTEST_PREFS.cmake")
+if( EXISTS "../.SC_CTEST_PREFS.cmake" )
+    include( "../.SC_CTEST_PREFS.cmake" )
 else()
-  message(WARNING "Did not find ../.SC_CTEST_PREFS.cmake, containing config variables - result submission disabled")
-  set(SKIP_SUBMISSION TRUE)
+    message( WARNING "Did not find ../.SC_CTEST_PREFS.cmake, containing config variables - result submission disabled" )
+    set( SKIP_SUBMISSION TRUE )
 endif()
 
 ######################################################
@@ -26,8 +26,8 @@ endif()
 # use config variables such as these in
 #   ../.SC_CTEST_PREFS.cmake
 #
-#set(CTEST_SITE "username")
-#set(CTEST_BUILD_NAME "build type, os, arch")
+#set( CTEST_SITE "username")
+#set( CTEST_BUILD_NAME "build type, os, arch")
 #
 #
 # setting any of these to true causes that set of tests
@@ -44,11 +44,11 @@ endif()
 ######################################################
 
 
-function(SUBMIT_TEST part)
-  if(NOT SKIP_SUBMISSION)
-    ctest_submit(PARTS ${part})
-  endif()
-endfunction(SUBMIT_TEST part)
+function( SUBMIT_TEST part )
+    if( NOT SKIP_SUBMISSION )
+        ctest_submit( PARTS ${part} )
+    endif()
+endfunction( SUBMIT_TEST part )
 
 ######################################################
 ##### To disable reporting of a set of tests, comment
@@ -56,73 +56,65 @@ endfunction(SUBMIT_TEST part)
 ##### the set you wish to disable.
 #####
 ##### To do this for all tests:
-##### set(SKIP_SUBMISSION TRUE)
+##### set( SKIP_SUBMISSION TRUE )
 ######################################################
 
 ctest_start(Experimental)
 ctest_empty_binary_directory(${CTEST_BINARY_DIRECTORY})
 
 file(WRITE "${CTEST_BINARY_DIRECTORY}/CTestCustom.cmake" "
-set(CTEST_CUSTOM_ERROR_EXCEPTION \"{standard input}:[0-9][0-9]*: WARNING: \")
+set( CTEST_CUSTOM_ERROR_EXCEPTION \"{standard input}:[0-9][0-9]*: WARNING: \")
 ")
 
-ctest_configure(BUILD "${CTEST_BINARY_DIRECTORY}" APPEND OPTIONS -DSC_ENABLE_TESTING=ON)
-SUBMIT_TEST(Configure)
-ctest_build(BUILD "${CTEST_BINARY_DIRECTORY}" APPEND)
-SUBMIT_TEST(Build)
-# ctest_memcheck(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
+ctest_configure( BUILD "${CTEST_BINARY_DIRECTORY}" APPEND OPTIONS -DSC_ENABLE_TESTING=ON )
+SUBMIT_TEST( Configure )
+ctest_build( BUILD "${CTEST_BINARY_DIRECTORY}" APPEND )
+SUBMIT_TEST( Build )
+# ctest_memcheck( BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res )
 
-if(NOT SKIP_TEST_UNITARY_SCHEMAS)
-  ctest_test(BUILD "${CTEST_BINARY_DIRECTORY}" APPEND
-    INCLUDE_LABEL "unitary_schemas")
-  SUBMIT_TEST(Test)
+if(NOT SKIP_TEST_UNITARY_SCHEMAS )
+    ctest_test( BUILD "${CTEST_BINARY_DIRECTORY}" APPEND
+                INCLUDE_LABEL "unitary_schemas" )
+    SUBMIT_TEST( Test )
 endif()
 
-if(NOT SKIP_CPP_TEST_SCHEMA_GEN)
-  ctest_test(BUILD "${CTEST_BINARY_DIRECTORY}" APPEND
-    INCLUDE_LABEL "cpp_schema_gen")
-  SUBMIT_TEST(Test)
-  if(NOT SKIP_CPP_TEST_SCHEMA_BUILD)
-    ctest_test(BUILD "${CTEST_BINARY_DIRECTORY}" APPEND
-      INCLUDE_LABEL "cpp_schema_build")
-    SUBMIT_TEST(Test)
-    if(NOT SKIP_CPP_TEST_SCHEMA_RW)
-      ctest_test(BUILD "${CTEST_BINARY_DIRECTORY}" APPEND
-	INCLUDE_LABEL "cpp_schema_rw")
-      SUBMIT_TEST(Test)
+if(NOT SKIP_CPP_TEST_SCHEMA_GEN )
+    ctest_test( BUILD "${CTEST_BINARY_DIRECTORY}" APPEND
+                INCLUDE_LABEL "cpp_schema_gen" )
+    SUBMIT_TEST( Test )
+    if(NOT SKIP_CPP_TEST_SCHEMA_BUILD )
+        ctest_test( BUILD "${CTEST_BINARY_DIRECTORY}" APPEND
+                    INCLUDE_LABEL "cpp_schema_build" )
+        SUBMIT_TEST( Test )
+        if(NOT SKIP_CPP_TEST_SCHEMA_RW )
+            ctest_test( BUILD "${CTEST_BINARY_DIRECTORY}" APPEND
+                        INCLUDE_LABEL "cpp_schema_rw" )
+            SUBMIT_TEST( Test )
+        endif()
     endif()
-  endif()
 endif()
 
-if(NOT SKIP_TEST_EXCHANGE_FILE)
-  if(SKIP_CPP_TEST_SCHEMA_BUILD)
-    ctest_test(BUILD "${CTEST_BINARY_DIRECTORY}" APPEND
-      INCLUDE "build_cpp_sdai_AP214E3_2010")
-    SUBMIT_TEST(Test)
-  endif()
-  ctest_test(BUILD "${CTEST_BINARY_DIRECTORY}" APPEND
-    INCLUDE_LABEL "exchange_file")
-  SUBMIT_TEST(Test)
+if(NOT SKIP_TEST_EXCHANGE_FILE )
+    if( SKIP_CPP_TEST_SCHEMA_BUILD )
+        ctest_test( BUILD "${CTEST_BINARY_DIRECTORY}" APPEND
+                INCLUDE "build_cpp_sdai_AP214E3_2010" )
+        SUBMIT_TEST( Test )
+    endif()
+    ctest_test( BUILD "${CTEST_BINARY_DIRECTORY}" APPEND
+                INCLUDE_LABEL "exchange_file" )
+    SUBMIT_TEST( Test )
 endif()
 
-if(NOT SKIP_TEST_CPP_SCHEMA_SPECIFIC)
-  ctest_test(BUILD "${CTEST_BINARY_DIRECTORY}" APPEND
-    INCLUDE_LABEL "cpp_schema_specific")
-  SUBMIT_TEST(Test)
+if(NOT SKIP_TEST_CPP_SCHEMA_SPECIFIC )
+    ctest_test( BUILD "${CTEST_BINARY_DIRECTORY}" APPEND
+                INCLUDE_LABEL "cpp_schema_specific" )
+    SUBMIT_TEST( Test )
 endif()
 
-if(NOT SKIP_TEST_CPP_UNIT)
-  ctest_test(BUILD "${CTEST_BINARY_DIRECTORY}" APPEND
-    INCLUDE_LABEL "cpp_unit_....*")
-  SUBMIT_TEST(Test)
+if(NOT SKIP_TEST_CPP_UNIT )
+    ctest_test( BUILD "${CTEST_BINARY_DIRECTORY}" APPEND
+                INCLUDE_LABEL "cpp_unit_....*" )
+    SUBMIT_TEST( Test )
 endif()
 
-# ctest_coverage()
-
-# Local Variables:
-# tab-width: 8
-# mode: cmake
-# indent-tabs-mode: t
-# End:
-# ex: shiftwidth=2 tabstop=8
-
+# ctest_coverage( )

src/base/CMakeLists.txt

@@ -1,68 +1,45 @@
 
 set(SC_BASE_SOURCES
-  sc_memmgr.cc
-  sc_trace_fprintf.c
-  sc_getopt.cc
-  sc_benchmark.cc
-  sc_mkdir.c
-  path2str.c
-  judy/src/judy.c
- )
+    sc_memmgr.cc
+    sc_trace_fprintf.c
+    sc_getopt.cc
+    sc_benchmark.cc
+)
 
 set(SC_BASE_HDRS
-  sc_benchmark.h
-  sc_memmgr.h
-  sc_getopt.h
-  sc_trace_fprintf.h
-  sc_mkdir.h
-  sc_nullptr.h
-  path2str.h
-  judy/src/judy.h
-  judy/src/judyLArray.h
-  judy/src/judyL2Array.h
-  judy/src/judySArray.h
-  judy/src/judyS2Array.h
- )
-
-include_directories(
-  ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_CURRENT_SOURCE_DIR}/judy/src
-  )
+    sc_benchmark.h
+    sc_memmgr.h
+    sc_getopt.h
+    sc_trace_fprintf.h
+    sc_stdbool.h
+)
 
 if(MINGW OR MSVC OR BORLAND)
-  add_definitions(-DSC_BASE_DLL_EXPORTS)
+add_definitions( -DSC_BASE_DLL_EXPORTS )
 endif()
 
 if (${SC_MEMMGR_ENABLE_CHECKS})
-  add_definitions(-DSC_MEMMGR_ENABLE_CHECKS)
+	add_definitions( -DSC_MEMMGR_ENABLE_CHECKS )
 endif()
 
 SC_ADDLIB(base "${SC_BASE_SOURCES}" "")
 
 if(MINGW OR MSVC OR BORLAND)
-  target_link_libraries(base psapi.lib)
+    target_link_libraries(base psapi.lib)
 endif()
 
-if(NOT IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/judy/src")
-  message("Judy array source code not found. Downloading (don't sweat, it's public domain)...")
-  file(DOWNLOAD "http://github.com/mpictor/judy-template/archive/master.tar.gz"
-    "${CMAKE_CURRENT_SOURCE_DIR}/judy.tar.gz" SHOW_PROGRESS)
-  execute_process(
-    COMMAND ${CMAKE_COMMAND} -E tar xzf "${CMAKE_CURRENT_SOURCE_DIR}/judy.tar.gz"
-    WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/"
-   )
-  file(RENAME judy-template-master judy)
-  file(REMOVE "${CMAKE_CURRENT_SOURCE_DIR}/judy.tar.gz")
-  message("Judy array source code extracted.")
-endif(NOT IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/judy/src")
+if(NOT IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/judy/src" )
+    message( "Judy array source code not found. Downloading (don't sweat, it's public domain)..." )
+    file( DOWNLOAD "http://github.com/mpictor/judy-template/archive/master.tar.gz"
+          "${CMAKE_CURRENT_SOURCE_DIR}/judy.tar.gz" SHOW_PROGRESS )
+    execute_process(
+        COMMAND ${CMAKE_COMMAND} -E tar xzf "${CMAKE_CURRENT_SOURCE_DIR}/judy.tar.gz"
+        WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/"
+    )
+    file( RENAME judy-template-master judy )
+    file( REMOVE "${CMAKE_CURRENT_SOURCE_DIR}/judy.tar.gz" )
+    message( "Judy array source code extracted." )
+endif(NOT IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/judy/src" )
 
 install(FILES ${SC_BASE_HDRS}
-  DESTINATION ${INCLUDE_INSTALL_DIR}/stepcode/base)
-
-# Local Variables:
-# tab-width: 8
-# mode: cmake
-# indent-tabs-mode: t
-# End:
-# ex: shiftwidth=2 tabstop=8
-
+        DESTINATION ${INCLUDE_INSTALL_DIR}/stepcode/base)

src/base/judy/CMakeLists.txt

@@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 2.8)
 project( JudyTemplates )
 
 if( NOT DEFINED CMAKE_BUILD_TYPE )
-  # set( CMAKE_BUILD_TYPE "RelWithDebInfo" ) #optimize, but include debug info
-  set( CMAKE_BUILD_TYPE "Release" )
+    # set( CMAKE_BUILD_TYPE "RelWithDebInfo" ) #optimize, but include debug info
+    set( CMAKE_BUILD_TYPE "Release" )
 endif( NOT DEFINED CMAKE_BUILD_TYPE )
 
 SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib )
@@ -12,29 +12,29 @@ SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib )
 SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin )
 
 if( NOT DEFINED JUDY_OPTIMIZE_FLAGS )
-  if( CMAKE_COMPILER_IS_GNUCC )
-    set( JUDY_OPTIMIZE_FLAGS "-march=native" )
+    if( CMAKE_COMPILER_IS_GNUCC )
+        set( JUDY_OPTIMIZE_FLAGS "-march=native" )
 
-    #test for LTO; this uses an internal variable so it may break
-    if( DEFINED CMAKE_C_COMPILER_VERSION )
-      if( ${CMAKE_C_COMPILER_VERSION} VERSION_GREATER 4.7.0 )
-	set( JUDY_OPTIMIZE_FLAGS "${JUDY_OPTIMIZE_FLAGS} -flto" )
-	message( "  --  GCC version: ${CMAKE_C_COMPILER_VERSION}. Enabling link-time optimization." )
-      endif( ${CMAKE_C_COMPILER_VERSION} VERSION_GREATER 4.7.0 )
-    endif( DEFINED CMAKE_C_COMPILER_VERSION )
+        #test for LTO; this uses an internal variable so it may break
+        if( DEFINED CMAKE_C_COMPILER_VERSION )
+            if( ${CMAKE_C_COMPILER_VERSION} VERSION_GREATER 4.7.0 )
+                set( JUDY_OPTIMIZE_FLAGS "${JUDY_OPTIMIZE_FLAGS} -flto" )
+                message( "  --  GCC version: ${CMAKE_C_COMPILER_VERSION}. Enabling link-time optimization." )
+            endif( ${CMAKE_C_COMPILER_VERSION} VERSION_GREATER 4.7.0 )
+        endif( DEFINED CMAKE_C_COMPILER_VERSION )
     #elseif( MSVC )
     #  set( JUDY_OPTIMIZE_FLAGS "..." ) # <--- set MSVC flags here <---
-  else()
-    message( "Unrecognized compiler - no optimization flags set. Edit CMakeLists.txt or set JUDY_OPTIMIZE_FLAGS." )
-    set( JUDY_OPTIMIZE_FLAGS "" )
-  endif( CMAKE_COMPILER_IS_GNUCC )
+    else()
+        message( "Unrecognized compiler - no optimization flags set. Edit CMakeLists.txt or set JUDY_OPTIMIZE_FLAGS." )
+        set( JUDY_OPTIMIZE_FLAGS "" )
+    endif( CMAKE_COMPILER_IS_GNUCC )
 endif( NOT DEFINED JUDY_OPTIMIZE_FLAGS )
 add_definitions( ${JUDY_OPTIMIZE_FLAGS} )
 
 set( JUDYS_SOURCES src/judy.c src/judy.h )
 
 if( CMAKE_COMPILER_IS_GNUCC )
-  add_definitions( -pedantic -W -Wall -Wundef -Wfloat-equal -Wshadow -Winline -Wno-long-long )
+    add_definitions( -pedantic -W -Wall -Wundef -Wfloat-equal -Wshadow -Winline -Wno-long-long )
 endif( CMAKE_COMPILER_IS_GNUCC )
 
 add_library( judy_lib STATIC ${JUDYS_SOURCES} )
@@ -42,37 +42,29 @@ add_library( judy_lib STATIC ${JUDYS_SOURCES} )
 include_directories( src )
 
 if( ENABLE_TESTING )
-  include( CTest )
-  include_directories( test )
-  enable_testing()
+    include( CTest )
+    include_directories( test )
+    enable_testing()
 
-  add_executable( pennysort test/pennySort.c test/sort.c ${JUDYS_SOURCES} )
-  add_executable( hexsort test/hexSort.c test/sort.c ${JUDYS_SOURCES} )
-  set_target_properties( pennysort hexsort PROPERTIES COMPILE_FLAGS "-DSTANDALONE" )
+    add_executable( pennysort test/pennySort.c test/sort.c ${JUDYS_SOURCES} )
+    add_executable( hexsort test/hexSort.c test/sort.c ${JUDYS_SOURCES} )
+    set_target_properties( pennysort hexsort PROPERTIES COMPILE_FLAGS "-DSTANDALONE" )
 
 
-  add_executable( judyLtest test/judyLtest.cc )
-  target_link_libraries( judyLtest judy_lib )
-  add_test( judyLtest judyLtest )
+    add_executable( judyLtest test/judyLtest.cc )
+    target_link_libraries( judyLtest judy_lib )
+    add_test( judyLtest judyLtest )
 
-  add_executable( judyL2test test/judyL2test.cc )
-  target_link_libraries( judyL2test judy_lib )
-  add_test( judyL2test judyL2test )
+    add_executable( judyL2test test/judyL2test.cc )
+    target_link_libraries( judyL2test judy_lib )
+    add_test( judyL2test judyL2test )
 
-  add_executable( judyStest test/judyStest.cc )
-  target_link_libraries( judyStest judy_lib )
-  add_test( judyStest judyStest )
+    add_executable( judyStest test/judyStest.cc )
+    target_link_libraries( judyStest judy_lib )
+    add_test( judyStest judyStest )
 
-  add_executable( judyS2test test/judyS2test.cc )
-  target_link_libraries( judyS2test judy_lib )
-  add_test( judyS2test judyS2test )
+    add_executable( judyS2test test/judyS2test.cc )
+    target_link_libraries( judyS2test judy_lib )
+    add_test( judyS2test judyS2test )
 
 endif( ENABLE_TESTING )
-
-# Local Variables:
-# tab-width: 8
-# mode: cmake
-# indent-tabs-mode: t
-# End:
-# ex: shiftwidth=2 tabstop=8
-

src/base/judy/src/judy.c

@@ -62,11 +62,10 @@
 
 #include "judy.h"
 
+#if defined(STANDALONE) || defined(ASKITIS)
 #include <string.h>
 #include <stdio.h>
 
-#if defined(STANDALONE) || defined(ASKITIS)
-
 extern unsigned int MaxMem;
 
 // void judy_abort (char *msg) __attribute__ ((noreturn)); // Tell static analyser that this function will not return
@@ -904,9 +903,8 @@ JudySlot * judy_last( Judy * judy, JudySlot next, unsigned int off, unsigned int
 JudySlot * judy_end( Judy * judy ) {
     judy->level = 0;
     return judy_last( judy, *judy->root, 0, 0 );
-}
+} //    judy_nxt: return next entry
 
-//    judy_nxt: return next entry
 JudySlot * judy_nxt( Judy * judy ) {
     JudySlot * table, *inner;
     int slot, size, cnt;

src/base/judy/src/judyL2Array.h

@@ -166,7 +166,7 @@ class judyL2Array {
                 kv.value = *_lastSlot;
                 _success = true;
             } else {
-                kv.value = NULL;
+                kv.value = ( JudyValue ) 0;
                 _success = false;
             }
             kv.key = _buff[0];

src/base/judy/src/judyLArray.h

@@ -29,16 +29,14 @@ struct judylKVpair {
  */
 template< typename JudyKey, typename JudyValue >
 class judyLArray {
-    public:
-        typedef judylKVpair< JudyKey, JudyValue > pair;
     protected:
         Judy * _judyarray;
         unsigned int _maxLevels, _depth;
         JudyValue * _lastSlot;
         JudyKey _buff[1];
         bool _success;
-        pair _kv;
     public:
+        typedef judylKVpair< JudyKey, JudyValue > pair;
         judyLArray(): _maxLevels( sizeof( JudyKey ) ), _depth( 1 ), _lastSlot( 0 ), _success( true ) {
             assert( sizeof( JudyKey ) == JUDY_key_size && "JudyKey *must* be the same size as a pointer!" );
             assert( sizeof( JudyValue ) == JUDY_key_size && "JudyValue *must* be the same size as a pointer!" );
@@ -57,12 +55,9 @@ class judyLArray {
             judy_close( _judyarray );
         }
 
-        void clear( bool deleteContents = false ) {
+        void clear() {
             JudyKey key = 0;
             while( 0 != ( _lastSlot = ( JudyValue * ) judy_strt( _judyarray, ( const unsigned char * ) &key, 0 ) ) ) {
-                if( deleteContents ) {
-                    delete *_lastSlot;
-                }
                 judy_del( _judyarray );
             }
         }
@@ -117,17 +112,18 @@ class judyLArray {
         }
 
         /// retrieve the key-value pair for the most recent judy query.
-        inline const pair & mostRecentPair() {
+        inline const pair mostRecentPair() {
+            pair kv;
             judy_key( _judyarray, ( unsigned char * ) _buff, _depth * JUDY_key_size );
             if( _lastSlot ) {
-                _kv.value = *_lastSlot;
+                kv.value = *_lastSlot;
                 _success = true;
             } else {
-                _kv.value = ( JudyValue ) 0;
+                kv.value = ( JudyValue ) 0;
                 _success = false;
             }
-            _kv.key = _buff[0];
-            return _kv;
+            kv.key = _buff[0];
+            return kv;
         }
 
         /// retrieve the first key-value pair in the array

src/base/judy/src/judyS2Array.h

@@ -191,7 +191,7 @@ class judyS2Array {
                 kv.value = *_lastSlot;
                 _success = true;
             } else {
-                kv.value = NULL;
+                kv.value = ( JudyValue ) 0;
                 _success = false;
             }
             kv.key = _buff;

src/base/path2str.c

@@ -1,29 +0,0 @@
-
-#include "path2str.h"
-#include "sc_memmgr.h"
-#include <string.h>
-
-/* for windows, rewrite backslashes in paths
- * that will be written to generated code
- */
-const char * path2str_fn( const char * fileMacro ) {
-    static char * result = 0;
-    static size_t rlen = 0;
-    char * p;
-    if( rlen < strlen( fileMacro ) ) {
-        if( result ) {
-            sc_free( result );
-        }
-        rlen = strlen( fileMacro );
-        result = ( char * )sc_malloc( rlen * sizeof( char ) + 1 );
-    }
-    strcpy( result, fileMacro );
-    p = result;
-    while( *p ) {
-        if( *p == '\\' ) {
-            *p = '/';
-        }
-        p++;
-    }
-    return result;
-}

src/base/path2str.h

@@ -1,20 +0,0 @@
-#ifndef PATH2STR_H
-#define PATH2STR_H
-
-#include <sc_export.h>
-
-/** windows only: rewrite backslashes in paths as forward slashes
- * call as path2str(__FILE__) to take advantage of macro
- *
- * silence "unknown escape sequence" warning when contents of __FILE__
- * are fprintf'd into string in generated code
- */
-SC_BASE_EXPORT const char * path2str_fn( const char * fileMacro );
-
-#if defined( _WIN32 ) || defined ( __WIN32__ )
-#  define path2str(path) path2str_fn(path)
-#else
-#  define path2str(path) path
-#endif /* defined( _WIN32 ) || defined ( __WIN32__ ) */
-
-#endif /* PATH2STR_H */

src/base/sc_benchmark.cc

@@ -18,7 +18,6 @@
 #include <iomanip>
 #include <string>
 #include <sstream>
-#include <ios>
 
 /// mem values in kb, times in ms (granularity may be higher than 1ms)
 benchVals getMemAndTime( ) {

src/base/sc_benchmark.h

@@ -6,7 +6,6 @@
 
 #ifdef __cplusplus
 #include <iostream>
-#include <iosfwd>
 #include <string>
 
 #include "sc_memmgr.h"
@@ -39,6 +38,11 @@ extern "C" {
  * depends on getMemAndTime() above - may not work on all platforms.
  */
 
+#ifdef _WIN32
+  template class SC_BASE_EXPORT std::allocator<char>;
+  template class SC_BASE_EXPORT std::basic_string<char, std::char_traits<char>, std::allocator<char> >;
+#endif
+
 class SC_BASE_EXPORT benchmark {
     protected:
         benchVals initialVals, laterVals;