attempt to fix the build - whoops, sorry again :)

This commit is contained in:
James Strachan
2012-06-01 08:38:27 +01:00
parent 1bf6ebac57
commit ee1e7d5906
4 changed files with 25 additions and 9 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
package js.jquery; package js.jquery;
import org.w3c.dom.Element import js.dom.core.Element
native native
class JQuery() { class JQuery() {
@@ -17,6 +17,7 @@
package org.jetbrains.k2js.test.semantics; package org.jetbrains.k2js.test.semantics;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.cli.common.ExitCode; import org.jetbrains.jet.cli.common.ExitCode;
import org.jetbrains.jet.cli.js.K2JSCompiler; import org.jetbrains.jet.cli.js.K2JSCompiler;
@@ -29,6 +30,7 @@ import org.jetbrains.k2js.test.SingleFileTranslationTest;
import java.io.File; import java.io.File;
import java.util.EnumSet; import java.util.EnumSet;
import java.util.List; import java.util.List;
import java.util.Set;
/** /**
*/ */
@@ -58,10 +60,20 @@ public final class StdLibToJSTest extends SingleFileTranslationTest {
files.add(new File(stdlibDir, file).getPath()); files.add(new File(stdlibDir, file).getPath());
} }
Set<String> ignoreFiles = Sets.newHashSet(
"/jquery/common.kt",
"/jquery/ui.kt",
"/dom/domcore.kt",
"/dom/html/htmlcore.kt",
"/dom/html5/canvas.kt",
"/dom/html/window.kt");
// lets add the standard JS library files // lets add the standard JS library files
for (String libFileName : Config.LIB_FILE_NAMES) { for (String libFileName : Config.LIB_FILE_NAMES) {
System.out.println("Compiling " + libFileName); if (!ignoreFiles.contains(libFileName)) {
files.add(Config.LIBRARIES_LOCATION + libFileName); System.out.println("Compiling " + libFileName);
files.add(Config.LIBRARIES_LOCATION + libFileName);
}
} }
// now lets try invoke the compiler // now lets try invoke the compiler
@@ -64,12 +64,11 @@ public abstract class Config {
"/raphael/raphael.kt", "/raphael/raphael.kt",
"/stdlib/JUMaps.kt", "/stdlib/JUMaps.kt",
"/stdlib/browser.kt", "/stdlib/browser.kt",
"/core/dom.kt" "/core/dom.kt",
// TODO doesn't compile yet "/dom/domcore.kt",
// "/dom/domcore.kt", "/dom/html/htmlcore.kt",
// "/dom/html/htmlcore.kt", "/dom/html5/canvas.kt",
//"/dom/html5/canvas.kt" "/dom/html/window.kt"
//"/dom/html/window.kt"
); );
public static final String LIBRARIES_LOCATION = "js/js.libraries/src"; public static final String LIBRARIES_LOCATION = "js/js.libraries/src";
@@ -33,6 +33,11 @@
<fileset dir="${kotlin-js-lib-srcdir}"> <fileset dir="${kotlin-js-lib-srcdir}">
<exclude name="core/dom/core.kt"/> <exclude name="core/dom/core.kt"/>
<exclude name="html5/localstorage.kt"/> <exclude name="html5/localstorage.kt"/>
<exclude name="jquery/common.kt"/>
<exclude name="jquery/ui.kt"/>
<exclude name="dom/html/htmlcore.kt"/>
<exclude name="dom/html5/canvas.kt"/>
<exclude name="dom/html/window.kt"/>
</fileset> </fileset>
</copy> </copy>
<copy todir="${basedir}/target/generated-js-library/kotlin"> <copy todir="${basedir}/target/generated-js-library/kotlin">