Merge pull request #1834 from TheBigBear/update-rakkudo-star

Fix rakudo star dl link and update to ver. 2020.10
saltstack · May 13, 2021 · 922e4b2 · 922e4b2
2 parents 37709b8 + c9c218a
commit 922e4b2
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 10 deletions.
diff --git a/rakudo-star-no-jit_x86.sls b/rakudo-star-no-jit_x86.sls
@@ -1,10 +1,12 @@
-rakudo-star_x86:
+# rakudo-star-no-jit_x86:
+rakudo-star-no-jit-2016.01_x86:
   '1.0.0':
     full_name: 'Rakudo Star 2016.01'
-    installer: 'https://rakudo.org/downloads/star/rakudo-star-2016.01-x86%20(no%20JIT).msi'
+    installer: 'https://rakudo.org/dl/star/rakudo-star-2016.01-01-win-x86-(no%20JIT).msi'
     install_flags: '/qn /norestart'
-    uninstaller: 'https://rakudo.org/downloads/star/rakudo-star-2016.01-x86%20(no%20JIT).msi'
-    uninstall_flags: '/qn /norestart'
+    uninstaller: 'msiexec'
+    uninstall_flags: '/x {1032E96A-E5D5-4630-AAB4-2DECE094C227} /qn /norestart'
     msiexec: True
     locale: en_US
     reboot: False
+
diff --git a/rakudo-star_x64.sls b/rakudo-star_x64.sls
@@ -1,10 +1,34 @@
-rakudo-star_x64:
-  '1.0.0':
-    full_name: 'Rakudo Star 2016.04'
-    installer: 'https://rakudo.org/downloads/star/rakudo-star-2016.04-x86_64%20(JIT).msi'
+# rakudo-star_x64:
+#
+#  placeholder name, Rakudo Star re-use the version number '1.0.0' for each and every release
+# so we have to treat each and every Rakudo Star release as a separate pkg in its own right
+#
+{% for star_version, version, guid in ( ('2020.05.1', '1.0.0', '{4762F693-2C3A-4B0F-BC05-C3585669F7D7}'), 
+                                        ('2020.01', '1.0.0', '{E8982F92-0BFC-4381-89F4-49EBAA0CAD34}'), 
+                                        ('2019.03', '1.0.0', '{2612A516-13DD-4C59-8196-B34544084AF5}'), 
+                                        ('2018.10', '1.0.0', '{93EDC490-BBE1-4FB6-8B79-D71DEDBE5FC0}'), 
+                                        ('2018.06', '1.0.0', '{687C4DCF-0DCD-4DD8-8413-CBBFE8A3CE56}'), 
+                                        ('2018.04', '1.0.0', '{5873E1BD-BC62-4CC6-806C-FDCD8CDAF905}'), 
+                                        ('2018.01', '1.0.0', '{2BC1F425-919B-4643-96C0-276B781D66A4}'), 
+                                        ('2017.10', '1.0.0', '{C76048D0-CCE1-4B79-AB66-FF88B5105E99}'),
+                                        ('2017.07', '1.0.0', '{4593B5F3-B1AE-4632-80ED-8DECC493A2C4}'), 
+                                        ('2017.04.2', '1.0.0', '{F58CFF77-A2A5-42ED-9C21-81EEA410D1C8}'), 
+                                        ('2017.01', '1.0.0', '{72ED036A-8340-4228-9D47-8D10A4E56256}'), 
+                                        ('2016.11', '1.0.0', '{E817B182-BDEB-43F9-97C2-5051B8B0ECF7}'), 
+                                        ('2016.07', '1.0.0', '{73C56149-1826-4EA4-B5D0-FAA643AAC906}'), 
+                                        ('2016.04', '1.0.0', '{D5447817-6E7F-410B-B68B-5EB715A1AAAE}'),
+                                        ('2016.01', '1.0.0', '{53927780-9C62-47BA-A846-972EFFA69EA3}')
+                                 ) %}
+#
+rakudo-star-{{ star_version }}_x64:
+  '{{ version }}':
+    full_name: 'Rakudo Star {{ star_version }}'
+    installer: 'https://rakudo.org/dl/star/rakudo-star-{{ star_version }}-01-win-x86_64-(JIT).msi'
     install_flags: '/qn /norestart'
-    uninstaller: 'https://rakudo.org/downloads/star/rakudo-star-2016.04-x86_64%20(JIT).msi'
-    uninstall_flags: '/qn /norestart'
+    uninstaller: 'misexec'
+    uninstall_flags: '/x {{ guid }} /qn /norestart'
     msiexec: True
     locale: en_US
     reboot: False
+{% endfor %}
+#