Release version 4.1.0

Author: montykutyi

.gitattributes

@@ -1,5 +1,2 @@
 # Set line endigs of the text files to native format
 * text=auto
-
-lib/javascript/addon/package.json text eol=lf
-lib/javascript/addon/package-lock.json text eol=lf

.gitignore

@@ -1,4 +1,2 @@
 # Exclude the .gradle directories
 **/.gradle
-lib/javascript/addon/build/*
-lib/javascript/addon/node_modules/*

.gitmodules

@@ -7,12 +7,16 @@
 [submodule "3rdparty/PMD"]
 	path = 3rdparty/PMD
 	url = https://github.com/sed-inf-u-szeged/pmd.git
-[submodule "java/lib/langtools"]
-	path = java/lib/langtools
-	url = https://github.com/sed-inf-u-szeged/langtools.git
 [submodule "3rdparty/python2"]
 	path = 3rdparty/python2
 	url = ../cpython
 [submodule "3rdparty/python3"]
 	path = 3rdparty/python3
 	url = ../cpython
+[submodule "cl/LIM2Patterns/pybind11"]
+	path = cl/LIM2Patterns/pybind11
+	url = https://github.com/pybind/pybind11
+[submodule "java/lib/openjdk"]
+	path = java/lib/openjdk
+	url = ../openjdk
+	ignore = dirty

3rdparty/CMakeLists.txt

@@ -10,14 +10,19 @@ file (MAKE_DIRECTORY ${COLUMBUS_3RDPARTY_INSTALL_DIR}/bin)
 file (MAKE_DIRECTORY ${COLUMBUS_3RDPARTY_INSTALL_DIR}/lib)
 file (MAKE_DIRECTORY ${COLUMBUS_3RDPARTY_INSTALL_DIR}/include)
 
+# Disable warnings during building 3rdparty code
+if (CMAKE_SYSTEM_NAME STREQUAL Linux)
+  add_compile_options("-w")
+endif()
+
 ########################### zlib #########################
 
 ExternalProject_Add(zlib
     SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/zlib
     PATCH_COMMAND git clean -x -d -f
           COMMAND git reset --hard
           COMMAND git apply --ignore-whitespace ${CMAKE_CURRENT_SOURCE_DIR}/CMake/zlib.patch
-    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${COLUMBUS_3RDPARTY_INSTALL_DIR} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
+    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${COLUMBUS_3RDPARTY_INSTALL_DIR} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
     LOG_CONFIGURE 1
     LOG_BUILD 1
     LOG_INSTALL 1
@@ -38,15 +43,22 @@ if (CMAKE_SYSTEM_NAME STREQUAL Windows)
   if (COLUMBUS_64BIT)
     set (BOOST_ADDRESS_MODEL address-model=64)
   endif ()
+  set (BOOST_MSVC_TOOLSET toolset=msvc-14.1)
+endif ()
+
+
+if (CMAKE_SYSTEM_NAME STREQUAL Linux)
+  set (BOOST_EXTRA_CXX_COMPILER_FLAGS cxxflags=-fPIC)
+  set (BOOST_EXTRA_C_COMPILER_FLAGS cflags=-fPIC)
 endif ()  
 
 ExternalProject_Add(boost
     DEPENDS zlib
     SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/boost
     BUILD_IN_SOURCE 1
     CONFIGURE_COMMAND ${COMMAND_PREFIX}bootstrap${SCRIPT_EXT}
-    BUILD_COMMAND ${COMMAND_PREFIX}b2 cxxflags=-fPIC cflags=-fPIC --reconfigure --build-dir=${CMAKE_CURRENT_BINARY_DIR}/boost-prefix --prefix=${COLUMBUS_3RDPARTY_INSTALL_DIR} -j8 --with-filesystem --with-system --with-date_time --with-iostreams --with-graph --with-regex --with-thread --with-math --layout=system variant=$<$<CONFIG:Debug>:debug>$<$<CONFIG:Release>:release>  runtime-link=static architecture=x86  threading=multi ${BOOST_ADDRESS_MODEL} link=static  -sZLIB_INCLUDE=${COLUMBUS_3RDPARTY_INSTALL_DIR}/include -sZLIB_LIBPATH=${COLUMBUS_3RDPARTY_INSTALL_DIR}/lib -sZLIB_BINARY=z -sNO_ZLIB=0 -sNO_BZIP2=1   headers
-          COMMAND ${COMMAND_PREFIX}b2 cxxflags=-fPIC cflags=-fPIC --reconfigure --build-dir=${CMAKE_CURRENT_BINARY_DIR}/boost-prefix --prefix=${COLUMBUS_3RDPARTY_INSTALL_DIR} -j8 --with-filesystem --with-system --with-date_time --with-iostreams --with-graph --with-regex --with-thread --with-math --layout=system variant=$<$<CONFIG:Debug>:debug>$<$<CONFIG:Release>:release>  runtime-link=static architecture=x86  threading=multi ${BOOST_ADDRESS_MODEL} link=static  -sZLIB_INCLUDE=${COLUMBUS_3RDPARTY_INSTALL_DIR}/include -sZLIB_LIBPATH=${COLUMBUS_3RDPARTY_INSTALL_DIR}/lib -sZLIB_BINARY=z -sNO_ZLIB=0 -sNO_BZIP2=1   install
+    BUILD_COMMAND ${COMMAND_PREFIX}b2 ${BOOST_EXTRA_CXX_COMPILER_FLAGS} ${BOOST_EXTRA_C_COMPILER_FLAGS} ${BOOST_MSVC_TOOLSET} --reconfigure --build-dir=${CMAKE_CURRENT_BINARY_DIR}/boost-prefix --prefix=${COLUMBUS_3RDPARTY_INSTALL_DIR} -j8 --with-filesystem --with-system --with-date_time --with-iostreams --with-graph --with-regex --with-thread --with-math --layout=system variant=$<$<CONFIG:Debug>:debug>$<$<CONFIG:Release>:release>  runtime-link=static architecture=x86  threading=multi ${BOOST_ADDRESS_MODEL} link=static  -sZLIB_INCLUDE=${COLUMBUS_3RDPARTY_INSTALL_DIR}/include -sZLIB_LIBPATH=${COLUMBUS_3RDPARTY_INSTALL_DIR}/lib -sZLIB_BINARY=z -sNO_ZLIB=0 -sNO_BZIP2=1   headers
+          COMMAND ${COMMAND_PREFIX}b2 ${BOOST_EXTRA_CXX_COMPILER_FLAGS} ${BOOST_EXTRA_C_COMPILER_FLAGS} ${BOOST_MSVC_TOOLSET} --reconfigure --build-dir=${CMAKE_CURRENT_BINARY_DIR}/boost-prefix --prefix=${COLUMBUS_3RDPARTY_INSTALL_DIR} -j8 --with-filesystem --with-system --with-date_time --with-iostreams --with-graph --with-regex --with-thread --with-math --layout=system variant=$<$<CONFIG:Debug>:debug>$<$<CONFIG:Release>:release>  runtime-link=static architecture=x86  threading=multi ${BOOST_ADDRESS_MODEL} link=static  -sZLIB_INCLUDE=${COLUMBUS_3RDPARTY_INSTALL_DIR}/include -sZLIB_LIBPATH=${COLUMBUS_3RDPARTY_INSTALL_DIR}/lib -sZLIB_BINARY=z -sNO_ZLIB=0 -sNO_BZIP2=1   install
     INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "No sepearate installation step is needed."
     LOG_CONFIGURE 1
     LOG_BUILD 1
@@ -88,11 +100,11 @@ endif ()
 
 if (CMAKE_SYSTEM_NAME STREQUAL Linux)
   ExternalProject_Add( xerces-c
-      URL http://archive.apache.org/dist/xerces/c/3/sources/xerces-c-3.1.4.tar.gz
-	  URL_HASH MD5=21bb097b711a513275379b59757cba4c 
-	  BUILD_IN_SOURCE 1
+      URL https://archive.apache.org/dist/xerces/c/3/sources/xerces-c-3.1.4.tar.gz
+      URL_HASH MD5=21bb097b711a513275379b59757cba4c 
+      BUILD_IN_SOURCE 1
       CONFIGURE_COMMAND ./reconf
-                COMMAND ./configure --disable-shared -disable-network --disable-transcoder-icu --prefix=${COLUMBUS_3RDPARTY_INSTALL_DIR}
+                COMMAND ./configure --disable-shared -disable-network --disable-transcoder-icu --prefix=${COLUMBUS_3RDPARTY_INSTALL_DIR} --disable-dependency-tracking
       BUILD_COMMAND make -j8 all
       INSTALL_COMMAND make install
       LOG_DOWNLOAD 1
@@ -111,8 +123,8 @@ elseif (CMAKE_SYSTEM_NAME STREQUAL Windows)
   endif ()
 
   ExternalProject_Add( xerces-c
-	  URL http://archive.apache.org/dist/xerces/c/3/sources/xerces-c-3.1.4.zip
-	  URL_HASH MD5=6fcd8ec268f6bfe11d8ce2cd7d25a185
+      URL https://archive.apache.org/dist/xerces/c/3/sources/xerces-c-3.1.4.zip
+      URL_HASH MD5=6fcd8ec268f6bfe11d8ce2cd7d25a185
       BUILD_IN_SOURCE 1
       CONFIGURE_COMMAND ${CMAKE_COMMAND} -E echo "No configuration is required."
       BUILD_COMMAND msbuild projects/Win32/VC14/xerces-all/xerces-all.sln /m /t:XercesLib "/p:Configuration=Static $<CONFIG>" /p:Platform=${VS_PLATFORM} /p:PlatformToolset=${CMAKE_VS_PLATFORM_TOOLSET}
@@ -128,13 +140,19 @@ endif ()
 
 ########################### PMD #########################
 
-set (PMD_PACKAGE_VERSION pmd-bin-5.2.3)
+set (PMD_PACKAGE_VERSION pmd-bin-6.32.0)
 set (PMD_DIST_PACKAGE ${CMAKE_CURRENT_SOURCE_DIR}/PMD/pmd-dist/target/${PMD_PACKAGE_VERSION}.zip)
 set (PMD_PACKAGE ${COLUMBUS_3RDPARTY_INSTALL_DIR}/PMD.zip)
+if (CMAKE_SYSTEM_NAME STREQUAL Windows AND NOT COLUMBUS_64BIT)
+  set (PMD_MAVEN_OPTS ${CMAKE_COMMAND} -E env MAVEN_OPTS=-Xss16m)
+endif ()
+if (CMAKE_SYSTEM_NAME STREQUAL Windows)
+  set (MVNW_POSTFIX .cmd)
+endif ()
 
 add_custom_command (
   OUTPUT ${PMD_PACKAGE}
-  COMMAND mvn${MVN_POSTFIX} package -DskipTests > ${CMAKE_CURRENT_BINARY_DIR}/PMD-build.log
+  COMMAND ${PMD_MAVEN_OPTS} ${COMMAND_PREFIX}mvnw${MVNW_POSTFIX} package -DskipTests -Dmaven.test.skip=true -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -pl pmd-dist,pmd-core,pmd-java > ${CMAKE_CURRENT_BINARY_DIR}/PMD-build.log 2>&1
   COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_CURRENT_SOURCE_DIR}/PMD/pmd-dist/target/ ${CMAKE_COMMAND} -E remove_directory PMD
   COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_CURRENT_SOURCE_DIR}/PMD/pmd-dist/target/ ${CMAKE_COMMAND} -E tar xf ${PMD_DIST_PACKAGE}
   COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_CURRENT_SOURCE_DIR}/PMD/pmd-dist/target/ ${CMAKE_COMMAND} -E rename ${PMD_PACKAGE_VERSION} PMD
@@ -151,14 +169,26 @@ add_custom_target (
 
 set_target_properties (PMD PROPERTIES FOLDER "ExternalProjectTargets/pmd")
 
+
+########################### SpotBugs #########################
+
+ExternalProject_Add( spotbugs
+    URL https://repo.maven.apache.org/maven2/com/github/spotbugs/spotbugs/4.2.2/spotbugs-4.2.2.tgz
+    CONFIGURE_COMMAND ""
+    BUILD_COMMAND ""
+    INSTALL_COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_CURRENT_BINARY_DIR}/spotbugs-prefix/src ${CMAKE_COMMAND} -E tar cf ${COLUMBUS_3RDPARTY_INSTALL_DIR}/spotbugs.zip --format=zip spotbugs
+    LOG_DOWNLOAD 1
+    LOG_INSTALL 1
+)
+
+
 ########################### python27 #########################
 if (CMAKE_SYSTEM_NAME STREQUAL Linux)
 
   ExternalProject_Add( python2.7
       DEPENDS zlib
       SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/python2
-      BUILD_IN_SOURCE 1
-      CONFIGURE_COMMAND ./configure --enable-optimizations --disable-shared --prefix=${COLUMBUS_3RDPARTY_INSTALL_DIR}
+      CONFIGURE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/python2/configure --enable-optimizations --disable-shared --prefix=${COLUMBUS_3RDPARTY_INSTALL_DIR}
       BUILD_COMMAND make -j8 altbininstall inclinstall
       INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "No install step is required as the build step installs the library."
       LOG_CONFIGURE 1
@@ -186,14 +216,13 @@ elseif (CMAKE_SYSTEM_NAME STREQUAL Windows)
 
 endif ()
 
-########################### python36 #########################
+########################### python38 #########################
 if (CMAKE_SYSTEM_NAME STREQUAL Linux)
 
-  ExternalProject_Add( python3.6
+  ExternalProject_Add( python3.8
       DEPENDS zlib
       SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/python3
-      BUILD_IN_SOURCE 1
-      CONFIGURE_COMMAND ./configure --enable-optimizations --disable-shared --prefix=${COLUMBUS_3RDPARTY_INSTALL_DIR} --without-pymalloc
+      CONFIGURE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/python3/configure --enable-optimizations --disable-shared --prefix=${COLUMBUS_3RDPARTY_INSTALL_DIR} --without-pymalloc
       BUILD_COMMAND make -j8 altbininstall inclinstall
       INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "No install step is required as the build step installs the library."
       LOG_CONFIGURE 1
@@ -202,17 +231,51 @@ if (CMAKE_SYSTEM_NAME STREQUAL Linux)
   )
 elseif (CMAKE_SYSTEM_NAME STREQUAL Windows)
 
-  ExternalProject_Add( python3.6
+  ExternalProject_Add( python3.8
       DEPENDS zlib
       SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/python3
       BUILD_IN_SOURCE 1
       CONFIGURE_COMMAND ""
       BUILD_COMMAND msbuild PCbuild/pythoncore.vcxproj /m /t:Build /p:Configuration=$<CONFIG> /p:Platform=${VS_PLATFORM} /p:PlatformToolset=${CMAKE_VS_PLATFORM_TOOLSET}
-      INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory Include ${COLUMBUS_3RDPARTY_INSTALL_DIR}/include/python3.6
-              COMMAND ${CMAKE_COMMAND} -E copy "PC/pyconfig.h" ${COLUMBUS_3RDPARTY_INSTALL_DIR}/include/python3.6/pyconfig.h
-              COMMAND ${CMAKE_COMMAND} -E copy "PCbuild/${PYTHON_PLATFORM_NAME}/python36$<$<CONFIG:Debug>:_d>.lib" ${COLUMBUS_3RDPARTY_INSTALL_DIR}/lib/python3.6.lib
+      INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory Include ${COLUMBUS_3RDPARTY_INSTALL_DIR}/include/python3.8
+              COMMAND ${CMAKE_COMMAND} -E copy "PC/pyconfig.h" ${COLUMBUS_3RDPARTY_INSTALL_DIR}/include/python3.8/pyconfig.h
+              COMMAND ${CMAKE_COMMAND} -E copy "PCbuild/${PYTHON_PLATFORM_NAME}/python38$<$<CONFIG:Debug>:_d>.lib" ${COLUMBUS_3RDPARTY_INSTALL_DIR}/lib/python3.8.lib
       LOG_CONFIGURE 1
       LOG_BUILD 1
       LOG_INSTALL 1
   )
 endif ()
+
+###################### openssl ############################
+
+if (CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
+    if (CMAKE_CL_64)
+      set (OPENSSL_PLATFORM VC-WIN64A)
+    else ()
+      set (OPENSSL_PLATFORM VC-WIN32)
+    endif ()
+
+    ExternalProject_Add( openssl
+        URL https://www.openssl.org/source/openssl-1.1.0h.tar.gz
+        CONFIGURE_COMMAND perl ../openssl/Configure --prefix=${COLUMBUS_3RDPARTY_INSTALL_DIR} --openssldir=ssl ${OPENSSL_PLATFORM} ${DEBUG_BUILD} -no-shared
+        BUILD_COMMAND nmake
+        INSTALL_COMMAND nmake install
+        LOG_CONFIGURE 1
+        LOG_BUILD 1
+        LOG_INSTALL 1
+        LOG_DOWNLOAD 1
+    )
+
+  else ()
+    ExternalProject_Add( openssl
+        URL https://www.openssl.org/source/openssl-1.1.0h.tar.gz
+        CONFIGURE_COMMAND ../openssl/config --prefix=${COLUMBUS_3RDPARTY_INSTALL_DIR} --openssldir=ssl ${DEBUG_BUILD} -no-shared
+        BUILD_COMMAND make
+        INSTALL_COMMAND make install
+        LOG_CONFIGURE 1
+        LOG_BUILD 1
+        LOG_INSTALL 1
+        LOG_DOWNLOAD 1
+    )
+  
+endif ()

3rdparty/PMD

@@ -1,18 +1,11 @@
 
-set (BUILD_INFO_FILE ${CMAKE_BINARY_DIR}/BuildInfo.txt)
-set (BUILD_INFO_H_FILE ${CMAKE_BINARY_DIR}/BuildInfo.h)
-
-add_custom_command (
-  OUTPUT ${BUILD_INFO_FILE} ${BUILD_INFO_H_FILE}
-  COMMAND git rev-parse --short HEAD > ${BUILD_INFO_FILE}
-  COMMAND ${CMAKE_COMMAND} -DBINARY_DIR=${CMAKE_BINARY_DIR} -P ${CMAKE_MODULE_PATH}/GenerateBuildInfoH.cmake
-  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-  DEPENDS ${CMAKE_SOURCE_DIR}/.git/HEAD
-)
+set (TEMP_BUILD_INFO_FILE ${CMAKE_BINARY_DIR}/BuildInfo-temp.txt)
 
 add_custom_target (
   generate_build_info ALL
-  DEPENDS ${BUILD_INFO_FILE} ${BUILD_INFO_H_FILE}
+  COMMAND git rev-parse --short HEAD > ${TEMP_BUILD_INFO_FILE}
+  COMMAND ${CMAKE_COMMAND} -DBINARY_DIR=${CMAKE_BINARY_DIR} -P ${CMAKE_MODULE_PATH}/GenerateBuildInfoH.cmake
+  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
 )
 
 set_target_properties (generate_build_info PROPERTIES FOLDER ${CMAKE_SUPPORT_FOLDER_NAME})

3rdparty/boost

@@ -8,12 +8,17 @@ include_directories (${CMAKE_SOURCE_DIR}/lib)
 include_directories (${CMAKE_SOURCE_DIR}/wrapper)
 
 # Compiler standard options
-set (CMAKE_CXX_STANDARD 14)
+set (CMAKE_CXX_STANDARD 20)
 set (CMAKE_CXX_STANDARD_REQUIRED ON)
 set (CMAKE_CXX_EXTENSIONS OFF)
 
 option (STRIP "Strip all symbols from the binaries" OFF)
 
+add_definitions(-DBOOST_ALLOW_DEPRECATED_HEADERS -DBOOST_DISABLE_PRAGMA_MESSAGE)
+
+set (COLUMBUS_3RDPARTY_INSTALL_DIR ${CMAKE_BINARY_DIR}/3rdparty/install)
+set (COLUMBUS_3RDPARTY_SOURCE_DIR ${CMAKE_SOURCE_DIR}/3rdparty)
+
 # Compiler warning settings
 if (MSVC)
   # For ninja builds on windows we set the CMAKE_VS_PLATFORM_TOOLSET to V140 (VS2015)
@@ -22,7 +27,7 @@ if (MSVC)
   endif ()
 
   # Disable some common compiler warnings end enable parallel build
-  set (EXTRA_COMPILER_OPTIONS "/wd4996 /wd4267 /wd4786 /wd4996 /MP /EHsc")
+  set (EXTRA_COMPILER_OPTIONS "/WX /wd4996 /wd4267 /wd4786 /wd4244 /wd4068 /MP /EHsc /experimental:external /external:W0 /external:I ${COLUMBUS_3RDPARTY_INSTALL_DIR}/include")
 
   # In Release builds enable Whole Program Optimization and Compile Time Code Generation
   set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /GL")
@@ -31,22 +36,21 @@ if (MSVC)
   set (CMAKE_STATIC_LINKER_FLAGS_RELEASE "${CMAKE_STATIC_LINKER_FLAGS_RELEASE} /LTCG")
 
   # The MSVCRT library is the DLL version of the CRT. (/MD) Since we use static CRT no MSVCRT is needed.
-  set (CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /NODEFAULTLIB:MSVCRT")
+  set (CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /NODEFAULTLIB:MSVCRT /STACK:10485760")
 
   # The MSVCRTD library is the debug DLL version of the CRT. (/MDd) Since we use static CRT no MSVCRTD is needed.
-  set (CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:MSVCRTD")
+  set (CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:MSVCRTD /STACK:10485760")
 
-  # Replace the default MultiThreadedDLL runtime to MultiThreaded.
-  replace_compiler_options (/MD /MT)
-  replace_compiler_options (/MDd /MTd)
+  # Change the default MultiThreadedDLL runtime to MultiThreaded.
+  set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
 
   # Set some global macro definitions requred for use boost and xerces
   add_definitions(-DBOOST_ALL_NO_LIB -DXERCES_STATIC_LIBRARY)
 
 elseif (CMAKE_SYSTEM_NAME STREQUAL Linux)
 
   # Enable compiler warnings and use fPIC option
-  set (EXTRA_COMPILER_OPTIONS "-Wall -fPIC")
+  set (EXTRA_COMPILER_OPTIONS "-Wall -Werror -Wno-unused-local-typedefs -Wno-unknown-pragmas -fPIC")
 
   if (STRIP)
     set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s")
@@ -62,10 +66,9 @@ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_COMPILER_OPTIONS}")
 # Common global dependencies
 set (COLUMBUS_GLOBAL_DEPENDENCY generate_build_info)
 
-set (COLUMBUS_3RDPARTY_INSTALL_DIR ${CMAKE_BINARY_DIR}/3rdparty/install)
-set (COLUMBUS_3RDPARTY_SOURCE_DIR ${CMAKE_SOURCE_DIR}/3rdparty)
-
-include_directories (SYSTEM ${COLUMBUS_3RDPARTY_INSTALL_DIR}/include)
+if (CMAKE_SYSTEM_NAME STREQUAL Linux)
+  include_directories (SYSTEM ${COLUMBUS_3RDPARTY_INSTALL_DIR}/include)
+endif ()
 link_directories (${COLUMBUS_3RDPARTY_INSTALL_DIR}/lib)
 
 if (CMAKE_SYSTEM_NAME STREQUAL Windows)

3rdparty/python2

@@ -0,0 +1,31 @@
+if (CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
+    set (OPENSSL_LIBRARIES libssl.lib libcrypto.lib crypt32.lib)
+else ()
+    set (OPENSSL_LIBRARIES ssl crypto dl pthread)
+endif ()
+
+set (CSAN_BINARIES
+     Columbus.dll
+     CSAN${EXE}
+     CSAN.dll
+     CSAN.dll.config
+     CSharp.dll
+     Humanizer.dll
+     LIM.dll
+     Microsoft.Bcl.AsyncInterfaces.dll
+     Microsoft.Build.Locator.dll
+     Microsoft.CodeAnalysis.CSharp.dll
+     Microsoft.CodeAnalysis.CSharp.Workspaces.dll
+     Microsoft.CodeAnalysis.dll
+     Microsoft.CodeAnalysis.VisualBasic.dll
+     Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll
+     Microsoft.CodeAnalysis.Workspaces.dll
+     Microsoft.CodeAnalysis.Workspaces.MSBuild.dll
+     System.Composition.AttributedModel.dll
+     System.Composition.Convention.dll
+     System.Composition.Hosting.dll
+     System.Composition.Runtime.dll
+     System.Composition.TypedParts.dll
+     CSAN.deps.json
+     CSAN.runtimeconfig.json
+)

3rdparty/python3

@@ -1,9 +1,24 @@
 
-file(STRINGS ${BINARY_DIR}/BuildInfo.txt BUILD_NUMBER)
-
-file(WRITE ${BINARY_DIR}/BuildInfo.h
-  "#ifndef _BUILD_INFO_H_\n"
-  "#define _BUILD_INFO_H_\n"
-  "#define REVISION_NUMBER \"${BUILD_NUMBER}\"\n"
-  "#endif\n"
-)
+set (PREVIOUS_VERSION_FILE ${BINARY_DIR}/BuildInfo.txt)
+set (CURRENT_VERSION_FILE ${BINARY_DIR}/BuildInfo-temp.txt)
+file(STRINGS ${CURRENT_VERSION_FILE} CURRENT_BUILD_NUMBER)
+
+function (update_version_files)
+  file(WRITE ${PREVIOUS_VERSION_FILE} ${CURRENT_BUILD_NUMBER})
+  file(WRITE ${BINARY_DIR}/BuildInfo.h
+    "#ifndef _BUILD_INFO_H_\n"
+    "#define _BUILD_INFO_H_\n"
+    "#define REVISION_NUMBER \"${CURRENT_BUILD_NUMBER}\"\n"
+    "#endif\n"
+  )
+endfunction ()
+
+
+if (EXISTS ${PREVIOUS_VERSION_FILE})
+  file(STRINGS ${PREVIOUS_VERSION_FILE} PREVIOUS_BUILD_NUMBER)
+  if (NOT ${PREVIOUS_BUILD_NUMBER} STREQUAL ${CURRENT_BUILD_NUMBER})
+    update_version_files()
+  endif ()
+else()
+  update_version_files()
+endif ()