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

Minor fixes

Browse Source
This commit is contained in:
Alexey Andreev 2016-04-12 23:38:45 +03:00
parent ca8a9b95a1
commit e557a25a04
9 changed files with 15 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/compiler.xml
View File

@ -40,6 +40,7 @@
<module name="teavm-maven-plugin" />
<module name="teavm-maven-webapp" />
<module name="teavm-metaprogramming-api" />
<module name="teavm-metaprogramming-impl" />
<module name="teavm-platform" />
<module name="teavm-samples-async" />
<module name="teavm-samples-benchmark" />
@ -69,6 +70,7 @@
<module name="teavm-maven-plugin" target="1.8" />
<module name="teavm-maven-webapp" target="1.5" />
<module name="teavm-metaprogramming-api" target="1.8" />
<module name="teavm-metaprogramming-impl" target="1.8" />
<module name="teavm-platform" target="1.8" />
<module name="teavm-samples" target="1.5" />
<module name="teavm-samples-async" target="1.8" />

2
.idea/modules.xml
View File

@ -3,7 +3,6 @@
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/all-deps/all-deps.iml" filepath="$PROJECT_DIR$/all-deps/all-deps.iml" />
<module fileurl="file://$PROJECT_DIR$/metaprogramming/impl/impl.iml" filepath="$PROJECT_DIR$/metaprogramming/impl/impl.iml" />
<module fileurl="file://$PROJECT_DIR$/teavm.iml" filepath="$PROJECT_DIR$/teavm.iml" />
<module fileurl="file://$PROJECT_DIR$/tools/chrome-rdp/teavm-chrome-rdp.iml" filepath="$PROJECT_DIR$/tools/chrome-rdp/teavm-chrome-rdp.iml" />
<module fileurl="file://$PROJECT_DIR$/classlib/teavm-classlib.iml" filepath="$PROJECT_DIR$/classlib/teavm-classlib.iml" />
@ -21,6 +20,7 @@
<module fileurl="file://$PROJECT_DIR$/tools/maven/plugin/teavm-maven-plugin.iml" filepath="$PROJECT_DIR$/tools/maven/plugin/teavm-maven-plugin.iml" />
<module fileurl="file://$PROJECT_DIR$/tools/maven/webapp/teavm-maven-webapp.iml" filepath="$PROJECT_DIR$/tools/maven/webapp/teavm-maven-webapp.iml" />
<module fileurl="file://$PROJECT_DIR$/metaprogramming/api/teavm-metaprogramming-api.iml" filepath="$PROJECT_DIR$/metaprogramming/api/teavm-metaprogramming-api.iml" />
<module fileurl="file://$PROJECT_DIR$/metaprogramming/impl/teavm-metaprogramming-impl.iml" filepath="$PROJECT_DIR$/metaprogramming/impl/teavm-metaprogramming-impl.iml" />
<module fileurl="file://$PROJECT_DIR$/platform/teavm-platform.iml" filepath="$PROJECT_DIR$/platform/teavm-platform.iml" />
<module fileurl="file://$PROJECT_DIR$/samples/teavm-samples.iml" filepath="$PROJECT_DIR$/samples/teavm-samples.iml" />
<module fileurl="file://$PROJECT_DIR$/samples/async/teavm-samples-async.iml" filepath="$PROJECT_DIR$/samples/async/teavm-samples-async.iml" />

64
html4j/pom.xml
View File

@ -66,70 +66,6 @@
<build>
<plugins>
<plugin>
<groupId>org.teavm</groupId>
<artifactId>teavm-maven-plugin</artifactId>
<version>${project.version}</version>
<executions>
<execution>
<id>generate-javascript-tests</id>
<goals>
<goal>testCompile</goal>
</goals>
<configuration>
<minifying>false</minifying>
<targetDirectory>${project.build.directory}/javascript-test</targetDirectory>
<debugInformationGenerated>true</debugInformationGenerated>
<sourceMapsGenerated>true</sourceMapsGenerated>
</configuration>
</execution>
<execution>
<id>generate-javascript-tck</id>
<goals>
<goal>testCompile</goal>
</goals>
<configuration>
<minifying>false</minifying>
<scanDependencies>true</scanDependencies>
<targetDirectory>${project.build.directory}/javascript-tck</targetDirectory>
<adapterClass>org.teavm.html4j.testing.KOTestAdapter</adapterClass>
<transformers>
<param>org.teavm.javascript.NullPointerExceptionTransformer</param>
</transformers>
<debugInformationGenerated>true</debugInformationGenerated>
<sourceMapsGenerated>true</sourceMapsGenerated>
<sourceFilesCopied>true</sourceFilesCopied>
<excludeWildcards>
<wildcard>**.GC*Test</wildcard>
</excludeWildcards>
</configuration>
</execution>
<execution>
<id>run-javascript-tests</id>
<goals>
<goal>test</goal>
</goals>
<configuration>
<skip>${teavm.test.skip}</skip>
<numThreads>${teavm.test.threads}</numThreads>
<seleniumURL>${teavm.test.selenium}</seleniumURL>
</configuration>
</execution>
<execution>
<id>run-javascript-tck</id>
<goals>
<goal>test</goal>
</goals>
<configuration>
<testDirectory>${project.build.directory}/javascript-tck</testDirectory>
<reportFile>${project.build.directory}/teavm-tck-report.json</reportFile>
<skip>true</skip>
<numThreads>${teavm.test.threads}</numThreads>
<seleniumURL>${teavm.test.selenium}</seleniumURL>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>

2
samples/kotlin/pom.xml
View File

@ -96,7 +96,7 @@
</goals>
<configuration>
<targetDirectory>${project.build.directory}/generated/js/teavm</targetDirectory>
<mainClass>org.teavm.samples.kotlin.KotlinPackage</mainClass>
<mainClass>org.teavm.samples.kotlin.HelloKt</mainClass>
<runtime>SEPARATE</runtime>
<minifying>false</minifying>
<debugInformationGenerated>true</debugInformationGenerated>

14
samples/kotlin/src/main/webapp/index.html
View File

@ -13,18 +13,12 @@
<pre>
package org.teavm.samples.kotlin
import org.teavm.jso.*
import org.teavm.dom.browser.*
import org.teavm.dom.html.*
import org.teavm.dom.events.*
import org.teavm.jso.browser.*
fun main(args : Array&lt;String&gt;) {
var window = JS.getGlobal() as Window;
var document = window.getDocument();
fun main(args : Array&lt;String>) {
val document = Window.current().document;
document.getElementById("hello-kotlin").addEventListener("click", EventListener&lt;MouseEvent&gt;() {
window.alert("Hello, developer!");
})
document.getElementById("hello-kotlin").addEventListener("click") { Window.alert("Hello, developer!") }
}
</pre>
</body>

9
tests/pom.xml
View File

@ -84,11 +84,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.16</version>
<configuration>
<excludes>
<exclude>org/teavm/platform/**/*.java</exclude>
<exclude>org/teavm/jso/**/*.java</exclude>
</excludes>
<systemProperties>
<teavm.junit.target>${project.build.directory}/js-tests</teavm.junit.target>
<teavm.junit.js.runner>htmlunit</teavm.junit.js.runner>
</systemProperties>
</configuration>
</plugin>
<plugin>

2
tests/teavm-tests.iml
View File

@ -25,7 +25,7 @@
<orderEntry type="module" module-name="teavm-platform" />
<orderEntry type="module" module-name="teavm-jso-apis" />
<orderEntry type="module" module-name="teavm-jso-apis" production-on-test="" />
<orderEntry type="module" module-name="impl" />
<orderEntry type="module" module-name="teavm-metaprogramming-impl" />
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.11" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
<orderEntry type="module" module-name="teavm-tooling" scope="TEST" />

1
tools/junit/pom.xml
View File

@ -64,6 +64,7 @@
<artifactId>maven-checkstyle-plugin</artifactId>
<configuration>
<configLocation>../../checkstyle.xml</configLocation>
<propertyExpansion>config_loc=${basedir}/../..</propertyExpansion>
</configuration>
</plugin>
<plugin>

1
tools/junit/src/main/java/org/teavm/junit/TestRunner.java
View File

@ -17,7 +17,6 @@ package org.teavm.junit;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import java.io.IOException;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.LinkedBlockingQueue;