Commit Graph

348 Commits

Author SHA1 Message Date
Armin Schrenk
d8b71db8e5
bump metainfo.xml 2022-12-06 15:27:17 +01:00
Sebastian Stenzel
ba7029968d try fixing dpkg-shlibdeps: error: cannot find library libgtk-x11-2.0.so.0 ... 2022-11-30 11:16:38 +01:00
Sebastian Stenzel
a3fc68ab6f jlink javafx.* modules from arch-dependent jmod path 2022-11-30 11:16:38 +01:00
Sebastian Stenzel
abf944a130 add required openjfx jmods to debian source package 2022-11-30 11:16:38 +01:00
Sebastian Stenzel
6325c6f450
fixed java options required for panama 2022-11-25 14:42:18 +01:00
Armin Schrenk
dd79b46d72
add --enable-preview flag to java runtime options 2022-11-25 12:21:37 +01:00
Armin Schrenk
1b0eb34734
set loopback alias via parameter in ps1 script 2022-11-21 13:46:12 +01:00
Armin Schrenk
79952418f4
only use lower characters in loopback alias 2022-11-21 13:26:14 +01:00
Armin Schrenk
65e26971ff
make loopback alias depend on appName 2022-11-21 13:12:32 +01:00
Armin Schrenk
13debaafbe
set loopback alias in Cryptomator app during build time 2022-11-18 13:34:38 +01:00
Armin Schrenk
043184cf53
set loopback device alias during build
instead of hardcode
2022-11-18 12:36:10 +01:00
Armin Schrenk
38062f9a8d
Move Cryptomator installer defaults to actual installer file 2022-11-18 11:32:39 +01:00
Armin Schrenk
14d0d95f23
add variable to skip legacy check in installer 2022-11-18 11:20:51 +01:00
Armin Schrenk
fbe33e21fb
Fixes #2498
Bump winfsp for windows bundle distribution
2022-11-03 10:16:53 +01:00
Sebastian Stenzel
1f01923169
build on Ubuntu Focal 2022-10-14 13:44:50 +02:00
Sebastian Stenzel
6367cc2dfb
depend on coffeelibs-jdk-19 2022-10-14 13:10:37 +02:00
Julian Raufelder
26ecd67a79
Update linux common metainfo.xml file 2022-10-11 15:33:44 +02:00
Armin Schrenk
67dd1548cc
finalize release 2022-08-31 15:47:23 +02:00
Ralph Plawetzki
8290df9ea6
Pass on CLI parameters for Cryptomator started as an AppImage or installed from PPA
Fixes #2301
2022-08-01 18:17:41 +02:00
Armin Schrenk
57110ff417
add release to metainfo 2022-07-27 11:57:45 +02:00
Armin Schrenk
d5bdea4a75
fix debian build script
Fixes #2352
2022-07-27 11:57:00 +02:00
Armin Schrenk
9209e7698c
add release info to linux metainfo file 2022-07-26 13:23:31 +02:00
Armin Schrenk
8662abae5a
Merge branch 'feature/hub' into develop
# Conflicts:
#	.idea/runConfigurations/Cryptomator_Windows.xml
#	.idea/runConfigurations/Cryptomator_Windows_Dev.xml
#	dist/win/build.ps1
#	src/main/java/org/cryptomator/common/Environment.java
2022-07-26 12:29:33 +02:00
Armin Schrenk
f7ddb6e714
Update and deduplicate winfsp download link
Fixes #2117
2022-07-18 14:56:39 +02:00
Armin Schrenk
d814c1cfca
Update integrations-win lib (#2331)
* update to integrations-win 1.1.2

* refactor environment class to reduce maintenance

* fix test

Co-authored-by: Sebastian Stenzel <overheadhunter@users.noreply.github.com>
2022-07-11 15:59:54 +02:00
Armin Schrenk
45f038bae2
Merge branch 'develop' into feature/hub
# Conflicts:
#	dist/mac/dmg/build.sh
#	dist/win/build.ps1
#	pom.xml
2022-06-22 09:55:02 +02:00
Tobias Hagemann
5233e6b690
improved cleanup in manual build script for macos
[ci skip]
2022-05-17 18:33:02 +02:00
Sebastian Stenzel
90f523bee8
parameterize patchWebDAV.ps1 and add default values to .bat file (#2251)
Co-authored-by: Armin Schrenk <armin.schrenk@skymatic.de>
2022-05-13 15:11:41 +02:00
Tobias Hagemann
78bb996072
updated integrations-mac dependency 2022-05-13 13:42:40 +02:00
Tobias Hagemann
773a5d3570
Merge pull request #2244 from cryptomator/feature/parameterize-mac-build-script
Parameterized macOS build script
2022-05-12 16:19:14 +02:00
Armin Schrenk
75093f1c09
Make lauchner class configurable 2022-05-12 16:12:20 +02:00
Tobias Hagemann
0351595243
parameterized MODULE_AND_MAIN_CLASS 2022-05-12 16:07:47 +02:00
Armin Schrenk
3e6d81ef1b
Use parameter for main jar glob pattern 2022-05-12 09:15:04 +02:00
Tobias Hagemann
852daaa88e
parameterized mac build script 2022-05-12 09:14:10 +02:00
Armin Schrenk
7dfc4d9ded
allow custom name for c9r/c9s icon file 2022-05-12 09:14:03 +02:00
Armin Schrenk
80696972cb
allow upgrade-uuid to be customized in build script 2022-05-11 13:00:32 +02:00
Armin Schrenk
0f88e6c2fe
fix errors 2022-05-11 12:48:56 +02:00
Armin Schrenk
3524f273de
Merge branch 'develop' into feature/parameterize-win-build-script
# Conflicts:
#	dist/win/build.ps1
2022-05-11 12:48:31 +02:00
Armin Schrenk
fb3d64c43f
update integrations-win dependency 2022-05-11 12:41:33 +02:00
Armin Schrenk
90d43f28d9
eradicate last hard coded app name occurences in build script 2022-05-11 12:25:53 +02:00
Armin Schrenk
a29f10a504
refactor build scipt to be easiert customizable 2022-05-11 12:22:29 +02:00
Armin Schrenk
6702747652
separate cryptomator labels and asset paths from installer file 2022-05-10 18:35:04 +02:00
Armin Schrenk
a8b920698d
Generify error message in installer 2022-05-10 16:32:59 +02:00
Julian Raufelder
12ef32835c
Prepare 1.6.10
[ci skip]
2022-05-03 16:15:33 +02:00
Sebastian Stenzel
9f0e269baf
Merge branch 'develop' into feature/hub
# Conflicts:
#	pom.xml
#	src/main/resources/license/THIRD-PARTY.txt
2022-04-28 12:55:55 +02:00
Sebastian Stenzel
0a8cc7ed1e
Merge branch 'develop' into release/1.6.9 2022-04-27 13:19:41 +02:00
Sebastian Stenzel
3c376c4bf6
add -Dsun.java2d.metal=true, which fixes #2194 2022-04-27 13:18:25 +02:00
Armin Schrenk
8f97235b9a
Merge pull request #2189 from cryptomator/feature/on-the-fly-license
Generate app license on release/ installer build and remove commited third party file
2022-04-27 13:05:53 +02:00
Julian Raufelder
d127121007
Update metainfo.xml to 1.6.9
[ci skip]
2022-04-26 19:51:43 +02:00
Armin Schrenk
98b3b14e6a
Reverted bundle license to show links again and adjusted license template
* only those are depicted as clickable http links
2022-04-26 17:48:05 +02:00
Sebastian Stenzel
d1c4eda072
Merge branch 'develop' into feature/hub
# Conflicts:
#	.github/workflows/appimage.yml
#	dist/linux/appimage/build.sh
#	dist/linux/debian/rules
#	dist/mac/dmg/build.sh
#	dist/win/build.ps1
2022-04-25 15:30:56 +02:00
Tobias Hagemann
4d7e16d58e
updated license templates 2022-04-22 12:34:25 +02:00
Armin Schrenk
2f17d80fe6
Revert "removed license dir, renamed merge file and adjusted paths"
This reverts commit d053367f83.
2022-04-22 11:51:22 +02:00
Armin Schrenk
d053367f83
removed license dir, renamed merge file and adjusted paths 2022-04-22 09:49:04 +02:00
Armin Schrenk
c1801e3d22
fixed typo 2022-04-20 12:12:25 +02:00
Armin Schrenk
bff0194f3e
Fixed wrong file format and url of lcense merge file 2022-04-20 12:12:00 +02:00
Armin Schrenk
4d1d6f449e
Apply suggestions from code review
Co-authored-by: Sebastian Stenzel <overheadhunter@users.noreply.github.com>
2022-04-20 10:31:25 +02:00
Armin Schrenk
51d715caa1
apply same config to license generation 2022-04-19 16:47:33 +02:00
Tobias Hagemann
dc3894290b
updated license template for macos, fixed manual build script 2022-04-14 13:52:10 +02:00
Armin Schrenk
597bbdbdb8
for mac build generate license on the fly
References 7172462b4b
2022-04-13 17:53:44 +02:00
Sebastian Stenzel
2108a77e12
adjusted build scripts for Cryptomator Hub 2022-04-08 20:45:22 +02:00
Sebastian Stenzel
2ce7e84e3c
Merge branch 'develop' into feature/gtk2-launcher 2022-04-04 06:58:07 +02:00
Sebastian Stenzel
ec2524f6ff
use correct StartupWMClass (fixes #1955)
[ci skip]
2022-04-02 10:06:15 +02:00
Sebastian Stenzel
27d4e00210
Merge branch 'develop' into feature/gtk2-launcher 2022-04-02 10:01:25 +02:00
Armin Schrenk
a4c50da222
replicate naming scheme of win exe installer in CI job to local build 2022-03-31 11:12:50 +02:00
Sebastian Stenzel
828f32d3f6
Merge branch 'develop' into feature/gtk2-launcher 2022-03-31 08:57:27 +02:00
Julian Raufelder
732fc2f3dd
Update metainfo.xml to 1.6.8
[ci skip]
2022-03-30 17:17:48 +02:00
Armin Schrenk
1a0624cc81
Closes #2130
Prevent Windows installation if app is running
2022-03-29 23:47:03 +02:00
Sebastian Stenzel
67e1626de0
Merge branch 'develop' into feature/gtk2-launcher 2022-03-23 10:56:01 +01:00
Sebastian Stenzel
77e2be22de
updated .gitignore
[ci skip]
2022-03-18 18:06:31 +01:00
Sebastian Stenzel
504a384225
fix envsubst 2022-03-18 17:58:21 +01:00
Sebastian Stenzel
b565f1d0c0
remove unused java binaries from jlinked runtime image 2022-03-18 17:26:28 +01:00
Sebastian Stenzel
fab70ef8c9
run Cryptomator binaries instead of java from AppImage launcher .sh 2022-03-18 17:25:04 +01:00
Ralph Plawetzki
a32f5bb6d9 Use updated Cryptomator screenshots (1.6.5)
They do appstream-util validate
2022-03-07 11:59:54 +01:00
Sebastian Stenzel
349cefcbf5
Merge pull request #2073 from cryptomator/feature/dedup-freedesktop-metadata
Deduplicate Freedesktop Metadata
2022-03-03 13:08:36 +01:00
Sebastian Stenzel
0c6f4297a2
display version as x.y.z deb-1234 instead of x.y.z ppa-1234 2022-03-03 10:40:40 +01:00
Armin Schrenk
df7d9ba79e
Update winfsp download links 2022-03-01 15:25:00 +01:00
Sebastian Stenzel
5a8aacb7c0
Merge branch 'develop' into feature/dedup-freedesktop-metadata 2022-02-28 14:16:27 +01:00
Sebastian Stenzel
f7c4fc5fda
fix .deb binary build 2022-02-28 11:00:08 +01:00
Armin Schrenk
467d9e56a0
remove resolved TODO 2022-02-25 13:24:58 +01:00
Sebastian Stenzel
8ee47aad0f
remove version entirely (should have been 1.0, but not required) 2022-02-25 09:58:47 +01:00
Sebastian Stenzel
6553e48ea3
use oars-1.1 as suggested by @x80486 2022-02-25 09:33:15 +01:00
Sebastian Stenzel
10999b2725
renamed .appdata.xml to .metainfo.xml as suggested by @x80486 2022-02-25 09:28:58 +01:00
Sebastian Stenzel
02fe63c7bc
version of the spec, not version of the software
see https://specifications.freedesktop.org/desktop-entry-spec/latest/ar01s06.html
2022-02-25 09:28:14 +01:00
Sebastian Stenzel
7d9aab46a8
fix broken path during mimetype installation 2022-02-24 16:27:28 +01:00
Sebastian Stenzel
69ff0e44f5
fix build 2022-02-24 12:00:02 +01:00
Sebastian Stenzel
ec1c255bb4
update appstream metadata 2022-02-24 10:56:36 +01:00
Sebastian Stenzel
43e936d117
rename mimetype file 2022-02-24 10:56:23 +01:00
Sebastian Stenzel
90da61e495
adjust ppa build to use "common" resources 2022-02-24 10:41:40 +01:00
Sebastian Stenzel
d38c19cffc
adjust appimage build to use "common" resources 2022-02-24 10:38:32 +01:00
Sebastian Stenzel
0556bcd576
move metadata to "common" dir 2022-02-24 10:26:37 +01:00
Armin Schrenk
771e3ab6f3
remove unused ui elements from theme bundle 2022-02-24 09:53:26 +01:00
Armin Schrenk
7172462b4b
Create installation bundle with winfsp:
* via wix burn engine
* licenses generated on the fly
* customized theme
* local only
2022-02-23 22:27:41 +01:00
Sebastian Stenzel
d6ccb41027 add modules required for JFR 2022-01-26 19:47:51 +01:00
Tobias Hagemann
3e8690ca11
removed unnecessary entitlement in mac build
[ci skip]
2022-01-12 11:01:59 +01:00
httpjamesm
f1fdd7960c
Update copyright years from 2021 to 2022 to reflect the new year (#2015) 2022-01-10 10:01:07 +01:00
Armin Schrenk
bf382d928f
Update dokan.dll [ci skip] 2022-01-05 10:53:18 +01:00
Armin Schrenk
eee672f9ee
closes #1932, closes #1931 2021-12-01 13:53:51 +01:00
Sebastian Stenzel
9f4a7c8cce
renamed scripts 2021-12-01 12:35:01 +01:00
Sebastian Stenzel
2808d777e0
Add cryptomator-vault alias to etc/hosts during (re)install (#1914)
Co-authored-by: Armin Schrenk <armin.schrenk@skymatic.de>
2021-11-29 16:37:23 +01:00
Sebastian Stenzel
71a575e079 add build scripts for windows
[ci skip]
2021-11-10 16:08:11 +01:00
Sebastian Stenzel
c5b6d8f81f
target Ubuntu Bionic in PPA release (#1909) 2021-11-10 12:20:52 +01:00
Tobias Hagemann
b565a5a3f4
added dmg step to mac build script
[ci skip]
2021-11-09 15:49:25 +01:00
what-next-github
9408117028
Including pluginDir to linux/appimage/build.sh (#1850) 2021-11-02 10:40:41 +01:00
Armin Schrenk
28d2262962
on windows allow installations only on windows 10 1803 or newer due to unix socket support 2021-10-22 19:21:10 +02:00
Armin Schrenk
ec72762548
fix windows installer 2021-10-19 18:45:25 +02:00
Armin Schrenk
39d1a3d5a6
Merge branch 'develop' into release/1.6.0 2021-10-19 15:47:17 +02:00
Tobias Hagemann
a6b50bde75
Merge pull request #1796 from PBillodeau/fix/linux-build
Relative paths in linux build are incorrect
2021-10-19 13:51:00 +02:00
Armin Schrenk
e436ce372d
Merge branch 'develop' into release/1.6.0 2021-10-08 16:35:19 +02:00
Sebastian Stenzel
6c6f6baf12
Update to JDK 17 (#1828)
fixes #1404
2021-10-08 14:59:24 +02:00
Julian Raufelder
0fb5867bd8
Merge branch 'develop' into release/1.6.0 2021-09-29 16:43:26 +02:00
Tobias Hagemann
c9907d6085
added manual build script for mac (missing: notarization, create-dmg)
[ci skip]
2021-09-28 11:45:49 +02:00
Julian Raufelder
5eac665a93
Fixes #1814
Add missing backslash while setting the pluginDir
2021-09-27 18:50:26 +02:00
PBillodeau
aa7ee65d99
Update build version variable
Add path to pom.xml and move after preconditions
2021-09-27 09:54:43 -05:00
PBillodeau
279db5ffd0
Merge branch 'cryptomator:develop' into fix/linux-build 2021-09-27 09:51:20 -05:00
PBillodeau
772e3ae68a
Apply suggestions from code review
Co-authored-by: Tobias Hagemann <tobias.hagemann@gmail.com>
2021-09-27 09:50:51 -05:00
Sebastian Stenzel
cbe26d8a4f
Merge branch 'develop' into release/1.6.0, fixing appimage version number 2021-09-23 14:04:54 +02:00
Sebastian Stenzel
d07c018670
adjust appimage launcher script to comply with appdir built during CI
fixes #1806
2021-09-23 14:01:07 +02:00
Armin Schrenk
d241f022ab
Merge branch 'develop' into release/1.6.0
# Conflicts:
#	pom.xml
2021-09-22 16:36:36 +02:00
PBillodeau
96d37096c1 Relative paths in linux build are incorrect 2021-09-18 14:07:42 -05:00
Sebastian Stenzel
9e66f4b93e
Release to PPA (#1791)
Create a Debian source package and dput it to the cryptomator-beta staging repo
2021-09-16 13:01:34 +02:00
Armin Schrenk
e482574aaf
Block windows installation if old innosetup version is installed 2021-09-15 12:16:25 +02:00
Armin Schrenk
bbb30ebe0f
keep name of icon file 2021-09-03 12:54:24 +02:00
Armin Schrenk
869407cded
Win installer: use different icon file for Cryptomator files and make c9r/c9s file extensions non executing 2021-09-02 13:30:12 +02:00
Armin Schrenk
cc6471840f
Update build for mac installer:
* use correct mime type for vault metadata
* add icons file for cryptomator files
2021-08-30 15:58:23 +02:00
Armin Schrenk
b710fd33ce
updating third party license file 2021-08-16 15:27:06 +02:00
Armin Schrenk
12720d67e8
Revert "windows installer: disallow downgrades, allow upgrades"
This reverts commit 4b9ae03bc2.
2021-08-12 15:07:53 +02:00
Armin Schrenk
d319b45fce
add file associations for msi installer 2021-08-12 14:43:10 +02:00
Armin Schrenk
4b9ae03bc2
windows installer: disallow downgrades, allow upgrades 2021-08-12 11:04:16 +02:00
Armin Schrenk
2ea2a4ecec
clean up 2021-08-04 11:41:56 +02:00
Armin Schrenk
0e7e58d144
restore accidentally removed file in 8764c81 2021-08-03 15:51:15 +02:00
Armin Schrenk
8764c814d9
Adjust windows installer build:
* add branding
* only link third party drivers, don't ship'em
* add license
2021-08-03 14:03:36 +02:00
Sebastian Stenzel
279f82415e
install create-dmg via homebrew 2021-07-23 10:54:46 +02:00
Sebastian Stenzel
89688b7d18
first attempt to create a .dmg file 2021-07-23 10:35:45 +02:00
Sebastian Stenzel
9fd9f94823
add .bat file for easier debugging on console
(see https://bugs.openjdk.java.net/browse/JDK-8253461)
2021-07-23 09:27:16 +02:00
Sebastian Stenzel
e85a989e44
minor adjustments
[ci skip]
2021-07-22 14:36:02 +02:00
Sebastian Stenzel
3563ed3394
restructured dist/ dir 2021-07-22 14:09:06 +02:00
Sebastian Stenzel
eddb9f1d85
attempt to build mac app 2021-07-22 13:48:34 +02:00
Sebastian Stenzel
c7c910f738
fixing path, fixing variable 2021-07-22 08:42:07 +02:00
Sebastian Stenzel
aa7a4dbda9
further adjustments to new directory structure 2021-07-21 12:57:45 +02:00
Sebastian Stenzel
45777b12cd
add icon to linux appdir 2021-07-20 17:51:07 +02:00
Sebastian Stenzel
559f3116f9
create app dir in matrix build 2021-07-20 17:08:08 +02:00
Sebastian Stenzel
18305ca2d6
build windows app dir 2021-07-20 13:51:03 +02:00
Sebastian Stenzel
8d17042456
updated standalone build.sh
[ci skip]
2021-07-20 12:33:35 +02:00
Sebastian Stenzel
be44dcd569
added standalone build.sh for manually building AppImages 2021-07-20 10:47:42 +02:00
Sebastian Stenzel
01a3d16007
adjust launcher sh 2021-07-20 00:23:40 +02:00
Sebastian Stenzel
6a8f975955
build appimage 2021-07-19 23:57:26 +02:00
Sebastian Stenzel
45d9cd601a
create buildkit via CI 2021-07-19 21:20:27 +02:00