Split convert-flump-plugin out of tools.

Now we have a proper tripleplay-tools artifact, rather than the tripleplay-tools submodule being a Maven plugin, which was wacky. This commit also includes a bit of POM name tweaking (Triple Play -> TP).
threerings · May 18, 2015 · 726da29 · 726da29
1 parent f28258f
commit 726da29
Show file tree

Hide file tree

Showing 15 changed files with 149 additions and 41 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -10,7 +10,7 @@
   <artifactId>tripleplay</artifactId>
   <packaging>jar</packaging>
 
-  <name>Triple Play Core</name>
+  <name>TP Core</name>
   <description>Utilities for use in PlayN-based games.</description>
 
   <dependencies>

diff --git a/demo/android/pom.xml b/demo/android/pom.xml
@@ -9,7 +9,7 @@
 
   <artifactId>tripleplay-demo-android</artifactId>
   <packaging>apk</packaging>
-  <name>TripleDemo Android</name>
+  <name>TP Demo Android</name>
 
   <dependencies>
     <dependency>

diff --git a/demo/assets/pom.xml b/demo/assets/pom.xml
@@ -9,5 +9,5 @@
 
   <artifactId>tripleplay-demo-assets</artifactId>
   <packaging>jar</packaging>
-  <name>TripleDemo Assets</name>
+  <name>TP Demo Assets</name>
 </project>
diff --git a/demo/core/pom.xml b/demo/core/pom.xml
@@ -9,7 +9,7 @@
 
   <artifactId>tripleplay-demo-core</artifactId>
   <packaging>jar</packaging>
-  <name>TripleDemo Core</name>
+  <name>TP Demo Core</name>
 
   <dependencies>
     <dependency>

diff --git a/demo/html/pom.xml b/demo/html/pom.xml
@@ -9,7 +9,7 @@
 
   <artifactId>tripleplay-demo-html</artifactId>
   <packaging>war</packaging>
-  <name>TripleDemo HTML</name>
+  <name>TP Demo HTML</name>
 
   <properties>
     <gwt.module>tripleplay.TripleDemo</gwt.module>

diff --git a/demo/ios/pom.xml b/demo/ios/pom.xml
@@ -9,7 +9,7 @@
 
   <artifactId>tripleplay-demo-ios</artifactId>
   <packaging>dll</packaging>
-  <name>TripleDemo iOS</name>
+  <name>TP Demo iOS</name>
 
   <dependencies>
     <dependency>

diff --git a/demo/java/pom.xml b/demo/java/pom.xml
@@ -9,7 +9,7 @@
 
   <artifactId>tripleplay-demo-java</artifactId>
   <packaging>jar</packaging>
-  <name>TripleDemo Java</name>
+  <name>TP Demo Java</name>
 
   <properties>
     <mainClass>tripleplay.demo.TripleDemoJava</mainClass>

diff --git a/demo/pom.xml b/demo/pom.xml
@@ -10,7 +10,7 @@
   <artifactId>tripleplay-demo</artifactId>
   <packaging>pom</packaging>
 
-  <name>TripleDemo Parent</name>
+  <name>TP Demo Parent</name>
   <description>A demo of the various Triple Play features.</description>
 
   <properties>

diff --git a/java-lwjgl/pom.xml b/java-lwjgl/pom.xml
@@ -10,7 +10,7 @@
   <artifactId>tripleplay-java-lwjgl</artifactId>
   <packaging>jar</packaging>
 
-  <name>Triple Play Java LWJGL</name>
+  <name>TP Java LWJGL</name>
   <description>Java-specific code for TriplePlay, using PlayN LWJGL backend.</description>
 
   <dependencies>

diff --git a/java-swt/pom.xml b/java-swt/pom.xml
@@ -10,7 +10,7 @@
   <artifactId>tripleplay-java-swt</artifactId>
   <packaging>jar</packaging>
 
-  <name>Triple Play Java SWT</name>
+  <name>TP Java SWT</name>
   <description>Java-specific code for TriplePlay, using PlayN SWT backend.</description>
 
   <dependencies>

diff --git a/plugins/convert-flump-libs/pom.xml b/plugins/convert-flump-libs/pom.xml
@@ -0,0 +1,50 @@
+<?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/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>com.threerings</groupId>
+    <artifactId>tripleplay-plugins</artifactId>
+    <version>2.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>tripleplay-convert-flump-libs</artifactId>
+  <packaging>maven-plugin</packaging>
+
+  <name>TP Convert Flump Libs Plugin</name>
+  <description>Converts Flump libraries into binary format.</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>tripleplay</artifactId>
+      <version>${project.version}</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+<!--
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-plugin-plugin</artifactId>
+        <version>3.1</version>
+        <configuration>
+          <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
+          <extractors>
+            <extractor>java-annotations</extractor>
+          </extractors>
+        </configuration>
+        <executions>
+          <execution>
+            <id>mojo-descriptor</id>
+            <goals>
+              <goal>descriptor</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+    -->
+  </build>
+</project>
diff --git a/...ripleplay/tools/ConvertFlumpLibsMojo.java → ...ripleplay/tools/ConvertFlumpLibsMojo.java b/...ripleplay/tools/ConvertFlumpLibsMojo.java → ...ripleplay/tools/ConvertFlumpLibsMojo.java
diff --git a/plugins/pom.xml b/plugins/pom.xml
@@ -0,0 +1,62 @@
+<?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/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>com.threerings</groupId>
+    <artifactId>tripleplay-parent</artifactId>
+    <version>2.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>tripleplay-plugins</artifactId>
+  <packaging>pom</packaging>
+
+  <name>TP Plugins</name>
+  <description>A meta-package for Triple Play Maven plugins.</description>
+
+  <modules>
+    <module>convert-flump-libs</module>
+  </modules>
+
+  <dependencies>
+    <!-- Maven wiring dependencies -->
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-plugin-api</artifactId>
+      <version>2.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-core</artifactId>
+      <version>2.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.plugin-tools</groupId>
+      <artifactId>maven-plugin-annotations</artifactId>
+      <version>3.1</version>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-plugin-plugin</artifactId>
+        <version>3.1</version>
+        <configuration>
+          <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
+          <extractors>
+            <extractor>java-annotations</extractor>
+          </extractors>
+        </configuration>
+        <executions>
+          <execution>
+            <id>mojo-descriptor</id>
+            <goals>
+              <goal>descriptor</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,7 @@
   <version>2.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
-  <name>Triple Play Parent</name>
+  <name>TP Parent</name>
   <description>Utilities for use in PlayN-based games.</description>
   <url>http://github.com/threerings/tripleplay/</url>
   <issueManagement>
@@ -65,6 +65,7 @@
     <module>java-lwjgl</module>
     <module>java-swt</module>
     <module>tools</module>
+    <module>plugins</module>
     <module>demo</module>
   </modules>
 

diff --git a/tools/pom.xml b/tools/pom.xml
@@ -7,12 +7,16 @@
     <version>2.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>tripleplay-maven-plugin</artifactId>
-  <packaging>maven-plugin</packaging>
+  <artifactId>tripleplay-tools</artifactId>
+  <packaging>jar</packaging>
 
-  <name>Triple Play Tools</name>
+  <name>TP Tools</name>
   <description>Build-time tools for use with Triple Play.</description>
 
+  <properties>
+    <scala.version>2.11.6</scala.version>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -21,42 +25,33 @@
       <scope>compile</scope>
     </dependency>
 
-    <!-- Maven wiring dependencies -->
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin-api</artifactId>
-      <version>2.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-core</artifactId>
-      <version>2.0</version>
-    </dependency>
     <dependency>
-      <groupId>org.apache.maven.plugin-tools</groupId>
-      <artifactId>maven-plugin-annotations</artifactId>
-      <version>3.1</version>
+      <groupId>org.scala-lang</groupId>
+      <artifactId>scala-library</artifactId>
+      <version>${scala.version}</version>
     </dependency>
   </dependencies>
 
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-plugin-plugin</artifactId>
-        <version>3.1</version>
-        <configuration>
-          <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
-          <extractors>
-            <extractor>java-annotations</extractor>
-          </extractors>
-        </configuration>
+        <groupId>org.scala-tools</groupId>
+        <artifactId>maven-scala-plugin</artifactId>
+        <version>2.15.2</version>
         <executions>
           <execution>
-            <id>mojo-descriptor</id>
-            <goals>
-              <goal>descriptor</goal>
-            </goals>
+            <id>compile</id>
+            <goals><goal>compile</goal></goals>
+            <phase>compile</phase>
+          </execution>
+          <execution>
+            <id>test-compile</id>
+            <goals><goal>testCompile</goal></goals>
+            <phase>test-compile</phase>
+          </execution>
+          <execution>
+            <phase>process-resources</phase>
+            <goals><goal>compile</goal></goals>
           </execution>
         </executions>
       </plugin>