From bf21ff11211eb2fad6ff66cc76965c4da3f0bbf6 Mon Sep 17 00:00:00 2001
From: Salvo 'LtWorf' Tomaselli <tiposchi@tiscali.it>
Date: Wed, 2 Sep 2020 18:17:07 +0200
Subject: [PATCH] New installer

---
 windows/pipscript.bat |   4 ++
 windows/ss.iss        | 103 ++++++++++++++++++++----------------------
 2 files changed, 54 insertions(+), 53 deletions(-)
 create mode 100644 windows/pipscript.bat

diff --git a/windows/pipscript.bat b/windows/pipscript.bat
new file mode 100644
index 0000000..cd613ff
--- /dev/null
+++ b/windows/pipscript.bat
@@ -0,0 +1,4 @@
+# install dependencies using pip
+py -m pip install typedload
+py -m pip install xtermcolor
+py -m pip install PyQt5
diff --git a/windows/ss.iss b/windows/ss.iss
index b8d73c4..af7f394 100755
--- a/windows/ss.iss
+++ b/windows/ss.iss
@@ -1,53 +1,50 @@
-; Script generated by the Inno Setup Script Wizard.
-; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
-
-[Setup]
-; NOTE: The value of AppId uniquely identifies this application.
-; Do not use the same AppId value in installers for other applications.
-; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
-AppId={{6F127615-6AD4-4BD7-8135-2444A335B5CD}
-AppName=Relational
-AppVerName=Relational ver. 3.0
-AppPublisher=Salvo 'LtWorf' Tomaselli
-AppPublisherURL=http://ltworf.github.io/relational/
-AppSupportURL=http://ltworf.github.io/relational/
-AppUpdatesURL=http://ltworf.github.io/relational/
-DefaultDirName={pf}\Relational
-DefaultGroupName=Relational
-AllowNoIcons=yes
-LicenseFile=COPYING
-OutputBaseFilename=SetupRelational
-SetupIconFile=windows\favicon.ico
-Compression=lzma
-SolidCompression=yes
-
-[Languages]
-Name: "english"; MessagesFile: "compiler:Default.isl"
-
-[Tasks]
-Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
-Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
-
-[Run]
-; add the Parameters, WorkingDir and StatusMsg as you wish, just keep here
-; the conditional installation Check
-Filename: "{tmp}\vcredist_x86.exe"; Parameters: "/passive /norestart";
-
-[Files]
-Source: "dist\relational_gui.exe"; DestDir: "{app}"; Flags: ignoreversion
-Source: "dist\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
-; Source: "windows\font dejavu\*"; DestDir: "{fonts}"; FontInstall: "Dejavu Sans"
-Source: "samples\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "vcredist_x86.exe"; DestDir: {tmp}; Flags: deleteafterinstall
-; NOTE: Don't use "Flags: ignoreversion" on any shared system files
-
-[Icons]
-Name: "{group}\Relational"; Filename: "{app}\relational_gui.exe"
-Name: "{group}\{cm:ProgramOnTheWeb,Relational}"; Filename: "http://ltworf.github.io/relational/"
-Name: "{group}\{cm:UninstallProgram,Relational}"; Filename: "{uninstallexe}"
-Name: "{commondesktop}\Relational"; Filename: "{app}\relational_gui.exe"; Tasks: desktopicon
-Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\Relational"; Filename: "{app}\relational_gui.exe"; Tasks: quicklaunchicon
-
-[Run]
-Filename: "{app}\relational_gui.exe"; Description: "{cm:LaunchProgram,Relational}"; Flags: nowait postinstall skipifsilent
-
+[Setup]
+AppId={{6F127615-6AD4-4BD7-8135-2444A335B5CD}
+AppName=Relational
+AppVerName=Relational ver. 3.0
+AppPublisher=Salvo 'LtWorf' Tomaselli
+AppPublisherURL=https://ltworf.github.io/relational/
+AppSupportURL=https://ltworf.github.io/relational/
+AppUpdatesURL=https://ltworf.github.io/relational/
+DefaultDirName={pf}\Relational
+DefaultGroupName=Relational
+AllowNoIcons=yes
+LicenseFile=COPYING
+OutputBaseFilename=SetupRelational
+SetupIconFile=windows\favicon.ico
+Compression=lzma
+SolidCompression=yes
+
+[Languages]
+Name: "english"; MessagesFile: "compiler:Default.isl"
+
+[Tasks]
+Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
+Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
+
+[Run]
+; add the Parameters, WorkingDir and StatusMsg as you wish, just keep here
+; the conditional installation Check
+Filename: "{tmp}\python-3.8.5-amd64.exe"; Parameters: "/passive InstallAllUsers=1";
+Filename: "powershell"; Parameters: "-file {tmp}\pipscript.bat"
+
+[Files]
+; NOTE: Don't use "Flags: ignoreversion" on any shared system files
+Source: "windows\python-3.8.5-amd64.exe"; DestDir: {tmp}; Flags: deleteafterinstall
+Source: "windows\pipscript.bat"; DestDir: {tmp}; Flags: deleteafterinstall
+
+Source: "relational.py"; DestDir: "{app}"; Flags: ignoreversion
+Source: "relational\*"; DestDir: "{app}\relational"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "relational_gui\*"; DestDir: "{app}\relational_gui"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "samples\*"; DestDir: "{app}\samples"; Flags: ignoreversion recursesubdirs createallsubdirs
+
+
+[Icons]
+Name: "{group}\Relational"; Filename: "pyw"; Parameters: "relational.py"; WorkingDir: "{app}"
+Name: "{group}\{cm:ProgramOnTheWeb,Relational}"; Filename: "https://ltworf.github.io/relational/"
+Name: "{group}\{cm:UninstallProgram,Relational}"; Filename: "{uninstallexe}"
+Name: "{commondesktop}\Relational"; Tasks: desktopicon; Filename: "pyw"; Parameters: "relational.py"; WorkingDir: "{app}"
+Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\Relational"; Tasks: quicklaunchicon; Filename: "pyw"; Parameters: "relational.py"; WorkingDir: "{app}"
+
+[Run]
+Description: "{cm:LaunchProgram,Relational}"; Flags: nowait postinstall skipifsilent; Filename: "pyw"; Parameters: "relational.py"; WorkingDir: "{app}"