azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename kotlinLib.js to kotlinEcma3.js and update build.xml accordingly.

Browse Source 
Update paths to js-tests-lib in build.xml.

Adapted from https://github.com/develar/kotlin/commit/d3521123a6e4d551b30743b68b6bb23b9678553b.
This commit is contained in:
Pavel V. Talanov
2012-08-08 15:43:18 +04:00
parent 0c6308545b
commit 2eca6c836e
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.xml
+3 -3
View File
@@ -157,7 +157,7 @@
</jar>
<java classname="com.google.javascript.jscomp.CommandLineRunner" failonerror="true">
<classpath>
<pathelement location="${basedir}/js/js.translator/lib/closure-compiler.jar"/>
<pathelement location="${basedir}\js\js.tests\testLib\closure-compiler.jar"/>
</classpath>
<arg value="--formatting"/>
<arg value="PRETTY_PRINT"/>
@@ -174,7 +174,7 @@
</java>
<java classname="com.google.javascript.jscomp.CommandLineRunner" failonerror="true">
<classpath>
<pathelement location="${basedir}/js/js.translator/lib/closure-compiler.jar"/>
<pathelement location="${basedir}/js/js.tests/testLib/closure-compiler.jar"/>
</classpath>
<arg value="--formatting"/>
<arg value="PRETTY_PRINT"/>
@@ -187,7 +187,7 @@
<arg value="--js"/>
<arg value="${basedir}/js/js.translator/testFiles/kotlin_lib.js"/>
<arg value="--js_output_file"/>
<arg value="${kotlin-home}/lib/kotlinLib.js"/>
<arg value="${kotlin-home}/lib/kotlinEcma3.js"/>
</java>
</target>
compiler/util/src/org/jetbrains/jet/utils/PathUtil.java
+1 -3
View File
@@ -27,13 +27,11 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
public class PathUtil {
public static final String JS_LIB_JAR_NAME = "kotlin-jslib.jar";
public static final String JS_LIB_JS_NAME = "kotlinLib.js";
public static final String JS_LIB_JS_NAME = "kotlinEcma3.js";
public static final String JDK_ANNOTATIONS_JAR = "kotlin-jdk-annotations.jar";
private PathUtil() {}