diff --git a/release/linux/create_installer_linux.sh b/release/linux/create_installer_linux.sh index 8616c7b..4cfc2e6 100755 --- a/release/linux/create_installer_linux.sh +++ b/release/linux/create_installer_linux.sh @@ -1,5 +1,7 @@ #!bash +# TODO remove with old release workflow + # Initial cleanup rm -rf dist rm -rf build diff --git a/release/macos/create_installer_macos.sh b/release/macos/create_installer_macos.sh index ac70f6e..87d414d 100755 --- a/release/macos/create_installer_macos.sh +++ b/release/macos/create_installer_macos.sh @@ -1,5 +1,7 @@ #!bash +# TODO remove with old release workflow + # Initial cleanup rm -rf dist rm -rf build diff --git a/release/windows/build_package_windows.ps1 b/release/windows/build_package_windows.ps1 index 3c1451c..7627040 100644 --- a/release/windows/build_package_windows.ps1 +++ b/release/windows/build_package_windows.ps1 @@ -2,11 +2,5 @@ # This script must be run from the root of the repository after running build_installer_windows.ps1 -# Apparently, ISCC uses the directory of the .iss input file as the working directory. -mkdir release/windows/dist -mv dist_pyinstaller/* release/windows/dist - # Wrapping the pyinstaller folder in a .exe package & "C:\Program Files (x86)\Inno Setup 6\ISCC.exe" .\release\windows\directlfq_innoinstaller.iss -# release workflow expects artifact at root of repository -mv .\release\windows\dist\*.exe . diff --git a/release/windows/create_installer_windows.sh b/release/windows/create_installer_windows.sh index 4f30f5c..b4e798a 100644 --- a/release/windows/create_installer_windows.sh +++ b/release/windows/create_installer_windows.sh @@ -1,5 +1,7 @@ #!bash +# TODO remove with old release workflow + # Initial cleanup rm -rf dist rm -rf build @@ -29,5 +31,5 @@ conda deactivate # cp ../../directlfq/data/*.fasta dist/directlfq/data # Wrapping the pyinstaller folder in a .exe package -"C:\Program Files (x86)\Inno Setup 6\ISCC.exe" directlfq_innoinstaller.iss +"C:\Program Files (x86)\Inno Setup 6\ISCC.exe" directlfq_innoinstaller_old.iss # WARNING: this assumes a static location for innosetup diff --git a/release/windows/directlfq_innoinstaller.iss b/release/windows/directlfq_innoinstaller.iss index 4394a6e..ca56384 100644 --- a/release/windows/directlfq_innoinstaller.iss +++ b/release/windows/directlfq_innoinstaller.iss @@ -1,6 +1,9 @@ ; Script generated by the Inno Setup Script Wizard. ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! +; Note: apparently, ISCC uses the directory of the .iss input file as the working directory, +; so all paths are given relative to the location of this .iss file. + #define MyAppName "directlfq" #define MyAppVersion "0.2.20" #define MyAppPublisher "Max Planck Institute of Biochemistry and the University of Copenhagen, Mann Labs" @@ -24,7 +27,8 @@ LicenseFile=..\..\LICENSE ; Uncomment the following line to run in non administrative install mode (install for current user only.) PrivilegesRequired=lowest PrivilegesRequiredOverridesAllowed=dialog -OutputDir=dist +; release workflow expects artifact at root of repository +OutputDir=..\..\ ; example for BUILD_NAME: directlfq-1.2.3-windows-amd64 OutputBaseFilename={#GetEnv('BUILD_NAME')} SetupIconFile=..\logos\alpha_logo.ico @@ -39,8 +43,8 @@ Name: "english"; MessagesFile: "compiler:Default.isl" Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked [Files] -Source: "dist\directlfq_gui\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion -Source: "dist\directlfq_gui\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs +Source: "..\..\dist_pyinstaller\directlfq_gui\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\..\dist_pyinstaller\directlfq_gui\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs ; NOTE: Don't use "Flags: ignoreversion" on any shared system files [Icons] diff --git a/release/windows/directlfq_innoinstaller_old.iss b/release/windows/directlfq_innoinstaller_old.iss new file mode 100644 index 0000000..cd5cede --- /dev/null +++ b/release/windows/directlfq_innoinstaller_old.iss @@ -0,0 +1,52 @@ +; Script generated by the Inno Setup Script Wizard. +; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! +; # TODO remove with old release workflow + +#define MyAppName "directlfq" +#define MyAppVersion "0.2.20" +#define MyAppPublisher "Max Planck Institute of Biochemistry and the University of Copenhagen, Mann Labs" +#define MyAppURL "https://github.com/MannLabs/directlfq" +#define MyAppExeName "directlfq_gui.exe" + +[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={{directlfq_Mann_Labs_MPI_CPR} +AppName={#MyAppName} +AppVersion={#MyAppVersion} +;AppVerName={#MyAppName} {#MyAppVersion} +AppPublisher={#MyAppPublisher} +AppPublisherURL={#MyAppURL} +AppSupportURL={#MyAppURL} +AppUpdatesURL={#MyAppURL} +DefaultDirName={autopf}\{#MyAppName} +DisableProgramGroupPage=yes +LicenseFile=..\..\LICENSE +; Uncomment the following line to run in non administrative install mode (install for current user only.) +PrivilegesRequired=lowest +PrivilegesRequiredOverridesAllowed=dialog +OutputDir=dist +; example for BUILD_NAME: directlfq-1.2.3-windows-amd64 +OutputBaseFilename={#GetEnv('BUILD_NAME')} +SetupIconFile=..\logos\alpha_logo.ico +Compression=lzma +SolidCompression=yes +WizardStyle=modern + +[Languages] +Name: "english"; MessagesFile: "compiler:Default.isl" + +[Tasks] +Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked + +[Files] +Source: "dist\directlfq_gui\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion +Source: "dist\directlfq_gui\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs +; NOTE: Don't use "Flags: ignoreversion" on any shared system files + +[Icons] +Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}" +Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon + +[Run] +Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent