Merge pull request #27 from UniToolsTeam/bix/nre-onvalidate

0.1.2-preview

Author: Rinal

BuildScripts/Unity-Hub/build.bat

@@ -0,0 +1,2 @@
+@echo off
+echo TODO CallPSHere

BuildScripts/Unity-Hub/build.bat.meta

@@ -0,0 +1,37 @@
+Write-Output "PowerShell $($PSVersionTable.PSEdition) version $($PSVersionTable.PSVersion)"
+#The default quit timeout is 300 seconds (5 mins). The full build process could take more time, that's why we set this value bigger
+$QuitTimeout=86400
+#Define the project path
+$ProjectPath=$(pwd)
+#Parse UnityVersion from the version file
+$UnityVersion = Get-Content "$ProjectPath/ProjectSettings/ProjectVersion.txt" -Raw
+$UnityVersion = $UnityVersion -split " "
+$UnityVersion = $UnityVersion[1]
+$UnityVersion = $UnityVersion -split "\n"
+$UnityVersion = $UnityVersion[0]
+$UnityVersion = $UnityVersion.Trim()
+#Create a path to the Unity Folder
+$UnityPath="$Env:Programfiles\Unity\Hub\Editor\$UnityVersion\Editor\Unity.exe"
+#Path to log file
+$BuildLog="PipelineResults.log"
+
+
+# Remove previous Editor.log.
+Remove-Item "$BuildLog" -Recurse -ErrorAction Ignore
+# Start the Unity process in background thread.
+Start-Process -FilePath "$UnityPath" -ArgumentList "-quit -quitTimeout $QuitTimeout -batchmode -projectPath $ProjectPath -executeMethod UniTools.Build.BatchModeBuilder.Execute -logFile $BuildLog $args"
+# Wait for Editor.log to be created.
+while (!(Test-Path "$BuildLog")) {
+    Start-Sleep -m 10
+}
+# Output Editor.log until Unity is done.
+Get-Content -Path "$BuildLog" -Tail 1 -Wait | Where-Object {
+    Write-Host $_
+
+    if ($_ -match "Application will terminate with return code") {
+        [int]$exitCode = $_.Substring($_.get_Length()-1)
+        Write-Host "Exit code is: "
+        Write-Host $exitCode
+        exit $exitCode
+    }
+}

BuildScripts/Unity-Hub/build.ps1

@@ -5,11 +5,28 @@
 QUIT_TIMEOUT=86400
 #This is a current project directory.
 PROJECT_PATH=$(pwd)
-#Parse the Unity version from the ProjectVersion.txt file
-UNITY_VERSION=$(awk '{ print $2 ; exit}' "$PROJECT_PATH/ProjectSettings/ProjectVersion.txt")
-#Path to the Unity Editor executable
-UNITY_PATH="/Applications/Unity/Hub/Editor/$UNITY_VERSION/Unity.app/Contents/MacOS/Unity"
-#Execute unity in batchmode with desire configuration
+
+#Checking if the Unity Path was delivered with from CLI
+UNITY_PATH="$1"
+if [ -f "$UNITY_PATH" ]
+then
+    echo "The Unity Editor is found at Path $UNITY_PATH from CLI"
+else
+    echo "Unity path is not assigned from the CLI. Going to generate it based on the project version"
+    #Parse the Unity version from the ProjectVersion.txt file
+    UNITY_VERSION=$(awk '{ print $2 ; exit}' "$PROJECT_PATH/ProjectSettings/ProjectVersion.txt")
+    if [[ "$OSTYPE" == "darwin"* ]]
+    then
+        echo "The platform is OSX"
+        #Path to the Unity Editor executable
+        UNITY_PATH="/Applications/Unity/Hub/Editor/$UNITY_VERSION/Unity.app/Contents/MacOS/Unity"
+    else
+        echo "This is Windows. Should be Windows :)"
+        UNITY_PATH="C:/Program Files/Unity/Hub/Editor/$UNITY_VERSION/Editor/Unity.exe"
+    fi
+fi
+
+echo "Unity path is $UNITY_PATH"
 
 $UNITY_PATH -quit -quitTimeout $QUIT_TIMEOUT -batchmode -projectPath $PROJECT_PATH -executeMethod UniTools.Build.BatchModeBuilder.Execute -logFile - "$@"
 

BuildScripts/Unity-Hub/build.ps1.meta

@@ -0,0 +1,37 @@
+Write-Output "PowerShell $($PSVersionTable.PSEdition) version $($PSVersionTable.PSVersion)"
+#The default quit timeout is 300 seconds (5 mins). The full build process could take more time, that's why we set this value bigger
+$QuitTimeout=86400
+#Define the project path
+$ProjectPath=$(pwd)
+#Parse UnityVersion from the version file
+$UnityVersion = Get-Content "$ProjectPath/ProjectSettings/ProjectVersion.txt" -Raw
+$UnityVersion = $UnityVersion -split " "
+$UnityVersion = $UnityVersion[1]
+$UnityVersion = $UnityVersion -split "\n"
+$UnityVersion = $UnityVersion[0]
+$UnityVersion = $UnityVersion.Trim()
+#Create a path to the Unity Folder
+$UnityPath="$Env:Programfiles\Unity\Hub\Editor\$UnityVersion\Editor\Unity.exe"
+#Path to log file
+$BuildLog="PipelineResults.log"
+
+
+# Remove previous Editor.log.
+Remove-Item "$BuildLog" -Recurse -ErrorAction Ignore
+# Start the Unity process in background thread.
+Start-Process -FilePath "$UnityPath" -ArgumentList "-quit -quitTimeout $QuitTimeout -batchmode -projectPath $ProjectPath -executeMethod UniTools.Build.BatchModeBuilder.Execute -logFile $BuildLog $args"
+# Wait for Editor.log to be created.
+while (!(Test-Path "$BuildLog")) {
+    Start-Sleep -m 10
+}
+# Output Editor.log until Unity is done.
+Get-Content -Path "$BuildLog" -Tail 1 -Wait | Where-Object {
+    Write-Host $_
+
+    if ($_ -match "Application will terminate with return code") {
+        [int]$exitCode = $_.Substring($_.get_Length()-1)
+        Write-Host "Exit code is: "
+        Write-Host $exitCode
+        exit $exitCode
+    }
+}

BuildScripts/Unity-Hub/build.sh

@@ -0,0 +1,41 @@
+#!/usr/bin/env bash
+#This script is usefull to run Unity CLI commands
+
+#Read a Unity Version as a first arg (can be empty) in this case the version will be defined from the Project settings.
+UNITY_VERSION="$1"
+#Build Unity Path according to the OS
+if [[ "$OSTYPE" == "darwin"* ]]
+then
+    echo "The platform is OSX"
+    #Path to the Unity Editor executable
+    UNITY_PATH="/Applications/Unity/Hub/Editor/$UNITY_VERSION/Unity.app/Contents/MacOS/Unity"
+else
+    echo "This is Windows. Should be Windows :)"
+    UNITY_PATH="C:/Program Files/Unity/Hub/Editor/$UNITY_VERSION/Editor/Unity.exe"
+fi
+#Checking if the Unity Path
+echo "Checking if Unity is available at path $UNITY_PATH"
+if [ -f "$UNITY_PATH" ]
+then
+    echo "The Unity Editor is found at Path $UNITY_PATH"
+else
+    echo "Unity is not found. Going to generate it based on the project version"
+    #This is a current project directory.
+    PROJECT_PATH=$(pwd)
+    #Parse the Unity version from the ProjectVersion.txt file
+    UNITY_VERSION=$(awk '{ print $2 ; exit}' "$PROJECT_PATH/ProjectSettings/ProjectVersion.txt")
+    if [[ "$OSTYPE" == "darwin"* ]]
+    then
+        echo "The platform is OSX"
+        #Path to the Unity Editor executable
+        UNITY_PATH="/Applications/Unity/Hub/Editor/$UNITY_VERSION/Unity.app/Contents/MacOS/Unity"
+    else
+        echo "This is Windows. Should be Windows :)"
+        UNITY_PATH="C:/Program Files/Unity/Hub/Editor/$UNITY_VERSION/Editor/Unity.exe"
+    fi
+fi
+
+echo "Unity path is $UNITY_PATH"
+
+#Execute the command
+"$UNITY_PATH" "$@"

BuildScripts/Unity-Hub/unity.ps1

@@ -30,6 +30,7 @@ private void OnValidate()
             foreach (PipelineStep step in m_steps)
             {
                 if (step == null) continue;
+                if (step.Step == null) continue;
 
                 if (step.Skip)
                 {