Popravki ob začetku leta - predelani bolj ali manj vsi programi in predmeti

roles/matlab/files/matlab.desktop

@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Matlab
+GenericName=Matlab
+Comment=Use Octave instead
+Exec=matlab
+Icon=matlab
+Terminal=false
+Type=Application
+Categories=Science;Math;Education;
+StartupNotify=true

roles/matlab/meta/main.yml

@@ -0,0 +1,2 @@
+dependencies:
+  - role: fri_base

roles/matlab/tasks/main_lin.yml

@@ -1,6 +1,72 @@
-# TODO: usposobi install Matlaba na D:
-# TODO: zamenjaj podvojene datoteke s symlinki
-- name: Matlab
-  debug:
-    msg: "Matlab"
+- name: Set Matlab version and destination
+  set_fact:
+    target_version: "R2023b"
+    install_dir: "/mnt/ucilnice_d/install/matlab/"
+    license_path: "/mnt/ucilnice_d/install/matlab/network.lic"
+    dest_dir: /opt/matlab
 
+- name: Mount Matlab ISO
+  mount:
+    src: "{{install_dir}}/{{ target_version }}_Linux.iso"
+    path: "/tmp/matlab_iso"
+    fstype: auto
+    state: "{{ item }}"
+  loop:
+    - unmounted
+    - ephemeral
+
+- name: Prepare installer_input.txt
+  template:                                                                                
+    src: installer_input.txt
+    dest: /tmp/matlab_installer_input.txt
+
+- name: Install Matlab
+  command:
+    cmd: /tmp/matlab_iso/install -inputFile "/tmp/matlab_installer_input.txt"
+    # creates: "{{ dest_dir }}/VersionInfo.xml"
+#- name: Unmount Matlab ISO
+#  win_disk_image:
+#    image_path: "{{ installers }}\\matlab\\matlab-{{ target_version }}_windows.iso"
+#    state: absent
+
+- name: Unount Matlab ISO
+  mount:
+    path: "/tmp/matlab_iso"
+    state: unmounted
+
+# TODO MATLAB throws license error -83 when run
+- name: Create licenses dir
+  file:
+    path: "{{dest_dir}}/licenses"
+    state: directory
+
+- name: Install Matlab license
+  copy:
+    src: "{{ license_path }}"
+    dest: "{{ dest_dir }}/licenses/network.lic"
+    remote_src: true
+
+- name: Add symlink to /usr/local/bin
+  file:
+    src: /opt/matlab/bin/matlab
+    path: /usr/local/bin/matlab
+    state: link
+
+- name: Install .desktop file
+  block:
+    - file:
+        path: /usr/local/share/applications
+        state: directory
+    - copy:
+        dest: /usr/local/share/applications/matlab.desktop
+        src: matlab.desktop
+
+- name: Install icon
+  block:
+    - file:
+        path: /usr/local/share/icons
+        state: directory
+    - copy:
+        src: "{{ dest_dir }}/bin/glnxa64/cef_resources/matlab_icon.png"
+        dest: /usr/local/share/icons/matlab.png
+        remote_src: true

roles/matlab/tasks/main_win.yml

@@ -1,26 +1,33 @@
-- name: Set Matlab version
+- name: Set Matlab version and destination
   set_fact:
-    target_version: "r2022b"
+    target_version: "r2023b"
+    license_path: \\ucilnicesmb.fri1.uni-lj.si\ucilnice_d\install\matlab\network.lic
+    dest_dir: D:\matlab
 
 - name: Mount Matlab ISO
   win_disk_image:
-    image_path: "{{ installers }}\\matlab\\matlab-{{ target_version }}.iso"
+    image_path: "{{ installers }}\\matlab\\matlab-{{ target_version }}_windows.iso"
     state: present
   register: disk_image
 
+- name: Prepare installer_input.txt
+  template:                                                                                
+    src: installer_input.txt
+    dest: d:\matlab_installer_input.txt
+
 - name: Install Matlab
   win_package:
     path: "{{ disk_image.mount_paths[0] }}\\setup.exe"
-    arguments: -inputFile "{{ installers }}\\matlab\\installer_input.txt"
+    arguments: -inputFile "d:\\matlab_installer_input.txt"
 
 - name: Unmount Matlab ISO
   win_disk_image:
-    image_path: "{{ installers }}\\matlab\\matlab-{{ target_version }}.iso"
+    image_path: "{{ installers }}\\matlab\\matlab-{{ target_version }}_windows.iso"
     state: absent
 
 # TODO MATLAB throws license error -83 when run
 - name: Install Matlab license
   win_copy:
-    dest: "%ProgramFiles%\\MATLAB\\{{ target_version }}\\licenses\\network.lic"
+    dest: "{{ dest_dir }}\\licenses\\network.lic"
     src: "{{ installers }}\\matlab\\network.lic"
     remote_src: yes

roles/matlab/templates/installer_input.txt

@@ -0,0 +1,157 @@
+# (Windows) setup.exe -inputFile <file_name>
+# destinationFolder=
+destinationFolder={{ dest_dir }}
+
+fileInstallationKey={{ matlab_key }}
+
+agreeToLicense=yes
+# outputFile=C:\matlab-install.txt
+
+## Enable Login Named User licensing
+##
+## Set to Yes to enable use of a Login Named User license for all users of this MATLAB installation
+## Users must log in to their MathWorks Account when MATLAB starts.
+##
+## NOTE: This flag is valid in silent installations only.
+enableLNU=no
+
+improveMATLAB=no
+
+## SPECIFY PATH TO LICENSE FILE (Required for network license types only)
+##
+## This value is required when installing as a Network End-User
+## Example:
+##            (Windows) licensePath=C:\TEMP\license.dat
+##            (Linux) licensePath=/tmp/license.dat
+## Set the desired value for licensePath and
+## uncomment the line.
+licensePath={{ license_path }}
+
+# setFileAssoc=true
+desktopShortcut=true
+# startMenuShortcut=true
+# createAccelTask=true
+
+#product.5G_Toolbox
+#product.AUTOSAR_Blockset
+#product.Aerospace_Blockset
+#product.Aerospace_Toolbox
+#product.Antenna_Toolbox
+product.Audio_Toolbox
+#product.Automated_Driving_Toolbox
+product.Bioinformatics_Toolbox
+#product.Bluetooth_Toolbox
+#product.C2000_Microcontroller_Blockset
+#product.Communications_Toolbox
+#product.Computer_Vision_Toolbox
+#product.Control_System_Toolbox
+#product.Curve_Fitting_Toolbox
+#product.DDS_Blockset
+#product.DO_Qualification_Kit
+#product.DSP_HDL_Toolbox
+product.DSP_System_Toolbox
+#product.Data_Acquisition_Toolbox
+#product.Database_Toolbox
+#product.Datafeed_Toolbox
+#product.Deep_Learning_HDL_Toolbox
+product.Deep_Learning_Toolbox
+#product.Econometrics_Toolbox
+#product.Embedded_Coder
+#product.Filter_Design_HDL_Coder
+#product.Financial_Instruments_Toolbox
+#product.Financial_Toolbox
+#product.Fixed-Point_Designer
+#product.Fuzzy_Logic_Toolbox
+#product.GPU_Coder
+#product.Global_Optimization_Toolbox
+#product.HDL_Coder
+#product.HDL_Verifier
+#product.IEC_Certification_Kit
+#product.Image_Acquisition_Toolbox
+product.Image_Processing_Toolbox
+#product.Industrial_Communication_Toolbox
+#product.Instrument_Control_Toolbox
+#product.LTE_Toolbox
+#product.Lidar_Toolbox
+product.MATLAB
+product.MATLAB_Coder
+product.MATLAB_Compiler
+#product.MATLAB_Compiler_SDK
+#product.MATLAB_Parallel_Server
+#product.MATLAB_Production_Server
+#product.MATLAB_Report_Generator
+#product.MATLAB_Test
+#product.MATLAB_Web_App_Server
+#product.Mapping_Toolbox
+product.Medical_Imaging_Toolbox
+#product.Mixed-Signal_Blockset
+#product.Model_Predictive_Control_Toolbox
+#product.Model-Based_Calibration_Toolbox
+#product.Motor_Control_Blockset
+#product.Navigation_Toolbox
+#product.Optimization_Toolbox
+#product.Parallel_Computing_Toolbox
+#product.Partial_Differential_Equation_Toolbox
+#product.Phased_Array_System_Toolbox
+#product.Polyspace_Bug_Finder
+#product.Polyspace_Bug_Finder_Server
+#product.Polyspace_Code_Prover
+#product.Polyspace_Code_Prover_Server
+#product.Polyspace_Test
+#product.Powertrain_Blockset
+#product.Predictive_Maintenance_Toolbox
+#product.RF_Blockset
+#product.RF_PCB_Toolbox
+#product.RF_Toolbox
+#product.ROS_Toolbox
+#product.Radar_Toolbox
+#product.Reinforcement_Learning_Toolbox
+#product.Requirements_Toolbox
+#product.Risk_Management_Toolbox
+#product.Robotics_System_Toolbox
+#product.Robust_Control_Toolbox
+#product.Satellite_Communications_Toolbox
+#product.Sensor_Fusion_and_Tracking_Toolbox
+#product.SerDes_Toolbox
+#product.Signal_Integrity_Toolbox
+product.Signal_Processing_Toolbox
+#product.SimBiology
+#product.SimEvents
+#product.Simscape
+#product.Simscape_Battery
+#product.Simscape_Driveline
+#product.Simscape_Electrical
+#product.Simscape_Fluids
+#product.Simscape_Multibody
+#product.Simulink
+#product.Simulink_3D_Animation
+#product.Simulink_Check
+#product.Simulink_Code_Inspector
+#product.Simulink_Coder
+#product.Simulink_Compiler
+#product.Simulink_Control_Design
+#product.Simulink_Coverage
+#product.Simulink_Design_Optimization
+#product.Simulink_Design_Verifier
+#product.Simulink_Desktop_Real-Time
+#product.Simulink_Fault_Analyzer
+#product.Simulink_PLC_Coder
+#product.Simulink_Real-Time
+#product.Simulink_Report_Generator
+#product.Simulink_Test
+#product.SoC_Blockset
+#product.Spreadsheet_Link
+#product.Stateflow
+product.Statistics_and_Machine_Learning_Toolbox
+#product.Symbolic_Math_Toolbox
+#product.System_Composer
+#product.System_Identification_Toolbox
+#product.Text_Analytics_Toolbox
+#product.UAV_Toolbox
+#product.Vehicle_Dynamics_Blockset
+#product.Vehicle_Network_Toolbox
+#product.Vision_HDL_Toolbox
+#product.WLAN_Toolbox
+#product.Wavelet_Toolbox
+#product.Wireless_HDL_Toolbox
+#product.Wireless_Testbench

roles/matlab/templates/matlab.desktop

@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Matlab
+GenericName=Matlab
+Comment=Use Octave instead
+Exec=matlab
+Icon=matlab
+Terminal=false
+Type=Application
+Categories=Science;Math;
+StartupNotify=true

roles/matlab/templates/network.lic

@@ -0,0 +1,2 @@
+SERVER kms1.uni-lj.si 00155DCFD802 27000
+USE_SERVER