From 8085ddf3e47678d9b7fc8fd497b27b9127698cbb Mon Sep 17 00:00:00 2001
From: Spu7Nix <spu7nix@outlook.com>
Date: Tue, 14 Sep 2021 16:35:25 +0200
Subject: [PATCH] installer changes

---
 Cargo.toml                                 |  2 -
 libraries/std/lib.spwn                     |  1 +
 {wix => spwn/wix}/commands.sh              |  6 +-
 {wix => spwn/wix}/generate_wix_lib_file.py |  2 +-
 {wix => spwn/wix}/libraries.wxs            | 96 +++++++++++++---------
 {wix => spwn/wix}/main.wxs                 | 10 ++-
 6 files changed, 67 insertions(+), 50 deletions(-)
 rename {wix => spwn/wix}/commands.sh (64%)
 rename {wix => spwn/wix}/generate_wix_lib_file.py (95%)
 rename {wix => spwn/wix}/libraries.wxs (67%)
 rename {wix => spwn/wix}/main.wxs (97%)

diff --git a/Cargo.toml b/Cargo.toml
index 45373195..a783267a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,5 +11,3 @@ members = [
     "docgen",
 ]
 
-[profile.release]
-debug = true
diff --git a/libraries/std/lib.spwn b/libraries/std/lib.spwn
index beb3d1ed..1d24fce4 100644
--- a/libraries/std/lib.spwn
+++ b/libraries/std/lib.spwn
@@ -12,6 +12,7 @@ import "obj_set.spwn"
 import "dictionary.spwn"
 import "string.spwn"
 import "counter.spwn"
+import "binary_counter.spwn"
 import "fileio.spwn"
 import "regex.spwn"
 import "number.spwn"
diff --git a/wix/commands.sh b/spwn/wix/commands.sh
similarity index 64%
rename from wix/commands.sh
rename to spwn/wix/commands.sh
index 1edf253f..4cea4c0d 100644
--- a/wix/commands.sh
+++ b/spwn/wix/commands.sh
@@ -1,12 +1,12 @@
-python wix/generate_wix_lib_file.py
+python spwn/wix/generate_wix_lib_file.py
 rustup override unset
 
 rustup default nightly-i686-pc-windows-msvc
 cargo install cargo-wix
-cargo wix
+cargo wix spwn/Cargo.toml --nocapture
 
 rustup default nightly-x86_64-pc-windows-msvc
 cargo install cargo-wix
-cargo wix
+cargo wix spwn/Cargo.toml --nocapture
 
 rustup override set nightly-x86_64-pc-windows-msvc
diff --git a/wix/generate_wix_lib_file.py b/spwn/wix/generate_wix_lib_file.py
similarity index 95%
rename from wix/generate_wix_lib_file.py
rename to spwn/wix/generate_wix_lib_file.py
index 2c6d84c6..f9c3480a 100644
--- a/wix/generate_wix_lib_file.py
+++ b/spwn/wix/generate_wix_lib_file.py
@@ -45,6 +45,6 @@
 </Wix>
 """
 print(str)
-new_file = open("wix/libraries.wxs", mode="w")
+new_file = open("spwn/wix/libraries.wxs", mode="w")
 new_file.write(str)
 new_file.close()
diff --git a/wix/libraries.wxs b/spwn/wix/libraries.wxs
similarity index 67%
rename from wix/libraries.wxs
rename to spwn/wix/libraries.wxs
index d267b62b..8cfe168e 100644
--- a/wix/libraries.wxs
+++ b/spwn/wix/libraries.wxs
@@ -21,88 +21,104 @@
     <Fragment>
         <ComponentGroup Id="libraries">
 
-            <Component Id="C0" Directory="gamescene" Win64='$(var.Win64)' Guid="{3e389a0c-79d3-4f72-8d66-575bbb9a45f0}">
+            <Component Id="C0" Directory="gamescene" Win64='$(var.Win64)' Guid="{683ee443-0c16-4965-961d-c7ffc9950e49}">
                 <File Id="F0" KeyPath="yes" Source="libraries\gamescene\lib.spwn" />
             </Component>
         
-            <Component Id="C1" Directory="std" Win64='$(var.Win64)' Guid="{7faa3fc6-6eeb-4fbb-ad97-7674684b8469}">
+            <Component Id="C1" Directory="std" Win64='$(var.Win64)' Guid="{779de285-c03a-4453-ac89-11ca617aff2c}">
                 <File Id="F1" KeyPath="yes" Source="libraries\std\array.spwn" />
             </Component>
         
-            <Component Id="C2" Directory="std" Win64='$(var.Win64)' Guid="{1b820599-8f3e-4983-b830-c5573cffc924}">
-                <File Id="F2" KeyPath="yes" Source="libraries\std\block.spwn" />
+            <Component Id="C2" Directory="std" Win64='$(var.Win64)' Guid="{dde07e9f-dd78-45c9-aaf8-4e4e74648e90}">
+                <File Id="F2" KeyPath="yes" Source="libraries\std\binary_counter.spwn" />
             </Component>
         
-            <Component Id="C3" Directory="std" Win64='$(var.Win64)' Guid="{1d8414fb-0715-4777-9f7f-84d2b54cf0bd}">
-                <File Id="F3" KeyPath="yes" Source="libraries\std\color.spwn" />
+            <Component Id="C3" Directory="std" Win64='$(var.Win64)' Guid="{1de9a4ba-e2bd-4e89-a4d8-6de79c5e6ffa}">
+                <File Id="F3" KeyPath="yes" Source="libraries\std\block.spwn" />
             </Component>
         
-            <Component Id="C4" Directory="std" Win64='$(var.Win64)' Guid="{e8c54216-bda9-4423-acf7-2c9bb6633ab3}">
-                <File Id="F4" KeyPath="yes" Source="libraries\std\constants.spwn" />
+            <Component Id="C4" Directory="std" Win64='$(var.Win64)' Guid="{d56e20ff-8d41-4dc6-ab76-e1f4d288f5c0}">
+                <File Id="F4" KeyPath="yes" Source="libraries\std\color.spwn" />
             </Component>
         
-            <Component Id="C5" Directory="std" Win64='$(var.Win64)' Guid="{499d9200-0b01-4822-b36e-e62220962d7d}">
-                <File Id="F5" KeyPath="yes" Source="libraries\std\control_flow.spwn" />
+            <Component Id="C5" Directory="std" Win64='$(var.Win64)' Guid="{76297cb8-30be-4d66-b8ee-daa416ef6b36}">
+                <File Id="F5" KeyPath="yes" Source="libraries\std\complex.spwn" />
             </Component>
         
-            <Component Id="C6" Directory="std" Win64='$(var.Win64)' Guid="{245697a4-7c6d-45cf-8f3b-a07be98c1f08}">
-                <File Id="F6" KeyPath="yes" Source="libraries\std\counter.spwn" />
+            <Component Id="C6" Directory="std" Win64='$(var.Win64)' Guid="{65a6a0a9-44e3-4293-82e5-b34089e30ee0}">
+                <File Id="F6" KeyPath="yes" Source="libraries\std\constants.spwn" />
             </Component>
         
-            <Component Id="C7" Directory="std" Win64='$(var.Win64)' Guid="{0a6cec77-a26b-447c-a647-be6917f46aab}">
-                <File Id="F7" KeyPath="yes" Source="libraries\std\dictionary.spwn" />
+            <Component Id="C7" Directory="std" Win64='$(var.Win64)' Guid="{20076c73-a3d4-4ef0-8e2d-6a7d1487c68b}">
+                <File Id="F7" KeyPath="yes" Source="libraries\std\control_flow.spwn" />
             </Component>
         
-            <Component Id="C8" Directory="std" Win64='$(var.Win64)' Guid="{3ace42f4-604c-4b93-8292-c7d32fa0f53a}">
-                <File Id="F8" KeyPath="yes" Source="libraries\std\events.spwn" />
+            <Component Id="C8" Directory="std" Win64='$(var.Win64)' Guid="{853966f2-deaa-4d39-a8c9-ae73ed1c13f1}">
+                <File Id="F8" KeyPath="yes" Source="libraries\std\counter.spwn" />
             </Component>
         
-            <Component Id="C9" Directory="std" Win64='$(var.Win64)' Guid="{115ae4be-4fd5-4c80-bbf0-e1299c84ea84}">
-                <File Id="F9" KeyPath="yes" Source="libraries\std\fileio.spwn" />
+            <Component Id="C9" Directory="std" Win64='$(var.Win64)' Guid="{dfb9e175-116b-46f8-beaf-bec345a613f1}">
+                <File Id="F9" KeyPath="yes" Source="libraries\std\dictionary.spwn" />
             </Component>
         
-            <Component Id="C10" Directory="std" Win64='$(var.Win64)' Guid="{f7337500-f830-4a8d-b927-e47df7076c84}">
-                <File Id="F10" KeyPath="yes" Source="libraries\std\general_triggers.spwn" />
+            <Component Id="C10" Directory="std" Win64='$(var.Win64)' Guid="{b0f9c6a4-db7e-475f-8e9c-e1294257ec07}">
+                <File Id="F10" KeyPath="yes" Source="libraries\std\events.spwn" />
             </Component>
         
-            <Component Id="C11" Directory="std" Win64='$(var.Win64)' Guid="{f6db6af9-e01d-4629-8de0-3be4d9c6a3fe}">
-                <File Id="F11" KeyPath="yes" Source="libraries\std\group.spwn" />
+            <Component Id="C11" Directory="std" Win64='$(var.Win64)' Guid="{81a66d81-7924-4862-9177-a5a3afc2617a}">
+                <File Id="F11" KeyPath="yes" Source="libraries\std\fileio.spwn" />
             </Component>
         
-            <Component Id="C12" Directory="std" Win64='$(var.Win64)' Guid="{ccc14cd0-8226-4753-88a0-71380a65922c}">
-                <File Id="F12" KeyPath="yes" Source="libraries\std\heapq.spwn" />
+            <Component Id="C12" Directory="std" Win64='$(var.Win64)' Guid="{34f66596-1390-44af-b0c3-4aa4223b8fd7}">
+                <File Id="F12" KeyPath="yes" Source="libraries\std\general_triggers.spwn" />
             </Component>
         
-            <Component Id="C13" Directory="std" Win64='$(var.Win64)' Guid="{7886bbc0-863a-408a-908f-6f2ffd759059}">
-                <File Id="F13" KeyPath="yes" Source="libraries\std\item.spwn" />
+            <Component Id="C13" Directory="std" Win64='$(var.Win64)' Guid="{1985d3c9-b1b0-4015-9846-8f2432702878}">
+                <File Id="F13" KeyPath="yes" Source="libraries\std\group.spwn" />
             </Component>
         
-            <Component Id="C14" Directory="std" Win64='$(var.Win64)' Guid="{1929706c-f698-407e-a407-4e66331fc0b8}">
-                <File Id="F14" KeyPath="yes" Source="libraries\std\lib.spwn" />
+            <Component Id="C14" Directory="std" Win64='$(var.Win64)' Guid="{27f09819-202f-4042-8cfa-22bc85b1129a}">
+                <File Id="F14" KeyPath="yes" Source="libraries\std\heapq.spwn" />
             </Component>
         
-            <Component Id="C15" Directory="std" Win64='$(var.Win64)' Guid="{bb52dcaf-bf36-4731-91d6-ec5089e10a30}">
-                <File Id="F15" KeyPath="yes" Source="libraries\std\number.spwn" />
+            <Component Id="C15" Directory="std" Win64='$(var.Win64)' Guid="{ecbbe313-b9ea-44e1-8566-3b96d3aff0b3}">
+                <File Id="F15" KeyPath="yes" Source="libraries\std\http.spwn" />
             </Component>
         
-            <Component Id="C16" Directory="std" Win64='$(var.Win64)' Guid="{52f33b26-b455-43f6-8963-7f1918cc9d8a}">
-                <File Id="F16" KeyPath="yes" Source="libraries\std\object.spwn" />
+            <Component Id="C16" Directory="std" Win64='$(var.Win64)' Guid="{f0e94e6a-369c-4e67-9c74-6fd5b9c16d64}">
+                <File Id="F16" KeyPath="yes" Source="libraries\std\item.spwn" />
             </Component>
         
-            <Component Id="C17" Directory="std" Win64='$(var.Win64)' Guid="{51e609e7-d51f-4317-91ee-ff95550425f7}">
-                <File Id="F17" KeyPath="yes" Source="libraries\std\obj_set.spwn" />
+            <Component Id="C17" Directory="std" Win64='$(var.Win64)' Guid="{467bb91e-0c26-4207-a46a-2b17ad945b66}">
+                <File Id="F17" KeyPath="yes" Source="libraries\std\lib.spwn" />
             </Component>
         
-            <Component Id="C18" Directory="std" Win64='$(var.Win64)' Guid="{1fef6638-286d-4e97-864e-745c1c156695}">
-                <File Id="F18" KeyPath="yes" Source="libraries\std\regex.spwn" />
+            <Component Id="C18" Directory="std" Win64='$(var.Win64)' Guid="{ab38183d-6ee2-4079-8797-5037dabdc54c}">
+                <File Id="F18" KeyPath="yes" Source="libraries\std\number.spwn" />
             </Component>
         
-            <Component Id="C19" Directory="std" Win64='$(var.Win64)' Guid="{733156ec-2c1d-433d-9d6e-3e4e07b52f17}">
-                <File Id="F19" KeyPath="yes" Source="libraries\std\string.spwn" />
+            <Component Id="C19" Directory="std" Win64='$(var.Win64)' Guid="{55bcaf10-ae9a-4e4b-90dd-bb2b4b160282}">
+                <File Id="F19" KeyPath="yes" Source="libraries\std\object.spwn" />
             </Component>
         
-            <Component Id="C20" Directory="std" Win64='$(var.Win64)' Guid="{32a57240-a28c-4656-845e-6778ba6cd4e4}">
-                <File Id="F20" KeyPath="yes" Source="libraries\std\util.spwn" />
+            <Component Id="C20" Directory="std" Win64='$(var.Win64)' Guid="{24af206f-20f5-43d1-b47a-059ff52b9265}">
+                <File Id="F20" KeyPath="yes" Source="libraries\std\obj_set.spwn" />
+            </Component>
+        
+            <Component Id="C21" Directory="std" Win64='$(var.Win64)' Guid="{cb66b067-045c-4caa-bb2e-89ed3667752c}">
+                <File Id="F21" KeyPath="yes" Source="libraries\std\regex.spwn" />
+            </Component>
+        
+            <Component Id="C22" Directory="std" Win64='$(var.Win64)' Guid="{644832f9-5298-4147-a515-28e1d9f1b394}">
+                <File Id="F22" KeyPath="yes" Source="libraries\std\string.spwn" />
+            </Component>
+        
+            <Component Id="C23" Directory="std" Win64='$(var.Win64)' Guid="{5b28864f-3aaf-4ca1-a8a3-2e40b5d5ca62}">
+                <File Id="F23" KeyPath="yes" Source="libraries\std\util.spwn" />
+            </Component>
+        
+            <Component Id="C24" Directory="std" Win64='$(var.Win64)' Guid="{af20fc63-4355-4903-9994-cf08a668d19a}">
+                <File Id="F24" KeyPath="yes" Source="libraries\std\zip.spwn" />
             </Component>
         
         </ComponentGroup>
diff --git a/wix/main.wxs b/spwn/wix/main.wxs
similarity index 97%
rename from wix/main.wxs
rename to spwn/wix/main.wxs
index e062d863..19393cd0 100644
--- a/wix/main.wxs
+++ b/spwn/wix/main.wxs
@@ -23,10 +23,12 @@
 
     <Package Id='*' Keywords='Installer' Manufacturer='Spu7Nix' InstallerVersion='450' Languages='1033' Compressed='yes'
       InstallScope='perMachine' SummaryCodepage='1252' Platform='$(var.Platform)' />
-<!--
+
     <MajorUpgrade Schedule='afterInstallInitialize'
-      DowngradeErrorMessage='A newer version of [ProductName] is already installed. Setup will now exit.' />
-      -->
+      DowngradeErrorMessage='A newer version of [ProductName] is already installed. Setup will now exit.' 
+      AllowSameVersionUpgrades="yes"
+    />
+     
 
     <Media Id='1' Cabinet='media1.cab' EmbedCab='yes' DiskPrompt='CD-ROM #1' />
     <Property Id='DiskPrompt' Value='spwn Installation' />
@@ -106,7 +108,7 @@
       </Feature>
     </Feature>
 
-    <Feature Id="Libraries" Level="1">
+    <Feature Id="Libraries" Level="1" Title='SPWN Standard Library'>
 
         <ComponentGroupRef Id='libraries' />