Skip to content

Commit d057c46

Browse files
committed
Java Mode resources and Libraries
1 parent 0962013 commit d057c46

15 files changed

+35
-105
lines changed

.idea/modules.xml

Lines changed: 0 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle.kts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ tasks.register<Copy>("unzipJDK") {
141141
tarTree(dl.dest)
142142
}
143143

144-
from(archive){ eachFile{ file.setWritable(true, false) } }
144+
from(archive){ eachFile{ permissions{ unix("755") } } }
145145
into(layout.buildDirectory.dir("resources-bundled/common"))
146146
}
147147
tasks.register<Copy>("copyShared"){
@@ -161,6 +161,12 @@ tasks.register<Copy>("unzipExamples") {
161161
}
162162
into(layout.buildDirectory.dir("resources-bundled/common/modes/java/examples"))
163163
}
164+
tasks.register<Copy>("copyJavaMode"){
165+
dependsOn("unzipExamples")
166+
dependsOn(project(":java").tasks.named("extraResources"))
167+
from(project(":java").layout.buildDirectory.dir("resources-bundled"))
168+
into(layout.buildDirectory.dir("resources-bundled"))
169+
}
164170

165171
afterEvaluate {
166172
tasks.findByName("prepareAppResources")?.dependsOn("unzipJDK","copyShared", "copyCore", "unzipExamples")

java/build.gradle.kts

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,25 @@ tasks.compileJava{
4343
options.encoding = "UTF-8"
4444
}
4545

46-
// TODO: This is a temporary workaround until the resources are properly handled
4746
tasks.register<Copy>("extraResources"){
4847
from(".")
4948
include("keywords.txt")
50-
into("build/resources/main")
49+
include("theme/**/*")
50+
include("application/**/*")
51+
into( layout.buildDirectory.dir("resources-bundled/common/modes/java"))
52+
}
53+
54+
val libraries = arrayOf("dxf","io","net","pdf","serial","svg")
55+
libraries.forEach { library ->
56+
tasks.register<Copy>("library-$library-extraResources"){
57+
dependsOn(project(":java:libraries:$library").tasks.named("build"))
58+
from("libraries/$library")
59+
include("*.properties")
60+
include("library/**/*")
61+
include("examples/**/*")
62+
into( layout.buildDirectory.dir("resources-bundled/common/modes/java/libraries/$library"))
63+
}
64+
tasks.named("extraResources"){ dependsOn("library-$library-extraResources") }
5165
}
5266
tasks.jar { dependsOn("extraResources") }
5367
tasks.processResources{ finalizedBy("extraResources") }
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ant.importBuild("build.xml")

java/libraries/dxf/processing4-dxf.iml

Lines changed: 0 additions & 13 deletions
This file was deleted.

java/libraries/io/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ant.importBuild("build.xml")
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ant.importBuild("build.xml")

java/libraries/net/processing4-net.iml

Lines changed: 0 additions & 13 deletions
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ant.importBuild("build.xml")

java/libraries/pdf/processing4-pdf.iml

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)