Skip to content

Commit 546446a

Browse files
authored
Remove hotdoc gen & exclude jgit from compiler jar (#1146)
1 parent 0e4e9f1 commit 546446a

10 files changed

Lines changed: 8 additions & 410 deletions

File tree

de.peeeq.wurstscript/build.gradle

Lines changed: 8 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -103,15 +103,18 @@ dependencies {
103103
implementation 'org.eclipse.lsp4j:org.eclipse.lsp4j:0.24.0'
104104
implementation 'org.eclipse.jdt:org.eclipse.jdt.annotation:2.1.0'
105105
implementation 'com.google.code.gson:gson:2.10.1'
106-
implementation 'org.apache.velocity:velocity:1.7'
106+
implementation 'commons-lang:commons-lang:2.6'
107107
implementation 'com.github.albfernandez:juniversalchardet:2.4.0'
108108
implementation 'com.github.inwc3:jmpq3:29b55f2c32'
109109
implementation 'com.github.inwc3:wc3libs:bab65b961b'
110-
implementation 'com.github.wurstscript:wurstsetup:393cf5ea39'
110+
implementation('com.github.wurstscript:wurstsetup:393cf5ea39') {
111+
exclude group: 'org.eclipse.jgit', module: 'org.eclipse.jgit'
112+
exclude group: 'org.eclipse.jgit', module: 'org.eclipse.jgit.ssh.apache'
113+
}
111114
implementation 'org.slf4j:slf4j-api:2.0.17'
112115
implementation 'ch.qos.logback:logback-classic:1.5.20'
113-
implementation 'org.eclipse.jgit:org.eclipse.jgit:6.7.0.202309050840-r'
114-
implementation 'org.eclipse.jgit:org.eclipse.jgit.ssh.apache:6.7.0.202309050840-r'
116+
testImplementation 'org.eclipse.jgit:org.eclipse.jgit:6.7.0.202309050840-r'
117+
testImplementation 'org.eclipse.jgit:org.eclipse.jgit.ssh.apache:6.7.0.202309050840-r'
115118
implementation 'it.unimi.dsi:fastutil:8.5.16'
116119

117120
// Smallcheck
@@ -339,27 +342,7 @@ tasks.register('create_zips') {
339342
}
340343
}
341344

342-
/** -------- Hotdoc generation -------- */
343-
344-
tasks.register('generate_hotdoc') {
345-
dependsOn 'compileJava', 'downloadAndUnzipFile'
346-
347-
doLast {
348-
ExecOperations execOps = project.services.get(ExecOperations)
349-
350-
copy {
351-
from("src/main/resources/")
352-
// Gradle 9 output classes dir
353-
into("build/classes/java/main/")
354-
}
355-
execOps.javaexec {
356-
classpath = sourceSets.main.runtimeClasspath
357-
mainClass.set('de.peeeq.wurstio.Main')
358-
args("--hotdoc", "./build/deps/", "../downloads/hotdoc")
359-
}
360-
}
361-
}
362-
345+
// TODO add a modern documentation generator replacement for the removed legacy hotdoc pipeline.
363346
tasks.named("coveralls") {
364347
notCompatibleWithConfigurationCache("coveralls plugin task uses Project at execution time")
365348
}

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/Main.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import de.peeeq.wurstio.compilationserver.WurstServer;
88
import de.peeeq.wurstio.gui.AboutDialog;
99
import de.peeeq.wurstio.gui.WurstGuiImpl;
10-
import de.peeeq.wurstio.hotdoc.HotdocGenerator;
1110
import de.peeeq.wurstio.languageserver.LanguageServerStarter;
1211
import de.peeeq.wurstio.languageserver.ProjectConfigBuilder;
1312
import de.peeeq.wurstio.languageserver.WFile;
@@ -97,12 +96,6 @@ public static void main(String[] args) {
9796
return;
9897
}
9998

100-
if (runArgs.createHotDoc()) {
101-
HotdocGenerator hg = new HotdocGenerator(runArgs.getFiles());
102-
hg.generateDoc();
103-
return;
104-
}
105-
10699
if (runArgs.isGui()) {
107100
gui = new WurstGuiImpl();
108101
// use the error reporting with GUI

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/hotdoc/HotdocGenerator.java

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

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/hotdoc/package-info.java

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

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstscript/RunArgs.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ public class RunArgs {
3131
private final RunOption optionRuntests;
3232
private final RunOption optionGui;
3333
private final RunOption optionAbout;
34-
private final RunOption optionHotdoc;
3534
private final RunOption optionShowErrors;
3635
private final RunOption optionRunCompileTimeFunctions;
3736
private final RunOption optionStacktraces;
@@ -107,7 +106,6 @@ public RunArgs(String... args) {
107106
optionFixInstall = addOption("-fixInstallation", "Checks your wc3 installation and applies compatibility fixes");
108107
optionCopyMap = addOption("-copyMap", "copies map");
109108
optionStartServer = addOption("-startServer", "Starts the compilation server.");
110-
optionHotdoc = addOption("-hotdoc", "Generate hotdoc html documentation.");
111109
optionShowErrors = addOption("-showerrors", "(currently not implemented.) Show errors generated by last compile.");
112110
optionExtractImports = addOptionWithArg("-extractImports", "Extract all files from a map into a folder next to the mapp.", arg -> mapFile = arg);
113111
optionShowVersion = addOption("-version", "Shows the version of the compiler");
@@ -253,10 +251,6 @@ public boolean runCompiletimeFunctions() {
253251
}
254252

255253

256-
public boolean createHotDoc() {
257-
return optionHotdoc.isSet;
258-
}
259-
260254
public boolean isNullsetting() {
261255
return isOptimize();
262256
}

0 commit comments

Comments
 (0)