Merge branch 'LTS_Unity2018' into Unity2019

Author: svermeulen

Build/CreateSampleBuilds

@@ -1,3 +1,5 @@
 #!/bin/bash
 cd python
-python3 -m mtm.zen.CreateSampleBuilds $@
+source /usr/local/bin/virtualenvwrapper.sh
+workon extenject
+python3 -m mtm.zen.CreateSampleBuilds "$@"

Build/python/mtm/util/UnityHelper.py

@@ -45,8 +45,15 @@ def __init__(self):
     def onUnityLog(self, logStr):
         self._log.debug(logStr)
 
+    def _createUnityOpenCommand(self, args):
+        if os.name == 'nt':
+            return '"C:/Program Files/Unity/Hub/Editor/2018.1.0f2/Editor/Unity.exe" ' + args
+
+        return 'open -n "/Applications/UnityInstalls/2018.1.0f2/Unity.app" --args ' + args
+
     def openUnity(self, projectPath, platform):
-        self._sys.executeNoWait('"[UnityExePath]" -buildTarget {0} -projectPath "{1}"'.format(self._getBuildTargetArg(platform), projectPath))
+        args = '-buildTarget {0} -projectPath "{1}"'.format(self._getBuildTargetArg(platform), projectPath)
+        self._sys.executeNoWait(self._createUnityOpenCommand(args))
 
     def runEditorFunction(self, projectPath, editorCommand, platform = Platforms.Windows, batchMode = True, quitAfter = True, extraExtraArgs = ''):
         extraArgs = ''
@@ -96,17 +103,15 @@ def runEditorFunctionRaw(self, projectPath, editorCommand, platform, extraArgs):
         logWatcher = LogWatcher(logPath, self.onUnityLog)
         logWatcher.start()
 
-        assertThat(self._varMgr.hasKey('UnityExePath'), "Could not find path variable 'UnityExePath'")
-
         try:
-            command = '"[UnityExePath]" -buildTarget {0} -projectPath "{1}"'.format(self._getBuildTargetArg(platform), projectPath)
+            args = '-buildTarget {0} -projectPath "{1}"'.format(self._getBuildTargetArg(platform), projectPath)
 
             if editorCommand:
-                command += ' -executeMethod ' + editorCommand
+                args += ' -executeMethod ' + editorCommand
 
-            command += ' ' + extraArgs
+            args += ' ' + extraArgs
 
-            self._sys.executeAndWait(command)
+            self._sys.executeAndWait(self._createUnityOpenCommand(args))
 
         except ProcessErrorCodeException as e:
             raise UnityReturnedErrorCodeException("Error while running Unity!  Command returned with error code.")

Build/python/mtm/zen/CreateRelease.py

@@ -159,7 +159,6 @@ def installBindings():
 
     config = {
         'PathVars': {
-            'UnityExePath': 'C:/Program Files/Unity/Hub/Editor/2018.1.0f2/Editor/Unity.exe',
             'LogPath': os.path.join(BuildDir, 'Log.txt'),
             'MsBuildExePath': 'C:/Windows/Microsoft.NET/Framework/v4.0.30319/msbuild.exe'
         },

Build/python/mtm/zen/CreateSampleBuilds.py

@@ -36,7 +36,7 @@ class Runner:
     _varManager = Inject('VarManager')
 
     def __init__(self):
-        self._platform = Platforms.Windows
+        self._platform = Platforms.OsX
 
     def run(self, args):
         self._args = args
@@ -208,11 +208,6 @@ def installBindings():
         },
     }
 
-    if os.name == 'nt':
-        config['PathVars']['UnityExePath'] = 'C:/Program Files/Unity/Hub/Editor/2018.1.0f2/Editor/Unity.exe',
-    else:
-        config['PathVars']['UnityExePath'] = 'openunity'
-
     Container.bind('Config').toSingle(Config, [config])
 
     Container.bind('LogStream').toSingle(LogStreamFile)

README.md

@@ -1,7 +1,7 @@
 
 # Extenject - Extensions and bug fixes to Zenject
 
-This project is simply a fork of <a href="https://github.com/modesttree/zenject">Zenject</a>.  I was the primary maintainer but no longer have access after leaving my position at Modest Tree.  It is called Extenject to respect Modest Tree's <a href="https://github.com/modesttree/Zenject/commit/2cbbf11b344d083cc697d8b248acf41520d72da3">trademark claim</a> on the name Zenject.
+This project is simply a fork of <a href="https://github.com/modesttree/zenject">Zenject</a> with the aim of being actively maintained.  I was the primary maintainer but my access was removed after leaving my position at Modest Tree.  It is called Extenject to respect Modest Tree's <a href="https://github.com/modesttree/Zenject/commit/2cbbf11b344d083cc697d8b248acf41520d72da3">trademark claim</a> on the name Zenject.
 
 [![Join the chat at https://gitter.im/Extenject/community](https://badges.gitter.im/Extenject/Lobby.svg)](https://gitter.im/Extenject/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 

UnityProject/Assets/SampleBuilder/Editor/SampleBuilder.cs

@@ -61,6 +61,12 @@ static void BuildInternal(bool isRelease)
 
             switch (EditorUserBuildSettings.activeBuildTarget)
             {
+                case BuildTarget.StandaloneOSX: 
+                {
+                    BuildGeneric(
+                        "OsX/{0}/ZenjectSamples".Fmt(GetScriptingRuntimeString()), scenePaths, isRelease);
+                    break;
+                }
                 case BuildTarget.StandaloneWindows64:
                 case BuildTarget.StandaloneWindows:
                 {