Merge pull request #6 from tunnelvisionlabs/fix-builds

Fix builds

Author: sharwell

README.md

@@ -10,7 +10,7 @@ This is the "optimized" fork of ANTLR 4, which contains many features and optimi
 
 ## Build Status
 
-[![Build Travis-CI Status](https://travis-ci.org/sharwell/antlr4.svg?branch=optimized)](https://travis-ci.org/sharwell/antlr4)
+[![Build Travis-CI Status](https://travis-ci.org/tunnelvisionlabs/antlr4.svg?branch=master)](https://travis-ci.org/tunnelvisionlabs/antlr4) [![Build AppVeyor Status](https://ci.appveyor.com/api/projects/status/ba3jofc6j63wrl89/branch/master?svg=true)](https://ci.appveyor.com/project/sharwell/antlr4/branch/master)
 
 [![codecov](https://codecov.io/gh/sharwell/antlr4/branch/optimized/graph/badge.svg)](https://codecov.io/gh/sharwell/antlr4)
 

antlr4-maven-plugin/pom.xml

@@ -123,7 +123,44 @@
         </dependency>
 
     </dependencies>
-    
+
+    <profiles>
+        <profile>
+            <id>maven-plugin-no-tests</id>
+            <activation>
+                <jdk>1.6</jdk>
+            </activation>
+            <properties>
+                <skipTests>true</skipTests>
+            </properties>
+        </profile>
+
+        <profile>
+            <id>maven-plugin-tests</id>
+            <activation>
+                <jdk>!1.6</jdk>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>io.takari.maven.plugins</groupId>
+                        <artifactId>takari-lifecycle-plugin</artifactId>
+                        <version>1.11.12</version>
+                        <executions>
+                            <execution>
+                                <id>testProperties</id>
+                                <phase>process-test-resources</phase>
+                                <goals>
+                                    <goal>testProperties</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
     <build>
 
         <defaultGoal>install</defaultGoal>
@@ -183,20 +220,6 @@
                 </configuration>
             </plugin>
 
-            <plugin>
-                <groupId>io.takari.maven.plugins</groupId>
-                <artifactId>takari-lifecycle-plugin</artifactId>
-                <version>1.11.12</version>
-                <executions>
-                    <execution>
-                        <id>testProperties</id>
-                        <phase>process-test-resources</phase>
-                        <goals>
-                            <goal>testProperties</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
 
     </build>

appveyor.yml

@@ -1,8 +1,8 @@
-version: '4.6-SNAPSHOT+AppVeyor.{build}'
-os: Windows Server 2012
+version: '4.6.1-SNAPSHOT+AppVeyor.{build}'
+os: Visual Studio 2015
 build_script:
   - mvn -DskipTests install -q --batch-mode 
 test_script:
-  - mvn install -q -Dantlr-python2-python="C:\Python27\python.exe" -Dantlr-python3-python="C:\Python35\python.exe" -Dantlr-javascript-nodejs="C:\Program Files (x86)\nodejs\node.exe" --batch-mode
+  - mvn test -Dantlr.testinprocess=true -DJDK_SOURCE_ROOT=../runtime/Java/src -Dperformance.package= -q --batch-mode
 build:
   verbosity: minimal