diff --git a/build_create_app_win.bat b/build_create_app_win.bat deleted file mode 100644 index 7dc0da8324..0000000000 --- a/build_create_app_win.bat +++ /dev/null @@ -1,21 +0,0 @@ -mvn clean package -DskipTests -Dmaven.javadoc.skip=true -cp gui\target\shaded.jar gui\updatefx\builds\1.jar - -:: edit url -java -jar ./updatefx/updatefx-app-1.2.jar --url=http://localhost:8000/ gui/updatefx - -echo $JAVA_HOME -echo $JAVA_HOME\..\..\ - -$JAVA_HOME\bin\javapackager ^ - -deploy ^ - -BappVersion=0.1 ^ - -Bruntime="$JAVA_HOME\..\..\" ^ - -native exe ^ - -name Bitsquare ^ - -title Bitsquare ^ - -vendor Bitsquare ^ - -outdir gui\deploy ^ - -srcfiles gui\updatefx\builds\processed\1.jar ^ - -appclass io.bitsquare.app.gui.BitsquareAppMain ^ - -outfile Bitsquare \ No newline at end of file diff --git a/build_create_app_linux.sh b/package/linux/build_create_app.sh similarity index 100% rename from build_create_app_linux.sh rename to package/linux/build_create_app.sh diff --git a/build_create_app_mac.sh b/package/macosx/build_create_app.sh similarity index 100% rename from build_create_app_mac.sh rename to package/macosx/build_create_app.sh diff --git a/build_setup.sh b/package/macosx/build_setup.sh similarity index 100% rename from build_setup.sh rename to package/macosx/build_setup.sh diff --git a/build_update.sh b/package/macosx/build_update.sh similarity index 100% rename from build_update.sh rename to package/macosx/build_update.sh diff --git a/package/win/build_create_app.bat b/package/win/build_create_app.bat new file mode 100644 index 0000000000..8b173f4018 --- /dev/null +++ b/package/win/build_create_app.bat @@ -0,0 +1,7 @@ +mvn clean package -DskipTests -Dmaven.javadoc.skip=true +copy gui\target\shaded.jar gui\updatefx\builds\1.jar + +:: edit url +java -Xmx2048m -jar ./updatefx/updatefx-app-1.2.jar --url=http://localhost:8000/ gui/updatefx + +"c:\Program Files\Java\jdk1.8.0_40\bin\javapackager.exe" -deploy -BappVersion=0.1 -native exe -name Bitsquare -title Bitsquare -vendor Bitsquare -outdir gui\deploy -appclass io.bitsquare.app.gui.BitsquareAppMain -srcfiles "gui\updatefx\builds\processed\1.jar" -outfile Bitsquare -Bruntime="c:\Program Files\Java\jdk1.8.0_40\jre" diff --git a/build_setup_win.bat b/package/win/build_setup.bat similarity index 64% rename from build_setup_win.bat rename to package/win/build_setup.bat index 6f58dcf9b3..29a01337f2 100644 --- a/build_setup_win.bat +++ b/package/win/build_setup.bat @@ -1,4 +1,4 @@ -:: setup dirs +:: setup dirs mkdir gui\updatefx mkdir gui\updatefx\builds mkdir gui\updatefx\builds\processed @@ -6,9 +6,8 @@ mkdir gui\updatefx\site mkdir gui\deploy :: create key/wallet. Copy wallet to UpdateProcess or use wallet form other OS build -java -jar ./updatefx/updatefx-app-1.2.jar --url=http://localhost:8000/ gui/updatefx +java -Xmx2048m -jar ./updatefx/updatefx-app-1.2.jar --url=http://localhost:8000/ gui/updatefx :: start webserver for update data :: cd gui\updatefx\site -:: python -m SimpleHTTPServer 8000 - +:: python -m SimpleHTTPServer 8000 \ No newline at end of file diff --git a/build_update_win.bat b/package/win/build_update.bat similarity index 100% rename from build_update_win.bat rename to package/win/build_update.bat diff --git a/package/win/msvcp100.dll b/package/win/msvcp100.dll new file mode 100644 index 0000000000..68fa0d31ad Binary files /dev/null and b/package/win/msvcp100.dll differ diff --git a/package/win/msvcr100.dll b/package/win/msvcr100.dll new file mode 100644 index 0000000000..b1c3a5e77c Binary files /dev/null and b/package/win/msvcr100.dll differ diff --git a/package/win/windows/Bitsquare.iss b/package/win/windows/Bitsquare.iss new file mode 100644 index 0000000000..eacc9a7f22 --- /dev/null +++ b/package/win/windows/Bitsquare.iss @@ -0,0 +1,75 @@ +;This file will be executed next to the application bundle image +;I.e. current directory will contain folder Bitsquare with application files +[Setup] +AppId={{bitsquare}} +AppName=Bitsquare +AppVersion=0.1.1 +AppVerName=Bitsquare 0.1.1 +AppPublisher=Bitsquare +AppComments=Bitsquare +AppCopyright=Copyright (C) 2014 +AppPublisherURL=https://bitsquare.io +AppSupportURL=https://bitsquare.io +;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.1 +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\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] +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;