From 54c2afe3d125867f30f00a654834453dc620d122 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Mon, 11 May 2015 00:37:31 +0200 Subject: [PATCH] os-specific installer modules --- README.md | 2 +- .../package/linux/Cryptomator.png | Bin .../package/linux/control | 0 .../package/linux/copyright | 0 main/installer-linux/pom.xml | 58 +++++++ .../package/macosx/Cryptomator-Volume.icns | Bin .../package/macosx/Cryptomator-background.png | Bin .../package/macosx/Cryptomator.icns | Bin .../package/macosx/Info.plist | 0 main/installer-osx/pom.xml | 58 +++++++ .../windows/Cryptomator-setup-icon.bmp | Bin .../package/windows/Cryptomator.ico | Bin .../package/windows/Cryptomator.iss} | 148 +++++++++--------- main/installer-win-portable/pom.xml | 60 +++++++ .../windows/Cryptomator-setup-icon.bmp} | Bin .../package/windows/Cryptomator.ico} | Bin .../package/windows/Cryptomator.iss | 0 main/installer-win/pom.xml | 58 +++++++ main/pom.xml | 27 ++++ main/ui/pom.xml | 90 +---------- 20 files changed, 340 insertions(+), 161 deletions(-) rename main/{ui => installer-linux}/package/linux/Cryptomator.png (100%) rename main/{ui => installer-linux}/package/linux/control (100%) rename main/{ui => installer-linux}/package/linux/copyright (100%) create mode 100644 main/installer-linux/pom.xml rename main/{ui => installer-osx}/package/macosx/Cryptomator-Volume.icns (100%) rename main/{ui => installer-osx}/package/macosx/Cryptomator-background.png (100%) rename main/{ui => installer-osx}/package/macosx/Cryptomator.icns (100%) rename main/{ui => installer-osx}/package/macosx/Info.plist (100%) create mode 100644 main/installer-osx/pom.xml rename main/{ui => installer-win-portable}/package/windows/Cryptomator-setup-icon.bmp (100%) rename main/{ui => installer-win-portable}/package/windows/Cryptomator.ico (100%) rename main/{ui/package/windows/Cryptomator-Portable.iss => installer-win-portable/package/windows/Cryptomator.iss} (95%) create mode 100644 main/installer-win-portable/pom.xml rename main/{ui/package/windows/Cryptomator-Portable-setup-icon.bmp => installer-win/package/windows/Cryptomator-setup-icon.bmp} (100%) rename main/{ui/package/windows/Cryptomator-Portable.ico => installer-win/package/windows/Cryptomator.ico} (100%) rename main/{ui => installer-win}/package/windows/Cryptomator.iss (100%) create mode 100644 main/installer-win/pom.xml diff --git a/README.md b/README.md index 3325b88f6..c5046fdc3 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ apt-get install oracle-java8-installer oracle-java8-unlimited-jce-policy fakeroo git clone https://github.com/cryptomator/cryptomator.git cd cryptomator/main git checkout v0.6.0 -mvn clean install +mvn clean install -Pdebian ``` ## License diff --git a/main/ui/package/linux/Cryptomator.png b/main/installer-linux/package/linux/Cryptomator.png similarity index 100% rename from main/ui/package/linux/Cryptomator.png rename to main/installer-linux/package/linux/Cryptomator.png diff --git a/main/ui/package/linux/control b/main/installer-linux/package/linux/control similarity index 100% rename from main/ui/package/linux/control rename to main/installer-linux/package/linux/control diff --git a/main/ui/package/linux/copyright b/main/installer-linux/package/linux/copyright similarity index 100% rename from main/ui/package/linux/copyright rename to main/installer-linux/package/linux/copyright diff --git a/main/installer-linux/pom.xml b/main/installer-linux/pom.xml new file mode 100644 index 000000000..8ee11dd09 --- /dev/null +++ b/main/installer-linux/pom.xml @@ -0,0 +1,58 @@ + + 4.0.0 + + org.cryptomator + main + 0.7.0-SNAPSHOT + + installer-debian + pom + Cryptomator Debian installer + + + Cryptomator + org.cryptomator.ui.Cryptomator + ${java.home}/../lib/ant-javafx.jar + + + + + org.cryptomator + ui + + + + + + + maven-antrun-plugin + 1.7 + + + create-deployment-bundle + install + + run + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/main/ui/package/macosx/Cryptomator-Volume.icns b/main/installer-osx/package/macosx/Cryptomator-Volume.icns similarity index 100% rename from main/ui/package/macosx/Cryptomator-Volume.icns rename to main/installer-osx/package/macosx/Cryptomator-Volume.icns diff --git a/main/ui/package/macosx/Cryptomator-background.png b/main/installer-osx/package/macosx/Cryptomator-background.png similarity index 100% rename from main/ui/package/macosx/Cryptomator-background.png rename to main/installer-osx/package/macosx/Cryptomator-background.png diff --git a/main/ui/package/macosx/Cryptomator.icns b/main/installer-osx/package/macosx/Cryptomator.icns similarity index 100% rename from main/ui/package/macosx/Cryptomator.icns rename to main/installer-osx/package/macosx/Cryptomator.icns diff --git a/main/ui/package/macosx/Info.plist b/main/installer-osx/package/macosx/Info.plist similarity index 100% rename from main/ui/package/macosx/Info.plist rename to main/installer-osx/package/macosx/Info.plist diff --git a/main/installer-osx/pom.xml b/main/installer-osx/pom.xml new file mode 100644 index 000000000..0dc90b1c4 --- /dev/null +++ b/main/installer-osx/pom.xml @@ -0,0 +1,58 @@ + + 4.0.0 + + org.cryptomator + main + 0.7.0-SNAPSHOT + + installer-osx + pom + Cryptomator Mac OS X installer + + + Cryptomator + org.cryptomator.ui.Cryptomator + ${java.home}/../lib/ant-javafx.jar + + + + + org.cryptomator + ui + + + + + + + maven-antrun-plugin + 1.7 + + + create-deployment-bundle + install + + run + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/main/ui/package/windows/Cryptomator-setup-icon.bmp b/main/installer-win-portable/package/windows/Cryptomator-setup-icon.bmp similarity index 100% rename from main/ui/package/windows/Cryptomator-setup-icon.bmp rename to main/installer-win-portable/package/windows/Cryptomator-setup-icon.bmp diff --git a/main/ui/package/windows/Cryptomator.ico b/main/installer-win-portable/package/windows/Cryptomator.ico similarity index 100% rename from main/ui/package/windows/Cryptomator.ico rename to main/installer-win-portable/package/windows/Cryptomator.ico diff --git a/main/ui/package/windows/Cryptomator-Portable.iss b/main/installer-win-portable/package/windows/Cryptomator.iss similarity index 95% rename from main/ui/package/windows/Cryptomator-Portable.iss rename to main/installer-win-portable/package/windows/Cryptomator.iss index bbbee3d77..debf2c84f 100644 --- a/main/ui/package/windows/Cryptomator-Portable.iss +++ b/main/installer-win-portable/package/windows/Cryptomator.iss @@ -1,74 +1,74 @@ -;This file will be executed next to the application bundle image -;I.e. current directory will contain folder APPLICATION_NAME with application files -[Setup] -AppId={{PRODUCT_APP_IDENTIFIER}} -AppName=APPLICATION_NAME -AppVersion=APPLICATION_VERSION -AppVerName=APPLICATION_NAME APPLICATION_VERSION -AppPublisher=APPLICATION_VENDOR -AppComments=APPLICATION_COMMENTS -AppCopyright=APPLICATION_COPYRIGHT -AppPublisherURL=https://cryptomator.org/ -;AppSupportURL=http://java.com/ -;AppUpdatesURL=http://java.com/ -DefaultDirName=APPLICATION_INSTALL_ROOT\APPLICATION_NAME -DisableStartupPrompt=Yes -DisableDirPage=No -DisableProgramGroupPage=Yes -DisableReadyPage=Yes -DisableFinishedPage=No -DisableWelcomePage=Yes -DefaultGroupName=APPLICATION_GROUP -;Optional License -LicenseFile=APPLICATION_LICENSE_FILE -;WinXP or above -MinVersion=0,5.1 -OutputBaseFilename=INSTALLER_FILE_NAME -Compression=lzma -SolidCompression=yes -PrivilegesRequired=admin -SetupIconFile=APPLICATION_NAME\APPLICATION_NAME.ico -UninstallDisplayIcon={app}\APPLICATION_NAME.ico -UninstallDisplayName=APPLICATION_NAME -WizardImageStretch=No -WizardSmallImageFile=Cryptomator-Portable-setup-icon.bmp -WizardImageBackColor=$ffffff -ArchitecturesInstallIn64BitMode=ARCHITECTURE_BIT_MODE - -[Languages] -Name: "english"; MessagesFile: "compiler:Default.isl" - -[Files] -Source: "APPLICATION_NAME\APPLICATION_NAME.exe"; DestDir: "{app}"; Flags: ignoreversion -Source: "APPLICATION_NAME\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs - -[Icons] -Name: "{group}\APPLICATION_NAME"; Filename: "{app}\APPLICATION_NAME.exe"; IconFilename: "{app}\APPLICATION_NAME.ico"; Check: APPLICATION_MENU_SHORTCUT() -Name: "{commondesktop}\APPLICATION_NAME"; Filename: "{app}\APPLICATION_NAME.exe"; IconFilename: "{app}\APPLICATION_NAME.ico"; Check: APPLICATION_DESKTOP_SHORTCUT() - -[Run] -Filename: "{app}\RUN_FILENAME.exe"; Description: "{cm:LaunchProgram,APPLICATION_NAME}"; Flags: nowait postinstall skipifsilent; Check: APPLICATION_NOT_SERVICE() -Filename: "{app}\RUN_FILENAME.exe"; Parameters: "-install -svcName ""APPLICATION_NAME"" -svcDesc ""APPLICATION_DESCRIPTION"" -mainExe ""APPLICATION_LAUNCHER_FILENAME"" START_ON_INSTALL RUN_AT_STARTUP"; Check: APPLICATION_SERVICE() - -[UninstallRun] -Filename: "{app}\RUN_FILENAME.exe "; Parameters: "-uninstall -svcName APPLICATION_NAME STOP_ON_UNINSTALL"; Check: APPLICATION_SERVICE() - -[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; +;This file will be executed next to the application bundle image +;I.e. current directory will contain folder APPLICATION_NAME with application files +[Setup] +AppId={{PRODUCT_APP_IDENTIFIER}} +AppName=APPLICATION_NAME +AppVersion=APPLICATION_VERSION +AppVerName=APPLICATION_NAME APPLICATION_VERSION +AppPublisher=APPLICATION_VENDOR +AppComments=APPLICATION_COMMENTS +AppCopyright=APPLICATION_COPYRIGHT +AppPublisherURL=https://cryptomator.org/ +;AppSupportURL=http://java.com/ +;AppUpdatesURL=http://java.com/ +DefaultDirName=APPLICATION_INSTALL_ROOT\APPLICATION_NAME +DisableStartupPrompt=Yes +DisableDirPage=No +DisableProgramGroupPage=Yes +DisableReadyPage=Yes +DisableFinishedPage=No +DisableWelcomePage=Yes +DefaultGroupName=APPLICATION_GROUP +;Optional License +LicenseFile=APPLICATION_LICENSE_FILE +;WinXP or above +MinVersion=0,5.1 +OutputBaseFilename=INSTALLER_FILE_NAME +Compression=lzma +SolidCompression=yes +PrivilegesRequired=admin +SetupIconFile=APPLICATION_NAME\APPLICATION_NAME.ico +UninstallDisplayIcon={app}\APPLICATION_NAME.ico +UninstallDisplayName=APPLICATION_NAME +WizardImageStretch=No +WizardSmallImageFile=Cryptomator-setup-icon.bmp +WizardImageBackColor=$ffffff +ArchitecturesInstallIn64BitMode=ARCHITECTURE_BIT_MODE + +[Languages] +Name: "english"; MessagesFile: "compiler:Default.isl" + +[Files] +Source: "APPLICATION_NAME\APPLICATION_NAME.exe"; DestDir: "{app}"; Flags: ignoreversion +Source: "APPLICATION_NAME\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs + +[Icons] +Name: "{group}\APPLICATION_NAME"; Filename: "{app}\APPLICATION_NAME.exe"; IconFilename: "{app}\APPLICATION_NAME.ico"; Check: APPLICATION_MENU_SHORTCUT() +Name: "{commondesktop}\APPLICATION_NAME"; Filename: "{app}\APPLICATION_NAME.exe"; IconFilename: "{app}\APPLICATION_NAME.ico"; Check: APPLICATION_DESKTOP_SHORTCUT() + +[Run] +Filename: "{app}\RUN_FILENAME.exe"; Description: "{cm:LaunchProgram,APPLICATION_NAME}"; Flags: nowait postinstall skipifsilent; Check: APPLICATION_NOT_SERVICE() +Filename: "{app}\RUN_FILENAME.exe"; Parameters: "-install -svcName ""APPLICATION_NAME"" -svcDesc ""APPLICATION_DESCRIPTION"" -mainExe ""APPLICATION_LAUNCHER_FILENAME"" START_ON_INSTALL RUN_AT_STARTUP"; Check: APPLICATION_SERVICE() + +[UninstallRun] +Filename: "{app}\RUN_FILENAME.exe "; Parameters: "-uninstall -svcName APPLICATION_NAME STOP_ON_UNINSTALL"; Check: APPLICATION_SERVICE() + +[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; diff --git a/main/installer-win-portable/pom.xml b/main/installer-win-portable/pom.xml new file mode 100644 index 000000000..af8c84cf1 --- /dev/null +++ b/main/installer-win-portable/pom.xml @@ -0,0 +1,60 @@ + + 4.0.0 + + org.cryptomator + main + 0.7.0-SNAPSHOT + + installer-win-portable + pom + Cryptomator (Portable) Windows installer + + + Cryptomator + org.cryptomator.ui.Cryptomator + ${java.home}/../lib/ant-javafx.jar + + + + + org.cryptomator + ui + + + + + + + maven-antrun-plugin + 1.7 + + + create-deployment-bundle + install + + run + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/main/ui/package/windows/Cryptomator-Portable-setup-icon.bmp b/main/installer-win/package/windows/Cryptomator-setup-icon.bmp similarity index 100% rename from main/ui/package/windows/Cryptomator-Portable-setup-icon.bmp rename to main/installer-win/package/windows/Cryptomator-setup-icon.bmp diff --git a/main/ui/package/windows/Cryptomator-Portable.ico b/main/installer-win/package/windows/Cryptomator.ico similarity index 100% rename from main/ui/package/windows/Cryptomator-Portable.ico rename to main/installer-win/package/windows/Cryptomator.ico diff --git a/main/ui/package/windows/Cryptomator.iss b/main/installer-win/package/windows/Cryptomator.iss similarity index 100% rename from main/ui/package/windows/Cryptomator.iss rename to main/installer-win/package/windows/Cryptomator.iss diff --git a/main/installer-win/pom.xml b/main/installer-win/pom.xml new file mode 100644 index 000000000..db978f30a --- /dev/null +++ b/main/installer-win/pom.xml @@ -0,0 +1,58 @@ + + 4.0.0 + + org.cryptomator + main + 0.7.0-SNAPSHOT + + installer-win + pom + Cryptomator Windows installer + + + Cryptomator + org.cryptomator.ui.Cryptomator + ${java.home}/../lib/ant-javafx.jar + + + + + org.cryptomator + ui + + + + + + + maven-antrun-plugin + 1.7 + + + create-deployment-bundle + install + + run + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/main/pom.xml b/main/pom.xml index 20d1e2021..b9ff254b0 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -186,6 +186,33 @@ ui + + + debian + + installer-debian + + + + osx + + installer-osx + + + + win + + installer-win + + + + win-portable + + installer-win-portable + + + + diff --git a/main/ui/pom.xml b/main/ui/pom.xml index 7a5ed1117..c018282e5 100644 --- a/main/ui/pom.xml +++ b/main/ui/pom.xml @@ -17,12 +17,6 @@ ui Cryptomator GUI - - Cryptomator - org.cryptomator.ui.Cryptomator - ${java.home}/../lib/ant-javafx.jar - - org.cryptomator @@ -59,7 +53,7 @@ guice - + @@ -74,96 +68,20 @@ + ${project.parent.build.directory} + Cryptomator-${project.parent.version} jar-with-dependencies - ${javafx.application.name} false - ${exec.mainClass} + org.cryptomator.ui.Cryptomator ${project.version} - - - maven-antrun-plugin - 1.7 - - - create-deployment-bundle - install - - run - - - - - - - - - - - - - - - - - - - - - - - - - portable-win - - - Windows - - - - - - maven-antrun-plugin - 1.7 - - - create-portable-deployment-bundle - install - - run - - - - - - - - - - - - - - - - - - - - - - - - - -