From 587bcb0843ae93312d762e75929245ca41484059 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?--=3DFurtiF=E2=84=A2=3D--?= Date: Wed, 1 May 2024 19:08:23 +0200 Subject: [PATCH] ops!! bad old commit (cant not add ecu.zip in inmosetup) --- .../inno-win-setup/wininstaller-py3.8.6-inno-5-32-bits.iss | 5 ++--- ddt4all_data/inno-win-setup/wininstaller.iss | 5 ++--- ddt4all_data/mac-os/main.spec | 3 +-- version.py | 4 ++-- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/ddt4all_data/inno-win-setup/wininstaller-py3.8.6-inno-5-32-bits.iss b/ddt4all_data/inno-win-setup/wininstaller-py3.8.6-inno-5-32-bits.iss index 4f50bb4..62742f9 100644 --- a/ddt4all_data/inno-win-setup/wininstaller-py3.8.6-inno-5-32-bits.iss +++ b/ddt4all_data/inno-win-setup/wininstaller-py3.8.6-inno-5-32-bits.iss @@ -52,7 +52,7 @@ AppId={{#APP_ID} [Files] Source: "win32_deps\VC_redist.x86.exe"; DestDir: "{app}\win32_deps"; Tasks: microsoft_runtimes -Source: "..\..\ecu.zip"; DestDir: "{app}"; +;Source: "..\..\ecu.zip"; DestDir: "{app}"; Source: "\DDT4ALL-Dist-Versions\\Python38-32\*"; DestDir: "{app}\Python386-32"; Flags: ignoreversion recursesubdirs; Excludes: "*.pyc" ;Source: "\DDT4ALL-Dist-Versions\Git-2.43.0\x64\*"; DestDir: "{app}\Git"; Flags: ignoreversion recursesubdirs Source: "..\..\ddtplugins\*.py"; DestDir: "{app}\ddtplugins"; Flags: ignoreversion recursesubdirs; Excludes: "*.pyc" @@ -62,8 +62,7 @@ Source: "..\..\ddt4all_data\tools\*"; DestDir: "{app}\ddt4all_data\tools"; Flags Source: "..\..\ddt4all_data\locale\*"; DestDir: "{app}\ddt4all_data\locale"; Flags: ignoreversion recursesubdirs Source: "..\..\*.py"; DestDir: "{app}"; Excludes: "*.pyc" Source: "..\..\ddt4all_data\*.qss"; DestDir: "{app}\ddt4all_data" -Source: "..\..\ddt4all_data\projects.json"; DestDir: "{app}\ddt4all_data" -; AfterInstall: AfterMyProgInstall +Source: "..\..\ddt4all_data\projects.json"; DestDir: "{app}\ddt4all_data"; AfterInstall: AfterMyProgInstall [InstallDelete] Type: filesandordirs; Name: "{group}"; diff --git a/ddt4all_data/inno-win-setup/wininstaller.iss b/ddt4all_data/inno-win-setup/wininstaller.iss index 2e5a1cb..febd6e1 100644 --- a/ddt4all_data/inno-win-setup/wininstaller.iss +++ b/ddt4all_data/inno-win-setup/wininstaller.iss @@ -55,7 +55,7 @@ UsedUserAreasWarning=no AppId={{#APP_ID} [Files] -Source: "..\..\ecu.zip"; DestDir: "{app}"; +;Source: "..\..\ecu.zip"; DestDir: "{app}"; Source: "\DDT4ALL-Dist-Versions\Python312\*"; DestDir: "{app}\Python312-x64"; Flags: ignoreversion recursesubdirs; Excludes: "*.pyc" ;Source: "\DDT4ALL-Dist-Versions\Git-2.43.0\x64\*"; DestDir: "{app}\Git"; Flags: ignoreversion recursesubdirs Source: "..\..\ddtplugins\*.py"; DestDir: "{app}\ddtplugins"; Flags: ignoreversion recursesubdirs; Excludes: "*.pyc" @@ -65,8 +65,7 @@ Source: "..\..\ddt4all_data\tools\*"; DestDir: "{app}\ddt4all_data\tools"; Flags Source: "..\..\ddt4all_data\locale\*"; DestDir: "{app}\ddt4all_data\locale"; Flags: ignoreversion recursesubdirs Source: "..\..\*.py"; DestDir: "{app}"; Excludes: "*.pyc" Source: "..\..\ddt4all_data\*.qss"; DestDir: "{app}\ddt4all_data"; -Source: "..\..\ddt4all_data\projects.json"; DestDir: "{app}\ddt4all_data" -; AfterInstall: AfterMyProgInstall +Source: "..\..\ddt4all_data\projects.json"; DestDir: "{app}\ddt4all_data"; AfterInstall: AfterMyProgInstall [InstallDelete] Type: filesandordirs; Name: "{group}"; diff --git a/ddt4all_data/mac-os/main.spec b/ddt4all_data/mac-os/main.spec index bca154c..256a6f5 100644 --- a/ddt4all_data/mac-os/main.spec +++ b/ddt4all_data/mac-os/main.spec @@ -10,8 +10,7 @@ a = Analysis( ('../../ddt4all_data/projects.json', 'ddt4all_data'), ('../../ddt4all_data/*.qss', 'ddt4all_data'), ('../../ddtplugins/*.py', 'ddtplugins'), - ('../../*.py', '.'), - ('../../*.zip', '.') + ('../../*.py', '.') ], hiddenimports=[], hookspath=[], diff --git a/version.py b/version.py index 1cf9d86..91e7a0a 100644 --- a/version.py +++ b/version.py @@ -22,7 +22,7 @@ "krzeminskim" ] __license__ = "GPL" -__version__ = "3.0.2" +__version__ = "3.0.1" __maintainer__ = "Cedric PAILLE" __email__ = "cedricpaille@gmail.com" -__status__ = "Stable-Full" +__status__ = "Stable"