eaglercraft/eagler-teavm-fork
1
0
Fork 0
mirror of https://github.com/Eaglercraft-TeaVM-Fork/eagler-teavm.git synced 2024-12-22 16:14:10 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Adds ability to merge runtime.js into classes.js

Browse Source
This commit is contained in:
konsoletyper 2014-03-04 17:42:36 +04:00
parent 4701250154
commit a1565015c8
2 changed files with 46 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
teavm-maven-plugin/src/main/java/org/teavm/maven/BuildJavascriptMojo.java
View File

@ -33,6 +33,7 @@ import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.plugins.annotations.ResolutionScope; import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.project.MavenProject; import org.apache.maven.project.MavenProject;
import org.teavm.common.ThreadPoolFiniteExecutor; import org.teavm.common.ThreadPoolFiniteExecutor;
import org.teavm.javascript.DirectoryBuildTarget;
import org.teavm.javascript.JavascriptBuilder; import org.teavm.javascript.JavascriptBuilder;
import org.teavm.javascript.JavascriptBuilderFactory; import org.teavm.javascript.JavascriptBuilderFactory;
import org.teavm.model.ClassHolderTransformer; import org.teavm.model.ClassHolderTransformer;
@ -69,7 +70,7 @@ public class BuildJavascriptMojo extends AbstractMojo {
private String mainClass; private String mainClass;
@Parameter @Parameter
private boolean runtimeSuppressed; private RuntimeCopyOperation runtime = RuntimeCopyOperation.SEPARATE;
@Parameter @Parameter
private boolean mainPageIncluded; private boolean mainPageIncluded;
@ -103,8 +104,8 @@ public class BuildJavascriptMojo extends AbstractMojo {
this.bytecodeLogging = bytecodeLogging; this.bytecodeLogging = bytecodeLogging;
} }
public void setRuntimeSuppressed(boolean runtimeSuppressed) { public void setRuntimeCopy(RuntimeCopyOperation runtimeCopy) {
this.runtimeSuppressed = runtimeSuppressed; this.runtime = runtimeCopy;
} }
public void setMainPageIncluded(boolean mainPageIncluded) { public void setMainPageIncluded(boolean mainPageIncluded) {
@ -156,10 +157,16 @@ public class BuildJavascriptMojo extends AbstractMojo {
builder.entryPoint("main", new MethodReference(mainClass, mainMethodDesc)) builder.entryPoint("main", new MethodReference(mainClass, mainMethodDesc))
.withValue(1, "java.lang.String"); .withValue(1, "java.lang.String");
targetDirectory.mkdirs(); targetDirectory.mkdirs();
builder.build(targetDirectory, targetFileName); try (FileWriter writer = new FileWriter(new File(targetDirectory, targetFileName))) {
builder.checkForMissingItems(); if (runtime == RuntimeCopyOperation.MERGED) {
log.info("JavaScript file successfully built"); resourceToWriter("org/teavm/javascript/runtime.js", writer);
if (!runtimeSuppressed) { writer.append("\n");
}
builder.build(writer, new DirectoryBuildTarget(targetDirectory));
builder.checkForMissingItems();
log.info("JavaScript file successfully built");
}
if (runtime == RuntimeCopyOperation.SEPARATE) {
resourceToFile("org/teavm/javascript/runtime.js", "runtime.js"); resourceToFile("org/teavm/javascript/runtime.js", "runtime.js");
} }
if (mainPageIncluded) { if (mainPageIncluded) {
@ -255,4 +262,10 @@ public class BuildJavascriptMojo extends AbstractMojo {
} }
} }
} }
private void resourceToWriter(String resource, Writer writer) throws IOException {
try (InputStream input = BuildJavascriptMojo.class.getClassLoader().getResourceAsStream(resource)) {
IOUtils.copy(input, writer, "UTF-8");
}
}
} }

26
teavm-maven-plugin/src/main/java/org/teavm/maven/RuntimeCopyOperation.java Normal file
View File

@ -0,0 +1,26 @@
/*
* Copyright 2014 Alexey Andreev.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.teavm.maven;
/**
*
* @author Alexey Andreev
*/
public enum RuntimeCopyOperation {
SEPARATE,
MERGED,
NONE
}