Skip to content

Commit d0e065d

Browse files
author
Sven Marquardt
committed
Ignore flatpak files
Signed-off-by: Sven Marquardt <[email protected]>
1 parent cba891d commit d0e065d

File tree

2 files changed

+34
-8
lines changed

2 files changed

+34
-8
lines changed

Diff for: .gitignore

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
2+
# Created by https://www.gitignore.io/api/flatpak
3+
4+
#!! ERROR: flatpak is undefined. Use list command to see defined gitignore types !!#
5+
.flatpak-builder
6+
build-dir
7+
8+
# End of https://www.gitignore.io/api/flatpak

Diff for: cc.arduino.arduinoide.json

+26-8
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
"runtime": "org.freedesktop.Platform",
44
"runtime-version": "1.6",
55
"sdk": "org.freedesktop.Sdk",
6-
"sdk-extensions": [
7-
"org.freedesktop.Sdk.Extension.openjdk10"
8-
],
96
"rename-icon": "arduino",
107
"build-options": {
118
"cflags": "-O2 -g",
@@ -26,31 +23,52 @@
2623
"/lib/pkgconfig",
2724
"/share/aclocal",
2825
"/share/info",
29-
"/share/man"
26+
"/share/man",
27+
"/var/lib/openjdk8"
3028
],
3129
"modules": [
3230
{
3331
"name": "openjdk",
3432
"buildsystem": "simple",
33+
"sources":[
34+
{
35+
"type": "archive",
36+
"url": "https://api.adoptopenjdk.net/v2/binary/releases/openjdk8?openjdk_impl=hotspot&os=linux&arch=x64&release=latest&type=jdk",
37+
"only-arches": ["x86_64"],
38+
"dest-filename": "openjdk8.tar.gz",
39+
"sha256": "228d85bef36f5893885b52cb571101418c4f8b87c689996ace55d85b720b2a12"
40+
41+
},
42+
{
43+
"type": "archive",
44+
"url": "https://api.adoptopenjdk.net/v2/binary/releases/openjdk8?openjdk_impl=hotspot&os=linux&arch=aarch64&release=latest&type=jdk",
45+
"only-arches": ["arm"],
46+
"dest-filename": "openjdk8.tar.gz",
47+
"sha256": "6b35092d97779a970c48b27e70d88e5f459444a6845191cf57677df4bc99e37e"
48+
49+
}
50+
],
3551
"build-commands": [
36-
"/usr/lib/sdk/openjdk10/install.sh"
52+
"mv jdk8* openjdk8",
53+
"mv openjdk8 /var/lib/"
3754
]
3855
},
3956
{
4057
"name": "arduino",
4158
"buildsystem": "simple",
4259
"build-options": {
4360
"env": {
44-
"PATH": "/usr/bin:/usr/lib/sdk/openjdk10/jvm/openjdk-10/bin",
45-
"JAVA_HOME": "/usr/lib/sdk/openjdk10/jvm/openjdk-10"
61+
"PATH": "/usr/bin:/var/lib/openjdk8/bin",
62+
"JAVA_HOME": "/var/lib/openjdk8"
4663
}
4764
},
4865
"build-commands": [
4966
"./ant/bin/ant --execdebug build",
5067
"mkdir -p /app/bin /app/Arduino",
5168
"cp -a linux/work/* /app/Arduino",
5269
"ln -s /app/Arduino/arduino /app/bin",
53-
"ln -s /app/jre /app/Arduino",
70+
"mv /var/lib/openjdk8/jre /var/lib/",
71+
"ln -s /var/lib/jre /app/Arduino",
5472
"mv /app/Arduino/jre /app/Arduino/java",
5573
"mkdir -p /app/share/icons/hicolor",
5674
"cp -a /app/Arduino/lib/icons/* /app/share/icons/hicolor",

0 commit comments

Comments
 (0)