R2024a release!

Author: upradhan93

packer/v1/build-matlab-ami.pkr.hcl

@@ -35,6 +35,7 @@ variable "BUILD_SCRIPTS" {
     "Install-StartupScripts.ps1",
     "Install-NVIDIADrivers.ps1",
     "Install-Dependencies.ps1",
+    "Install-MATLABProxy.ps1",
     "Install-MATLAB.ps1",
     "Remove-IE.ps1"
   ]
@@ -50,9 +51,10 @@ variable "STARTUP_SCRIPTS" {
     "20_Set-AdminPassword.ps1",
     "30_Initialize-CloudWatchLogging.ps1",
     "40_Set-DDUX.ps1",
-    "50_Set-MATLABLicense.ps1",
-    "60_Invoke-MATLABStartupAccelerator.ps1",
-    "70_Invoke-MSHStartupAccelerator.ps1",
+    "50_Setup-MATLABProxy.ps1",
+    "60_Set-MATLABLicense.ps1",
+    "70_Invoke-MATLABStartupAccelerator.ps1",
+    "80_Invoke-MSHStartupAccelerator.ps1",
     "99_Invoke-OptionalUserCommand.ps1"
   ]
   description = "The list of startup scripts Packer will copy to the remote machine image builder, which can be used during the CloudFormation Stack creation."
@@ -61,7 +63,9 @@ variable "STARTUP_SCRIPTS" {
 variable "RUNTIME_SCRIPTS" {
   type = list(string)
   default = [
-    "Install-NVIDIAGridDriver.ps1"
+    "Install-NVIDIAGridDriver.ps1",
+    "Start-MATLABProxy.ps1",
+    "generate-certificate.py"
   ]
   description = "The list of runtime scripts Packer will copy to the remote machine image builder, which can be used after the CloudFormation Stack creation."
 }
@@ -161,6 +165,11 @@ variable "AWS_INSTANCE_PROFILE" {
   description = "The AWS instance profile role used during Packer builds."
 }
 
+variable "MATLAB_PROXY_VERSION" {
+  type        = string
+  default     = "0.10.0"
+  description = "The matlab-proxy version to use."
+}
 
 # Set up local variables used by provisioners.
 locals {
@@ -249,7 +258,8 @@ build {
       "NVIDIA_DRIVER_INSTALLER_URL=${var.NVIDIA_DRIVER_INSTALLER_URL}",
       "DCV_INSTALLER_URL=${var.DCV_INSTALLER_URL}",
       "PYTHON_INSTALLER_URL=${var.PYTHON_INSTALLER_URL}",
-      "MATLAB_SOURCE_URL=${var.MATLAB_SOURCE_URL}"
+      "MATLAB_SOURCE_URL=${var.MATLAB_SOURCE_URL}",
+      "MATLAB_PROXY_VERSION=${var.MATLAB_PROXY_VERSION}"
     ]
     scripts = "${local.build_scripts}"
   }

packer/v1/build/Install-MATLABProxy.ps1

@@ -0,0 +1,52 @@
+<#
+.SYNOPSIS
+    Installs the matlab-proxy Python package.
+
+.DESCRIPTION
+    Installs the matlab-proxy Python package.
+
+.PARAMETER Version
+    matlab-proxy version number. e.g. 0.10.0
+
+.EXAMPLE
+    Install-MATLABProxy -Version "0.10.0"
+
+.LINK
+    https://github.com/mathworks/matlab-proxy
+
+.NOTES
+    Copyright 2024 The MathWorks Inc.
+    The function sets $ErrorActionPreference to 'Stop' to ensure that any errors encountered during the installation process will cause the script to stop and throw an error.
+#>
+
+function Install-MATLABProxy {
+
+    param(
+        [Parameter(Mandatory = $true)]
+        [string] $Version
+    )
+
+    Write-Output 'Starting Install-MATLABProxy...'
+    & $Env:ProgramFiles\Python310\python.exe -m pip install matlab-proxy==$Version
+
+    Write-Output 'Moving the SSL certificate generator and launcher script to the right directory...'
+    $RuntimeSource = 'C:\Windows\Temp\runtime'
+    
+    $DestinationFolder = "$Env:ProgramFiles\MathWorks\matlab-proxy"
+    
+    New-Item $DestinationFolder -Type Directory
+    Copy-Item "$RuntimeSource\Start-MatlabProxy.ps1" -Destination "$DestinationFolder\Start-MatlabProxy.ps1"
+    Copy-Item "$RuntimeSource\generate-certificate.py" -Destination "$DestinationFolder\generate-certificate.py"
+    
+    Write-Output 'Done with Install-MATLABProxy.'   
+}
+
+try {
+    $ErrorActionPreference = 'Stop'
+    Install-MATLABProxy -Version $Env:MATLAB_PROXY_VERSION
+}
+catch {
+    $ScriptPath = $MyInvocation.MyCommand.Path
+    Write-Output "ERROR - An error occurred while running script: $ScriptPath. Error: $_"
+    throw
+}

packer/v1/build/Remove-TemporaryFiles.ps1

@@ -13,18 +13,6 @@
     The function sets $ErrorActionPreference to 'Stop' to ensure that any errors encountered during the installation process will cause the script to stop and throw an error.
 #>
 
-function Uninstall-Python {
-    Write-Output 'Removing the Python installation used for executing build tools'
-
-    Write-Output 'Starting Uninstall-Python...'
-
-    wmic product where "Name like 'Python%'" call uninstall /nointeractive
-
-    Remove-Item 'C:\Program Files\Python310' -Force -Recurse
-
-    Write-Output 'Done with Uninstall-Python.'
-}
-
 function Remove-TemporaryBuildFiles {
     Write-Output 'Starting Remove-TemporaryBuildFiles...'
 
@@ -57,12 +45,11 @@ function Clear-TemporaryLogContents {
 
 try {
     $ErrorActionPreference = 'Stop'
-    Uninstall-Python
     Remove-TemporaryBuildFiles
     Clear-TemporaryLogContents
 }
 catch {
     $ScriptPath = $MyInvocation.MyCommand.Path
     Write-Output "ERROR - An error occurred while running script 'Remove-TemporaryFiles': $ScriptPath. Error: $_"
     throw
-}
+}