Merge rhino8_cycles35 into rhino9_cycles35

Author: matulski

DockerfileHIP

@@ -6,7 +6,7 @@
 #  * Make sure Docker Desktop is running
 #  * Use a terminal to build a Docker image: 'docker build -f DockerfileHIP -t ubuntu-cycles-hip-build .'
 #  * After that, run the Docker image in a container while mounting your Rhino repository root:
-#    'docker run -it -v D:/dev/mcneel/rhino-8.x:/rhino/rhino-8.x ubuntu-cycles-hip-build'
+#    'docker run -it -v D:/dev/mcneel/rhino:/rhino/repo ubuntu-cycles-hip-build'
 #  * The .fatbin files should en up in the cycles/cycles/install/lib directory
 
 FROM ubuntu:22.04
@@ -25,6 +25,6 @@ RUN wget https://repo.radeon.com/amdgpu-install/7.1.1/ubuntu/jammy/amdgpu-instal
 RUN apt-get install -y ./amdgpu-install_7.1.1.70101-1_all.deb
 RUN DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC amdgpu-install -y --no-dkms --usecase=rocm
 
-CMD ["bash", "-c", "cd /rhino/rhino-8.x/src4/rhino4/Plug-ins/RDK/cycles/cycles && dos2unix make_hip.sh && bash make_hip.sh Release"]
+CMD ["bash", "-c", "cd /rhino/repo/src4/rhino4/Plug-ins/RDK/cycles/cycles && dos2unix make_hip.sh && bash make_hip.sh Release"]
 
 #ENTRYPOINT [ "bash" ]

DockerfileOneAPI

@@ -6,7 +6,7 @@
 #  * Make sure Docker Desktop is running
 #  * Use a terminal to build a Docker image: 'docker build -f DockerfileOneAPI -t ubuntu-cycles-oneapi-build .'
 #  * After that, run the Docker image in a container while mounting your Rhino repository root:
-#    'docker run -it -v D:/dev/mcneel/rhino-8.x:/rhino/rhino-8.x ubuntu-cycles-oneapi-build'
+#    'docker run -it -v D:/dev/mcneel/rhino:/rhino/repo ubuntu-cycles-oneapi-build'
 
 FROM ubuntu:latest
 
@@ -18,6 +18,6 @@ RUN apt-get install -y git
 RUN apt-get install -y python3
 RUN apt-get install -y xorg-dev
 
-CMD ["bash", "-c", "cd /rhino/rhino-8.x/src4/rhino4/Plug-ins/RDK/cycles/cycles && ./make_oneapi.sh Debug"]
+CMD ["bash", "-c", "cd /rhino/repo/src4/rhino4/Plug-ins/RDK/cycles/cycles && ./make_oneapi.sh Debug"]
 
-# && ./make_oneapi.sh Debug
+# && ./make_oneapi.sh Debug

make_rhino_all.ps1

@@ -2,12 +2,16 @@
 param(
     [Parameter(Position = 0)]
     [ValidateSet("release", "debug", "release_debuggable", "hybrid", "minimal")]
-    [string]$BuildType = "release"
+    [string]$BuildType = "release",
+    [string]$RhinoBranchName
 )
 
 $ErrorActionPreference = "Stop"
 
 $scriptRoot = if ($PSScriptRoot) { $PSScriptRoot } else { Split-Path -Parent $MyInvocation.MyCommand.Path }
+. (Join-Path $scriptRoot "..\rhino_branch_info.ps1")
+
+$branchInfo = Resolve-RhinoBranchInfo -StartPath $scriptRoot -RhinoBranchName $RhinoBranchName
 $logPath = Join-Path $scriptRoot "make_rhino_all.log"
 try {
     if (Test-Path $logPath) {
@@ -125,10 +129,11 @@ $dpcppRoot = "..\lib\win64_vc15\dpcpp"
 $levelZeroRoot = "..\lib\win64_vc15\level-zero"
 $msvcRedistDir = "C:/Program Files (x86)/Microsoft Visual Studio/2019/Professional/VC/Redist/MSVC/14.29.30133"
 $windowsKitsDir = "C:/Program Files (x86)/Windows Kits/10"
-$rhinoBranchRoot = [System.IO.Path]::GetFullPath((Join-Path $scriptRoot "..\..\..\..\..\.."))
-$rhinoBranchName = Split-Path -Leaf $rhinoBranchRoot
+$rhinoBranchRoot = $branchInfo.BranchRoot
+$rhinoBranchName = $branchInfo.BranchName
+$rhinoMajorVersion = $branchInfo.MajorVersion
 $dockerHostRoot = $rhinoBranchRoot -replace '\\', '/'
-$dockerContainerRoot = "/rhino/rhino-$rhinoBranchName"
+$dockerContainerRoot = "/rhino/repo"
 $dockerVolume = "${dockerHostRoot}:$dockerContainerRoot"
 
 $buildMode = $BuildType.ToLowerInvariant()
@@ -426,6 +431,7 @@ try {
     Write-Log "Install dir: $installDir"
     Write-Log "HIP build dir: $hipBuildDir"
     Write-Log "Rhino branch root: $rhinoBranchRoot"
+    Write-Log "Rhino branch: $rhinoBranchName (major $rhinoMajorVersion, source $($branchInfo.Source))"
     Write-Log "Docker volume: $dockerVolume"
     Write-Log "SVN retries after first failure: $script:SvnRetryCount (fixed $script:SvnRetryDelaySeconds second delay)."
     Write-Log "Allowed cleanup paths: $($script:AllowedCleanupPaths -join ', ')"
@@ -534,7 +540,7 @@ try {
     Invoke-TimedStage -Name "Update Version Info" -Action {
         Push-Location ([System.IO.Path]::GetFullPath((Join-Path $scriptRoot "..")))
         try {
-            & powershell -NoProfile -ExecutionPolicy Bypass -File ".\versioninfo_changer.ps1" | Out-Host
+            & powershell -NoProfile -ExecutionPolicy Bypass -File ".\versioninfo_changer.ps1" -RhinoBranchName $rhinoBranchName | Out-Host
             if ($LASTEXITCODE -ne 0) {
                 Write-Log "WARNING: versioninfo_changer.ps1 failed with code $LASTEXITCODE."
             }