Merge branch 'master' into hotgym-fix

Author: ctrl-z-9000-times

CHANGELOG.md

@@ -1,7 +1,10 @@
 # Changelog
 
-This file is no longer being updated.
-Instead see the [API_CHANGELOG](API_CHANGELOG.md).
+Also see [API_CHANGELOG](API_CHANGELOG.md).
+
+## 2.0.0
+* changed repository name from nupic.core to htm.core
+* Added support for Visual Studio 2019
 
 ## 1.1.0
 

CommonCompilerConfig.cmake

@@ -154,7 +154,7 @@ set(COMMON_OS_LIBS)
 
 if(MSVC)
 	# MS Visual C
-	# on Windows using Visual Studio 2015, 2017   https://docs.microsoft.com/en-us/cpp/build/reference/compiler-options-listed-by-category
+	# on Windows using Visual Studio 2015, 2017, 2019   https://docs.microsoft.com/en-us/cpp/build/reference/compiler-options-listed-by-category
 	#  /permissive- forces standards behavior.  See https://docs.microsoft.com/en-us/cpp/build/reference/permissive-standards-conformance?view=vs-2017
 	#  /Zc:__cplusplus   This is required to force MSVC to pay attention to the standard setting and sets __cplusplus.
 	#                    NOTE: MSVC does not support C++11.  But does support C++14 and C++17.

README.md

@@ -46,7 +46,7 @@ Fork or download the HTM-Community htm.core repository from https://github.com/h
 
 ## Prerequisites
 
-- [CMake](http://www.cmake.org/)
+- [CMake](http://www.cmake.org/)  Version 3.8  (3.14 for Visual Studio 2019)
 - [Python](https://python.org/downloads/)
     - Version 3.4+
     - Version 2.7
@@ -125,10 +125,11 @@ make -j install
 
  * This will not build the Python interface.
 
-## Simple Build On Windows (MS Visual Studio 2017)
+## Simple Build On Windows (MS Visual Studio 2017 or 2019)
 
 After downloading the repository, do the following:
 
+ * NOTE: Visual Studio 2019 requires CMake version 3.14 or higher.
  * CD to the top of repository.
  * Double click on startupMSVC.bat
     - This will setup the build, create the solution file (build/scripts/htm.cpp.sln), and start MS Visual Studio.

RELEASE.md

@@ -1,14 +1,5 @@
 # Release Process
 
-1. Select a green build in Bamboo that has the changes that you want to release
-2. Ensure that this build has the correct version in the VERSION file
-3. Create a Bamboo release with version matching the VERSION file in the repo
-4. Deploy the release in Bamboo. This will:
-    - Validate that the Bamboo release number matches the wheel versions.
-    - Push the wheels to PyPI
-    - Push the source archive to S3
-    - Create a Github release
-    - Tag the repo commit with the version
-    - Bump the VERSION file to the next bugfix release number
+Not doing releases yet.  
 
 :-) 

VERSION

@@ -1 +1 @@
-1.0.8.community0
+2.0.0

startupMSVC.bat

@@ -1,23 +1,30 @@
 @echo off
-rem // Runs CMake to configure htm.core for Visual Studio 2017
+rem // Runs CMake to configure htm.core for Visual Studio 2017 and 2019
 rem // Execute this file to start up CMake and configure Visual Studio.
 rem //
 rem // There is no need to use Developer Command Prompt for running CMake with 
 rem // Visual Studio generators, corresponding environment will be loaded automatically by CMake.
 rem // 
 rem // Prerequisites:
 rem //
-rem //     Microsoft Visual Studio 2017 or newer (any flavor)
+rem //     Microsoft Visual Studio 2017, 2019 or newer (any flavor)
 rem //
 rem //     CMake: 3.7+ Download CMake from https://cmake.org/download/
+rem //            NOTE: CMake 3.14+ is required for MSCV 2019
 rem //
 rem //     Python 2.7 or 3.x Download from https://www.python.org/downloads/windows/  (optional)
 rem // 
 rem //
 rem //   This script will create a Vsual Studio solution file at build/scripts/htm_core.sln
 rem //   Double click htm_core.sln to start up Visual Studio.  Then perform a full build.
 rem //
-rem // Tricks for executing Visual Studio is Release or Build mode.
+rem //   Note: if you were originally using this repository with VS 2017 and you now
+rem //         want to use VS 2019, Do the following:
+rem //           1) delete the build folder in the repository.  This will remove the .sln and other VS files.
+rem //           2) run startupMSVC.bat again.   It will detect that VS 2019 is installed and configure for it but it will start VS 2017.
+rem //           3) after .sln is re-created in build/scripts/, right click, on the .sln file, select "open with", click "choose another app", select VS 2019
+rem //
+rem // Tricks for executing Visual Studio in Release or Build mode.
 rem // https://stackoverflow.com/questions/24460486/cmake-build-type-not-being-used-in-cmakelists-txt
 
 
@@ -58,20 +65,36 @@ if exist "htm_core.sln" (
   exit /B 0
 )
 
-rem // Run CMake using the Visual Studio generator for VS 2017
-rem //   -G "Visual Studio 15 2017 Win64"   set the generator toolset to use. Could also set ARM rather than Win64.
+rem // Run CMake using the Visual Studio generator.  The generator can be one of these.
+rem //   cmake -G "Visual Studio 15 2017" -A x64
+rem //   cmake -G "Visual Studio 16 2017" -A ARM
+rem //
+rem //   cmake -G "Visual Studio 16 2019" -A x64
+rem //   cmake -G "Visual Studio 16 2019" -A ARM64
+rem //      NOTE: MSVC 2019 tool set generator requires CMake V3.14 or greater)
+rem //   
+rem //  arguments:
+rem //   -G "Visual Studio 16 2019"  Sets the generator toolset (compilers/linkers) to use. 
+rem //   -A x64                      Sets the platform.  Note that 64bit only supported.
 rem //   -Thost=x64                  Tell CMake to tell VS to use 64bit tools for compiler and linker
 rem //   --config "Release"          Start out in Release mode
 rem //   -DCMAKE_CONFIGURATION_TYPES="Debug;Release"   Specify the build types allowed.
 rem //   ../..                       set the source directory (top of repository)
 
-rem // cmake -G "Visual Studio 15 2017 Win64" -Thost=x64 --config "Release" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DBINDING_BUILD=Python3 ../..
-cmake -G "Visual Studio 15 2017 Win64" -Thost=x64 --config "Release" -DCMAKE_CONFIGURATION_TYPES="Debug;Release"  ../..
+if exist "C:\Program Files (x86)\Microsoft Visual Studio\2019" (
+    set GENERATOR="Visual Studio 16 2019"
+    set PLATFORM=x64
+) else (
+    set GENERATOR="Visual Studio 15 2017"
+    set PLATFORM=x64
+)
+
+cmake -G %GENERATOR% -A %PLATFORM% -Thost=x64 --config "Release" -DCMAKE_CONFIGURATION_TYPES="Debug;Release"  ../..
 
 if exist "htm_core.sln" (
-    rem //cmake --build . --target install --config "Release"
     @echo " "
     @echo You can now start Visual Studio using solution file %HTM_BASE%\build\scripts\htm_core.sln
+    @echo Dont forget to set your default Startup Project to unit_tests.
     @echo Press any key to start Visual Studio 
     pause >nul