Merge pull request #2 from ericmehl/msvc2017

Msvc2017

.gitignore

@@ -1,2 +1,7 @@
 working
 */archives
+**/gafferBuild
+llvm*/build-release
+qt*/**/*.qm
+c-blosc*/**
+qt-adsk-*/**

Alembic/config.py

@@ -36,4 +36,40 @@
 
 	],
 
+	"platform:windows" : {
+
+		"commands" : [
+
+			"cmake"
+				" -G {cmakeGenerator}"
+				" -D CMAKE_BUILD_TYPE={cmakeBuildType}"
+				" -D CMAKE_INSTALL_PREFIX={buildDir}"
+				" -D CMAKE_PREFIX_PATH={buildDir}"
+				" -D ALEMBIC_NO_TESTS=ON"
+				" -D ALEMBIC_NO_OPENGL=ON"
+				" -D Boost_NO_SYSTEM_PATHS=ON"
+				" -D Boost_NO_BOOST_CMAKE=ON"
+				" -D BOOST_ROOT={buildDir}"
+				" -D HDF5_ROOT={buildDir}"
+				" -D ILMBASE_ROOT={buildDir}"
+				" -D USE_TESTS=OFF"
+				" -D USE_HDF5=ON"
+				" -D USE_PYILMBASE=OFF"
+				" -D USE_PYALEMBIC=OFF"
+				" -D USE_ARNOLD=OFF"
+				" -D USE_PRMAN=OFF"
+				" -D USE_MAYA=OFF"
+				" -D ALEMBIC_LIB_USES_BOOST=TRUE"
+				" -D ALEMBIC_ILMBASE_HALF_LIB={buildDir}\\lib\\half.lib"
+				" -D ALEMBIC_ILMBASE_IEX_LIB={buildDir}\\lib\\Iex-2_3.lib"
+				" -D ALEMBIC_ILMBASE_IEXMATH_LIB={buildDir}\\lib\\IexMath-2_3.lib"
+				" -D ALEMBIC_ILMBASE_ILMTHREAD_LIB={buildDir}\\lib\\IlmThread-2_3.lib"
+				" -D ALEMBIC_ILMBASE_IMATH_LIB={buildDir}\\lib\\Imath-2_3.lib"
+				" .",
+			"cmake --build . --config {cmakeBuildType} --target install"
+
+		],
+
+	},
+
 }

Appleseed/config.py

@@ -2,7 +2,7 @@
 
 	"downloads" : [
 
-		"https://github.com/appleseedhq/appleseed/archive/1.9.0-beta.tar.gz"
+		"https://github.com/appleseedhq/appleseed/archive/2.0.5-beta.tar.gz"
 
 	],
 
@@ -38,12 +38,15 @@
 
 		"cd build &&"
 			" cmake"
+			" -G {cmakeGenerator}"
+			" -D CMAKE_BUILD_TYPE={cmakeBuildType}"
 			" -D WITH_CLI=ON"
 			" -D WITH_STUDIO=OFF"
 			" -D WITH_TOOLS=OFF"
 			" -D WITH_TESTS=OFF"
 			" -D WITH_PYTHON=ON"
 			" -D USE_STATIC_BOOST=OFF"
+			" -D USE_STATIC_EXR=OFF"
 			" -D USE_STATIC_OIIO=OFF"
 			" -D USE_STATIC_OSL=OFF"
 			" -D USE_EXTERNAL_ZLIB=ON"
@@ -58,8 +61,7 @@
 			" -D CMAKE_INSTALL_PREFIX={buildDir}/appleseed"
 			" -D PYTHON_INCLUDE_DIR={pythonIncludeDir}"
 			" ..",
-
-		"cd build && make install -j {jobs} VERBOSE=1"
+		"cd build && cmake --build . --config {cmakeBuildType} --target install -- -j {jobs}"
 
 	],
 
@@ -74,4 +76,67 @@
 
 	},
 
+	"platform:windows" : {
+
+		"variables" : {
+			"cmakeGenerator" : "\"Visual Studio 15 2017 Win64\"",
+		},
+
+		"environment" : {
+
+			"PATH" : "%PATH%;{buildDir}\\lib;{buildDir}\\bin",
+
+		},
+
+		"commands" : [
+			"if not exist \"build\" mkdir build",
+			"cd build &&"
+				" cmake"
+				" -G {cmakeGenerator}"
+				" -D CMAKE_VERBOSE_MAKEFILE:BOOL=ON"
+				" -D CMAKE_BUILD_TYPE={cmakeBuildType}"
+				" -D PYTHON_LIBRARY={buildDir}\\lib\\python27.lib"
+				" -D PYTHON_INCLUDE_DIR={buildDir}\\include"
+				" -D WITH_OSL=ON"
+				" -D WITH_CLI=ON"
+				" -D WITH_STUDIO=OFF"
+				" -D WITH_TOOLS=OFF"
+				" -D WITH_PYTHON=ON"
+				" -D WITH_OSL=ON"
+				" -D WITH_TESTS=OFF"
+				" -D USE_STATIC_BOOST=OFF"
+				" -D USE_STATIC_OIIO=OFF"
+				" -D USE_STATIC_EXR=OFF"
+				" -D USE_STATIC_OSL=OFF"
+				" -D USE_EXTERNAL_ZLIB=ON"
+				" -D USE_EXTERNAL_EXR=ON"
+				" -D USE_EXTERNAL_PNG=ON"
+				" -D USE_EXTERNAL_XERCES=ON"
+				" -D USE_EXTERNAL_OSL=ON"
+				" -D USE_EXTERNAL_OIIO=ON"
+				" -D USE_EXTERNAL_ALEMBIC=ON"
+				" -D WARNINGS_AS_ERRORS=OFF"
+				" -D USE_SSE=ON"
+				" -D CMAKE_PREFIX_PATH={buildDir}"
+				" -D CMAKE_INSTALL_PREFIX={buildDir}\\appleseed"
+				" -D BOOST_ROOT={buildDir}"
+				" -D IMATH_INCLUDE_DIR={buildDir}\\include"
+				" -D IMATH_HALF_LIBRARY={buildDir}\\lib\\Half.lib"
+				" -D IMATH_IEX_LIBRARY={buildDir}\\lib\\Iex-2_3.lib"
+				" -D IMATH_MATH_LIBRARY={buildDir}\\lib\\Imath-2_3.lib"
+				" -D OPENEXR_INCLUDE_DIR={buildDir}\\include"
+				" -D OPENEXR_IMF_LIBRARY={buildDir}\\lib\\IlmImf-2_3.lib"
+				" -D OPENEXR_THREADS_LIBRARY={buildDir}\\lib\\IlmThread-2_3.lib"
+				" -D XERCES_LIBRARY={buildDir}\\lib\\xerces-c_3.lib"
+				" -D OSL_INCLUDE_DIR={buildDir}\\include"
+				" -D LLVM_LIBS_DIR={buildDir}\\lib"
+				" OSL_EXEC_LIBRARY={buildDir}\\lib\\oslexec.lib"
+				" OSL_COMP_LIBRARY={buildDir}\\lib\\oslcomp.lib"
+				" OSL_QUERY_LIBRARY={buildDir}\\lib\\oslquery.lib"
+				" ..",
+			"cd build && cmake --build . --config {cmakeBuildType} --target install",
+		]
+
+	}
+
 }

Appleseed/patches/windows/win-vs.patch

@@ -0,0 +1,17 @@
+diff --git a/./cmake/config/win-vs.txt b/./cmake/config/win-vs.txt
+--- ./cmake/config/win-vs.txt
++++ ./cmake/config/win-vs.txt
+@@ -297,10 +297,10 @@
+
+ macro (link_against_osl target)
+     set (LLVM_LIBS
+-        LLVMLTO LLVMLinker LLVMipo LLVMVectorize LLVMBitWriter LLVMTableGen LLVMDebugInfo LLVMOption LLVMX86Disassembler LLVMX86AsmParser
++        LLVMLTO LLVMLinker LLVMipo LLVMVectorize LLVMBitWriter LLVMTableGen LLVMOption LLVMX86Disassembler LLVMX86AsmParser
+         LLVMX86CodeGen LLVMSelectionDAG LLVMAsmPrinter LLVMX86Desc LLVMX86Info LLVMX86AsmPrinter LLVMX86Utils LLVMIRReader LLVMBitReader
+-        LLVMAsmParser LLVMMCDisassembler LLVMMCParser LLVMInstrumentation LLVMInterpreter LLVMMCJIT LLVMJIT LLVMCodeGen LLVMObjCARCOpts
+-        LLVMScalarOpts LLVMInstCombine LLVMTransformUtils LLVMipa LLVMAnalysis LLVMRuntimeDyld LLVMExecutionEngine LLVMTarget LLVMMC
++        LLVMAsmParser LLVMMCDisassembler LLVMMCParser LLVMInstrumentation LLVMInterpreter LLVMMCJIT LLVMCodeGen LLVMObjCARCOpts
++        LLVMScalarOpts LLVMInstCombine LLVMTransformUtils LLVMAnalysis LLVMRuntimeDyld LLVMExecutionEngine LLVMTarget LLVMMC
+         LLVMObject LLVMCore LLVMSupport
+     )
+

BitstreamVera/config.py

@@ -14,4 +14,15 @@
 
 	],
 
+	"platform:windows" : {
+
+		"commands" : [
+
+			"if not exist \"{buildDir}\\fonts\" mkdir {buildDir}\\fonts",
+			"copy *.ttf {buildDir}\\fonts"
+
+		]
+
+	}
+
 }

Blosc/config.py

@@ -17,4 +17,26 @@
 
 	],
 
+	"platform:windows" : {
+
+		"commands" : [
+
+			"mkdir gafferBuild",
+			"cd gafferBuild && "
+				" cmake"
+				" -Wno-dev"
+				" -G {cmakeGenerator}"
+				" -D CMAKE_BUILD_TYPE={cmakeBuildType}"
+				" -D CMAKE_INSTALL_PREFIX={buildDir}"
+				" -D BUILD_TESTS=OFF"
+				" -D BUILD_BENCHMARKS=OFF"
+				" -D BUILD_STATIC=OFF"
+				" ..",
+
+			"cd gafferBuild && cmake --build . --config {cmakeBuildType} --target install -- -j {jobs}",
+
+		],
+
+	},
+
 }

Boost/config.py

@@ -27,4 +27,31 @@
 
 	],
 
+	"platform:windows" : {
+
+		"variables" : {
+
+			# technically not accurate for MSVC 2017 but Boost needs this
+			# for Boost versions < 1.65
+			"boostMsvcVersion" : "msvc-14.0",
+
+		},
+
+		"environment" : {
+
+			# Boost needs help finding Python
+			"PATH" : "%PATH%;{buildDir}\\bin",
+			"PYTHONPATH" : "{buildDir};{buildDir}\\bin;{buildDir}\\lib64;{buildDir}\\lib"
+
+		},
+
+		"commands" : [
+
+			"bootstrap.bat --prefix={buildDir} --with-python=\"{buildDir}\" --with-python-root=\"{buildDir}\" --without-libraries=log",
+			"(echo using python ^: 2.7 : {buildDirFwd} ^: {buildDirFwd}/include ^: {buildDirFwd}/lib ^: ^<address-model^>64 ^;) >> project-config.jam",
+			"b2 -d+2 --prefix={buildDir} --toolset={boostMsvcVersion} architecture=x86 address-model=64 --build-type=complete variant=release link=shared threading=multi -s ZLIB_SOURCE=%ROOT_DIR%\\Zlib\\working\\zlib-1.2.11 -s ZLIB_INCLUDE={buildDir}\\include -s ZLIB_LIBPATH={buildDir}\\lib -s ZLIB_BINARY=zlib install"
+
+		],
+
+	},
 }

CMark/config.py

@@ -16,4 +16,22 @@
 
 	],
 
+	"platform:windows" : {
+
+		"commands" : [
+
+			"mkdir gafferBuild",
+			"cd gafferBuild && "
+				" cmake"
+				" -G {cmakeGenerator}"
+				" -D CMAKE_BUILD_TYPE={cmakeBuildType}"
+				" -D CMAKE_INSTALL_PREFIX={buildDir}"
+				" ..",
+
+			"cd gafferBuild && cmake --build . --config {cmakeBuildType} --target install -- -j {jobs}",
+
+		],
+
+	}
+
 }

Changes

@@ -1,12 +1,20 @@
+0.54.1.0
+--------
+
+- Cortex :
+	- Updated to version 10.0.0-a60.
+	- Added display driver for RenderMan.
+
 0.54.0.0
 --------
 
 - OpenEXR : Updated to version 2.3.0.
 - OpenVDB : Updated to version 6.0.0.
 - Blosc : Updated to version 1.15.1.
 - PySide : Updated to version corresponding with Maya 2018 Update 6.
-- Cortex : Updated to version 10.0.0-a58.
+- Cortex : Updated to version 10.0.0-a59.
 - USD : Enable support for loading Alembic archives.
+- Appleseed : Updated to version 2.0.5-beta.
 
 0.54.0.0-rc3
 ------------

Cortex/config.py

@@ -2,7 +2,7 @@
 
 	"downloads" : [
 
-		"https://github.com/ImageEngine/cortex/archive/10.0.0-a58.tar.gz"
+		"https://github.com/ImageEngine/cortex/archive/10.0.0-a60.tar.gz"
 
 	],
 
@@ -47,7 +47,8 @@
 			" OPTIONS=''"
 			" SAVE_OPTIONS=gaffer.options",
 
-		"cp -r contrib/scripts/9to10 {buildDir}/python",
+		# Symlink for RenderMan, which uses a different convention to 3Delight.
+		"ln -s ieDisplay{sharedLibraryExtension} {buildDir}/renderMan/displayDrivers/d_ieDisplay.so"
 
 	],
 

FreeType/config.py

@@ -23,4 +23,25 @@
 
 	],
 
+	"platform:windows" : {
+
+		"commands" : [
+
+			"mkdir gafferBuild",
+			"cd gafferBuild && cmake"
+				" -Wno-dev"
+				" -G {cmakeGenerator}"
+				" -D CMAKE_BUILD_TYPE={cmakeBuildType}"
+				" -D CMAKE_INSTALL_PREFIX={buildDir}"
+				" -D CMAKE_DISABLE_FIND_PACKAGE_PNG=TRUE"
+				" ..",
+			# FreeType 2.9.1 does not copy the ftconfig.h header
+			# the binary directory, help it out here
+			"copy include\\freetype\\config\\ftconfig.h gafferBuild\\include\\freetype\\config\\ftconfig.h",
+			"cd gafferBuild && cmake --build . --config {cmakeBuildType} --target install -- -j {jobs}",
+
+		]
+
+	}
+
 }

GLEW/config.py

@@ -15,4 +15,21 @@
 
 	],
 
+	"platform:windows" : {
+
+		"commands" : [
+
+			"if not exist \"build\" mkdir build",
+			"cd build &&"
+				" cmake"
+				" -Wno-dev"
+				" -G {cmakeGenerator}"
+				" -DCMAKE_INSTALL_PREFIX={buildDir}"
+				" ..\\build\\cmake",
+			"cd build && cmake --build . --config {cmakeBuildType} --target install -- -j {jobs}"
+
+		]
+
+	}
+
 }

GafferResources/config.py

@@ -14,4 +14,14 @@
 
 	],
 
+	"platform:windows" : {
+
+		"commands" : [
+
+			"xcopy /s /e /h /y /i resources {buildDir}\\resources",
+
+		],
+
+	}
+
 }