Merge pull request #29 from Autodesk/develop

SItoA for Arnold 5.2 to master

.gitignore

@@ -19,6 +19,12 @@ custom.py
 dist
 build
 
+# VS and VS Code
+.vs
+.vscode/*
+*.user
+*.code-workspace
+
 # Eclipse
 .settings
 .*project
@@ -35,3 +41,8 @@ cmake-build-debug
 
 # mac cruft
 .DS_Store
+
+# Softimage testsuite
+testsuite/XSIProject/Backup/*
+testsuite/XSIProject/Cache/*
+testsuite/XSIProject/system/*

README.md

@@ -18,7 +18,7 @@ under an Apache 2.0 open source license.
 #### Requirements
 
 * Softimage 2015 SP1
-* Arnold 5.0.2.4 or newer
+* Arnold 5.2.2.0 or newer
 * Python 2.6 or newer
 * Visual Studio 2012 (Windows)
 * GCC 4.2.4 (Linux)
@@ -65,7 +65,7 @@ VS_HOME             = r'C:/Program Files (x86)/Microsoft Visual Studio 11.0/VC'
 WINDOWS_KIT         = r'C:/Program Files (x86)/Windows Kits/8.0'
 
 XSISDK_ROOT         = r'C:/Program Files/Autodesk/Softimage 2015/XSISDK'
-ARNOLD_HOME         = r'C:/SolidAngle/Arnold-5.0.1.1/win64'
+ARNOLD_HOME         = r'C:/SolidAngle/Arnold-5.2.2.0/win64'
 
 TARGET_WORKGROUP_PATH  = r'./Softimage_2015/Addons/SItoA'
 
@@ -339,6 +339,12 @@ RendererContext g_renderContext;
 For anything else not in these rules, use common sense, but keep it consistent. If you are modifying an existing function or method, respect its original coding style. The same applies to adding code to an existing file: **respect the coding style around you**.
 
 
+#### Versioning
+
+Before SItoA was open-sourced it had it's own versioning scheme, with the last official version being 4.1.0. This is similar to how the other Arnold plugins are versioned.
+Because of the probability of releases being less and less frequent now, and mostly just being compatibility fixes with a new Arnold core, a decision was made to change versioning to partly match the Arnold Core. This should make it easier and more apparent which Arnold version SItoA is prepared for. The new open-source versioning will therefore be `ARNOLD_MAJOR.ARNOLD_POINT.SITOA_VERSION`.
+
+
 ### Acknowledgments
 
 Before it was open-sourced, throughout the years, SItoA has been developed by:
@@ -365,6 +371,7 @@ With contributions by:
 - Holger Schoenberger
 - Frederic Servant
 - Jules Stevenson
+- Jens Lindgren
 
 Special thanks to all the users who passionately provided feedback, production
 assets, bug reports and suggested features during those years.

SConstruct

@@ -20,7 +20,7 @@ import SCons
 def make_package(target, source, env):
    package_name = str(target[0]) + ".xsiaddon"
    zip_name = str(target[0])
-   base_pkg_dir = 'package_temp' + get_softimage_version(env['XSISDK_ROOT']);
+   base_pkg_dir = os.path.join('dist', 'package_temp' + get_softimage_version(env['XSISDK_ROOT']));
 
    # First we make sure the temp directory doesn't exist
    #if os.path.exists(base_pkg_dir):
@@ -77,7 +77,7 @@ function main()
       #if retcode != 0:
       #   print "ERROR: Could not create package '%s'" % package_name
       #else:
-      shutil.move(os.path.join(base_pkg_dir, 'SItoA.xsiaddon'), package_name)
+      shutil.move(os.path.join(base_pkg_dir, 'SItoA.xsiaddon'), os.path.join('dist', package_name))
    """
    import zipfile
 
@@ -140,6 +140,7 @@ system.set_target_arch(env['TARGET_ARCH'])
 ARNOLD_HOME = env['ARNOLD_HOME']
 ARNOLD_API_INCLUDES = os.path.join(ARNOLD_HOME, 'include')
 ARNOLD_BINARIES = os.path.join(ARNOLD_HOME, 'bin')
+ARNOLD_PLUGINS = os.path.join(ARNOLD_HOME, 'plugins')
 if system.os() == 'windows':
   ARNOLD_API_LIB = os.path.join(ARNOLD_HOME, 'lib')
 else:
@@ -319,7 +320,7 @@ if system.os() == 'windows':
                                projects = [os.path.join('plugins', 'sitoa', 'sitoa') + env['MSVS']['PROJECTSUFFIX'],
                                            os.path.join('shaders', 'src', 'sitoa_shaders') + env['MSVS']['PROJECTSUFFIX'],
                                            'install' + env['MSVS']['PROJECTSUFFIX']],  ## TODO: Find a clean way of getting these project paths
-                               dependencies = [[], [], [], ['sitoa', 'sitoa_shaders']],
+                               dependencies = [[], [], ['sitoa', 'sitoa_shaders']],
                                variant = ['Debug_MSVC|Win32',
                                           'Debug_ICC|Win32',
                                           'Opt_MSVC|Win32',
@@ -391,10 +392,16 @@ PACKAGE_FILES = [
 [os.path.join(plugin_binary_path, 'shaders', DLLS),                        os.path.join(addon_path, bin_path)],
 [os.path.join(ARNOLD_BINARIES, 'kick%s' % get_executable_extension()),     os.path.join(addon_path, bin_path)],
 [os.path.join(ARNOLD_BINARIES, 'maketx%s' % get_executable_extension()),   os.path.join(addon_path, bin_path)],
+[os.path.join(ARNOLD_BINARIES, 'noice%s' % get_executable_extension()),    os.path.join(addon_path, bin_path)],
+[os.path.join(ARNOLD_BINARIES, 'oslc%s' % get_executable_extension()),     os.path.join(addon_path, bin_path)],
+[os.path.join(ARNOLD_BINARIES, 'oslinfo%s' % get_executable_extension()),  os.path.join(addon_path, bin_path)],
 [os.path.join(ARNOLD_BINARIES, '*%s' % get_library_extension()),           os.path.join(addon_path, bin_path)],
+[os.path.join(ARNOLD_BINARIES, '*.pit'),                                   os.path.join(addon_path, bin_path)],
+[os.path.join(ARNOLD_PLUGINS, '*'),                                        os.path.join(addon_path, bin_path, '..', 'plugins')],
 [os.path.join('plugins', 'helpers', '*.js'),                               os.path.join(addon_path, plugins_path)],
 [os.path.join('plugins', 'helpers', 'Pictures', '*.bmp'),                  os.path.join(addon_path, pictures_path)],
 [os.path.join('shaders', 'metadata', '*.mtd'),                             os.path.join(addon_path, bin_path)],
+[os.path.join(ARNOLD_HOME, 'license', 'lmuti*'),                           os.path.join(addon_path, license_path)],
 [os.path.join(ARNOLD_HOME, 'license', 'rl*'),                              os.path.join(addon_path, license_path)],
 [os.path.join(ARNOLD_HOME, 'license', 'solidangle.*'),                     os.path.join(addon_path, license_path)],
 [os.path.join(ARNOLD_HOME, 'license', 'pit', '*'),                         os.path.join(addon_path, pit_path)]
@@ -452,6 +459,7 @@ env.Install(os.path.join(env['TARGET_WORKGROUP_PATH'], bin_path), [str(SITOA[0])
                                                                    str(SITOA_SHADERS[0])])
 
 env.Install(os.path.join(env['TARGET_WORKGROUP_PATH'], bin_path), [glob.glob(os.path.join(ARNOLD_BINARIES, '*'))])
+env.Install(os.path.join(env['TARGET_WORKGROUP_PATH'], bin_path, '..'), [glob.glob(ARNOLD_PLUGINS)])
 
 # Copying Scripting Plugins 
 # (if you modify the files directly on workgroup they will be overwritted with trunk version)

config/custom_linux.py

@@ -6,7 +6,7 @@
 SHCXX       = r'/usr/bin/gcc-4.2.4/bin/gcc-4.2.4'
 
 XSISDK_ROOT = r'/usr/Softimage/Softimage_2015/XSISDK'
-ARNOLD_HOME = r'/usr/SolidAngle/Arnold-5.0.2.4/linux'
+ARNOLD_HOME = r'/usr/SolidAngle/Arnold-5.2.2.0/linux'
 
 TARGET_WORKGROUP_PATH = './Softimage_2015/Addons/SItoA'
 

config/custom_windows.py

@@ -9,7 +9,7 @@
 WINDOWS_KIT         = r'C:/Program Files (x86)/Windows Kits/8.0'
 
 XSISDK_ROOT         = r'C:/Program Files/Autodesk/Softimage 2015/XSISDK'
-ARNOLD_HOME         = r'C:/SolidAngle/Arnold-5.0.2.4/win64'
+ARNOLD_HOME         = r'C:/SolidAngle/Arnold-5.2.2.0/win64'
 
 TARGET_WORKGROUP_PATH  = r'./Softimage_2015/Addons/SItoA'