Temporarily disabled wasm in bazel since it breaks tests

Vertispan · Jan 18, 2021 · 073ec61 · 073ec61
1 parent 90953d2
commit 073ec61
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 8 deletions.
diff --git a/build_defs/internal_do_not_use/j2cl_library.bzl b/build_defs/internal_do_not_use/j2cl_library.bzl
@@ -66,10 +66,10 @@ def j2cl_library(
         _to_j2wasm_targets("exports", j2wasm_args)
         j2wasm_args["tags"] = (j2wasm_args.get("tags") or []) + ["manual", "notap"]
 
-        j2wasm_library(
-            name = j2wasm_library_name,
-            **j2wasm_args
-        )
+#        j2wasm_library(
+#            name = j2wasm_library_name,
+#            **j2wasm_args
+#        )
 
 _ALLOWED_ATTRS = [key for key in J2WASM_LIB_ATTRS] + ["tags", "visibility"]
 

diff --git a/maven/backend-libraryinfo/pom.xml b/maven/backend-libraryinfo/pom.xml
@@ -60,7 +60,7 @@
 
         <dependency>
             <groupId>com.vertispan.j2cl</groupId>
-            <artifactId>libraryinfo-proto</artifactId>
+            <artifactId>backend-libraryinfo-proto</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>

diff --git a/maven/common-visitor/pom.xml b/maven/common-visitor/pom.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>com.vertispan.j2cl</groupId>
+        <artifactId>j2cl-parent</artifactId>
+        <version>0.9-SNAPSHOT</version>
+    </parent>
+    <artifactId>common-visitor</artifactId>
+    <packaging>pom</packaging>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>3.0.0</version>
+                <executions>
+                    <execution>
+                        <id>attach-artifacts</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>attach-artifact</goal>
+                        </goals>
+                        <configuration>
+                            <artifacts>
+                                <artifact>
+                                    <file>../../bazel-bin/transpiler/java/com/google/j2cl/common/visitor/libvisitor-internal.jar</file>
+                                    <type>jar</type>
+                                </artifact>
+                                <artifact>
+                                    <file>../../bazel-bin/transpiler/java/com/google/j2cl/common/visitor/libvisitor-internal-src.jar</file>
+                                    <type>jar</type>
+                                    <classifier>sources</classifier>
+                                </artifact>
+                            </artifacts>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+
+    </dependencies>
+</project>
diff --git a/maven/passes/pom.xml b/maven/passes/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.vertispan.j2cl</groupId>
         <artifactId>j2cl-parent</artifactId>
-        <version>0.8-SNAPSHOT</version>
+        <version>0.9-SNAPSHOT</version>
     </parent>
     <artifactId>passes</artifactId>
     <packaging>pom</packaging>
@@ -28,11 +28,11 @@
                         <configuration>
                             <artifacts>
                                 <artifact>
-                                    <file>../../bazel-bin/transpiler/java/com/google/j2cl/backend/passes/libpasses.jar</file>
+                                    <file>../../bazel-bin/transpiler/java/com/google/j2cl/transpiler/passes/libpasses.jar</file>
                                     <type>jar</type>
                                 </artifact>
                                 <artifact>
-                                    <file>../../bazel-bin/transpiler/java/com/google/j2cl/backend/passes/libpasses-src.jar</file>
+                                    <file>../../bazel-bin/transpiler/java/com/google/j2cl/transpiler/passes/libpasses-src.jar</file>
                                     <type>jar</type>
                                     <classifier>sources</classifier>
                                 </artifact>

diff --git a/maven/pom.xml b/maven/pom.xml
@@ -19,7 +19,9 @@
 
   <modules>
     <module>external</module>
+
     <module>common</module>
+    <module>common-visitor</module>
     <module>ast</module>
 
     <module>backend</module>
@@ -34,6 +36,8 @@
     <module>frontend-jdt</module>
     <module>frontend-javac</module>
 
+    <module>passes</module>
+
     <module>transpiler</module>
 
     <module>gwt-incompatible-stripper</module>