Merge branch 'develop'

v0.8.2

.appveyor.yml

@@ -1,65 +0,0 @@
-version: '{build}'
-
-# for Appveyor CI (windows)
-
-branches:
-  only:
-    - master
-
-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;ap214e3;ap209"
-    echo "filtering build output with grep"
-    cmake --build . --config Debug | grep -ve "CMake does not need to re-run because" -e "ZERO_CHECK.ZERO_CHECK" -e "^  Creating directory"
-
-#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 Running CTest...
-  - cmd: cd c:\projects\STEPcode\build
-  - cmd: echo excluding test_inverse_attr3, which hangs
-  - cmd: ctest -j1 . -C Debug -E test_inverse_attr3 --output-on-failure
-
-# - cmd: grep -niB20 "Test Failed" Testing/Temporary/LastTest.log
-
-# we could upload a compiled zip somewhere (see Appveyor artifact documentation)

.github/workflows/build.yml

@@ -0,0 +1,277 @@
+name: STEPCODE
+
+on:
+  workflow_dispatch:
+  pull_request:
+
+jobs:
+  windows:
+    name: Windows Latest MSVC
+    runs-on: windows-latest
+    strategy:
+      fail-fast: true
+    steps:
+      - name: Setup - CMake
+        uses: lukka/get-cmake@latest
+
+      - name: Setup - Ninja
+        uses: seanmiddleditch/gha-setup-ninja@master
+
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Add github workspace to path
+        # https://github.community/t/deprecated-add-path/136621
+        run: echo "$ENV{GITHUB_WORKSPACE}" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
+
+      - name: Add msbuild to PATH
+        uses: microsoft/setup-msbuild@v1.0.2
+
+      - name: Add cl.exe to PATH
+        uses: ilammy/msvc-dev-cmd@v1
+
+      - name: Configure
+        run: |
+          cmake -S . -B build -G Ninja -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_CXX_COMPILER="cl.exe" -DSC_ENABLE_TESTING=ON
+          # We do the following in order to help ensure files are "flushed"
+          # to disk before compilation is attempted
+          # https://superuser.com/a/1553374/1286142
+          powershell Write-VolumeCache C
+          powershell Write-VolumeCache D
+
+      - name: Build
+        run: cd build && ninja -j1 -v
+
+      - name: Test
+        run: |
+          cd build && ctest -j1 .
+
+  linux:
+    name: Ubuntu Latest GCC
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: true
+    steps:
+      - name: Setup - CMake
+        uses: lukka/get-cmake@latest
+
+      - name: Setup - Ninja
+        uses: seanmiddleditch/gha-setup-ninja@master
+
+        # TODO - we will want this when the new parser work comes in,
+        # as we won't need perplex and the system tools should suffice
+        # to exercise the generator logic:
+        #
+        #  - name: Setup - System
+        #    env:
+        #      DEBIAN_FRONTEND: noninteractive
+        #    run: |
+        #      sudo apt-get update
+        #      # Install dev tools
+        #      sudo apt-get install re2c lemon
+        #      sudo apt-get clean
+
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Configure
+        run: |
+          export PATH=$ENV{GITHUB_WORKSPACE}:$PATH
+          cmake -S . -G Ninja -B build -D ENABLE_ALL=ON -D CMAKE_BUILD_TYPE=Release -DSC_ENABLE_TESTING=ON
+
+      - name: Build
+        run: |
+          export PATH=$ENV{GITHUB_WORKSPACE}:$PATH
+          cmake --build build --config Release
+
+      - name: Test
+        run: |
+          cd build && ctest -j1 . -C Release
+
+  linux_clang:
+    name: Ubuntu Latest Clang
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: true
+    steps:
+      - name: Setup - CMake
+        uses: lukka/get-cmake@latest
+
+      - name: Setup - Ninja
+        uses: seanmiddleditch/gha-setup-ninja@master
+
+        # TODO - we will want this when the new parser work comes in,
+        # as we won't need perplex and the system tools should suffice
+        # to exercise the generator logic:
+        #
+        #  - name: Setup - System
+        #    env:
+        #      DEBIAN_FRONTEND: noninteractive
+        #    run: |
+        #      sudo apt-get update
+        #      # Install dev tools
+        #      sudo apt-get install re2c lemon
+        #      sudo apt-get clean
+
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Configure
+        run: |
+          export PATH=$ENV{GITHUB_WORKSPACE}:$PATH
+          CC=clang CXX=clang++ cmake -S . -G Ninja -B build -D ENABLE_ALL=ON -D CMAKE_BUILD_TYPE=Release -DSC_ENABLE_TESTING=ON
+
+      - name: Build
+        run: |
+          export PATH=$ENV{GITHUB_WORKSPACE}:$PATH
+          CC=clang CXX=clang++ cmake --build build --config Release
+
+      - name: Test
+        run: |
+          cd build && ctest -j1 . -C Release
+
+
+  osx:
+    name: macOS Latest Clang
+    runs-on: macos-latest
+    strategy:
+      fail-fast: true
+    steps:
+      - name: Setup - CMake
+        uses: lukka/get-cmake@latest
+
+      - name: Setup - Ninja
+        uses: seanmiddleditch/gha-setup-ninja@master
+
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Configure
+        run: |
+          export PATH=$ENV{GITHUB_WORKSPACE}:$PATH
+          export CC=clang
+          export CXX=clang++
+          cmake -S . -G Ninja -B build -D CMAKE_BUILD_TYPE=Release -DSC_ENABLE_TESTING=ON
+
+      - name: Build
+        run: |
+          export PATH=$ENV{GITHUB_WORKSPACE}:$PATH
+          cd build && ninja -j1
+
+      - name: Test
+        run: |
+          cd build && ctest -j1 . -C Release
+
+  brlcad_linux:
+    name: BRL-CAD Linux step-g Test
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: true
+    steps:
+      - name: Setup - CMake
+        uses: lukka/get-cmake@latest
+
+      - name: Setup - Ninja
+        uses: seanmiddleditch/gha-setup-ninja@master
+
+      - name: Setup - System
+        env:
+          DEBIAN_FRONTEND: noninteractive
+        run: |
+          sudo apt-get update
+          # Install dev tools
+          sudo apt-get install re2c lemon
+          sudo apt-get clean
+
+      - name: Checkout
+        run: |
+          git clone --depth 1 https://github.com/BRL-CAD/brlcad.git -b main
+          cd brlcad/src/other/ext && rm -rf stepcode
+          git clone --depth 1 https://github.com/stepcode/stepcode.git -b develop
+          # Ordinarily BRL-CAD keeps track of what files are supposed to be
+          # present in the repository.  In this case we're not interested in
+          # updating the list to the working stepcode filelist, so use an empty
+          # list instead
+          echo "set(stepcode_ignore_files)" > stepcode.dist
+          cd ../../../../
+
+
+      - name: Configure
+        run: |
+          export PATH=$ENV{GITHUB_WORKSPACE}:$PATH
+          cd brlcad
+          cmake -S . -G Ninja -B build -DENABLE_ALL=ON -DCMAKE_BUILD_TYPE=Release -DEXT_BUILD_VERBOSE=ON
+          cd ..
+
+      - name: Build
+        run: |
+          export PATH=$ENV{GITHUB_WORKSPACE}:$PATH
+          cd brlcad
+          cmake --build build --config Release --target step-g
+          cd ..
+
+      - name: Test
+        run: |
+          export PATH=$ENV{GITHUB_WORKSPACE}:$PATH
+          cd brlcad/build
+          ./bin/step-g ../db/nist/NIST_MBE_PMI_3.stp -o nist3.g
+          cd ../..
+
+
+  brlcad_windows:
+    name: BRL-CAD Windows step-g Test
+    runs-on: windows-latest
+    strategy:
+      fail-fast: true
+    steps:
+      - name: Setup - CMake
+        uses: lukka/get-cmake@latest
+
+      - name: Setup - Ninja
+        uses: seanmiddleditch/gha-setup-ninja@master
+
+      - name: Add github workspace to path
+        # https://github.community/t/deprecated-add-path/136621
+        run: echo "$ENV{GITHUB_WORKSPACE}" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
+
+      - name: Add msbuild to PATH
+        uses: microsoft/setup-msbuild@v1.0.2
+
+      - name: Add cl.exe to PATH
+        uses: ilammy/msvc-dev-cmd@v1
+
+      - name: Checkout
+        run: |
+          git clone --depth 1 https://github.com/BRL-CAD/brlcad.git -b main
+          cd brlcad/src/other/ext
+          cmake -E rm -r stepcode
+          git clone --depth 1 https://github.com/stepcode/stepcode.git -b develop
+          # Ordinarily BRL-CAD keeps track of what files are supposed to be
+          # present in the repository.  In this case we're not interested in
+          # updating the list to the working stepcode filelist, so use an empty
+          # list instead
+          echo "set(stepcode_ignore_files)" > stepcode.dist
+          cd ../../../../
+
+      - name: Configure
+        run: |
+          cd brlcad && cmake -S . -B build -G Ninja -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_CXX_COMPILER="cl.exe" -DSC_ENABLE_TESTING=ON
+          cd ..
+          # We do the following in order to help ensure files are "flushed"
+          # to disk before compilation is attempted
+          # https://superuser.com/a/1553374/1286142
+          powershell Write-VolumeCache C
+          powershell Write-VolumeCache D
+
+      - name: Build
+        run: |
+          cd brlcad/build
+          ninja -j1 -v step-g
+          cd ../..
+
+      - name: Test
+        run: |
+          cd brlcad/build
+          ./bin/step-g.exe ../db/nist/NIST_MBE_PMI_3.stp -o nist3.g
+          cd ../..
+

.gitignore

@@ -1,3 +1,21 @@
+# Common build directories used in the source tree
 /build
+/.build
+
+# Temporary files
+*~
+\#*\#
+.\#*
+[._]*.s[a-v][a-z]
+[._]*.sw[a-p]
+[._]s[a-v][a-z]
+[._]sw[a-p]
+**/__pycache__/
+
+# OS specific files
+.DS_Store
+.DS_Store?
+
+# Tool specific patterns
 *.kdev4
 .kdev_include_paths

.travis.yml

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

AUTHORS

@@ -19,6 +19,7 @@ Paviot, Thomas (tpaviot)
 Pictor, Mark (mpictor)
 Reed, Nick (nickreed)
 Shah, Kesha (kesha, keshashah)
+Sparks, Devon (devonsparks)
 Thomas, Dawn (homovulgaris, madant)
 Wouters, Dave (davyw)
 Yapp, Clifford (starseeker)

CMakeLists.txt

@@ -40,60 +40,131 @@
 
 project(SC)
 
+# Minimum required version of CMake
+cmake_minimum_required(VERSION 3.12)
+if (POLICY CMP0077)
+  cmake_policy(SET CMP0077 OLD)
+endif (POLICY CMP0077)
+
 # 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_MINOR 8)
+set(SC_VERSION_PATCH 1)
+set(SC_VERSION ${SC_VERSION_MAJOR}.${SC_VERSION_MINOR}.${SC_VERSION_PATCH})
 
-# SC ABI version. SC_ABI_SOVERSION should be incremented
-# for each release introducing API incompatibilities
-set(SC_ABI_SOVERSION 2)
-set(SC_ABI_VERSION ${SC_ABI_SOVERSION}.0.0)
-
-# Minimum required version of CMake
-cmake_minimum_required(VERSION 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)
+# Set language standards
+set(CMAKE_C_EXTENSIONS OFF)
+set(CMAKE_C_STANDARD 11)
+set(CMAKE_C_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 # CMake derives much of its functionality from modules, typically
 # stored in one directory - let CMake know where to find them.
 set(SC_CMAKE_DIR "${SC_SOURCE_DIR}/cmake")
-if(NOT 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}")
-endif(NOT SC_IS_SUBBUILD)
+list(APPEND CMAKE_MODULE_PATH "${SC_CMAKE_DIR}")
 
-# testing and compilation options, build output dirs, install dirs, uninstall, package creation, etc
-include(${SC_CMAKE_DIR}/SC_Build_opts.cmake)
+# OpenBSD has its own naming conventions.  Set a platform variable based on
+# the OS name so we can test for it succinctly.
+if ("${CMAKE_SYSTEM}" MATCHES ".*OpenBSD.*")
+  set(OPENBSD ON)
+endif ("${CMAKE_SYSTEM}" MATCHES ".*OpenBSD.*")
+
+#---------------------------------------------------------------------
+# Set up various relative path variables and build output directories
+include(Path_Setup)
+
+#---------------------------------------------------------------------
+# 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
+if(NOT DEFINED CMAKE_SKIP_BUILD_RPATH)
+  set(CMAKE_SKIP_BUILD_RPATH  FALSE)
+endif()
+
+# when building, don't use the install RPATH already
+# (but later on when installing)
+if(NOT DEFINED CMAKE_BUILD_WITH_INSTALL_RPATH)
+  set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+endif()
+
+# the RPATH/INSTALL_NAME_DIR to be used when installing
+if (NOT APPLE)
+  if(NOT DEFINED CMAKE_INSTALL_RPATH)
+    set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib:\$ORIGIN/../lib")
+  endif()
+endif(NOT APPLE)
+# On OSX, we need to set INSTALL_NAME_DIR instead of RPATH
+# http://www.cmake.org/cmake/help/cmake-2-8-docs.html#variable:CMAKE_INSTALL_NAME_DIR
+if(NOT DEFINED CMAKE_INSTALL_NAME_DIR)
+  set(CMAKE_INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
+endif()
+
+# add the automatically determined parts of the RPATH which point to
+# directories outside the build tree to the install RPATH
+if(NOT DEFINED CMAKE_INSTALL_RPATH_USE_LINK_PATH)
+  set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+endif()
+
+
+#---------------------------------------------------------------------
+# Build options
+option(BUILD_SHARED_LIBS "Build shared libraries" ON)
+option(BUILD_STATIC_LIBS "Build static libraries" OFF)
+
+option(SC_PYTHON_GENERATOR "Compile exp2python" ON)
+option(SC_CPP_GENERATOR "Compile exp2cxx" ON)
+
+option(SC_TRACE_FPRINTF "Enable extra comments in generated code so the code's source in exp2cxx may be located" OFF)
+
+option(SC_ENABLE_COVERAGE "Enable code coverage test" OFF)
+if (SC_ENABLE_COVERAGE AND ${CMAKE_C_COMPILER_ID} STREQUAL "GNU")
+  set(CMAKE_C_FLAGS_DEBUG "-O0 -g -fprofile-arcs -ftest-coverage" CACHE STRING "Extra compile flags required by code coverage" FORCE)
+  set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -fprofile-arcs -ftest-coverage" CACHE STRING "Extra compile flags required by code coverage" FORCE)
+  set(CMAKE_MODULE_LINKER_FLAGS_DEBUG "-fprofile-arcs -ftest-coverage" CACHE STRING "Extra linker flags required by code coverage" FORCE)
+endif (SC_ENABLE_COVERAGE AND ${CMAKE_C_COMPILER_ID} STREQUAL "GNU")
+
+option(SC_BUILD_EXPRESS_ONLY "Only build express parser." OFF)
+mark_as_advanced(SC_BUILD_EXPRESS_ONLY)
+
+option(SC_ENABLE_TESTING "Enable unittesting framework" OFF)
+if(SC_ENABLE_TESTING)
+  if(NOT "${SC_BUILD_EXPRESS_ONLY}" AND NOT DEFINED SC_BUILD_SCHEMAS)
+    set(SC_BUILD_SCHEMAS "ALL") #test all schemas, unless otherwise specified
+  endif()
+  include(CTest)
+endif(SC_ENABLE_TESTING)
 
 # SC_ADDEXEC and SC_ADDLIB macros, dllimport/export, etc
-include(${SC_CMAKE_DIR}/SC_Targets.cmake)
+include(SC_Targets)
 
 # Macros related to paths
-include(${SC_CMAKE_DIR}/SC_Paths.cmake)
+include(SC_Paths)
 
 # locale stuff
-include(${SC_CMAKE_DIR}/SC_Locale.cmake)
+include(SC_Locale)
 
 # logic related to regenerating the lexer and parser source code
-include(${SC_CMAKE_DIR}/SC_Regenerate.cmake)
+include(SC_Regenerate)
+
+# create config.h header
+include(SC_Config_Headers)
 
 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)
+if(NOT "${SC_BUILD_EXPRESS_ONLY}" AND 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)
+    "** Note: CMake variable SC_BUILD_SCHEMAS was not set - defaults to building ALL 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()
 
 if(NOT SC_IS_SUBBUILD)
   list(APPEND CONFIG_END_MESSAGES
@@ -102,23 +173,14 @@ if(NOT SC_IS_SUBBUILD)
     ".. Generating step can take a while if you are building several schemas.")
 endif(NOT SC_IS_SUBBUILD)
 
-# create config headers sc_cf.h and sc_version_string.h
-include(${SC_CMAKE_DIR}/SC_Config_Headers.cmake)
-
-
 ################
 
 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()
+endif()
+if (${CMAKE_C_COMPILER_ID} STREQUAL "GNU" OR ${CMAKE_C_COMPILER_ID} STREQUAL "Clang")
   add_definitions(-pedantic -W -Wall -Wundef -Wfloat-equal -Wshadow -Winline -Wno-long-long)
-  if(HAVE_NULLPTR)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-  endif(HAVE_NULLPTR)
 endif()
 
 include_directories(
@@ -126,7 +188,6 @@ include_directories(
   ${SC_BINARY_DIR}/include
  )
 
-add_subdirectory(src/base)
 add_subdirectory(src/express)
 add_subdirectory(src/exppp)
 add_subdirectory(src/exp2cxx)
@@ -143,9 +204,19 @@ if(SC_ENABLE_TESTING)
 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(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)
+endif(NOT SC_IS_SUBBUILD)
+
 
 # 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.

CONTRIBUTING.md

@@ -11,9 +11,12 @@ We love contributions!
   * 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.
+  * Do not change EXPRESS schema definition without reference to an upstream change.
 * 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`.
+  - enable github option on each PR 'Allow edits from maintainers', refer to github help if necessary
+* We'll look at the PR and either merge (possibly after rebase) 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
 

COPYING

@@ -1,108 +1,47 @@
-Modifications to the original NIST code are (C)opyright by their 
-respective authors. Unless otherwise specified, they are copyright
-on the date those changes were committed to whichever repository 
-they were committed to first (i.e. BRL-CAD on SourceForge.net, 
-mpictor/StepClassLibrary or stepcode/stepcode on github).
+STEPcode is provided as a collective work under the 3-clause BSD
+license.  As some portions are not subject to copyright in some
+jurisdictions, see INTENT.md for additional details regarding intent
+and history.  See the AUTHORS file for a list of contributors and
+copyright holders.
+
+Code generated by STEPcode containing substantial parts of STEPcode
+complex enough to have copyright protection are subject to the terms
+of this license.
+
+STEPcode acknowledgement and/or attribution is appreciated regardless
+of license or copyright status.
 
-Modifications which were first commited to the repository on github
-are licensed under the 3-clause BSD license below. Changes committed
-to BRL-CAD either contain license information mentioning BRL-CAD 
-near the top of the file, or are licensed under the same terms that
-NIST used.
 
 ********************************************************************
-3-clause BSD license:
+                        3-Clause BSD License
+********************************************************************
 
-Copyright (c) <date committed>, <copyright holder>
+Copyright (c) 2009-2019 STEPcode AUTHORS
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-    * Neither the name of the <organization> nor the
-      names of its contributors may be used to endorse or promote products
-      derived from this software without specific prior written permission.
+modification, are permitted provided that the following conditions are
+met:
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-********************************************************************
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
 
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
 
-********************************************************************
-                    ORIGINAL NIST TEXT FOLLOWS
-********************************************************************
-
-This software was produced by the National Institute of Standards and 
-Technology (NIST), an agency of the U.S. government, and by statute is 
-not subject to copyright in the United States. Recipients of this 
-software assume all responsibility associated with its operation, 
-modification, maintenance, and subsequent redistribution.
-
-Acknowledgements:
-The STEP Class Library (SCL) was developed by the Manufacturing 
-Systems Integration Division at NIST to support testing of the 
-Standard for the Exchange of Product Model Data (a.k.a STEP) and 
-validation of STEP's emerging implementation specifications. Funding 
-for the project has come from the Department of Commerce and the 
-Department of Defense agencies including the Office of the Defense 
-CALS (Continuous Acquisition and Life-Cycle Support) Executive and 
-the Defense Advanced Research Projects Agency (DARPA). Recent 
-enhancements were sponsored by the National Information Infrastructure 
-Protocols Consortium and NIST's Systems Integration for Manufacturing 
-Applications (SIMA) program.
-
-
-/* ********************************************************************
- *                            D I S C L A I M E R
- *                              (February 6, 1992)
- *  
- * There is no warranty for the NIST PDES Toolkit.
- * If the NIST PDES Toolkit
- * is modified by someone else and passed on, NIST wants
- * the Toolkit's recipients to know that what they have is not what NIST
- * distributed.
- * 
- * Policies
- * 
- * 1. Anyone may copy and distribute verbatim copies of the NIST PDES Toolkit 
- *    source code as received in any medium.
- * 
- * 2. Anyone may modify your copy or copies of the NIST PDES Toolkit source
- *    code or any portion of it, and copy and distribute such modifications
- *    provided that all modifications are clearly associated with the entity
- *    that performs the modifications.
- * 
- * NO WARRANTY
- * ===========
- * 
- * NIST PROVIDES ABSOLUTELY NO WARRANTY.  THE NIST PDES TOOLKIT
- * IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- * THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS
- * WITH YOU.  SHOULD ANY PORTION OF THE NIST PDES TOOLKIT PROVE DEFECTIVE,
- * YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
- * 
- * IN NO EVENT WILL NIST BE LIABLE FOR DAMAGES,
- * INCLUDING ANY LOST PROFITS, LOST MONIES, OR OTHER SPECIAL,
- * INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR
- * INABILITY TO USE (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA
- * BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY THIRD PARTIES OR A
- * FAILURE OF THE PROGRAM TO OPERATE WITH PROGRAMS NOT DISTRIBUTED BY
- * NIST) THE PROGRAMS, EVEN IF YOU HAVE BEEN ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGES, OR FOR ANY CLAIM BY ANY OTHER PARTY.
- */
-
+3. Neither the name of the copyright holder nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
 
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

INTENT.md

@@ -0,0 +1,102 @@
+## Licensing Intent 
+
+The intent is that this software and documentation ("Project") should
+be treated as if it is licensed under the license(s) associated with
+the Project ("License") in the `COPYING` file.  However, because some
+contributors work for the United States (U.S.) Federal Government, it
+is not that simple.
+
+The portions of this Project written by United States (U.S.) federal
+government employees within the scope of their federal employment are
+ineligible for copyright protection in the U.S.; this is generally
+understood to mean that these portions of the Project are placed in
+the public domain.
+
+In countries where copyright protection is available (which does not
+include the U.S.), contributions made by U.S. Federal government
+employees are released under the License. Merged contributions from
+private contributors are released under the License.
+
+## Background History
+
+STEPcode was originally developed as the STEP Class Libraries (SCL) by
+the U.S. National Institute of Standards and Technology (NIST).  Prior
+to 2009, the U.S. Army Research Laboratory and members of the BRL-CAD
+open source community researched freely available open source options
+for ISO 10303 STEP support.  Development had ceased, no open source
+community existed, the code was out of date in many regards, and
+additional work was needed to become production-ready, but SCL was
+found to be a usable reference implementation.
+
+Consulting with NIST and others circa 2009, the BRL-CAD community
+began efforts to take over SCL development, modernization, and code
+enhancements.  The BRL-CAD community purchased licenses for the ISO
+10303 standard and began working to bring SCL up-to-date with the
+latest specification.  By 2011, significant progress had been made,
+the project had garnered attention from others, and STEPcode was
+establishd as an independent project.
+
+## Original NIST License Text
+
+This software was [originally] produced by the National Institute of
+Standards and Technology (NIST), an agency of the U.S. government, and
+by statute is not subject to copyright in the United
+States. Recipients of this software assume all responsibility
+associated with its operation, modification, maintenance, and
+subsequent redistribution.
+
+Acknowledgements:
+The STEP Class Library (SCL) was developed by the Manufacturing 
+Systems Integration Division at NIST to support testing of the 
+Standard for the Exchange of Product Model Data (a.k.a STEP) and 
+validation of STEP's emerging implementation specifications. Funding 
+for the project has come from the Department of Commerce and the 
+Department of Defense agencies including the Office of the Defense 
+CALS (Continuous Acquisition and Life-Cycle Support) Executive and 
+the Defense Advanced Research Projects Agency (DARPA). Recent 
+enhancements [circa 1992] were sponsored by the National Information Infrastructure 
+Protocols Consortium and NIST's Systems Integration for Manufacturing 
+Applications (SIMA) program.
+
+~~~~
+/* ********************************************************************
+ *                            D I S C L A I M E R
+ *                              (February 6, 1992)
+ *  
+ * There is no warranty for the NIST PDES Toolkit.
+ * If the NIST PDES Toolkit
+ * is modified by someone else and passed on, NIST wants
+ * the Toolkit's recipients to know that what they have is not what NIST
+ * distributed.
+ * 
+ * Policies
+ * 
+ * 1. Anyone may copy and distribute verbatim copies of the NIST PDES Toolkit 
+ *    source code as received in any medium.
+ * 
+ * 2. Anyone may modify your copy or copies of the NIST PDES Toolkit source
+ *    code or any portion of it, and copy and distribute such modifications
+ *    provided that all modifications are clearly associated with the entity
+ *    that performs the modifications.
+ * 
+ * NO WARRANTY
+ * ===========
+ * 
+ * NIST PROVIDES ABSOLUTELY NO WARRANTY.  THE NIST PDES TOOLKIT
+ * IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS
+ * WITH YOU.  SHOULD ANY PORTION OF THE NIST PDES TOOLKIT PROVE DEFECTIVE,
+ * YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+ * 
+ * IN NO EVENT WILL NIST BE LIABLE FOR DAMAGES,
+ * INCLUDING ANY LOST PROFITS, LOST MONIES, OR OTHER SPECIAL,
+ * INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR
+ * INABILITY TO USE (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA
+ * BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY THIRD PARTIES OR A
+ * FAILURE OF THE PROGRAM TO OPERATE WITH PROGRAMS NOT DISTRIBUTED BY
+ * NIST) THE PROGRAMS, EVEN IF YOU HAVE BEEN ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGES, OR FOR ANY CLAIM BY ANY OTHER PARTY.
+ */
+ ~~~~

NEWS

@@ -1,5 +1,8 @@
-STEPcode -- http://github.com/stepcode/stepcode -- http://stepcode.org
 ************************************************************************
+                             STEPcode
+               http://github.com/stepcode/stepcode
+************************************************************************
+
 Release 0.8 (December, 2014)
 
 New since v0.7:
@@ -176,7 +179,7 @@ There were also some issues with the configure script and some
 makefiles which are addressed, as well as a new macro that is at 
 least required for gcc.
 
-Remaing problem: The p21 file scanner of SCL currently 
+Remaining problem: The p21 file scanner of SCL currently 
 does not allow for comments within the parameter list of 
 data records. Only comments outside of data records are 
 accepted.
@@ -252,7 +255,7 @@ the TD for label.
 
 - Fixed the casting operator for the class representing EXPRESS
 enumeration types. It was returning the last element of the enum type
-as the the default when the enum was unset. This choice predated enums
+as the default when the enum was unset. This choice predated enums
 having an unset enum value. It now returns <enum_name>_unset as the
 default when the enum is unset.
 
@@ -794,7 +797,7 @@ When this case of multiple inheritance is encountered attributes are
 duplicated.  This case of multiple inheritance may possibly be
 avoided by modifying the EXPRESS schema by breaking some links in the 
 inheritance hierarchy.  This will not have an adverse affect on the
-implemementation.  The user may choose to use the current or previous
+implementation.  The user may choose to use the current or previous
 method of handling multiple inheritance.  The current method is the
 default behavior.  The previous method is obtained by supplying the 
 -s (or -S) option with the exp2cxx code generator or the mkProbe
@@ -987,7 +990,7 @@ the attribute value field in the entity editor.
 If there wasn't a value in the attribute previously, then the field will 
 contain just the type specifier, e.g., Str1() if Str1 is the type selected.
 
-If a value exists in the field, it is modified to accomodate the new 
+If a value exists in the field, it is modified to accommodate the new 
 specifier.  This means the following:
  o  If the value in the field starts with a single-quote ('), it is 
         assumed to be a string literal, and is completely wrapped in the new 

README.md

@@ -1,10 +1,7 @@
-   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)
+![Build Status](https://github.com/stepcode/stepcode/actions/workflows/build.yml/badge.svg?branch=develop)
 
 ***********************************************************************
-STEPcode v0.8 -- stepcode.org, github.com/stepcode/stepcode
+STEPcode v0.8 -- 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

SC_VERSION.txt

@@ -1 +0,0 @@
-0.8

cmake/FindLEMON.cmake

@@ -47,158 +47,136 @@
 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)
+  if(NOT LEMON_TEMPLATE)
+    # look for the template, if we've not already been told where it is
+    if (DATA_DIR AND EXISTS "${DATA_DIR}/lemon/lempar.c")
+      find_file(LEMON_TEMPLATE lempar.c
+	PATHS "${DATA_DIR}/lemon/lempar.c"
+	NO_DEFAULT_PATH)
+    endif ()
 
-if (LEMON_EXECUTABLE AND NOT LEMON_TEMPLATE)
-  # look for the template in bin dir
-  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)
-endif(LEMON_EXECUTABLE AND NOT LEMON_TEMPLATE)
+    # If the above did not succeed, check standard locations
+    get_filename_component(lemon_dir ${LEMON_EXECUTABLE} DIRECTORY)
+    find_file(LEMON_TEMPLATE lempar.c
+      PATHS "${lemon_dir}" "/usr/share/lemon"
+      NO_DEFAULT_PATH)
+    mark_as_advanced(LEMON_TEMPLATE)
+  endif()
 
-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)
+  # We need a template to be able to use lemon correctly
+  if(NOT LEMON_TEMPLATE)
+    message(FATAL_ERROR "Failed to find lemon template file (lempar.c) - need to set LEMON_TEMPLATE")
+  endif()
 
-mark_as_advanced(LEMON_TEMPLATE)
+  # Define the function
+  #  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)
+    function(LEMON_TARGET Name LemonInput LemonOutput)
+      set(LT_ARGS DEFINES_FILE COMPILE_FLAGS)
+      cmake_parse_arguments(LEMON_TARGET_ARG "" "${LT_ARGS}" "" ${ARGN})
+
+      if(NOT "${LEMON_TARGET_ARG_COMPILE_FLAGS}" STREQUAL "")
+	set(LEMON_EXECUTABLE_opts "${LEMON_TARGET_ARG_COMPILE_FLAGS}")
+	separate_arguments(LEMON_EXECUTABLE_opts)
+      else()
+	set(LEMON_EXECUTABLE_opts "")
+      endif()
+
+      # check for LemonOutput
+      get_filename_component(_basename ${LemonOutput} NAME_WE)
+      get_filename_component(_out_src_file ${LemonOutput} NAME)
+      get_filename_component(_out_dir ${LemonOutput} PATH)
+      if(NOT "${_out_dir}" STREQUAL "")
+	message(WARNING "Full path specified for LemonOutput - should be filename only")
+      endif()
+
+      # set report file
+      set(_out_rpt_file "${_basename}.out")
+
+      # check for DEFINES_FILE
+      if ("${LEMON_TARGET_ARG_DEFINES_FILE}" STREQUAL "")
+	set(_out_hdr_file "${_basename}.h")
+      else()
+	get_filename_component(_out_dir ${LEMON_TARGET_ARG_DEFINES_FILE} PATH)
+	get_filename_component(_out_hdr_file ${LEMON_TARGET_ARG_DEFINES_FILE} NAME)
+	if(NOT "${_out_dir}" STREQUAL "")
+	  message(WARNING "Full path specified for DEFINES_FILE - should be filename only")
+	endif()
+      endif()
+
+      # input file
+      get_filename_component(_in_y_path ${LemonInput} ABSOLUTE)
+      get_filename_component(_in_y_file ${LemonInput} NAME)
+
+      # Stage the source file in the binary directory for lemon.  We need to make
+      # sure it's fully copied, so use a sentinel guard
+      add_custom_command(
+	OUTPUT ${_in_y_file}
+	COMMAND ${CMAKE_COMMAND} -E copy ${_in_y_path} ${CMAKE_CURRENT_BINARY_DIR}
+	)
+      add_custom_command(
+	OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_in_y_file}.sentinel
+	COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/${_in_y_file}.sentinel
+	DEPENDS ${_in_y_file}
+	)
+      add_custom_target(${Name}_input_cpy DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_in_y_file}.sentinel)
+
+      # execute lemon
+      add_custom_command(
+	OUTPUT ${_out_src_file} ${_basename}.h
+	COMMAND ${LEMON_EXECUTABLE} -T${LEMON_TEMPLATE} ${LEMON_EXECUTABLE_opts} ${_in_y_file}
+	DEPENDS ${Name}_input_cpy
+	WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+	COMMENT "[LEMON][${Name}] Building parser with ${LEMON_EXECUTABLE}"
+	)
+
+      # rename the header
+      add_custom_command(
+	OUTPUT ${_out_hdr_file}
+	COMMAND ${CMAKE_COMMAND} ARGS -E rename ${_basename}.h ${_out_hdr_file}
+	DEPENDS ${_out_src_file} ${_basename}.h
+	WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+	)
+
+      # set the return values
+      # TODO: for generated sources even headers should be target dependencies
+      set(LEMON_${Name}_DEFINED TRUE PARENT_SCOPE)
+      set(LEMON_${Name}_OUTPUT_HEADER "${CMAKE_CURRENT_BINARY_DIR}/${_out_hdr_file}" PARENT_SCOPE)
+      set(LEMON_${Name}_INCLUDE_DIR "${CMAKE_CURRENT_BINARY_DIR}" PARENT_SCOPE)
+      set(LEMON_${Name}_OUTPUTS "${_out_src_file}" PARENT_SCOPE)
+
+      # TODO - remove once perplex goes away...
+      add_custom_target(${Name} DEPENDS ${_out_hdr_file})
+
+      # make sure we clean up generated output and copied input
+      set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES "${_out_src_file}")
+      set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES "${CMAKE_CURRENT_BINARY_DIR}/${_in_y_file}")
+
+    endfunction(LEMON_TARGET)
+  endif(NOT COMMAND LEMON_TARGET)
+
+endif(LEMON_EXECUTABLE)
 
 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)
+find_package_handle_standard_args(LEMON REQUIRED_VARS LEMON_EXECUTABLE LEMON_TEMPLATE)
 
 #============================================================
 # FindLEMON.cmake ends here

cmake/FindPERPLEX.cmake

@@ -227,6 +227,14 @@ if(NOT COMMAND PERPLEX_TARGET)
     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})
+
+    add_custom_command(
+      OUTPUT ${${PVAR_PREFIX}_WORKING_DIR}/${Name}.sentinel
+      COMMAND ${CMAKE_COMMAND} -E touch ${${PVAR_PREFIX}_WORKING_DIR}/${Name}.sentinel
+      DEPENDS ${${PVAR_PREFIX}_OUT_SRC_FILE} ${${PVAR_PREFIX}_OUT_HDR_FILE}
+      )
+    add_custom_target(${Name} DEPENDS ${${PVAR_PREFIX}_WORKING_DIR}/${Name}.sentinel)
+
   endmacro(PERPLEX_TARGET)
 endif(NOT COMMAND PERPLEX_TARGET)
 
@@ -240,12 +248,12 @@ if(NOT COMMAND ADD_PERPLEX_LEMON_DEPENDENCY)
       message(SEND_ERROR "PERPLEX target `${PERPLEXTarget}' does not exists.")
     endif()
 
-    if(NOT LEMON_${LemonTarget}_HDR)
+    if(NOT TARGET ${LemonTarget})
       message(SEND_ERROR "Lemon target `${LemonTarget}' does not exists.")
     endif()
 
     set_source_files_properties(${PERPLEX_${PERPLEXTarget}_SRC}
-      PROPERTIES OBJECT_DEPENDS ${LEMON_${LemonTarget}_HDR})
+      PROPERTIES OBJECT_DEPENDS ${LEMON_${LemonTarget}_OUTPUT_HEADER})
   endmacro(ADD_PERPLEX_LEMON_DEPENDENCY)
 endif(NOT COMMAND ADD_PERPLEX_LEMON_DEPENDENCY)
 

cmake/FindRE2C.cmake

@@ -6,134 +6,163 @@
 find_program(RE2C_EXECUTABLE re2c DOC "path to the re2c executable")
 mark_as_advanced(RE2C_EXECUTABLE)
 
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(RE2C DEFAULT_MSG RE2C_EXECUTABLE)
+if(RE2C_EXECUTABLE)
 
-# Provide a macro to generate custom build rules:
+  execute_process(COMMAND ${RE2C_EXECUTABLE} -v
+    OUTPUT_VARIABLE RE2C_version_output
+    ERROR_VARIABLE  RE2C_version_error
+    RESULT_VARIABLE RE2C_version_result
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
 
-# 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.
+  if(NOT ${RE2C_version_result} EQUAL 0)
+    message(SEND_ERROR
+      "Command \"${RE2C_EXECUTABLE} -v\" failed with output:\n${RE2C_version_output}\n${RE2C_version_error}")
+  else()
+    string(REGEX REPLACE "^re2c ([0-9]+[^ ]*)( .*)?$" "\\1" RE2C_VERSION "${RE2C_version_output}")
+  endif()
 
-# 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.
-#=============================================================================
+  # Provide a macro to generate custom build rules:
 
-#============================================================
-# 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()
+  # 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)
+  #============================================================
+  #
+  if(NOT COMMAND RE2C_TARGET)
+    function(RE2C_TARGET Name RE2CInput RE2COutput)
+      set(_re2c_args COMPILE_FLAGS DEFINES_FILE)
+      cmake_parse_arguments(RE2C_TARGET_ARG "" "${_re2c_args}" "" ${ARGN})
+
+      if(NOT "${RE2C_TARGET_ARG_UNPARSED_ARGUMENTS}" STREQUAL "")
+	message(SEND_ERROR "RE2C_TARGET(<Name> <RE2CInput> <RE2COutput>
+	[COMPILE_FLAGS <string>]
+	[DEFINES_FILE <string>])")
       else()
-	message(SEND_ERROR ${RE2C_TARGET_usage})
+	if(NOT "${RE2C_TARGET_ARG_COMPILE_FLAGS}" STREQUAL "")
+	  set(RE2C_EXECUTABLE_opts "${RE2C_TARGET_ARG_COMPILE_FLAGS}")
+	  separate_arguments(RE2C_EXECUTABLE_opts)
+	else()
+	  set(RE2C_EXECUTABLE_opts "")
+	endif()
+
+	if(NOT "${RE2C_TARGET_ARG_DEFINES_FILE}" STREQUAL "")
+	  list(APPEND RE2C_EXECUTABLE_opts -t ${RE2C_TARGET_ARG_DEFINES_FILE})
+	endif()
+
+	add_custom_command(
+	  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${RE2COutput}
+	  COMMAND ${RE2C_EXECUTABLE}
+	  ARGS ${RE2C_EXECUTABLE_opts} -o ${RE2COutput} ${CMAKE_CURRENT_SOURCE_DIR}/${RE2CInput}
+	  DEPENDS ${RE2CInput}
+	  COMMENT "[RE2C][${Name}] Building scanner with ${RE2C_EXECUTABLE}"
+	  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+	  )
+
+	# TODO: check, for generated sources headers should be included in outputs
+	set(RE2C_${Name}_DEFINED TRUE PARENT_SCOPE)
+	set(RE2C_${Name}_OUTPUTS ${RE2COutput} PARENT_SCOPE)
+	if("${RE2C_TARGET_ARG_DEFINES_FILE}" STREQUAL "")
+	  set(RE2C_${Name}_OUTPUT_HEADER "" PARENT_SCOPE)
+	else()
+	  set(RE2C_${Name}_OUTPUT_HEADER "${RE2C_TARGET_ARG_DEFINES_FILE}" PARENT_SCOPE)
+	endif()
+	set(RE2C_${Name}_INCLUDE_DIR "${CMAKE_CURRENT_BINARY_DIR}" PARENT_SCOPE)
       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}")
+    endfunction(RE2C_TARGET)
+  endif(NOT COMMAND RE2C_TARGET)
+  #============================================================
 
-    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)
+    function(ADD_RE2C_LEMON_DEPENDENCY RE2CTarget LemonTarget)
 
-#============================================================
-# 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 RE2C_${RE2CTarget}_OUTPUTS)
-      message(SEND_ERROR "RE2C target `${RE2CTarget}' does not exists.")
-    endif()
+      if(NOT LEMON_${LemonTarget}_OUTPUT_HEADER)
+	message(SEND_ERROR "Lemon target `${LemonTarget}' 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}_OUTPUT_HEADER})
+    endfunction(ADD_RE2C_LEMON_DEPENDENCY)
+  endif(NOT COMMAND ADD_RE2C_LEMON_DEPENDENCY)
+  #============================================================
 
-    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)
-#============================================================
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(RE2C REQUIRED_VARS RE2C_EXECUTABLE
+  VERSION_VAR RE2C_VERSION)
 
 # RE2C_Util.cmake ends here
 

cmake/Generated_Source_Utils.cmake

@@ -1,67 +0,0 @@
-# Utility routines for managing generated files with CMake
-
-macro(MD5 filename md5sum)
-  file(READ "${filename}" RAW_MD5_FILE)
-  string(REGEX REPLACE "\r" "" STRIPPED_MD5_FILE "${RAW_MD5_FILE}")
-  string(MD5 ${md5sum} "${STRIPPED_MD5_FILE}")
-endmacro(MD5)
-
-macro(FILEVAR filename var)
-  string(REGEX REPLACE "[^a-zA-Z0-9]" "_" ${var} ${filename})
-endmacro(FILEVAR)
-
-macro(VERIFY_FILES filelist warn resultvar)
-  set(${resultvar} 1)
-  foreach(fileitem ${filelist})
-    # Deal with absolute and relative paths a bit differently
-    get_filename_component(ITEM_ABS_PATH "${fileitem}" ABSOLUTE)
-    if("${fileitem}" STREQUAL "${ITEM_ABS_PATH}")
-      set(filefullname "${fileitem}")
-    else("${fileitem}" STREQUAL "${ITEM_ABS_PATH}")
-      set(filefullname "${CURRENT_SOURCE_DIR}/${fileitem}")
-    endif("${fileitem}" STREQUAL "${ITEM_ABS_PATH}")
-    get_filename_component(filename "${fileitem}" NAME)
-    # Got filename components sorted - proceed
-    if(NOT EXISTS ${filefullname})
-      message(FATAL_ERROR "Attempted to verify non-existant file ${filefullname}")
-    endif(NOT EXISTS ${filefullname})
-    FILEVAR(${filename} filevar)
-    if(NOT baseline_${filevar}_md5)
-      message(FATAL_ERROR "No baseline MD5 available for ${filename} - baseline_${filevar}_md5 is not defined")
-    endif(NOT baseline_${filevar}_md5)
-    MD5(${filefullname} ${filevar}_md5)
-    if(NOT "${${filevar}_md5}" STREQUAL "${baseline_${filevar}_md5}")
-      if("${warn}" STREQUAL "1")
-	message("\n${filename} differs from baseline: baseline md5 hash is ${baseline_${filevar}_md5} and current hash is ${${filevar}_md5}\n")
-      endif("${warn}" STREQUAL "1")
-      set(${resultvar} 0)
-    endif(NOT "${${filevar}_md5}" STREQUAL "${baseline_${filevar}_md5}")
-  endforeach(fileitem ${filelist})
-endmacro(VERIFY_FILES filelist resultvar)
-
-macro(WRITE_MD5_SUMS filelist outfile)
-  foreach(fileitem ${filelist})
-    # Deal with absolute and relative paths a bit differently
-    get_filename_component(ITEM_ABS_PATH "${fileitem}" ABSOLUTE)
-    if("${fileitem}" STREQUAL "${ITEM_ABS_PATH}")
-      set(filefullname "${fileitem}")
-    else("${fileitem}" STREQUAL "${ITEM_ABS_PATH}")
-      set(filefullname "${CURRENT_SOURCE_DIR}/${fileitem}")
-    endif("${fileitem}" STREQUAL "${ITEM_ABS_PATH}")
-    get_filename_component(filename "${fileitem}" NAME)
-    # Got filename components sorted - proceed
-    if(NOT EXISTS ${filefullname})
-      message(FATAL_ERROR "Attempted to get MD5 sum of non-existant file ${filefullname}")
-    endif(NOT EXISTS ${filefullname})
-    FILEVAR(${filename} filevar)
-    MD5(${filefullname} ${filevar}_md5)
-    file(APPEND ${outfile} "set(baseline_${filevar}_md5 ${${filevar}_md5})\n")
-  endforeach(fileitem ${filelist})
-endmacro(WRITE_MD5_SUMS)
-
-# Local Variables:
-# tab-width: 8
-# mode: cmake
-# indent-tabs-mode: t
-# End:
-# ex: shiftwidth=2 tabstop=8

cmake/Path_Setup.cmake

@@ -0,0 +1,164 @@
+# Copyright (c) 2010-2020 United States Government as represented by
+# the U.S. Army Research Laboratory.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following
+# disclaimer in the documentation and/or other materials provided
+# with the distribution.
+#
+# 3. The name of the author may not be used to endorse or promote
+# products derived from this software without specific prior written
+# permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+#---------------------------------------------------------------------
+# Define relative install locations.  Don't set these if they have already
+# been set by some other means (like a higher level CMakeLists.txt file
+# including this one).
+
+# The location in which to install BRL-CAD executables.
+if(NOT BIN_DIR)
+  set(BIN_DIR bin)
+endif(NOT BIN_DIR)
+
+# Define a relative path that will "reset" a path back to
+# the point before BIN_DIR was appended.  This is primarily
+# useful when working with generator expressions
+unset(RBIN_DIR CACHE)
+set(LBIN_DIR "${BIN_DIR}")
+while (NOT "${LBIN_DIR}" STREQUAL "")
+  get_filename_component(LBDIR "${LBIN_DIR}" DIRECTORY)
+  set(LBIN_DIR "${LBDIR}")
+  if ("${RBIN_DIR}" STREQUAL "")
+    set(RBIN_DIR "..")
+  else ("${RBIN_DIR}" STREQUAL "")
+    set(RBIN_DIR "../${RBIN_DIR}")
+  endif ("${RBIN_DIR}" STREQUAL "")
+endwhile (NOT "${LBIN_DIR}" STREQUAL "")
+
+# The location in which to install BRL-CAD libraries.
+if(NOT LIB_DIR)
+  set(LIB_DIR lib)
+endif(NOT LIB_DIR)
+if(NOT LIBEXEC_DIR)
+  set(LIBEXEC_DIR libexec)
+endif(NOT LIBEXEC_DIR)
+
+# The location in which to install BRL-CAD header files.
+if(NOT INCLUDE_DIR)
+  set(INCLUDE_DIR include)
+endif(NOT INCLUDE_DIR)
+
+# The location in which to install BRL-CAD data files
+if(NOT DATA_DIR)
+  set(DATA_DIR share)
+endif(NOT DATA_DIR)
+
+# The location in which to install BRL-CAD documentation files
+if(NOT DOC_DIR)
+  set(DOC_DIR ${DATA_DIR}/doc)
+endif(NOT DOC_DIR)
+
+# The location in which to install BRL-CAD Manual pages
+if(NOT MAN_DIR)
+  set(MAN_DIR ${DATA_DIR}/man)
+endif(NOT MAN_DIR)
+
+# Make sure no absolute paths have been supplied to these variables
+set(INSTALL_DIRS BIN INCLUDE LIB LIBEXEC DATA MAN DOC)
+foreach(instdir ${INSTALL_DIRS})
+  get_filename_component(instdir_full ${${instdir}_DIR} ABSOLUTE)
+  if("${${instdir}_DIR}" STREQUAL "${instdir_full}")
+    message(FATAL_ERROR "Error - absolute path supplied for ${instdir}_DIR.  This path must be relative - e.g. \"bin\" instead of \"/usr/bin\"")
+    set(HAVE_INSTALL_DIR_FULL_PATH 1)
+  endif("${${instdir}_DIR}" STREQUAL "${instdir_full}")
+endforeach(instdir ${INSTALL_DIRS})
+
+#---------------------------------------------------------------------
+# Output directories - this is where built library and executable
+# files will be placed after building but prior to install.  The
+# necessary variables change between single and multi configuration
+# build systems, so it is necessary to handle both cases on a
+# conditional basis.
+
+if(NOT CMAKE_CONFIGURATION_TYPES)
+  # If we're not doing multi-configuration, just set the three main
+  # variables to the correct values.
+  if(NOT DEFINED CMAKE_LIBRARY_OUTPUT_DIRECTORY)
+    set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${${PROJECT_NAME}_BINARY_DIR}/${LIB_DIR} CACHE INTERNAL "Single output directory for building all libraries.")
+  endif(NOT DEFINED CMAKE_LIBRARY_OUTPUT_DIRECTORY)
+  if(NOT DEFINED CMAKE_ARCHIVE_OUTPUT_DIRECTORY)
+    set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${${PROJECT_NAME}_BINARY_DIR}/${LIB_DIR} CACHE INTERNAL "Single output directory for building all archives.")
+  endif(NOT DEFINED CMAKE_ARCHIVE_OUTPUT_DIRECTORY)
+  if(NOT DEFINED CMAKE_RUNTIME_OUTPUT_DIRECTORY)
+    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${${PROJECT_NAME}_BINARY_DIR}/${BIN_DIR} CACHE INTERNAL "Single output directory for building all executables.")
+  endif(NOT DEFINED CMAKE_RUNTIME_OUTPUT_DIRECTORY)
+else(NOT CMAKE_CONFIGURATION_TYPES)
+  # Multi-configuration is more difficult.  Not only do we need to
+  # properly set the output directories, but we also need to
+  # identify the "toplevel" directory for each configuration so
+  # we can place files, documentation, etc. in the correct
+  # relative positions.  Because files may be placed by CMake
+  # without a build target to put them in their proper relative build
+  # directory position using these paths, we must fully qualify them
+  # without using CMAKE_CFG_INTDIR.
+  #
+  # We define directories that may not be quite "standard"
+  # for a particular build tool - for example, native VS2010 projects use
+  # another directory to denote CPU type being compiled for - but CMake only
+  # supports multi-configuration setups having multiple configurations,
+  # not multiple compilers.
+  #
+  # One additional wrinkle we must watch for here is the case where
+  # a multi-configuration setup uses "." for its internal directory -
+  # if that's the case, we need to just set the various config output
+  # directories to the same value.
+  set(CFG_ROOT ${${PROJECT_NAME}_BINARY_DIR})
+  foreach(CFG_TYPE ${CMAKE_CONFIGURATION_TYPES})
+    if(NOT "${CMAKE_CFG_INTDIR}" STREQUAL ".")
+      set(CFG_ROOT ${${PROJECT_NAME}_BINARY_DIR}/${CFG_TYPE})
+    endif(NOT "${CMAKE_CFG_INTDIR}" STREQUAL ".")
+    string(TOUPPER "${CFG_TYPE}" CFG_TYPE_UPPER)
+    if(NOT DEFINED CMAKE_LIBRARY_OUTPUT_DIRECTORY_${CFG_TYPE_UPPER})
+      set("CMAKE_LIBRARY_OUTPUT_DIRECTORY_${CFG_TYPE_UPPER}" ${CFG_ROOT}/${LIB_DIR} CACHE INTERNAL "Single output directory for building ${CFG_TYPE} libraries.")
+    endif(NOT DEFINED CMAKE_LIBRARY_OUTPUT_DIRECTORY_${CFG_TYPE_UPPER})
+    if(NOT DEFINED CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${CFG_TYPE_UPPER})
+      set("CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${CFG_TYPE_UPPER}" ${CFG_ROOT}/${LIB_DIR} CACHE INTERNAL "Single output directory for building ${CFG_TYPE} archives.")
+    endif(NOT DEFINED CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${CFG_TYPE_UPPER})
+    if(NOT DEFINED CMAKE_RUNTIME_OUTPUT_DIRECTORY_${CFG_TYPE_UPPER})
+      set("CMAKE_RUNTIME_OUTPUT_DIRECTORY_${CFG_TYPE_UPPER}" ${CFG_ROOT}/${BIN_DIR} CACHE INTERNAL "Single output directory for building ${CFG_TYPE} executables.")
+    endif(NOT DEFINED CMAKE_RUNTIME_OUTPUT_DIRECTORY_${CFG_TYPE_UPPER})
+    if(NOT DEFINED CMAKE_BINARY_DIR_${CFG_TYPE_UPPER})
+      set("CMAKE_BINARY_DIR_${CFG_TYPE_UPPER}" ${CFG_ROOT} CACHE INTERNAL "Toplevel binary dir for ${CFG_TYPE} building.")
+    endif(NOT DEFINED CMAKE_BINARY_DIR_${CFG_TYPE_UPPER})
+    if(NOT DEFINED ${PROJECT_NAME}_BINARY_DIR_${CFG_TYPE_UPPER})
+      set("${PROJECT_NAME}_BINARY_DIR_${CFG_TYPE_UPPER}" ${CFG_ROOT} CACHE INTERNAL "Toplevel binary dir for ${CFG_TYPE} building.")
+    endif(NOT DEFINED ${PROJECT_NAME}_BINARY_DIR_${CFG_TYPE_UPPER})
+  endforeach()
+endif(NOT CMAKE_CONFIGURATION_TYPES)
+
+# Local Variables:
+# tab-width: 8
+# mode: cmake
+# indent-tabs-mode: t
+# End:
+# ex: shiftwidth=2 tabstop=8

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

@@ -27,19 +27,16 @@ 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)
+  SC_ADDEXEC(p21read_${PROJECT_NAME} SOURCES "${RELATIVE_PATH_COMPONENT}/src/test/p21read/p21read.cc;${RELATIVE_PATH_COMPONENT}/src/test/p21read/sc_benchmark.cc" LINK_LIBRARIES ${PROJECT_NAME} stepdai stepcore stepeditor steputils TESTABLE)
   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)
+    SC_ADDEXEC(lazy_${PROJECT_NAME} SOURCES "${RELATIVE_PATH_COMPONENT}/src/cllazyfile/lazy_test.cc;${RELATIVE_PATH_COMPONENT}/src/cllazyfile/sc_benchmark.cc" LINK_LIBRARIES ${PROJECT_NAME} steplazyfile stepdai stepcore stepeditor steputils TESTABLE)
   endif(NOT WIN32)
 
   #add user-defined executables
   foreach(src ${SC_SDAI_ADDITIONAL_EXES_SRCS})
     get_filename_component(name ${src} NAME_WE)
     get_filename_component(path ${src} ABSOLUTE)
-    SC_ADDEXEC(${name}_${PROJECT_NAME} "${src}" "${PROJECT_NAME};stepdai;stepcore;stepeditor;steputils;base" "TESTABLE")
-    add_dependencies(${name}_${PROJECT_NAME} version_string)
+    SC_ADDEXEC(${name}_${PROJECT_NAME} SOURCES ${src} LINK_LIBRARIES ${PROJECT_NAME} stepdai stepcore stepeditor steputils TESTABLE)
     #set_target_properties(${name}_${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "${${PROJECT_NAME}_COMPILE_FLAGS} -I${path}")
   endforeach(src ${SC_SDAI_ADDITIONAL_EXES_SRCS})
 ENDMACRO(SCHEMA_EXES)
@@ -92,12 +89,36 @@ macro(SCHEMA_TARGETS expFile schemaName sourceFiles)
   )
   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
+    ${SC_SOURCE_DIR}/src/clutils        ${SC_SOURCE_DIR}/src/clstepcore     ${SC_SOURCE_DIR}/src/cllazyfile
+    ${SC_SOURCE_DIR}/src/cllazyfile/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})
+  if(BUILD_SHARED_LIBS)
+    SC_ADDLIB(${PROJECT_NAME} SHARED SOURCES ${sourceFiles} LINK_LIBRARIES stepdai stepcore stepeditor steputils TESTABLE)
+    add_dependencies(${PROJECT_NAME} generate_cpp_${PROJECT_NAME})
+    if(WIN32)
+      target_compile_definitions("${PROJECT_NAME}" PRIVATE SC_SCHEMA_DLL_EXPORTS)
+      if(MSVC)
+        target_compile_options("${PROJECT_NAME}" PRIVATE "/bigobj")
+      endif()
+    endif()
+    # TODO - ideally we would avoid generating code that triggers this warning, but figuring out
+    # how to do so is a non-trivial exercise.  In the meantime, suppress the (very verbose) warnings
+    # we get due to this issue so it doesn't mask other problems.
+    if(${CMAKE_C_COMPILER_ID} STREQUAL "GNU")
+      target_compile_options("${PROJECT_NAME}" PRIVATE "-Wno-ignored-qualifiers")
+    endif()
+  endif()
+
+  if($CACHE{SC_BUILD_STATIC_LIBS})
+    SC_ADDLIB(${PROJECT_NAME}-static STATIC SOURCES ${sourceFiles} LINK_LIBRARIES stepdai-static stepcore-static stepeditor-static steputils-static TESTABLE)
+    add_dependencies(${PROJECT_NAME}-static generate_cpp_${PROJECT_NAME})
+    target_compile_definitions("${PROJECT_NAME}-static" PRIVATE SC_STATIC)
+    if(MSVC)
+      target_compile_options("${PROJECT_NAME}-static" PRIVATE "/bigobj")
+    endif()
+  endif()
+
 
   SCHEMA_EXES()
   SCHEMA_TESTS()

cmake/SC_Config_Headers.cmake

@@ -1,29 +1,11 @@
-# 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}")
+# create config.h
 
 include(CheckLibraryExists)
 include(CheckIncludeFile)
-include(CheckFunctionExists)
+include(CheckSymbolExists)
 include(CheckTypeSize)
 include(CMakePushCheckState)
+include(CheckCSourceCompiles)
 include(CheckCXXSourceRuns)
 
 CHECK_INCLUDE_FILE(ndir.h HAVE_NDIR_H)
@@ -37,10 +19,13 @@ 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)
+# ensure macro functions are captured
+CHECK_SYMBOL_EXISTS(abs "stdlib.h" HAVE_ABS)
+CHECK_SYMBOL_EXISTS(memcpy "string.h" HAVE_MEMCPY)
+CHECK_SYMBOL_EXISTS(memmove "string.h" HAVE_MEMMOVE)
+CHECK_SYMBOL_EXISTS(getopt "getopt.h" HAVE_GETOPT)
+CHECK_SYMBOL_EXISTS(snprintf "stdio.h" HAVE_SNPRINTF)
+CHECK_SYMBOL_EXISTS(vsnprintf "stdio.h" HAVE_VSNPRINTF)
 
 CHECK_TYPE_SIZE("ssize_t" SSIZE_T)
 
@@ -92,37 +77,9 @@ int main() {return !(f() == f());}
   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 )
+# Now that all the tests are done, configure the config.h file:
+configure_file(${CMAKE_SOURCE_DIR}/include/config.h.in ${SC_BINARY_DIR}/${INCLUDE_DIR}/config.h.gen)
+execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SC_BINARY_DIR}/${INCLUDE_DIR}/config.h.gen ${SC_BINARY_DIR}/${INCLUDE_DIR}/config.h)
 
 # Local Variables:
 # tab-width: 8

cmake/SC_Regenerate.cmake

@@ -1,4 +1,4 @@
-# The Express parser uses the tools Perplex, RE2C and Lemon to generate code
+# The Express parser uses the tools 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.
@@ -10,45 +10,38 @@
 # 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")
+
+set(_valid_gen_states AUTO ON OFF)
+set(_verbosity "QUIET")
+
+set(SC_GENERATE_LEXER_PARSER "AUTO" CACHE
+    STRING "Use Perplex, RE2C and Lemon to generate C source code.")
+set_property(CACHE SC_GENERATE_LEXER_PARSER PROPERTY STRINGS ${_valid_gen_states})
+string(TOUPPER "${SC_GENERATE_LEXER_PARSER}" SC_GENERATE_LEXER_PARSER)
+
+if(NOT "${SC_GENERATE_LEXER_PARSER}" IN_LIST _valid_gen_states)
   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")
+endif()
 
 # If the generators have not been turned off, we need to check for them
 if(NOT "${SC_GENERATE_LEXER_PARSER}" STREQUAL "OFF")
+  # NOTE: lemon doesn't have a stable versioning system (it's always 1)
   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}")
 
+  if(LEMON_FOUND AND RE2C_FOUND)
     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)
+    message(".. Found re2c, and lemon - can regenerate lexer/parser if necessary")
+  else()
     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")
+      message(FATAL_ERROR "\nSC_GENERATE_LEXER_PARSER set to ON, but couldn't find lemon/re2c")
     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)
+  endif()
 else(NOT "${SC_GENERATE_LEXER_PARSER}" STREQUAL "OFF")
   set(SC_GENERATE_LP_SOURCES 0)
 endif(NOT "${SC_GENERATE_LEXER_PARSER}" STREQUAL "OFF")

cmake/SC_Targets.cmake

@@ -1,150 +1,86 @@
+macro(SC_ADDEXEC execname)
+  set(_addexec_opts NO_INSTALL TESTABLE)
+  set(_addexec_multikw SOURCES LINK_LIBRARIES)
+  string(TOUPPER "SC_ADDEXEC_${execname}_ARG" _arg_prefix)
+  cmake_parse_arguments(${_arg_prefix} "${_addexec_opts}" "" "${_addexec_multikw}" ${ARGN})
 
-# 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)
+  if(NOT DEFINED "${_arg_prefix}_SOURCES")
+    message(SEND_ERROR "SC_ADDEXEC usage error!")
+  endif()
 
-# 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)
+  add_executable(${execname} ${${_arg_prefix}_SOURCES})
 
-#SC_ADDEXEC(execname "source files" "linked libs" ["TESTABLE"] ["NO_INSTALL"])
-macro(SC_ADDEXEC execname srcslist libslist)
+  if(DEFINED "${_arg_prefix}_LINK_LIBRARIES")
+    foreach(_lib ${${_arg_prefix}_LINK_LIBRARIES})
+        if($CACHE{SC_STATIC_UTILS})
+            if(NOT $<TARGET_PROPERTY:${_lib},TYPE> STREQUAL "STATIC_LIBRARY")
+                message(SEND_ERROR "SC_ADDEXEC usage error - expected STATIC LINK_LIBRARIES targets (${_lib})")
+            endif()
+        endif()
+        target_link_libraries(${execname} ${_lib})
+    endforeach()
+  endif()
 
-  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)
+  if(NOT ${_arg_prefix}_NO_INSTALL AND NOT ${_arg_prefix}_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)
+      ARCHIVE DESTINATION ${LIB_DIR}	
+     )
+  endif()
 
-  # 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)
+  if(NOT SC_ENABLE_TESTING AND ${_arg_prefix}_TESTABLE)
+    set_target_properties(${execname} PROPERTIES EXCLUDE_FROM_ALL ON)
+  endif()
+endmacro()
 
-endmacro(SC_ADDEXEC execname srcslist libslist)
+macro(SC_ADDLIB _addlib_target)
+  set(_addlib_opts SHARED STATIC NO_INSTALL TESTABLE)
+  set(_addlib_multikw SOURCES LINK_LIBRARIES)
+  string(TOUPPER "SC_ADDLIB_${libname}_ARG" _arg_prefix)
+  cmake_parse_arguments(${_arg_prefix} "${_addlib_opts}" "" "${_addlib_multikw}" ${ARGN})
 
-#SC_ADDLIB(libname "source files" "linked libs" ["TESTABLE"] ["NO_INSTALL"] ["SO_SRCS ..."] ["STATIC_SRCS ..."])
-macro(SC_ADDLIB libname srcslist libslist)
+  if(NOT DEFINED ${_arg_prefix}_SOURCES)
+    message(SEND_ERROR "SC_ADDLIB usage error!")
+  endif()
 
-  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(${_arg_prefix}_SHARED)
+    add_library(${_addlib_target} SHARED ${${_arg_prefix}_SOURCES})
+    if(OPENBSD)
+      set_target_properties(${_addlib_target} PROPERTIES VERSION ${SC_VERSION_MAJOR}.${SC_VERSION_MINOR})
+    else(OPENBSD)
+      set_target_properties(${_addlib_target} PROPERTIES VERSION ${SC_VERSION} SOVERSION ${SC_VERSION_MAJOR})
+    endif(OPENBSD)
     if(APPLE)
-      set_target_properties(${libname} PROPERTIES LINK_FLAGS "-flat_namespace -undefined suppress")
+      set_target_properties(${_addlib_target} 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)
+  elseif(${_arg_prefix}_STATIC)
+    add_library(${_addlib_target} STATIC ${${_arg_prefix}_SOURCES})
+    target_compile_definitions(${_addlib_target} PRIVATE SC_STATIC)
+  else()
+    message(SEND_ERROR "SC_ADDLIB usage error!")
+  endif()
+
+  if(DEFINED ${_arg_prefix}_LINK_LIBRARIES)
+    foreach(_lib ${${_arg_prefix}_LINK_LIBRARIES})
+        if(${_arg_prefix}_STATIC AND TARGET ${_lib})
+	  get_property(_libtype TARGET ${_lib} PROPERTY TYPE)
+	  if(NOT ${_libtype} STREQUAL "STATIC_LIBRARY")
+	      message(SEND_ERROR "SC_ADDLIB usage error - expected (static) LINK_LIBRARIES targets (${_lib})")
+            endif()
+        endif()
+        target_link_libraries(${_addlib_target} ${_lib})
+    endforeach()
+  endif()
+
+  if(NOT ${_arg_prefix}_NO_INSTALL AND NOT ${_arg_prefix}_TESTABLE)
+    install(TARGETS ${_addlib_target}
+      RUNTIME DESTINATION ${BIN_DIR}
+      LIBRARY DESTINATION ${LIB_DIR}
+      ARCHIVE DESTINATION ${LIB_DIR}	
+    )
+  endif()
+endmacro()
 
 # Local Variables:
 # tab-width: 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,96 +0,0 @@
-# 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_ENABLE_TESTING "@SC_ENABLE_TESTING@")
-
-set(SC_VERSION_HEADER "${BINARY_DIR}/include/sc_version_string.h")
-
-#---------- find commit id ------------------
-#use git for a pretty commit id
-#uses 'git describe --tags', so tags are required in the repo
-#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)
-    if(NOT SC_IS_SUBBUILD)
-      message(WARNING "Git not found. Build will contain revision info from ${VERS_FILE}.")
-    endif(NOT SC_IS_SUBBUILD)
-  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)
-endif()
-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)
-
-if(SC_ENABLE_TESTING)
-  set (date_time_string "NA - disabled for testing")
-elseif(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()
-
-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"
- )
-
-#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})
-
-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,5 +1,5 @@
 project(SC_SUBPROJECT_SCHEMA_SCANNER)
-cmake_minimum_required(VERSION 2.8.7)
+cmake_minimum_required(VERSION 3.12)
 
 if(NOT ("${CALLED_FROM}" STREQUAL "STEPCODE_CMAKELISTS" AND DEFINED SC_ROOT AND DEFINED SC_BUILDDIR))
   message(" ${CALLED_FROM}  ${SC_ROOT} ${SC_BUILDDIR}")
@@ -16,12 +16,12 @@ 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/alloc.c
   ${SC_ROOT}/src/express/caseitem.c
   ${SC_ROOT}/src/express/dict.c
   ${SC_ROOT}/src/express/entity.c
@@ -29,6 +29,7 @@ set(schema_scanner_src
   ${SC_ROOT}/src/express/exp_kw.c
   ${SC_ROOT}/src/express/expr.c
   ${SC_ROOT}/src/express/express.c
+  ${SC_ROOT}/src/express/factory.c
   ${SC_ROOT}/src/express/hash.c
   ${SC_ROOT}/src/express/lexact.c
   ${SC_ROOT}/src/express/linklist.c
@@ -36,6 +37,7 @@ set(schema_scanner_src
   ${SC_ROOT}/src/express/object.c
   ${SC_ROOT}/src/express/info.c
   ${SC_ROOT}/src/express/resolve.c
+  ${SC_ROOT}/src/express/resolve2.c
   ${SC_ROOT}/src/express/schema.c
   ${SC_ROOT}/src/express/scope.c
   ${SC_ROOT}/src/express/stmt.c
@@ -49,24 +51,20 @@ 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
  )
 
+add_executable(schema_scanner ${schema_scanner_src})
+
 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__)
+  target_compile_definitions(schema_scanner PUBLIC _CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_WARNINGS)
 else()
-  add_definitions(-pedantic -W -Wall -Wundef -Wfloat-equal -Wshadow -Winline -Wno-long-long)
+  target_compile_options(schema_scanner PUBLIC -pedantic -W -Wall -Wundef -Wfloat-equal -Wshadow -Winline -Wno-long-long)
 endif()
 
-add_definitions(-DSCHEMA_SCANNER)
-
-add_executable(schema_scanner ${schema_scanner_src})
+target_compile_definitions(schema_scanner PUBLIC SC_STATIC SCHEMA_SCANNER)
 
 # Local Variables:
 # tab-width: 8

cmake/schema_scanner/schemaScanner.cc

@@ -14,20 +14,25 @@
  */
 
 extern "C" {
-#  include "expparse.h"
-#  include "expscan.h"
-#  include "express/scope.h"
-#  include "genCxxFilenames.h"
-#  include "sc_mkdir.h"
+#define _XOPEN_SOURCE /* for S_IFDIR */
 
-#  include <string.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <errno.h>
 
-#  if defined( _WIN32 ) || defined ( __WIN32__ )
-#    include <direct.h>
-#    define getcwd _getcwd
-#  else
-#    include <unistd.h>
-#  endif
+#include "expparse.h"
+#include "expscan.h"
+#include "express/scope.h"
+#include "genCxxFilenames.h"
+
+#include <string.h>
+
+#ifdef _WIN32
+#  include <direct.h>
+#  define getcwd _getcwd
+#else
+#  include <unistd.h>
+#endif
 }
 
 #include <string>
@@ -125,6 +130,30 @@ string makeShortName( const char * longName ) {
     return filename;
 }
 
+/* cross-platform mkdir */
+int sc_mkdir( const char * path ) {
+    #ifdef _WIN32
+    return mkdir( path );
+    #else
+    return mkdir( path, 0777 );
+    #endif /* _WIN32 */
+}
+
+/* return -1 if error, 0 if created, 1 if dir existed already */
+static int mkDirIfNone( const char * path ) {
+	struct stat s;
+	if( stat( path, &s ) != 0 ) {
+		if( errno == ENOENT ) {
+			return sc_mkdir( path );
+		}
+	} else if( s.st_mode & S_IFDIR ) {
+		return 1;
+	}
+	/* either stat returned an error other than ENOENT, or 'path' exists but isn't a dir */
+	return -1;
+}
+
+
 /** 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 ) {
@@ -220,7 +249,7 @@ void writeLists( const char * schemaName, stringstream & eh, stringstream & ei,
 
     cmLists.close();
 
-    char pwd[BUFSIZ] = {0};
+    char pwd[BUFSIZ+1] = {0};
     if( getcwd( pwd, BUFSIZ ) ) {
         cout << pwd << "/" << shortName << endl;
     } else {
@@ -244,7 +273,7 @@ void printSchemaFilenames( Schema sch ){
     int ecount = 0, tcount = 0;
 
     DictionaryEntry de;
-    Generic x;
+    void *x;
     filenames_t fn;
     DICTdo_init( sch->symbol_table, &de );
     while( 0 != ( x = DICTdo( &de ) ) ) {

cmake/schema_scanner/schemaScanner.cmake

@@ -11,13 +11,8 @@
 # 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 "Assuming compiler is capable of unity build. (SC_UNITY_BUILD=TRUE)")
+  set(SC_UNITY_BUILD TRUE)
   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}.")
@@ -76,9 +71,9 @@ 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})
+	install(PROGRAMS ${SCANNER_OUT_DIR}/schema_scanner.exe DESTINATION ${BIN_DIR})
 else(WIN32)
-	install(PROGRAMS ${SCANNER_OUT_DIR}/schema_scanner DESTINATION ${BIN_INSTALL_DIR})
+	install(PROGRAMS ${SCANNER_OUT_DIR}/schema_scanner DESTINATION ${BIN_DIR})
 endif(WIN32)
 
 # macro SCHEMA_CMLIST
@@ -106,5 +101,6 @@ macro(SCHEMA_CMLIST SCHEMA_FILE)
   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.
+  # 2e6ee669 removed _schema, does this still work?
   configure_file(${SCHEMA_FILE} ${SCANNER_BUILD_DIR}/${_schema})
 endmacro(SCHEMA_CMLIST SCHEMA_FILE)

cmake/sync_generated.cmake.in

@@ -1,83 +0,0 @@
-# Inherit the parent CMake setting
-set(CURRENT_SOURCE_DIR @CMAKE_CURRENT_SOURCE_DIR@)
-set(CURRENT_BINARY_DIR @CMAKE_CURRENT_BINARY_DIR@)
-set(CACHED_FILES_DIR @CACHED_FILES_DIR@)
-set(LEMON_EXECUTABLE @LEMON_EXECUTABLE@)
-set(RE2C_EXECUTABLE @RE2C_EXECUTABLE@)
-set(PERPLEX_EXECUTABLE @PERPLEX_EXECUTABLE@)
-set(LOCKED_SOURCE_DIR @LOCKED_SOURCE_DIR@)
-set(DEBUGGING_GENERATED_SOURCES @DEBUGGING_GENERATED_SOURCES@)
-
-if(NOT DEBUGGING_GENERATED_SOURCES)
-  # 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 current versions of perplex, re2c and lemon.
-  #     Also add the MD5 sums for current template files.
-  #
-  # 2.  For all files that need to be updated in the cache,
-  #     calculate new MD5 sums and add them to the new
-  #     verification_info.cmake - this is usually the input
-  #     files and the generated outputs.
-  #
-  # 3.  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.new")
-
-
-  file(WRITE ${new_info_file} "# Autogenerated verification information\n")
-
-  # Handle generator version numbers
-  GET_GENERATOR_EXEC_VERSIONS()
-  file(APPEND ${new_info_file} "set(baseline_lemon_version \"${lemon_version}\")\n")
-  file(APPEND ${new_info_file} "set(baseline_re2c_version \"${re2c_version}\")\n")
-  file(APPEND ${new_info_file} "set(baseline_perplex_version \"${perplex_version}\")\n")
-
-  # Handle template files
-  set(template_files "@TEMPLATE_FILELIST@")
-  WRITE_MD5_SUMS("${template_files}" "${new_info_file}")
-
-  # Handle input files
-  set(input_files "@INPUT_FILELIST@")
-  WRITE_MD5_SUMS("${input_files}" "${new_info_file}")
-
-  # Handle generated files
-  set(output_files "@BUILD_OUTPUT_FILELIST@")
-  WRITE_MD5_SUMS("${output_files}" "${new_info_file}")
-
-  # Copy files into their final locations
-  if(NOT LOCKED_SOURCE_DIR)
-    configure_file(${new_info_file} "${CACHED_FILES_DIR}/verification_info.cmake" COPYONLY)
-    foreach(outf ${output_files})
-      get_filename_component(filecorename ${outf} NAME)
-      message("copying ${outf} to ${CACHED_FILES_DIR}/${filecorename}")
-      configure_file(${outf} "${CACHED_FILES_DIR}/${filecorename}" COPYONLY)
-    endforeach(outf ${output_files})
-  else(NOT LOCKED_SOURCE_DIR)
-    message("Source directory writing is locked - LOCKED_SOURCE_DIR is set.")
-    message("To update the generated files, manually copy the following to ${CACHED_FILES_DIR}:")
-    message("   ${new_info_file} (rename to verification_info.cmake)")
-    foreach(outf ${output_files})
-      message("   ${outf}")
-    endforeach(outf ${output_files})
-  endif(NOT LOCKED_SOURCE_DIR)
-
-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

data/CMakeLists.txt

@@ -10,7 +10,7 @@
 # .exp file inside, which it uses. otherwise, ${path} is assumed to
 # be an express file.
 
-if(NOT "${SC_BUILD_SCHEMAS}" STREQUAL "")
+if(NOT "${SC_BUILD_EXPRESS_ONLY}" AND 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)
@@ -25,7 +25,7 @@ if(NOT "${SC_BUILD_SCHEMAS}" STREQUAL "")
     LOCATE_SCHEMA(${FILE} abspath)
     SCHEMA_CMLIST(${abspath})
   endforeach()
-endif(NOT "${SC_BUILD_SCHEMAS}" STREQUAL "")
+endif()
 
 # Local Variables:
 # tab-width: 8

data/ap238/ap238-aim-long.exp

@@ -3891,11 +3891,11 @@ ENTITY grooving_turning_operation
   WR3:  (verify_optional_action_property        (SELF, 'allowance')) AND
         (verify_length_measure_action_property  (SELF, 'allowance'));
 
-  -- allowance propery required for roughing
+  -- allowance property required for roughing
   WR4:  NOT (SELF.description = 'roughing') OR
         (verify_required_action_property (SELF, 'allowance'));
 
-  -- allowance propery forbidden for cutting in
+  -- allowance property forbidden for cutting in
   WR5:  NOT (SELF.description = 'cutting in') OR
         (0 = SIZEOF (get_action_property (SELF, 'allowance')));
 END_ENTITY; -- 10303-238: integrated_cnc_schema

doc/doxyassist.xml

@@ -36,7 +36,7 @@
     <!-- This is a single string setting. When writing this out to the doxyfile,
          it will be quoted and treated as a whole. -->
     <string name="OUTPUT_LANGUAGE">English</string>
-    <!-- A list setting contains multiple elements, seperated by whitespace. Each
+    <!-- A list setting contains multiple elements, separated by whitespace. Each
          individual item will be quoted and treated as a whole for Doxygen. By
          default a list replaces the existing setting. If the append attribute is
          set to true, then the items will be added to the existing set. -->

doc/man/man1/exp2cxx.1

@@ -5,7 +5,7 @@
 .\" $Id: exp2cxx.1,v 2.1.0.2 1998/02/27 23:54:30 sauderd Exp $
 .TH FEDEX_PLUS 1 "19 November 1997"
 .SH NAME
-exp2cxx - EXPRESS compiler and translater
+exp2cxx - EXPRESS compiler and translator
 .SH SYNOPSIS
 exp2cxx [ options ] [ express-file ]
 .nf

example/ap203min/CMakeLists.txt

@@ -6,7 +6,7 @@
 # for the use of this file.
 #
 project(AP203Minimum)
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.12)
 
 # Set STEPCODE_ROOT_DIR to point to the root of the STEPcode source tree.
 if(NOT DEFINED STEPCODE_ROOT_DIR)
@@ -14,14 +14,14 @@ if(NOT DEFINED STEPCODE_ROOT_DIR)
 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")
+if(EXISTS "${CMAKE_BINARY_DIR}/${STEPCODE_ROOT_DIR}/src/express/express.c")
   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")
+  if(NOT EXISTS "${STEPCODE_ROOT_DIR}/src/express/express.c")
     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")
+  endif(NOT EXISTS "${STEPCODE_ROOT_DIR}/src/express/express.c")
+endif(EXISTS "${CMAKE_BINARY_DIR}/${STEPCODE_ROOT_DIR}/src/express/express.c")
 
 
 # Use STEPcode as library, but build from this build process.
@@ -51,18 +51,13 @@ 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})
+set(STEPCODE_LIBRARIES stepcore stepeditor stepdai steputils ${SCHEMA_LINK_NAME})
 
 # Add STEPCode project to CMake build.
 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}

example/ap203min/ExternalProjectBuild/CMakeLists.txt

@@ -6,7 +6,7 @@
 # for the use of this file.
 #
 project(AP203Minimum)
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.12)
 
 INCLUDE( ExternalProject )
 
@@ -19,7 +19,6 @@ INCLUDE( External_STEPCode )
 
 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
@@ -28,7 +27,6 @@ IF(NOT WIN32)
 	)
 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
@@ -44,7 +42,6 @@ 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
@@ -77,4 +74,4 @@ target_link_libraries( ${PROJECT_NAME}
 # mode: cmake
 # indent-tabs-mode: t
 # End:
-# ex: shiftwidth=2 tabstop=8
+# ex: shiftwidth=2 tabstop=8

example/ap203min/ExternalProjectBuild/cmake/External_STEPCode.cmake

@@ -22,8 +22,3 @@ 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,15 +49,15 @@
 //  $./AP203Minimum
 //  AP203Minimum    outfile.stp
 
-#include <STEPfile.h>
-#include <sdai.h>
-#include <STEPattribute.h>
-#include <ExpDict.h>
-#include <Registry.h>
-#include <errordesc.h>
+#include <cleditor/STEPfile.h>
+#include <clstepcore/sdai.h>
+#include <clstepcore/STEPattribute.h>
+#include <clstepcore/ExpDict.h>
+#include <clstepcore/Registry.h>
+#include <clutils/errordesc.h>
 
-#include <STEPcomplex.h>
-#include <SdaiHeaderSchema.h>
+#include <clstepcore/STEPcomplex.h>
+#include <cleditor/SdaiHeaderSchema.h>
 
 #include "schema.h"
 

example/ap203min/include/config.h.in

@@ -2,8 +2,9 @@
 #define SCL_CF_H
 
 /**** Define statements for CMake ****/
+#cmakedefine SC_VERSION "@SC_VERSION@"
 #cmakedefine HAVE_NDIR_H 1
-#cmakedefine HAVE_STDARG_H 1
+#cmakedefine HAVE_STDINT_H 1
 #cmakedefine HAVE_SYS_STAT_H 1
 #cmakedefine HAVE_SYS_PARAM_H 1
 #cmakedefine HAVE_SYSENT_H 1
@@ -14,12 +15,12 @@
 #cmakedefine HAVE_IO_H 1
 
 #cmakedefine SC_TRACE_FPRINTF 1
-#cmakedefine SC_MEMMGR_ENABLE_CHECKS 1
 
 #cmakedefine HAVE_ABS 1
 #cmakedefine HAVE_MEMCPY 1
 #cmakedefine HAVE_MEMMOVE 1
 #cmakedefine HAVE_GETOPT 1
+#cmakedefine HAVE_VSNPRINTF 1
 
 #cmakedefine HAVE_SSIZE_T 1
 

include/CMakeLists.txt

@@ -22,22 +22,26 @@ set(express_HDRS
   express/variable.h
   )
 install(FILES ${express_HDRS}
-  DESTINATION ${INCLUDE_INSTALL_DIR}/stepcode/express)
+  DESTINATION ${INCLUDE_DIR}/stepcode/express)
 
 set(exppp_HDRS
   exppp/exppp.h
   )
 install(FILES ${exppp_HDRS}
-  DESTINATION ${INCLUDE_INSTALL_DIR}/stepcode/exppp)
+  DESTINATION ${INCLUDE_DIR}/stepcode/exppp)
 
 install(FILES ordered_attrs.h
   sc_export.h
-  sc_stdbool.h
-  DESTINATION ${INCLUDE_INSTALL_DIR}/stepcode)
+  DESTINATION ${INCLUDE_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)
+install(FILES ${SC_BINARY_DIR}/${INCLUDE_DIR}/config.h
+  DESTINATION ${INCLUDE_DIR}/stepcode)
+
+add_subdirectory(cldai)
+add_subdirectory(cleditor)
+add_subdirectory(cllazyfile)
+add_subdirectory(clstepcore)
+add_subdirectory(clutils)
 
 # Local Variables:
 # tab-width: 8

include/cldai/CMakeLists.txt

@@ -0,0 +1,24 @@
+set(DAI_HDRS
+  sdaiApplication_instance_set.h
+  sdaiBinary.h
+  sdaiDaObject.h
+  sdaiEntity_extent.h
+  sdaiEntity_extent_set.h
+  sdaiEnum.h
+  sdaiModel_contents.h
+  sdaiModel_contents_list.h
+  sdaiObject.h
+  sdaiSession_instance.h
+  sdaiString.h
+  )
+
+install(FILES ${DAI_HDRS}
+  DESTINATION ${INCLUDE_DIR}/stepcode/cldai)
+
+# Local Variables:
+# tab-width: 8
+# mode: cmake
+# indent-tabs-mode: t
+# End:
+# ex: shiftwidth=2 tabstop=8
+

include/cldai/sdaiBinary.h

@@ -15,7 +15,15 @@
 
 class SC_DAI_EXPORT SDAI_Binary {
     private:
+#ifdef _MSC_VER
+#pragma warning( push )
+#pragma warning( disable: 4251 )
+#endif
         std::string content;
+#ifdef _MSC_VER
+#pragma warning( pop )
+#endif
+
     public:
 
         //constructor(s) & destructor

include/cldai/sdaiDaObject.h

@@ -1,9 +1,9 @@
 #ifndef SDAIDAOBJECT_H
 #define SDAIDAOBJECT_H 1
 
-#include <sdaiObject.h>
-#include <sdaiString.h>
-#include <sdaiEnum.h>
+#include "cldai/sdaiObject.h"
+#include "cldai/sdaiString.h"
+#include "cldai/sdaiEnum.h"
 
 #include <sc_export.h>
 
@@ -65,7 +65,7 @@ typedef SDAI_PID_ptr SDAI_PID_var;
 // The Direct Access Protocol supports direct access to persistent data
 // through typed attributes organized in data objects that are defined
 // in a Data Definition Language (DDL). An object using this protocol
-// whould represent its persistent data as one or more interconnected
+// would represent its persistent data as one or more interconnected
 // data objects, For uniformity, the persistent data of an object is
 // described as a single data object; however, that data object might be
 // the root of a graph of data objects interconnected by stored data

include/cldai/sdaiEntity_extent.h

@@ -56,7 +56,7 @@ class SC_DAI_EXPORT SDAI_Entity_extent : public SDAI_Session_instance {
             return &_instances;
         }
         SDAI_DAObject__set_var instances_() const {
-            return ( const SDAI_DAObject__set_var )&_instances;
+            return ( SDAI_DAObject__set_var )&_instances;
         }
 
 // need to implement Model_contents__list

include/cldai/sdaiEnum.h

@@ -138,6 +138,7 @@ class SC_DAI_EXPORT SDAI_BOOLEAN :
 
         operator ::Boolean() const;
         SDAI_BOOLEAN & operator=( const SDAI_LOGICAL & t );
+        SDAI_BOOLEAN & operator=( const SDAI_BOOLEAN & t );
 
         SDAI_BOOLEAN & operator=( const ::Boolean t );
         SDAI_LOGICAL operator==( const SDAI_LOGICAL & t ) const;

include/cldai/sdaiModel_contents.h

@@ -40,7 +40,7 @@ class SC_DAI_EXPORT SDAI_Model_contents_instances : public SDAI_DAObject {
             return &_instances;
         }
         SDAI_DAObject__set_var contents_() const {
-            return ( const SDAI_DAObject__set_var ) &_instances;
+            return ( SDAI_DAObject__set_var ) &_instances;
         }
 
 };

include/cldai/sdaiSession_instance.h

@@ -3,7 +3,7 @@
 #define SESSION_INSTANCE_H 1
 
 #include <sc_export.h>
-//#include <sdai.h>
+//#include "clstepcore/sdai.h"
 
 class SC_DAI_EXPORT SDAI_Session_instance : public SDAI_sdaiObject {
 

include/cldai/sdaiString.h

@@ -12,12 +12,21 @@
 */
 
 #include <sc_export.h>
+#include <string>
 #include <limits>
 
 
 class SC_DAI_EXPORT SDAI_String {
     private:
+#ifdef _MSC_VER
+#pragma warning( push )
+#pragma warning( disable: 4251 )
+#endif
         std::string content;
+#ifdef _MSC_VER
+#pragma warning( pop )
+#endif
+
     public:
 
         //constructor(s) & destructor
@@ -28,6 +37,7 @@ class SC_DAI_EXPORT SDAI_String {
 
 //  operators
         SDAI_String & operator= ( const char * s );
+        SDAI_String & operator= ( const SDAI_String & s );
         bool operator== ( const char * s ) const;
 
         void clear( void );

include/cleditor/CMakeLists.txt

@@ -0,0 +1,20 @@
+set(EDITOR_HDRS
+  STEPfile.h
+  cmdmgr.h
+  editordefines.h
+  SdaiHeaderSchema.h
+  SdaiHeaderSchemaClasses.h
+  SdaiSchemaInit.h
+  seeinfodefault.h
+  )
+
+install(FILES ${EDITOR_HDRS}
+  DESTINATION ${INCLUDE_DIR}/stepcode/cleditor)
+
+# Local Variables:
+# tab-width: 8
+# mode: cmake
+# indent-tabs-mode: t
+# End:
+# ex: shiftwidth=2 tabstop=8
+

include/cleditor/STEPfile.h

@@ -15,14 +15,14 @@
 
 #include <sc_export.h>
 #include <string>
-#include <instmgr.h>
-#include <Registry.h>
+#include "clstepcore/instmgr.h"
+#include "clstepcore/Registry.h"
 #include <fstream>
-#include <dirobj.h>
-#include <errordesc.h>
+#include "clutils/dirobj.h"
+#include "clutils/errordesc.h"
 #include <time.h>
 
-#include <read_func.h>
+#include "clstepcore/read_func.h"
 
 //error reporting level
 #define READ_COMPLETE    10
@@ -58,11 +58,18 @@ class SC_EDITOR_EXPORT STEPfile {
 
 //file information
         DirObj * _currentDir;
+#ifdef _MSC_VER
+#pragma warning( push )
+#pragma warning( disable: 4251 )
+#endif
         std::string _fileName;
 
         //the following are used to compute read/write progress
         std::ifstream::pos_type _iFileSize; ///< input file size
         std::ifstream::pos_type _iFileCurrentPosition; ///< input file position (from ifstream::tellg())
+#ifdef _MSC_VER
+#pragma warning( pop )
+#endif
         bool _iFileStage1Done; ///< set immediately before ReadData1() returns
         int _oFileInstsWritten; ///< number of instances that have been written
 
@@ -92,8 +99,15 @@ class SC_EDITOR_EXPORT STEPfile {
 //file type information
         FileTypeCode _fileType;
         char ENTITY_NAME_DELIM;
+#ifdef _MSC_VER
+#pragma warning( push )
+#pragma warning( disable: 4251 )
+#endif
         std::string FILE_DELIM;
         std::string END_FILE_DELIM;
+#ifdef _MSC_VER
+#pragma warning( pop )
+#endif
 
 //public member functions
     public:

include/cleditor/SdaiHeaderSchema.h

@@ -5,11 +5,11 @@
 // regenerate it.
 
 #include <sc_export.h>
-#include <sdai.h>
-#include <Registry.h>
-#include <STEPaggregate.h>
-#include <SdaiHeaderSchemaClasses.h>
-#include <SdaiSchemaInit.h>
+#include "clstepcore/sdai.h"
+#include "clstepcore/Registry.h"
+#include "clstepcore/STEPaggregate.h"
+#include "cleditor/SdaiHeaderSchemaClasses.h"
+#include "cleditor/SdaiSchemaInit.h"
 
 /////////         ENTITY section_language
 

include/cleditor/SdaiSchemaInit.h

@@ -9,16 +9,16 @@
 #endif
 
 #include <sc_export.h>
-#include <sdai.h>
-#include <Registry.h>
-#include <STEPaggregate.h>
-#include <STEPundefined.h>
-#include <ExpDict.h>
-#include <STEPattribute.h>
-#include <complexSupport.h>
+#include "clstepcore/sdai.h"
+#include "clstepcore/Registry.h"
+#include "clstepcore/STEPaggregate.h"
+#include "clstepcore/STEPundefined.h"
+#include "clstepcore/ExpDict.h"
+#include "clstepcore/STEPattribute.h"
+#include "clstepcore/complexSupport.h"
 
-#include <SdaiHeaderSchemaClasses.h>
-#include <SdaiHeaderSchema.h>
+#include "cleditor/SdaiHeaderSchemaClasses.h"
+#include "cleditor/SdaiHeaderSchema.h"
 
 SC_EDITOR_EXPORT void HeaderSchemaInit( Registry & );
 SC_EDITOR_EXPORT void HeaderInitSchemasAndEnts( Registry & );

include/cleditor/cmdmgr.h

@@ -13,16 +13,16 @@
 */
 
 #include <sc_export.h>
-#include <gennode.h>
-#include <gennodelist.h>
-#include <gennodearray.h>
+#include "clutils/gennode.h"
+#include "clutils/gennodelist.h"
+#include "clutils/gennodearray.h"
 
-#include <editordefines.h>
-#include <mgrnode.h>
-#include <mgrnodelist.h>
-#include <dispnode.h>
-#include <dispnodelist.h>
-#include <SingleLinkList.h>
+#include "cleditor/editordefines.h"
+#include "clstepcore/mgrnode.h"
+#include "clstepcore/mgrnodelist.h"
+#include "clstepcore/dispnode.h"
+#include "clstepcore/dispnodelist.h"
+#include "clstepcore/SingleLinkList.h"
 
 //#define NUM_CMDMGR_CMDS 9
 // this is the number of columns that contain cmds (as opposed
@@ -145,6 +145,7 @@ class SC_EDITOR_EXPORT CmdMgr {
     public:
 
         CmdMgr();
+        ~CmdMgr();
 
 // STATE LIST OPERATIONS
         MgrNode   *  GetHead( stateEnum listType );

include/cleditor/seeinfodefault.h

@@ -20,10 +20,10 @@
 class MgrNode;
 class DisplayNode;
 class DisplayNodelist;
-#include <sdai.h>
+#include "clstepcore/sdai.h"
 //class SDAI_Application_instance;
 
-#include <editordefines.h>
+#include "cleditor/editordefines.h"
 
 class SC_EDITOR_EXPORT seeInfo : public DisplayNode {
     public:

include/cllazyfile/CMakeLists.txt

@@ -0,0 +1,27 @@
+set(LAZY_HDRS
+  headerSectionReader.h
+  lazyFileReader.h
+  lazyP21DataSectionReader.h
+  p21HeaderSectionReader.h
+  lazyDataSectionReader.h
+  lazyInstMgr.h
+  lazyTypes.h
+  sectionReader.h
+  instMgrHelper.h
+  judy.h
+  judyL2Array.h
+  judyLArray.h
+  judyS2Array.h
+  judySArray.h
+  )
+
+install(FILES ${LAZY_HDRS}
+  DESTINATION ${INCLUDE_DIR}/stepcode/cllazyfile)
+
+# Local Variables:
+# tab-width: 8
+# mode: cmake
+# indent-tabs-mode: t
+# End:
+# ex: shiftwidth=2 tabstop=8
+

include/cllazyfile/headerSectionReader.h

@@ -5,10 +5,9 @@
 #include <fstream>
 
 #include "judyL2Array.h"
-#include "lazyFileReader.h"
-#include "sectionReader.h"
-#include "lazyTypes.h"
-#include "sc_memmgr.h"
+#include "cllazyfile/lazyFileReader.h"
+#include "cllazyfile/sectionReader.h"
+#include "cllazyfile/lazyTypes.h"
 
 #include "sc_export.h"
 
@@ -31,6 +30,7 @@ class SC_LAZYFILE_EXPORT headerSectionReader: public sectionReader {
             //FIXME delete each instance?! maybe add to clear, since it iterates over everything already
             //enum clearHow { rawData, deletePointers }
             _headerInstances->clear();
+	    delete _headerInstances;
         }
 };
 

include/cllazyfile/instMgrHelper.h

@@ -3,9 +3,9 @@
 
 #include <sc_export.h>
 
-#include <mgrnode.h>
-#include <lazyInstMgr.h>
-#include <instmgr.h>
+#include "clstepcore/mgrnode.h"
+#include "cllazyfile/lazyInstMgr.h"
+#include "clstepcore/instmgr.h"
 
 /**
  * \file instMgrHelper.h helper classes for the lazyInstMgr. Allows use of SDAI_Application_instance class

include/cllazyfile/judy.h

@@ -32,18 +32,7 @@
 //  judy_prv:   retrieve the cell pointer for the prev string in the array.
 //  judy_del:   delete the key and cell for the current stack entry.
 
-/* Import/Export flags for base. */
-#ifndef SC_BASE_EXPORT
-# if defined(SC_BASE_DLL_EXPORTS) && defined(SC_BASE_DLL_IMPORTS)
-#  error "Only SC_BASE_DLL_EXPORTS or SC_BASE_DLL_IMPORTS can be defined, not both."
-# elif defined(SC_BASE_DLL_EXPORTS)
-#  define SC_BASE_EXPORT __declspec(dllexport)
-# elif defined(SC_BASE_DLL_IMPORTS)
-#  define SC_BASE_EXPORT __declspec(dllimport)
-# else
-#  define SC_BASE_EXPORT
-# endif
-#endif
+#include "sc_export.h"
 
 #if defined(__LP64__)      || \
     defined(__x86_64__)    || \

include/cllazyfile/lazyDataSectionReader.h

@@ -3,9 +3,8 @@
 
 #include <map>
 #include <iostream>
-#include "sectionReader.h"
-#include "lazyTypes.h"
-#include "sc_memmgr.h"
+#include "cllazyfile/sectionReader.h"
+#include "cllazyfile/lazyTypes.h"
 
 #include "sc_export.h"
 
@@ -16,7 +15,14 @@
 class SC_LAZYFILE_EXPORT lazyDataSectionReader: public sectionReader {
     protected:
         bool _error, _completelyLoaded;
+#ifdef _MSC_VER
+#pragma warning( push )
+#pragma warning( disable: 4251 )
+#endif
         std::string _sectionIdentifier;
+#ifdef _MSC_VER
+#pragma warning( pop )
+#endif
 
         /// only makes sense to call the ctor from derived class ctors
         lazyDataSectionReader( lazyFileReader * parent, std::ifstream & file, std::streampos start, sectionID sid );

include/cllazyfile/lazyFileReader.h

@@ -8,16 +8,14 @@
 #include "sc_export.h"
 
 // PART 21
-#include "lazyP21DataSectionReader.h"
-#include "p21HeaderSectionReader.h"
-#include "headerSectionReader.h"
+#include "cllazyfile/lazyP21DataSectionReader.h"
+#include "cllazyfile/p21HeaderSectionReader.h"
+#include "cllazyfile/headerSectionReader.h"
 
 /* // PART 28
  * #include "lazyP28DataSectionReader.h"
  * #include "p28HeaderSectionReader.h"
  */
-#include "sc_memmgr.h"
-
 class lazyInstMgr;
 class Registry;
 class headerSectionReader;
@@ -26,10 +24,17 @@ class headerSectionReader;
 ///for use only from within lazyInstMgr
 class SC_LAZYFILE_EXPORT lazyFileReader {
     protected:
+#ifdef _MSC_VER
+#pragma warning( push )
+#pragma warning( disable: 4251 )
+#endif
         std::string _fileName;
         lazyInstMgr * _parent;
         headerSectionReader * _header;
         std::ifstream _file;
+#ifdef _MSC_VER
+#pragma warning( pop )
+#endif
         fileTypeEnum _fileType;
         fileID _fileID;
 

include/cllazyfile/lazyInstMgr.h

@@ -5,12 +5,11 @@
 #include <string>
 #include <assert.h>
 
-#include "lazyDataSectionReader.h"
-#include "lazyFileReader.h"
-#include "lazyTypes.h"
+#include "cllazyfile/lazyDataSectionReader.h"
+#include "cllazyfile/lazyFileReader.h"
+#include "cllazyfile/lazyTypes.h"
 
-#include "Registry.h"
-#include "sc_memmgr.h"
+#include "clstepcore/Registry.h"
 #include "sc_export.h"
 
 #include "judyLArray.h"
@@ -26,6 +25,10 @@ class SC_LAZYFILE_EXPORT lazyInstMgr {
         /** multimap from instance number to instances that it refers to
          * \sa instanceRefs_pair
          */
+#ifdef _MSC_VER
+#pragma warning( push )
+#pragma warning( disable: 4251 )
+#endif
         instanceRefs_t  _fwdInstanceRefs;
         /** multimap from instance number to instances that refer to it - the majority of these will not be inverse references!
          * \sa instanceRefs_pair
@@ -67,6 +70,10 @@ class SC_LAZYFILE_EXPORT lazyInstMgr {
 
         instMgrAdapter * _ima;
 
+#ifdef _MSC_VER
+#pragma warning( pop )
+#endif
+
     public:
         lazyInstMgr();
         ~lazyInstMgr();

include/cllazyfile/lazyP21DataSectionReader.h

@@ -1,9 +1,8 @@
 #ifndef LAZYP21DATASECTIONREADER_H
 #define LAZYP21DATASECTIONREADER_H
 
-#include "lazyDataSectionReader.h"
-#include "lazyFileReader.h"
-#include "sc_memmgr.h"
+#include "cllazyfile/lazyDataSectionReader.h"
+#include "cllazyfile/lazyFileReader.h"
 #include "sc_export.h"
 
 class SC_LAZYFILE_EXPORT lazyP21DataSectionReader: public lazyDataSectionReader {

include/cllazyfile/lazyTypes.h

@@ -1,10 +1,20 @@
 #ifndef LAZYTYPES_H
 #define LAZYTYPES_H
 
+#include "config.h"
+
 #include <iostream>
 #include <vector>
 #include <set>
+
+#ifdef HAVE_STDINT_H
 #include <stdint.h>
+#else
+#if defined(_MSC_VER) && _MSC_VER < 1600
+typedef unsigned __int64 uint64_t;
+typedef unsigned __int16 uint16_t;
+#endif
+#endif
 
 #include "judyLArray.h"
 #include "judySArray.h"

include/cllazyfile/p21HeaderSectionReader.h

@@ -1,8 +1,7 @@
 #ifndef P21HEADERSECTIONREADER_H
 #define P21HEADERSECTIONREADER_H
 
-#include "headerSectionReader.h"
-#include "sc_memmgr.h"
+#include "cllazyfile/headerSectionReader.h"
 #include "sc_export.h"
 
 class SC_LAZYFILE_EXPORT p21HeaderSectionReader: public headerSectionReader {

include/cllazyfile/sectionReader.h

@@ -3,11 +3,10 @@
 
 #include <fstream>
 #include <set>
-#include "lazyTypes.h"
-#include "sc_memmgr.h"
+#include "cllazyfile/lazyTypes.h"
 #include "sc_export.h"
-#include "errordesc.h"
-#include "STEPcomplex.h"
+#include "clutils/errordesc.h"
+#include "clstepcore/STEPcomplex.h"
 
 class SDAI_Application_instance;
 class lazyFileReader;
@@ -18,10 +17,17 @@ class SC_LAZYFILE_EXPORT sectionReader {
     protected:
         //protected data members
         lazyFileReader * _lazyFile;
+#ifdef _MSC_VER
+#pragma warning( push )
+#pragma warning( disable: 4251 )
+#endif
         std::ifstream & _file;
 
         std::streampos _sectionStart,  ///< the start of this section as reported by tellg()
             _sectionEnd;               ///< the end of this section as reported by tellg()
+#ifdef _MSC_VER
+#pragma warning( pop )
+#endif
         unsigned long _totalInstances;
 
         ErrorDescriptor * _error;
@@ -31,6 +37,7 @@ class SC_LAZYFILE_EXPORT sectionReader {
         // protected member functions
 
         sectionReader( lazyFileReader * parent, std::ifstream & file, std::streampos start, sectionID sid );
+	~sectionReader();
 
         /** Find a string, ignoring occurrences in comments or Part 21 strings (i.e. 'string with \S\' control directive' )
          * \param str string to find

include/clstepcore/CMakeLists.txt

@@ -0,0 +1,71 @@
+set(CORE_HDRS
+  aggrTypeDescriptor.h
+  attrDescriptor.h
+  attrDescriptorList.h
+  baseType.h
+  complexSupport.h
+  create_Aggr.h
+  derivedAttribute.h
+  dictSchema.h
+  dictdefs.h
+  dictionaryInstance.h
+  dispnode.h
+  dispnodelist.h
+  entityDescriptor.h
+  entityDescriptorList.h
+  enumTypeDescriptor.h
+  ExpDict.h
+  explicitItemId.h
+  globalRule.h
+  implicitItemId.h
+  instmgr.h
+  interfaceSpec.h
+  interfacedItem.h
+  inverseAttribute.h
+  inverseAttributeList.h
+  mgrnode.h
+  mgrnodearray.h
+  mgrnodelist.h
+  needFunc.h
+  read_func.h
+  realTypeDescriptor.h
+  Registry.h
+  schRename.h
+  sdai.h
+  sdaiApplication_instance.h
+  sdaiSelect.h
+  selectTypeDescriptor.h
+  SingleLinkList.h
+  STEPaggregate.h
+  STEPaggrBinary.h
+  STEPaggrEntity.h
+  STEPaggrEnum.h
+  STEPaggrGeneric.h
+  STEPaggrInt.h
+  STEPaggrReal.h
+  STEPaggrSelect.h
+  STEPaggrString.h
+  STEPattribute.h
+  STEPattributeList.h
+  STEPcomplex.h
+  STEPinvAttrList.h
+  STEPundefined.h
+  stringTypeDescriptor.h
+  SubSuperIterators.h
+  typeDescriptor.h
+  typeDescriptorList.h
+  typeOrRuleVar.h
+  uniquenessRule.h
+  whereRule.h
+)
+
+install(FILES ${CORE_HDRS}
+  DESTINATION ${INCLUDE_DIR}/stepcode/clstepcore)
+
+# Local Variables:
+# tab-width: 8
+# mode: cmake
+# indent-tabs-mode: t
+# End:
+# ex: shiftwidth=2 tabstop=8
+

include/clstepcore/ExpDict.h

@@ -15,20 +15,20 @@
  */
 
 #include <sc_export.h>
-#include <sdai.h>
+#include "clstepcore/sdai.h"
 
 #include <vector>
 #include <string>
 #include <assert.h>
 
-#include <SingleLinkList.h>
+#include "clstepcore/SingleLinkList.h"
 
-#include <baseType.h>
-#include <dictdefs.h>
-#include <Str.h>
+#include "clstepcore/baseType.h"
+#include "clstepcore/dictdefs.h"
+#include "clutils/Str.h"
 
 // each of these contains linked list, list node, iterator
-#include "attrDescriptorList.h"
+#include "clstepcore/attrDescriptorList.h"
 #include "inverseAttributeList.h"
 #include "typeDescriptorList.h"
 #include "entityDescriptorList.h"
@@ -37,12 +37,12 @@
 #include "typeDescriptor.h"
 #include "entityDescriptor.h"
 #include "enumTypeDescriptor.h"
-#include "attrDescriptor.h"
-#include "derivedAttribute.h"
+#include "clstepcore/attrDescriptor.h"
+#include "clstepcore/derivedAttribute.h"
 #include "inverseAttribute.h"
 
-#include "create_Aggr.h"
-#include "dictionaryInstance.h"
+#include "clstepcore/create_Aggr.h"
+#include "clstepcore/dictionaryInstance.h"
 
 #include "uniquenessRule.h"
 #include "whereRule.h"
@@ -53,10 +53,10 @@
 #include "interfaceSpec.h"
 #include "typeOrRuleVar.h"
 #include "globalRule.h"
-#include "dictSchema.h"
+#include "clstepcore/dictSchema.h"
 #include "schRename.h"
 
-#include "aggrTypeDescriptor.h"
+#include "clstepcore/aggrTypeDescriptor.h"
 #include "selectTypeDescriptor.h"
 #include "stringTypeDescriptor.h"
 #include "realTypeDescriptor.h"

include/clstepcore/Registry.h

@@ -13,11 +13,11 @@
 */
 
 #include <sc_export.h>
-#include <sdai.h>
-#include <errordesc.h>
-#include <sc_hash.h>
-#include <Str.h>
-#include <complexSupport.h>
+#include "clstepcore/sdai.h"
+#include "clutils/errordesc.h"
+#include "clutils/sc_hash.h"
+#include "clutils/Str.h"
+#include "clstepcore/complexSupport.h"
 
 
 // defined and created in Registry.cc

include/clstepcore/STEPaggrBinary.h

@@ -1,7 +1,7 @@
 #ifndef STEPAGGRBINARY_H
 #define STEPAGGRBINARY_H
 
-#include "STEPaggregate.h"
+#include "clstepcore/STEPaggregate.h"
 #include <sc_export.h>
 
 /** \file STEPaggrBinary.h

include/clstepcore/STEPaggrEntity.h

@@ -5,7 +5,7 @@
  * classes EntityAggregate, EntityNode
  */
 
-#include "STEPaggregate.h"
+#include "clstepcore/STEPaggregate.h"
 #include <sc_export.h>
 
 class SC_CORE_EXPORT EntityAggregate  :  public  STEPaggregate {
@@ -57,7 +57,7 @@ public:
 
     virtual SingleLinkNode   *  NewNode();
 
-    // Calling these funtions is an error.
+    // Calling these functions is an error.
     Severity StrToVal( const char * s, ErrorDescriptor * err ) {
         cerr << "Internal error:  " << __FILE__ <<  __LINE__
         << "\n" << _POC_ "\n";

include/clstepcore/STEPaggrEnum.h

@@ -1,7 +1,7 @@
 #ifndef STEPAGGRENUM_H
 #define STEPAGGRENUM_H
 
-#include "STEPaggregate.h"
+#include "clstepcore/STEPaggregate.h"
 #include "sc_export.h"
 /** \file StepaggrEnum.h
  * classes EnumAggregate, LOGICALS, BOOLEANS, EnumNode
@@ -9,7 +9,7 @@
 
 /**
  * \class EnumAggregate
- * This is a minimal representions for a collection of SDAI_Enum
+ * This is a minimal representation for a collection of SDAI_Enum
  */
 class SC_CORE_EXPORT EnumAggregate  :  public STEPaggregate {
 public:
@@ -55,7 +55,7 @@ SC_CORE_EXPORT BOOLEANS * create_BOOLEANS();
 
 /**
  * * \class EnumNode
- ** This is a minimal representions for node in lists of SDAI_Enum
+ ** This is a minimal representation for node in lists of SDAI_Enum
  */
 class SC_CORE_EXPORT EnumNode  : public STEPnode {
 public:

include/clstepcore/STEPaggrGeneric.h

@@ -1,7 +1,7 @@
 #ifndef STEPAGGRGENERIC_H
 #define STEPAGGRGENERIC_H
 
-#include "STEPaggregate.h"
+#include "clstepcore/STEPaggregate.h"
 #include <sc_export.h>
 
 /** \file STEPaggrGeneric.h

include/clstepcore/STEPaggrInt.h

@@ -1,7 +1,7 @@
 #ifndef STEPAGGRINT_H
 #define STEPAGGRINT_H
 
-#include "STEPaggregate.h"
+#include "clstepcore/STEPaggregate.h"
 #include <sc_export.h>
 
 class SC_CORE_EXPORT IntAggregate  : public STEPaggregate  {

include/clstepcore/STEPaggrReal.h

@@ -1,7 +1,7 @@
 #ifndef STEPAGGRREAL_H
 #define STEPAGGRREAL_H
 
-#include "STEPaggregate.h"
+#include "clstepcore/STEPaggregate.h"
 #include <sc_export.h>
 
 class SC_CORE_EXPORT RealAggregate  : public STEPaggregate  {

include/clstepcore/STEPaggrSelect.h

@@ -1,7 +1,7 @@
 #ifndef STEPAGGRSELECT_H
 #define STEPAGGRSELECT_H
 
-#include "STEPaggregate.h"
+#include "clstepcore/STEPaggregate.h"
 #include <sc_export.h>
 
 /** \file STEPaggrSelect.h
@@ -11,7 +11,7 @@
 
 /**
  * * \class SelectAggregate
- ** This is a minimal represention for a collection of SDAI_Select
+ ** This is a minimal representation for a collection of SDAI_Select
  */
 class SC_CORE_EXPORT SelectAggregate  :  public STEPaggregate {
 public:
@@ -35,7 +35,7 @@ typedef        SelectAggregate_ptr  SelectAggregate_var;
 
 /**
  * * \class SelectNode
- ** This is a minimal representions for node in lists of SDAI_Select
+ ** This is a minimal representation for node in lists of SDAI_Select
  */
 class SC_CORE_EXPORT SelectNode  : public STEPnode {
 public:
@@ -68,7 +68,7 @@ public:
 
     virtual SingleLinkNode   *  NewNode();
 
-    // Calling these funtions is an error.
+    // Calling these functions is an error.
     Severity StrToVal( const char * s, ErrorDescriptor * err ) {
         cerr << "Internal error:  " << __FILE__ <<  __LINE__
         << "\n" << _POC_ "\n";

include/clstepcore/STEPaggrString.h

@@ -1,7 +1,7 @@
 #ifndef STEPAGGRSTRING_H
 #define STEPAGGRSTRING_H
 
-#include "STEPaggregate.h"
+#include "clstepcore/STEPaggregate.h"
 #include <sc_export.h>
 
 /** \file STEPaggrString.h

include/clstepcore/STEPaggregate.h

@@ -17,11 +17,11 @@ class STEPaggregate;
 class TypeDescriptor;
 
 #include <sc_export.h>
-#include <errordesc.h>
-#include <SingleLinkList.h>
-#include <baseType.h>
-#include <sdai.h>
-#include <STEPundefined.h>
+#include "clutils/errordesc.h"
+#include "clstepcore/SingleLinkList.h"
+#include "clstepcore/baseType.h"
+#include "clstepcore/sdai.h"
+#include "clstepcore/STEPundefined.h"
 #include <string>
 
 #define     AGGR_NULL   &NilSTEPaggregate
@@ -110,14 +110,14 @@ public:
 };
 typedef  STEPnode  * STEPnodeH;
 
-#include "STEPaggrGeneric.h"
-#include "STEPaggrEntity.h"
-#include "STEPaggrSelect.h"
-#include "STEPaggrString.h"
-#include "STEPaggrBinary.h"
-#include "STEPaggrEnum.h"
-#include "STEPaggrReal.h"
-#include "STEPaggrInt.h"
+#include "clstepcore/STEPaggrGeneric.h"
+#include "clstepcore/STEPaggrEntity.h"
+#include "clstepcore/STEPaggrSelect.h"
+#include "clstepcore/STEPaggrString.h"
+#include "clstepcore/STEPaggrBinary.h"
+#include "clstepcore/STEPaggrEnum.h"
+#include "clstepcore/STEPaggrReal.h"
+#include "clstepcore/STEPaggrInt.h"
 
 /******************************************************************
  **   FIXME The following classes are currently stubs

include/clstepcore/STEPattribute.h

@@ -15,10 +15,10 @@
 
 #include <sc_export.h>
 #include <stdio.h>
-#include <errordesc.h>
-#include <baseType.h>
+#include "clutils/errordesc.h"
+#include "clstepcore/baseType.h"
 
-#include <sdai.h>
+#include "clstepcore/sdai.h"
 
 /** \def REAL_NUM_PRECISION
  * this is used to set a const int Real_Num_Precision
@@ -75,21 +75,15 @@ extern SC_CORE_EXPORT void PushPastAggr1Dim( istream & in, std::string & s, Erro
 class SC_CORE_EXPORT STEPattribute {
         friend ostream & operator<< ( ostream &, STEPattribute & );
         friend class SDAI_Application_instance;
-    protected:
-        bool _derive;
-        bool _mustDeletePtr; ///if a member uses new to create an object in ptr
-        ErrorDescriptor _error;
-        STEPattribute * _redefAttr;
-        const AttrDescriptor * aDesc;
-        int refCount;
 
+    public:
         /** \union ptr
-        ** You know which of these to use based on the return value of
-        ** NonRefType() - see below. BASE_TYPE is defined in baseType.h
-        ** This variable points to an appropriate member variable in the entity
-        ** class in the generated schema class library (the entity class is
-        ** inherited from SDAI_Application_instance)
-        */
+            ** You know which of these to use based on the return value of
+            ** NonRefType() - see below. BASE_TYPE is defined in baseType.h
+            ** This variable points to an appropriate member variable in the entity
+            ** class in the generated schema class library (the entity class is
+            ** inherited from SDAI_Application_instance)
+            */
         union attrUnion {
             SDAI_String * S;                 // STRING_TYPE
             SDAI_Integer * i;                // INTEGER_TYPE (Integer is a long int)
@@ -103,6 +97,18 @@ class SC_CORE_EXPORT STEPattribute {
             void * p;
         } ptr;
 
+
+    protected:
+        bool _derive;
+        bool _mustDeletePtr; ///if a member uses new to create an object in ptr
+        ErrorDescriptor _error;
+        STEPattribute * _redefAttr;
+    public:
+        const AttrDescriptor * aDesc;
+
+    protected:
+        int refCount;
+
         char SkipBadAttr( istream & in, char * StopChars );
         void AddErrorInfo();
         void STEPwriteError( ostream& out, unsigned int line, const char* desc );
@@ -137,6 +143,7 @@ class SC_CORE_EXPORT STEPattribute {
 
         /// return the attr value as a string
         string asStr( const char * currSch = 0 ) const;
+        const char * asStr( std::string &, const char * = 0 ) const;
 
         /// put the attr value in ostream
         void STEPwrite( ostream & out = cout, const char * currSch = 0 );
@@ -167,11 +174,6 @@ class SC_CORE_EXPORT STEPattribute {
         SCLundefined              * Undefined();
         ///@}
 
-        /// allows direct access to the union containing attr data (dangerous!)
-        attrUnion * Raw() {
-            return & ptr;
-        }
-
         /**
          * These functions allow setting the attribute value.
          * Attr type is verified using an assertion.
@@ -206,7 +208,7 @@ class SC_CORE_EXPORT STEPattribute {
         }
 
         const char  *  Name() const;
-        const char  *  TypeName() const;
+	std::string TypeName() const;
         BASE_TYPE   Type() const;
         BASE_TYPE   NonRefType() const;
         BASE_TYPE   BaseType() const;

include/clstepcore/STEPattributeList.h

@@ -16,7 +16,7 @@
 class STEPattribute;
 
 #include <sc_export.h>
-#include <SingleLinkList.h>
+#include "clstepcore/SingleLinkList.h"
 
 class STEPattributeList;
 

include/clstepcore/STEPcomplex.h

@@ -2,11 +2,11 @@
 #define STEPCOMPLEX_H
 
 #include <sc_export.h>
-#include <errordesc.h>
-#include <sdai.h>
-#include <baseType.h>
-#include <ExpDict.h>
-#include <Registry.h>
+#include "clutils/errordesc.h"
+#include "clstepcore/sdai.h"
+#include "clstepcore/baseType.h"
+#include "clstepcore/ExpDict.h"
+#include "clstepcore/Registry.h"
 
 #include <list>
 
@@ -42,7 +42,14 @@ class SC_CORE_EXPORT STEPcomplex : public SDAI_Application_instance {
         STEPcomplex * head;
         Registry * _registry;
         int visited; ///< used when reading (or as you wish?)
+#ifdef _MSC_VER
+#pragma warning( push )
+#pragma warning( disable: 4251 )
+#endif
         STEPcomplex_attr_data_list _attr_data_list; ///< attrs are created with a pointer to data; this stores them for deletion
+#ifdef _MSC_VER
+#pragma warning( pop )
+#endif
     public:
         STEPcomplex( Registry * registry, int fileid );
         STEPcomplex( Registry * registry, const std::string ** names, int fileid,

include/clstepcore/STEPinvAttrList.h

@@ -15,7 +15,7 @@
 class Inverse_attribute;
 
 #include <sc_export.h>
-#include <SingleLinkList.h>
+#include "clstepcore/SingleLinkList.h"
 
 class STEPinvAttrList;
 class EntityAggregate;

include/clstepcore/STEPundefined.h

@@ -13,13 +13,20 @@
 */
 
 #include <sc_export.h>
-#include <errordesc.h>
+#include "clutils/errordesc.h"
 #include <string>
-#include <read_func.h>
+#include "clstepcore/read_func.h"
 
 class SC_CORE_EXPORT SCLundefined  {
     protected:
+#ifdef _MSC_VER
+#pragma warning( push )
+#pragma warning( disable: 4251 )
+#endif
         std::string val;
+#ifdef _MSC_VER
+#pragma warning( pop )
+#endif
 
     public:
 //  INPUT

include/clstepcore/SubSuperIterators.h

@@ -1,8 +1,8 @@
 #ifndef SUB_SUPER_ITERATORS
 #define SUB_SUPER_ITERATORS
 
-#include "ExpDict.h"
-#include "ExpDict.h"
+#include "clstepcore/ExpDict.h"
+#include "clstepcore/ExpDict.h"
 #include <queue>
 #include <assert.h>
 

include/clstepcore/aggrTypeDescriptor.h

@@ -2,7 +2,7 @@
 #define AGGRTYPEDESCRIPTOR_H
 
 #include "typeDescriptor.h"
-#include "create_Aggr.h"
+#include "clstepcore/create_Aggr.h"
 
 #include "assert.h"
 
@@ -35,7 +35,14 @@ protected:
 
     AggrBoundTypeEnum _bound1_type, _bound2_type;
     boundCallbackFn _bound1_callback, _bound2_callback;
+#ifdef _MSC_VER
+#pragma warning( push )
+#pragma warning( disable: 4251 )
+#endif
     std::string _bound1_str, _bound2_str;
+#ifdef _MSC_VER
+#pragma warning( pop )
+#endif
 
 public:
 
@@ -50,7 +57,7 @@ public:
     AggrTypeDescriptor( const char * nm, PrimitiveType ft,
                         Schema * origSchema, const char * d,
                         AggregateCreator f = 0 )
-    : TypeDescriptor( nm, ft, origSchema, d ), _bound1( 0 ), _bound2( 0 ), _uniqueElements( 0 ), _aggrDomainType( NULL ), CreateNewAggr( f ) { }
+    : TypeDescriptor( nm, ft, origSchema, d ), _bound1( 0 ), _bound2( 0 ), _uniqueElements( 0 ), _aggrDomainType( NULL ), CreateNewAggr( f ), _bound1_type( bound_unset ), _bound2_type( bound_unset ), _bound1_callback( NULL ), _bound2_callback( NULL ) { }
     virtual ~AggrTypeDescriptor();
 
 

include/clstepcore/attrDescriptor.h

@@ -3,7 +3,7 @@
 
 #include "typeDescriptor.h"
 
-#include "sdaiEnum.h"
+#include "cldai/sdaiEnum.h"
 
 #include "sc_export.h"
 

include/clstepcore/complexSupport.h

@@ -18,7 +18,7 @@
 #include <iostream>
 #include <fstream>
 using namespace std;
-#include "Str.h"
+#include "clutils/Str.h"
 
 #define LISTEND 999
 /** \def LISTEND
@@ -132,7 +132,7 @@ class SC_CORE_EXPORT EntNode {
 
     private:
         MarkType mark;
-        char name[BUFSIZ];
+        char name[BUFSIZ+1];
         bool multSupers;  ///< do I correspond to an entity with >1 supertype?
         EntNode * lastSmaller( EntNode * ); ///< used by ::sort()
 };
@@ -173,26 +173,27 @@ class SC_CORE_EXPORT EntList {
         // but all we need.
         EntList * firstNot( JoinType );
         EntList * nextNot( JoinType j ) {
-            return next->firstNot( j );
+            return ( next ) ? next->firstNot( j ) : NULL;
         }
         EntList * firstWanted( MatchType );
         EntList * nextWanted( MatchType mat ) {
-            return next->firstWanted( mat );
+            return ( next ) ? next->firstWanted( mat ) : NULL;
         }
         EntList * lastNot( JoinType );
         EntList * prevNot( JoinType j ) {
-            return prev->lastNot( j );
+            return ( prev ) ? prev->lastNot( j ) : NULL;
         }
         EntList * lastWanted( MatchType );
         EntList * prevWanted( MatchType mat ) {
-            return prev->lastWanted( mat );
+            return ( prev ) ? prev->lastWanted( mat ) : NULL;
         }
 
         JoinType join;
         int multiple() {
             return ( join != SIMPLE );
         }
-        EntList * next, *prev;
+        EntList * next = NULL;
+        EntList * prev = NULL;
 
     protected:
         MatchType viable;
@@ -237,7 +238,7 @@ class SC_CORE_EXPORT SimpleList : public EntList {
         }
 
     private:
-        char name[BUFSIZ];    ///< Name of entity we correspond to.
+        char name[BUFSIZ+1];    ///< Name of entity we correspond to.
         MarkType I_marked; ///< Did I mark, and with what type of mark.
 };
 

include/clstepcore/create_Aggr.h

@@ -3,7 +3,7 @@
 
 //typedef's for aggregate creators
 
-#include "sdai.h"
+#include "clstepcore/sdai.h"
 #include "sc_export.h"
 
 

include/clstepcore/derivedAttribute.h

@@ -1,7 +1,7 @@
 #ifndef DERIVEDATTRIBUTE_H
 #define DERIVEDATTRIBUTE_H
 
-#include "attrDescriptor.h"
+#include "clstepcore/attrDescriptor.h"
 
 #include "sc_export.h"