From 8db981c138ffdbf19140a0a1e1cf40fe5f795b45 Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Thu, 27 Nov 2014 17:11:57 +0100 Subject: [PATCH 1/3] Add Bitsquare.iss file as produced by javapackager This file was produced by adding a `-v` flag following the `-deploy` flag in `package/windows.bat`. The creation of the file is reported by javapackager as follows: Config files are saved to C:\Users\CBEAMS~1.WIN\AppData\Local\Temp\fxbundler5661616451276716144\windows. Use them to customize package. Subsequent commits will customize this file, primarily for the purpose of avoid the dreaded 'missing dll' errors mentioned originally in d16c274 and detailed at https://bitbucket.org/shemnon/javafx-gradle/issue/43. --- package/windows/Bitsquare.iss | 73 +++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 package/windows/Bitsquare.iss diff --git a/package/windows/Bitsquare.iss b/package/windows/Bitsquare.iss new file mode 100644 index 0000000000..ade73e3839 --- /dev/null +++ b/package/windows/Bitsquare.iss @@ -0,0 +1,73 @@ +;This file will be executed next to the application bundle image +;I.e. current directory will contain folder Bitsquare with application files +[Setup] +AppId={{io.bitsquare.app.gui}} +AppName=Bitsquare +AppVersion=0.1.0 +AppVerName=Bitsquare 0.1.0 +AppPublisher=Bitsquare +AppComments=Bitsquare +AppCopyright=Copyright (C) 2014 +;AppPublisherURL=http://java.com/ +;AppSupportURL=http://java.com/ +;AppUpdatesURL=http://java.com/ +DefaultDirName={localappdata}\Bitsquare +DisableStartupPrompt=Yes +DisableDirPage=Yes +DisableProgramGroupPage=Yes +DisableReadyPage=Yes +DisableFinishedPage=Yes +DisableWelcomePage=Yes +DefaultGroupName=Bitsquare +;Optional License +LicenseFile= +;WinXP or above +MinVersion=0,5.1 +OutputBaseFilename=Bitsquare-0.1.0 +Compression=lzma +SolidCompression=yes +PrivilegesRequired=lowest +SetupIconFile=Bitsquare\Bitsquare.ico +UninstallDisplayIcon={app}\Bitsquare.ico +UninstallDisplayName=Bitsquare +WizardImageStretch=No +WizardSmallImageFile=Bitsquare-setup-icon.bmp +ArchitecturesInstallIn64BitMode=x64 + +[Languages] +Name: "english"; MessagesFile: "compiler:Default.isl" + +[Files] +Source: "Bitsquare\Bitsquare.exe"; DestDir: "{app}"; Flags: ignoreversion +Source: "Bitsquare\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs + +[Icons] +Name: "{group}\Bitsquare"; Filename: "{app}\Bitsquare.exe"; IconFilename: "{app}\Bitsquare.ico"; Check: returnTrue() +Name: "{commondesktop}\Bitsquare"; Filename: "{app}\Bitsquare.exe"; IconFilename: "{app}\Bitsquare.ico"; Check: returnFalse() + +[Run] +Filename: "{app}\Bitsquare.exe"; Description: "{cm:LaunchProgram,Bitsquare}"; Flags: nowait postinstall skipifsilent; Check: returnTrue() +Filename: "{app}\Bitsquare.exe"; Parameters: "-install -svcName ""Bitsquare"" -svcDesc ""Bitsquare"" -mainExe ""Bitsquare.exe"" "; Check: returnFalse() + +[UninstallRun] +Filename: "{app}\Bitsquare.exe "; Parameters: "-uninstall -svcName Bitsquare -stopOnUninstall"; Check: returnFalse() + +[Code] +function returnTrue(): Boolean; +begin + Result := True; +end; + +function returnFalse(): Boolean; +begin + Result := False; +end; + +function InitializeSetup(): Boolean; +begin +// Possible future improvements: +// if version less or same => just launch app +// if upgrade => check if same app is running and wait for it to exit +// Add pack200/unpack200 support? + Result := True; +end; From 040571421a580ad0c42289a35337d05b89fcc006 Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Fri, 28 Nov 2014 11:29:00 +0100 Subject: [PATCH 2/3] Customize AppId and PublicationUrl entries --- package/windows/Bitsquare.iss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/windows/Bitsquare.iss b/package/windows/Bitsquare.iss index ade73e3839..2c2a64c1f8 100644 --- a/package/windows/Bitsquare.iss +++ b/package/windows/Bitsquare.iss @@ -1,15 +1,15 @@ ;This file will be executed next to the application bundle image ;I.e. current directory will contain folder Bitsquare with application files [Setup] -AppId={{io.bitsquare.app.gui}} +AppId={{bitsquare}} AppName=Bitsquare AppVersion=0.1.0 AppVerName=Bitsquare 0.1.0 AppPublisher=Bitsquare AppComments=Bitsquare AppCopyright=Copyright (C) 2014 -;AppPublisherURL=http://java.com/ -;AppSupportURL=http://java.com/ +AppPublisherURL=https://bitsquare.io +AppSupportURL=https://bitsquare.io ;AppUpdatesURL=http://java.com/ DefaultDirName={localappdata}\Bitsquare DisableStartupPrompt=Yes From 533c6ba6760c3f1bcc5bddce5d06f14f8e0167ab Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Fri, 28 Nov 2014 11:29:35 +0100 Subject: [PATCH 3/3] Configure the inclusion of missing .dll files --- package/windows/Bitsquare.iss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/windows/Bitsquare.iss b/package/windows/Bitsquare.iss index 2c2a64c1f8..ba68858c19 100644 --- a/package/windows/Bitsquare.iss +++ b/package/windows/Bitsquare.iss @@ -39,6 +39,8 @@ Name: "english"; MessagesFile: "compiler:Default.isl" [Files] Source: "Bitsquare\Bitsquare.exe"; DestDir: "{app}"; Flags: ignoreversion +Source: "Bitsquare\runtime\jre\bin\plugin2\msvcr100.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "Bitsquare\runtime\jre\bin\msvcp100.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "Bitsquare\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs [Icons]