From be7cdf62ddb4e547112ae2f075893691e81e9640 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Tue, 4 Oct 2022 11:20:24 +0000 Subject: [PATCH 01/16] Remove ocaml extension for VS Code on Windows Broken and not needed. --- roles/winroom/tasks/vscode.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/roles/winroom/tasks/vscode.yml b/roles/winroom/tasks/vscode.yml index 6cb29eb..1d97ecb 100644 --- a/roles/winroom/tasks/vscode.yml +++ b/roles/winroom/tasks/vscode.yml @@ -22,7 +22,6 @@ - ms-dotnettools.csharp - ms-python.python - ms-vscode.cpptools - - ocamllabs.ocaml-platform - stonebuddha.vscode-better-sml - vscode-icons-team.vscode-icons - vscjava.vscode-java-pack From af08e2c52c1177a0084b9f6a475fbf9ed9e4e297 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Tue, 4 Oct 2022 11:21:21 +0000 Subject: [PATCH 02/16] Add Sublime Text on Windows --- roles/winroom/tasks/sublime-text.yml | 4 ++++ roles/winroom/tasks/util.yml | 1 + 2 files changed, 5 insertions(+) create mode 100644 roles/winroom/tasks/sublime-text.yml diff --git a/roles/winroom/tasks/sublime-text.yml b/roles/winroom/tasks/sublime-text.yml new file mode 100644 index 0000000..5ab7212 --- /dev/null +++ b/roles/winroom/tasks/sublime-text.yml @@ -0,0 +1,4 @@ +- name: Install Sublime Text + win_chocolatey: + name: sublimetext4 + state: present diff --git a/roles/winroom/tasks/util.yml b/roles/winroom/tasks/util.yml index c07855c..64f75f5 100644 --- a/roles/winroom/tasks/util.yml +++ b/roles/winroom/tasks/util.yml @@ -3,5 +3,6 @@ - include_tasks: firefox.yml - include_tasks: libreoffice.yml - include_tasks: msys2.yml +- include_tasks: sublime-text.yml - include_tasks: sumatrapdf.yml - include_tasks: vlc.yml From 99fbc726686230f07afa3e99f0441d7e06dbf7c6 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Tue, 4 Oct 2022 11:21:44 +0000 Subject: [PATCH 03/16] Add make to msys2 packages --- roles/winroom/tasks/msys2.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/roles/winroom/tasks/msys2.yml b/roles/winroom/tasks/msys2.yml index 0161544..0e22935 100644 --- a/roles/winroom/tasks/msys2.yml +++ b/roles/winroom/tasks/msys2.yml @@ -34,6 +34,7 @@ loop: - gcc - git + - make - nano - rlwrap - rsync From 5c182638bfcdc3f1abc16195ed98c68ed3963821 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Tue, 4 Oct 2022 12:35:49 +0000 Subject: [PATCH 04/16] Fix SML/NJ download URL --- roles/winroom/tasks/smlnj.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/winroom/tasks/smlnj.yml b/roles/winroom/tasks/smlnj.yml index e73d300..3de06e4 100644 --- a/roles/winroom/tasks/smlnj.yml +++ b/roles/winroom/tasks/smlnj.yml @@ -4,5 +4,5 @@ - name: Install SML/NJ win_package: - path: "http://smlnj.cs.uchicago.edu/dist/working/{{ target_version }}/smlnj-{{ target_version }}.msi" + path: "https://smlnj.org/dist/working/{{ target_version }}/smlnj-{{ target_version }}.msi" creates_path: "%ProgramFiles(x86)%\\SMLNJ\\bin\\sml.bat" From ee677ed60e529b10ff0c42363074789e58f3748f Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Tue, 4 Oct 2022 12:38:47 +0000 Subject: [PATCH 05/16] Set timezone on Windows --- roles/winroom/tasks/main.yml | 1 + roles/winroom/tasks/settings.yml | 3 +++ 2 files changed, 4 insertions(+) create mode 100644 roles/winroom/tasks/settings.yml diff --git a/roles/winroom/tasks/main.yml b/roles/winroom/tasks/main.yml index 9749289..bf7bd91 100644 --- a/roles/winroom/tasks/main.yml +++ b/roles/winroom/tasks/main.yml @@ -1,3 +1,4 @@ +- import_tasks: settings.yml - import_tasks: util.yml - import_tasks: AAHRP-63263.yml - import_tasks: APS1-63279.yml diff --git a/roles/winroom/tasks/settings.yml b/roles/winroom/tasks/settings.yml new file mode 100644 index 0000000..e6b936d --- /dev/null +++ b/roles/winroom/tasks/settings.yml @@ -0,0 +1,3 @@ +- name: Set timezone + win_timezone: + timezone: Central Europe Standard Time From f019f3b5b6e31345ec5d8e791d534cfb71301820 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Tue, 4 Oct 2022 12:42:31 +0000 Subject: [PATCH 06/16] linroom/GUI_development: add weston --- roles/linroom/tasks/GUI_development.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/roles/linroom/tasks/GUI_development.yml b/roles/linroom/tasks/GUI_development.yml index 4e6f5e5..6d1d0e9 100644 --- a/roles/linroom/tasks/GUI_development.yml +++ b/roles/linroom/tasks/GUI_development.yml @@ -45,6 +45,10 @@ apt: name: qt6-wayland-dev-tools state: latest + - name: Install weston + apt: + name: weston + state: latest - name: Install Glade apt: name: glade From 4bbf015cb758ea7d0a3932ee285873ff0f8243c3 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Wed, 5 Oct 2022 07:35:49 +0000 Subject: [PATCH 07/16] winroom: add SceneBuilder --- roles/winroom/tasks/GUI_development.yml | 1 - roles/winroom/tasks/SceneBuilder.yml | 4 ++++ roles/winroom/tasks/UV-63721.yml | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) delete mode 100644 roles/winroom/tasks/GUI_development.yml create mode 100644 roles/winroom/tasks/SceneBuilder.yml diff --git a/roles/winroom/tasks/GUI_development.yml b/roles/winroom/tasks/GUI_development.yml deleted file mode 100644 index 882e21a..0000000 --- a/roles/winroom/tasks/GUI_development.yml +++ /dev/null @@ -1 +0,0 @@ -# TODO what? diff --git a/roles/winroom/tasks/SceneBuilder.yml b/roles/winroom/tasks/SceneBuilder.yml new file mode 100644 index 0000000..293c724 --- /dev/null +++ b/roles/winroom/tasks/SceneBuilder.yml @@ -0,0 +1,4 @@ +- name: Install SceneBuilder + win_package: + path: https://download2.gluonhq.com/scenebuilder/18.0.0/install/win/SceneBuilder-18.0.0.msi + arguments: INSTALLDIR="C:\Program Files\SceneBuilder" ALLUSERS=1 diff --git a/roles/winroom/tasks/UV-63721.yml b/roles/winroom/tasks/UV-63721.yml index cf15c53..e922aa4 100644 --- a/roles/winroom/tasks/UV-63721.yml +++ b/roles/winroom/tasks/UV-63721.yml @@ -4,4 +4,4 @@ - include_tasks: JDK.yml - include_tasks: IDEA.yml - include_tasks: javafx.yml -- include_tasks: GUI_development.yml +- include_tasks: SceneBuilder.yml From f22807b1361e7c8152e6bb021305bfdf7d22f2a7 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Wed, 5 Oct 2022 07:49:01 +0000 Subject: [PATCH 08/16] winroom: add javafx --- roles/winroom/tasks/javafx.yml | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/roles/winroom/tasks/javafx.yml b/roles/winroom/tasks/javafx.yml index 4640904..9bc5d80 100644 --- a/roles/winroom/tasks/javafx.yml +++ b/roles/winroom/tasks/javafx.yml @@ -1 +1,20 @@ -# TODO +- name: Check javafx install + win_find: + paths: "C:\\Program Files\\Java" + patterns: ['javafx-sdk-*'] + file_type: directory + register: install + +- when: install.matched == 0 + block: + - name: Download javafx + win_get_url: + url: https://download2.gluonhq.com/openjfx/19/openjfx-19_windows-x64_bin-sdk.zip + dest: C:\ + register: download + + - name: Install javafx + win_unzip: + src: "{{ download.dest }}" + dest: "%ProgramFiles%\\Java" + delete_archive: yes From feead7ed0e8ef8370eaa2d28cc61a042e4f33247 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Wed, 5 Oct 2022 09:45:11 +0000 Subject: [PATCH 09/16] winroom: add 7zip file associations --- roles/winroom/tasks/7zip.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/roles/winroom/tasks/7zip.yml b/roles/winroom/tasks/7zip.yml index 4c9241d..05aebff 100644 --- a/roles/winroom/tasks/7zip.yml +++ b/roles/winroom/tasks/7zip.yml @@ -1,3 +1,18 @@ - name: Install 7-zip win_chocolatey: name: 7zip + register: install + +- when: install.changed + block: + - name: Create 7-zip filetype + win_command: cmd.exe /c ftype 7-zip=%ProgramFiles%\7-zip\7zFM.exe + + - name: Associate 7-zip with archive filetypes + win_command: cmd.exe /c assoc .{{ item }}=7-zip + loop: + - gz + - tar + - targz + - rar + - 7z From 1d64693617f1d96045d8d64a6495142813b5dfb6 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Wed, 5 Oct 2022 09:49:39 +0000 Subject: [PATCH 10/16] winroom: install JDK from installer Chocolatey is problematic. --- roles/winroom/tasks/JDK.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/roles/winroom/tasks/JDK.yml b/roles/winroom/tasks/JDK.yml index 9f09113..a390bad 100644 --- a/roles/winroom/tasks/JDK.yml +++ b/roles/winroom/tasks/JDK.yml @@ -1,6 +1,7 @@ - name: Install Oracle JDK - win_chocolatey: - name: oraclejdk + win_package: + path: https://download.oracle.com/java/19/latest/jdk-19_windows-x64_bin.msi + arguments: INSTALLLEVEL=3 - name: Find Java version win_reg_stat: From 9344f7b9e8db35e9374fa2e0cfc186091aea4251 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Wed, 5 Oct 2022 10:10:27 +0000 Subject: [PATCH 11/16] winroom: add HAXM for Android Studio --- roles/winroom/tasks/Android_Studio.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/roles/winroom/tasks/Android_Studio.yml b/roles/winroom/tasks/Android_Studio.yml index d4a0f0d..6a85812 100644 --- a/roles/winroom/tasks/Android_Studio.yml +++ b/roles/winroom/tasks/Android_Studio.yml @@ -48,3 +48,29 @@ ANDROID_HOME: "{{ sdk_path }}" ANDROID_PREFS_ROOT: D:\ GRADLE_USER_HOME: D:\.gradle + +- name: Check HAXM install status + win_stat: + path: "%ProgramFiles%\\Intel\\HAXM" + register: file + +- when: not file.stat.exists + block: + - name: Download HAXM + win_get_url: + url: https://github.com/intel/haxm/releases/download/v7.7.1/haxm-windows_v7_7_1.zip + dest: C:\ + register: download + + - name: Unzip HAXM + win_unzip: + src: "{{ download.dest }}" + dest: C:\haxm + + - name: Install HAXM + win_command: C:\haxm\silent_install.bat + + - name: Remove temporaries + win_file: + path: C:\haxm + state: absent From 88342491b8d628d6f8d73096c68a5772d3afd8a8 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Wed, 5 Oct 2022 13:01:20 +0000 Subject: [PATCH 12/16] winroom: actually install pycharm --- roles/winroom/tasks/util.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/roles/winroom/tasks/util.yml b/roles/winroom/tasks/util.yml index 64f75f5..9cd664b 100644 --- a/roles/winroom/tasks/util.yml +++ b/roles/winroom/tasks/util.yml @@ -3,6 +3,7 @@ - include_tasks: firefox.yml - include_tasks: libreoffice.yml - include_tasks: msys2.yml +- include_tasks: pycharm.yml # not required by anyone but used by everyone - include_tasks: sublime-text.yml - include_tasks: sumatrapdf.yml - include_tasks: vlc.yml From a4ebbd949c8603f21c76007d8b3dac44379ea12d Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Wed, 5 Oct 2022 13:05:32 +0000 Subject: [PATCH 13/16] winroom: add qcadesigner-e --- roles/winroom/tasks/qcadesigner-e.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/roles/winroom/tasks/qcadesigner-e.yml b/roles/winroom/tasks/qcadesigner-e.yml index 4640904..31a1cd2 100644 --- a/roles/winroom/tasks/qcadesigner-e.yml +++ b/roles/winroom/tasks/qcadesigner-e.yml @@ -1 +1,9 @@ -# TODO +- name: Install GTK+ + win_package: + path: https://github.com/FSillT/QCADesigner-E/raw/master/Windows/gtk2-runtime-2.24.10-2012-10-10-ash.exe + arguments: /S + +- name: Install QCADesigner-E + win_package: + path: https://github.com/FSillT/QCADesigner-E/raw/master/Windows/QCADesignerE-2.2-setup.exe + arguments: /VerySilent From 33361c1d51558417b7116c98c9e1bf90b2f3cd73 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Wed, 5 Oct 2022 13:18:27 +0000 Subject: [PATCH 14/16] winroom: remove ocaml Not needed. --- roles/winroom/tasks/PPJ-63220.yml | 4 +--- roles/winroom/tasks/ocaml.yml | 31 ------------------------------- 2 files changed, 1 insertion(+), 34 deletions(-) delete mode 100644 roles/winroom/tasks/ocaml.yml diff --git a/roles/winroom/tasks/PPJ-63220.yml b/roles/winroom/tasks/PPJ-63220.yml index 1e2ebf9..c490204 100644 --- a/roles/winroom/tasks/PPJ-63220.yml +++ b/roles/winroom/tasks/PPJ-63220.yml @@ -1,10 +1,8 @@ # Principi programskih jezikov # Klemen.Klanjscek@fri.uni-lj.si -# Windows, GNU/Linux, VS Code, Ocaml, Eclipse, Haskell, SWI-Prolog, rlwrap +# Windows, GNU/Linux, VS Code, Eclipse, Haskell, SWI-Prolog, rlwrap - include_tasks: vscode.yml -- include_tasks: ocaml.yml - include_tasks: Eclipse.yml - include_tasks: haskell.yml - include_tasks: swi-prolog.yml - diff --git a/roles/winroom/tasks/ocaml.yml b/roles/winroom/tasks/ocaml.yml deleted file mode 100644 index 0230f8b..0000000 --- a/roles/winroom/tasks/ocaml.yml +++ /dev/null @@ -1,31 +0,0 @@ -# TODO ugh -#- name: Install OCaml -# win_chocolatey: -# name: ocaml -#- name: Set Ocaml installer version -# set_fact: -# target_version: "1.0.1" -# -#- name: Check Ocaml install status -# win_stat: -# path: C:\Program Files (x86)\Thonny\thonny.exeasd -# register: file -# -#- when: not file.stat.exists -# block: -# # win_package fails to download for some reason -# - name: Download Ocaml -# win_get_url: -# url: https://github.com/diskuv/dkml-installer-ocaml/releases/download/v{{ target_version }}/setup-diskuv-ocaml-windows_x86_64-{{ target_version }}.exe -# dest: 'C:\' -# register: download -# -# - name: Install Ocaml -# win_package: -# path: "{{ download.dest }}" -# #arguments: /Verysilent /AllUsers -# -# - name: Remove temporary files -# win_file: -# path: "{{ download.dest }}" -# state: absent From 2f0093dee890cda30b14c76ec26d9d9fa3463f40 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Wed, 5 Oct 2022 14:08:21 +0000 Subject: [PATCH 15/16] winroom: add pyodbc --- roles/winroom/tasks/PB-63707.yml | 1 + roles/winroom/tasks/pyodbc.yml | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 roles/winroom/tasks/pyodbc.yml diff --git a/roles/winroom/tasks/PB-63707.yml b/roles/winroom/tasks/PB-63707.yml index 22eea37..ee690dc 100644 --- a/roles/winroom/tasks/PB-63707.yml +++ b/roles/winroom/tasks/PB-63707.yml @@ -6,6 +6,7 @@ - include_tasks: jupyter.yml - include_tasks: JDK.yml - include_tasks: powerdesigner.yml +- include_tasks: pyodbc.yml - include_tasks: mysql_workbench.yml - include_tasks: mysql-odbc-connector.yml - include_tasks: notepad++.yml diff --git a/roles/winroom/tasks/pyodbc.yml b/roles/winroom/tasks/pyodbc.yml new file mode 100644 index 0000000..70e0fb8 --- /dev/null +++ b/roles/winroom/tasks/pyodbc.yml @@ -0,0 +1,2 @@ +- name: Install pyodbc + win_command: pip install pyodbc From fb1d0303a67be7dde080b68d3e2babd483622e1f Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Wed, 5 Oct 2022 14:53:15 +0000 Subject: [PATCH 16/16] winroom: add OMNeT++ --- roles/winroom/tasks/omnetpp.yml | 48 ++++++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) diff --git a/roles/winroom/tasks/omnetpp.yml b/roles/winroom/tasks/omnetpp.yml index 4640904..05d30b5 100644 --- a/roles/winroom/tasks/omnetpp.yml +++ b/roles/winroom/tasks/omnetpp.yml @@ -1 +1,47 @@ -# TODO +- name: Set OMNet++ version + set_fact: + target_version: "6.0.1" + target_dir: "C:\\OMNeT++" + +- name: Check OMNet++ install status + win_stat: + path: "{{ target_dir }}" + register: file + +- when: not file.stat.exists + block: + - name: Download OMNet++ + win_get_url: + url: "https://github.com/omnetpp/omnetpp/releases/download/omnetpp-{{ target_version }}/omnetpp-{{ target_version }}-windows-x86_64.zip" + dest: C:\ + register: download + + - name: Unzip OMNet++ + win_unzip: + src: "{{ download.dest }}" + dest: C:\ + delete_archive: yes + + - name: Move OMNet++ to final location + win_command: cmd.exe /c move "C:\\omnetpp-{{ target_version }}" "{{ target_dir }}" + + - name: Create OMNet++ compile script + win_copy: + src: "{{ target_dir }}\\mingwenv.cmd" + dest: "{{ target_dir }}\\mingwenv-install.cmd" + remote_src: yes + + - name: Fix OMNet++ compile script + win_lineinfile: + path: "{{ target_dir }}\\mingwenv-install.cmd" + insertbefore: "rem Open the MinGW" + line: call "%HOME%\\tools\\win32.x86_64\\msys2_shell.cmd" -mingw64 -c "./configure && make -j4" & exit + + - name: Compile OMNet++ + win_command: cmd.exe /c "{{ target_dir }}\\mingwenv-install.cmd" + + - name: Copy OMNet++ shortcut + win_copy: + src: "{{ target_dir }}\\OMNeT++ {{ target_version }} IDE.lnk" + dest: "C:\\Users\\Public\\Desktop" + remote_src: yes