Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 8 additions & 25 deletions de.peeeq.wurstscript/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -103,15 +103,18 @@ dependencies {
implementation 'org.eclipse.lsp4j:org.eclipse.lsp4j:0.24.0'
implementation 'org.eclipse.jdt:org.eclipse.jdt.annotation:2.1.0'
implementation 'com.google.code.gson:gson:2.10.1'
implementation 'org.apache.velocity:velocity:1.7'
implementation 'commons-lang:commons-lang:2.6'
implementation 'com.github.albfernandez:juniversalchardet:2.4.0'
implementation 'com.github.inwc3:jmpq3:29b55f2c32'
implementation 'com.github.inwc3:wc3libs:bab65b961b'
implementation 'com.github.wurstscript:wurstsetup:393cf5ea39'
implementation('com.github.wurstscript:wurstsetup:393cf5ea39') {
exclude group: 'org.eclipse.jgit', module: 'org.eclipse.jgit'
exclude group: 'org.eclipse.jgit', module: 'org.eclipse.jgit.ssh.apache'
}
implementation 'org.slf4j:slf4j-api:2.0.17'
implementation 'ch.qos.logback:logback-classic:1.5.20'
implementation 'org.eclipse.jgit:org.eclipse.jgit:6.7.0.202309050840-r'
implementation 'org.eclipse.jgit:org.eclipse.jgit.ssh.apache:6.7.0.202309050840-r'
testImplementation 'org.eclipse.jgit:org.eclipse.jgit:6.7.0.202309050840-r'
testImplementation 'org.eclipse.jgit:org.eclipse.jgit.ssh.apache:6.7.0.202309050840-r'
implementation 'it.unimi.dsi:fastutil:8.5.16'

// Smallcheck
Expand Down Expand Up @@ -339,27 +342,7 @@ tasks.register('create_zips') {
}
}

/** -------- Hotdoc generation -------- */

tasks.register('generate_hotdoc') {
dependsOn 'compileJava', 'downloadAndUnzipFile'

doLast {
ExecOperations execOps = project.services.get(ExecOperations)

copy {
from("src/main/resources/")
// Gradle 9 output classes dir
into("build/classes/java/main/")
}
execOps.javaexec {
classpath = sourceSets.main.runtimeClasspath
mainClass.set('de.peeeq.wurstio.Main')
args("--hotdoc", "./build/deps/", "../downloads/hotdoc")
}
}
}

// TODO add a modern documentation generator replacement for the removed legacy hotdoc pipeline.
tasks.named("coveralls") {
notCompatibleWithConfigurationCache("coveralls plugin task uses Project at execution time")
}
Expand Down
7 changes: 0 additions & 7 deletions de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import de.peeeq.wurstio.compilationserver.WurstServer;
import de.peeeq.wurstio.gui.AboutDialog;
import de.peeeq.wurstio.gui.WurstGuiImpl;
import de.peeeq.wurstio.hotdoc.HotdocGenerator;
import de.peeeq.wurstio.languageserver.LanguageServerStarter;
import de.peeeq.wurstio.languageserver.ProjectConfigBuilder;
import de.peeeq.wurstio.languageserver.WFile;
Expand Down Expand Up @@ -97,12 +96,6 @@ public static void main(String[] args) {
return;
}

if (runArgs.createHotDoc()) {
HotdocGenerator hg = new HotdocGenerator(runArgs.getFiles());
hg.generateDoc();
return;
}

if (runArgs.isGui()) {
gui = new WurstGuiImpl();
// use the error reporting with GUI
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ public class RunArgs {
private final RunOption optionRuntests;
private final RunOption optionGui;
private final RunOption optionAbout;
private final RunOption optionHotdoc;
private final RunOption optionShowErrors;
private final RunOption optionRunCompileTimeFunctions;
private final RunOption optionStacktraces;
Expand Down Expand Up @@ -107,7 +106,6 @@ public RunArgs(String... args) {
optionFixInstall = addOption("-fixInstallation", "Checks your wc3 installation and applies compatibility fixes");
optionCopyMap = addOption("-copyMap", "copies map");
optionStartServer = addOption("-startServer", "Starts the compilation server.");
optionHotdoc = addOption("-hotdoc", "Generate hotdoc html documentation.");
optionShowErrors = addOption("-showerrors", "(currently not implemented.) Show errors generated by last compile.");
optionExtractImports = addOptionWithArg("-extractImports", "Extract all files from a map into a folder next to the mapp.", arg -> mapFile = arg);
optionShowVersion = addOption("-version", "Shows the version of the compiler");
Expand Down Expand Up @@ -253,10 +251,6 @@ public boolean runCompiletimeFunctions() {
}


public boolean createHotDoc() {
return optionHotdoc.isSet;
}

public boolean isNullsetting() {
return isOptimize();
}
Expand Down
Loading
Loading