From 82b129dfe755ecbdd6d12e7c713b574fd3cbb07e Mon Sep 17 00:00:00 2001 From: Furtif Date: Tue, 13 Jun 2023 00:49:14 +0200 Subject: [PATCH] enable dev-mode --- main.py | 4 +- version.py | 4 +- wininstaller-py3.8.6-inno-5-32-bits.iss | 110 ++++++++++++++++++++++++ wininstaller.iss | 9 +- 4 files changed, 120 insertions(+), 7 deletions(-) create mode 100644 wininstaller-py3.8.6-inno-5-32-bits.iss diff --git a/main.py b/main.py index 995e8b63..9a4e532b 100644 --- a/main.py +++ b/main.py @@ -299,7 +299,7 @@ def __init__(self, parent=None): self.sdsready = False self.ecunamemap = {} self.plugins = {} - self.setWindowTitle(_("DDT4All") + " " + __version__) + self.setWindowTitle(_("DDT4All") + " - Version: " + __version__ + " - Build status: " + __status__) self.ecu_scan = ecu.Ecu_scanner() self.ecu_scan.qapp = app options.ecu_scanner = self.ecu_scan @@ -1268,7 +1268,7 @@ def __init__(self): self.portcount = -1 self.usb() - self.setWindowTitle(_("DDT4All") + " " + __version__) + self.setWindowTitle(_("DDT4All") + " - Version: " + __version__ + " - Build status: " + __status__) self.setIcon() def setIcon(self): diff --git a/version.py b/version.py index 00ca9725..4ad96489 100644 --- a/version.py +++ b/version.py @@ -5,7 +5,7 @@ __copyright__ = "Copyright 2016-2023" __credits__ = [] __license__ = "GPL" -__version__ = "2.1.0" +__version__ = "2.1.1" __maintainer__ = "Cedric PAILLE" __email__ = "cedricpaille@gmail.com" -__status__ = "Beta" +__status__ = "Dev" diff --git a/wininstaller-py3.8.6-inno-5-32-bits.iss b/wininstaller-py3.8.6-inno-5-32-bits.iss new file mode 100644 index 00000000..ce39b4bb --- /dev/null +++ b/wininstaller-py3.8.6-inno-5-32-bits.iss @@ -0,0 +1,110 @@ +;--------------------- This requires Inno Setup 5 for compatibilities, an python 3.8.6 - 32 bits for autonomous modes. +#define MyAppName "DDT4All" +#define MyAppVersion GetDateTimeString('yy.mm.dd','','') +#define MyAppDir "ddtall" +#define MyAppAuthor "Cedric PAILLE" +#define MyAppCompany "Cedric PAILLE" +#define MyAppContact "cedricpaille@gmail.com" +#define MyAppSupportURL "https://github.com/cedricp/ddt4all" +#define MyAppReadmeMd "https://github.com/cedricp/ddt4all/blob/master/README.md" +#define C_StartingYear "2016" +#define C_EndingYear GetDateTimeString('yyyy','','') +#define DateEUR GetDateTimeString('dd.mm.yyyy','','') + +[Setup] +AppName={#MyAppName} +AppVersion={#MyAppVersion} +AppVerName={#MyAppName} {#MyAppVersion} + +AppPublisherURL={#MyAppSupportURL} +AppSupportURL={#MyAppSupportURL} +AppUpdatesURL={#MyAppSupportURL} +AppReadmeFile={#MyAppReadmeMd} +AppContact={#MyAppContact} + +;--------------------- Info for exe file properties +VersionInfoDescription={#MyAppName} installer +VersionInfoVersion={#MyAppVersion} +VersionInfoProductName={#MyAppName} +AppCopyright={#MyAppCompany} {#C_StartingYear}-{#C_EndingYear} + +;--------------------- Info Windows program list +UninstallDisplayIcon={app}\icons\obd.ico +UninstallDisplayName={#MyAppName} +AppPublisher={#MyAppCompany} + +UsepreviousLanguage=No + +DefaultDirName={pf}\{#MyAppDir} +DefaultGroupName={#MyAppDir} +SetupIconFile=icons\obd.ico +OutputBaseFilename={#MyAppDir}-win-installer-{#MyAppVersion}-python-3.8.6-32bits +VersionInfoCompany={#MyAppCompany} +VersionInfoTextVersion={#MyAppVersion} +VersionInfoCopyright={#MyAppCompany} {#C_StartingYear}-{#C_EndingYear} +VersionInfoProductVersion={#MyAppVersion} +VersionInfoProductTextVersion={#MyAppVersion} +LicenseFile=license.txt +WizardStyle=modern + +[Files] +//Source: "ecu.zip"; DestDir: "{app}"; Flags: onlyifdoesntexist skipifsourcedoesntexist +Source: "*.py"; DestDir: "{app}"; Excludes: "*.pyc" +Source: "*.qss"; DestDir: "{app}" ; AfterInstall: AfterMyProgInstall +Source: "\Python38-32\*"; DestDir: "{app}\Python38-32"; Flags: ignoreversion recursesubdirs; Excludes: "*.pyc" +Source: "ddtplugins\*"; DestDir: "{app}\ddtplugins"; Flags: ignoreversion recursesubdirs; Excludes: "*.pyc" +Source: "icons\*"; DestDir: "{app}\icons"; Flags: ignoreversion recursesubdirs +Source: "address\*"; DestDir: "{app}\address"; Flags: ignoreversion recursesubdirs +Source: "locale\*"; DestDir: "{app}\locale"; Flags: ignoreversion recursesubdirs +Source: "json\*"; DestDir: "{app}\json"; Flags: ignoreversion recursesubdirs onlyifdoesntexist skipifsourcedoesntexist + +[InstallDelete] +Type: filesandordirs; Name: "{app}\__pycache__" +Type: filesandordirs; Name: "{app}\importlib" +Type: filesandordirs; Name: "{app}\python27" + +[UninstallDelete] +Type: filesandordirs; Name: "{app}" + +[Code] +procedure AfterMyProgInstall; +begin + MsgBox(ExpandConstant('{cm:AfterMyProgInstall} {app}'), mbInformation, MB_OK); +end; + +[Dirs] +Name: "{app}"; Permissions: users-full +Name: "{app}\logs"; Permissions: users-full +Name: "{app}\json"; Permissions: users-full +Name: "{app}\vehicles"; Permissions: users-full + +[Tasks] +Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked + +[Icons] +Name: "{group}\ddt4all"; Filename: "{app}\Python38-32\python.exe"; Parameters: """{app}\main.py"""; WorkingDir: "{app}"; IconFilename: "{app}\icons\obd.ico" +Name: "{userdesktop}\ddt4all"; Filename: "{app}\Python38-32\python.exe"; Parameters: """{app}\main.py"""; WorkingDir: "{app}"; IconFilename: "{app}\icons\obd.ico"; Tasks: desktopicon + +[CustomMessages] +en.AfterMyProgInstall=Do not forget to install database to %n%n +de.AfterMyProgInstall=Erwägen Sie die Installation einer Datenbank in%n%n +fr.AfterMyProgInstall=Pensez a installer une base de données dans%n%n +es.AfterMyProgInstall=Considere instalar una base de datos en%n%n +it.AfterMyProgInstall=Non dimenticare di installare il database in%n%n +nl.AfterMyProgInstall=Overweeg een database te installeren in%n%n +pl.AfterMyProgInstall=Rozważ zainstalowanie bazy danych w%n%n +ptbr.AfterMyProgInstall=Considere instalar um banco de dados em%n%n +pt.AfterMyProgInstall=Considere instalar um banco de dados em%n%n +ru.AfterMyProgInstall=Рассмотрите возможность установки базы данных в%n%n + +[Languages] +Name: "en"; MessagesFile: "C:\Program Files (x86)\Inno Setup 5\Default.isl" +Name: "de"; MessagesFile: "C:\Program Files (x86)\Inno Setup 5\Languages\German.isl" +Name: "fr"; MessagesFile: "C:\Program Files (x86)\Inno Setup 5\Languages\French.isl" +Name: "es"; MessagesFile: "C:\Program Files (x86)\Inno Setup 5\Languages\Spanish.isl" +Name: "it"; MessagesFile: "C:\Program Files (x86)\Inno Setup 5\Languages\Italian.isl" +Name: "nl"; MessagesFile: "C:\Program Files (x86)\Inno Setup 5\Languages\Dutch.isl" +Name: "pl"; MessagesFile: "C:\Program Files (x86)\Inno Setup 5\Languages\Polish.isl" +Name: "ptbr"; MessagesFile: "C:\Program Files (x86)\Inno Setup 5\Languages\BrazilianPortuguese.isl" +Name: "pt"; MessagesFile: "C:\Program Files (x86)\Inno Setup 5\Languages\Portuguese.isl" +Name: "ru"; MessagesFile: "C:\Program Files (x86)\Inno Setup 5\Languages\Russian.isl" diff --git a/wininstaller.iss b/wininstaller.iss index d90a63b5..77c776b4 100644 --- a/wininstaller.iss +++ b/wininstaller.iss @@ -6,7 +6,7 @@ #define MyAppContact "cedricpaille@gmail.com" #define MyAppSupportURL "https://github.com/cedricp/ddt4all" #define MyAppReadmeMd "https://github.com/cedricp/ddt4all/blob/master/README.md" -#define C_StartingYear "2011" +#define C_StartingYear "2016" #define C_EndingYear GetDateTimeString('yyyy','','') #define DateEUR GetDateTimeString('dd.mm.yyyy','','') @@ -37,7 +37,7 @@ UsepreviousLanguage=No DefaultDirName={pf}\{#MyAppDir} DefaultGroupName={#MyAppDir} SetupIconFile=icons\obd.ico -OutputBaseFilename={#MyAppDir}-win-installer-{#MyAppVersion} +OutputBaseFilename={#MyAppDir}-win-installer-{#MyAppVersion}-python-3.11.4-64bits UsePreviousPrivileges=True VersionInfoCompany={#MyAppCompany} VersionInfoTextVersion={#MyAppVersion} @@ -66,6 +66,9 @@ Type: filesandordirs; Name: "{app}\python27" Type: filesandordirs; Name: "{app}\Python38" Type: filesandordirs; Name: "{app}\Python39" Type: filesandordirs; Name: "{app}\Python310" +Type: filesandordirs; Name: "{app}\Python38-32" +Type: filesandordirs; Name: "{app}\Python39-32" +Type: filesandordirs; Name: "{app}\Python310-32" [UninstallDelete] Type: filesandordirs; Name: "{app}" @@ -92,7 +95,7 @@ Name: "{userdesktop}\ddt4all"; Filename: "{app}\Python311\python.exe"; Parameter [CustomMessages] en.AfterMyProgInstall=Do not forget to install database to %n%n de.AfterMyProgInstall=Erwägen Sie die Installation einer Datenbank in%n%n -fr.AfterMyProgInstall=Pensez a installer une base de donnée dans%n%n +fr.AfterMyProgInstall=Pensez a installer une base de données dans%n%n es.AfterMyProgInstall=Considere instalar una base de datos en%n%n it.AfterMyProgInstall=Non dimenticare di installare il database in%n%n nl.AfterMyProgInstall=Overweeg een database te installeren in%n%n