update compiler artifacts for Groovy 3

#1029
groovy · Feb 11, 2020 · 78d9fa5 · 78d9fa5
1 parent 19584c5
commit 78d9fa5
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 16 deletions.
diff --git a/extras/groovy-eclipse-batch-builder/build.properties b/extras/groovy-eclipse-batch-builder/build.properties
@@ -5,8 +5,8 @@ version3.0=3.0.0-01
 
 # uncomment to do a particular build -- only one should be uncommented at a time
 #do-24-build=true
-do-25-build=true
-#do-30-build=true
+#do-25-build=true
+do-30-build=true
 
 # location of the plugins directory for the eclipse install
 eclipse.install.plugins=C:/Users/Public/Eclipse-4.14/plugins

diff --git a/extras/groovy-eclipse-batch-builder/build.xml b/extras/groovy-eclipse-batch-builder/build.xml
@@ -35,6 +35,7 @@
         <jar destfile="${build.dir}/${main.jar}">
             <fileset dir="${stage.dir}">
                 <exclude name="**/*.g"/>
+                <exclude name="**/*.g4"/>
                 <exclude name="**/*.groovy"/>
                 <exclude name="**/*.html"/>
                 <exclude name="**/*.jar"/>
@@ -45,11 +46,14 @@
                 <exclude name=".options"/>
                 <exclude name="about_files/**"/>
                 <exclude name="ant_tasks/**"/>
+                <exclude name="package-list"/>
                 <exclude name="plugin.*"/>
-                <exclude name="org/codehaus/groovy/activator/**"/>
                 <exclude name="script.js"/>
                 <exclude name="stylesheet.css"/>
+                <exclude name="systembundle.properties"/>
+                <exclude name="META-INF/*.properties"/>
                 <exclude name="META-INF/eclipse.inf"/>
+                <exclude name="META-INF/INDEX.LIST"/>
                 <exclude name="META-INF/maven/**"/>
                 <exclude name="META-INF/*.RSA"/>
                 <exclude name="META-INF/*.SF"/>
@@ -72,6 +76,10 @@
                 <include name="**/BatchCompiler.java" />
                 <include name="**/Main.java" />
             </fileset>
+            <fileset dir="${stage.dir}">
+                <include name="**/*.groovy" />
+                <include name="**/*.java" />
+            </fileset>
         </jar>
     </target>
 
@@ -133,9 +141,9 @@
         </fileset>
 
         <fileset dir="${git.repo.loc}/base" id="orig.groovy.jars">
-            <!-- include groovy and the sources -->
-            <include name="${groovy.folder}/lib/groovy-*.jar"/>
-            <!-- also include the non-locking classloader with sources -->
+            <include name="${groovy.folder}/lib/groovy*.jar"/>
+            <exclude name="${groovy.folder}/lib/groovy-test*.jar"/>
+            <!-- include the non-locking classloader w/ sources -->
             <include name="org.eclipse.jdt.groovy.core/nlcl*.jar"/>
         </fileset>
         <fileset dir="${git.repo.loc}/base/org.eclipse.jdt.groovy.core/bin" id="jdt.groovy.core.class.files">

diff --git a/extras/groovy-eclipse-compiler-tests/pom.xml b/extras/groovy-eclipse-compiler-tests/pom.xml
@@ -8,9 +8,9 @@
 
 	<properties>
 		<!-- groovy version to use for tests: -->
-		<groovy.rt.version>2.5.9</groovy.rt.version>
+		<groovy.rt.version>3.0.0</groovy.rt.version>
 		<!-- groovy-batch version to use for tests: -->
-		<groovy.xx.version>2.5.9-01</groovy.xx.version>
+		<groovy.xx.version>3.0.0-01</groovy.xx.version>
 		<!-- maven-compiler version to use for tests: -->
 		<maven-compiler-plugin.version>3.6.2</maven-compiler-plugin.version>
 

diff --git a/extras/groovy-eclipse-compiler-tests/src/it/groovy-for-tests/pom.xml b/extras/groovy-eclipse-compiler-tests/src/it/groovy-for-tests/pom.xml
@@ -32,7 +32,7 @@
     <dependency>
       <groupId>org.spockframework</groupId>
       <artifactId>spock-core</artifactId>
-      <version>1.3-groovy-2.5</version>
+      <version>2.0-M2-groovy-3.0</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -101,6 +101,10 @@
           </dependency>
         </dependencies>
       </plugin>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.22.2</version>
+      </plugin>
     </plugins>
   </build>
 

diff --git a/ide/Feature-org.codehaus.groovy30.feature/feature.properties b/ide/Feature-org.codehaus.groovy30.feature/feature.properties
@@ -4,7 +4,7 @@
 
 providerName=Pivotal Software, Inc.
 
-featureName=Groovy Compiler 3.0 (early access)
+featureName=Groovy Compiler 3.0
 
 descriptionURL=https://github.com/groovy/groovy-eclipse/wiki
 

diff --git a/jdt-patch/e414/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/Main.java b/jdt-patch/e414/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/Main.java
@@ -1495,6 +1495,9 @@ public boolean accept(File dir, String name) {
 }
 
 public static void main(String[] argv) {
+	// GROOVY add
+	if (System.getProperty("groovy.antlr4") == null) System.setProperty("groovy.antlr4", "true"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+	// GROOVY end
 	new Main(new PrintWriter(System.out), new PrintWriter(System.err), true/*systemExit*/, null/*options*/, null/*progress*/).compile(argv);
 }
 
@@ -1757,9 +1760,6 @@ public boolean compile(String[] argv) {
 		if (this.progress != null)
 			this.progress.begin(this.filenames == null ? 0 : this.filenames.length * this.maxRepetition);
 		if (this.proceed) {
-//				if (this.verbose) {
-//					System.out.println(new CompilerOptions(this.options));
-//				}
 			if (this.showProgress) this.logger.compiling();
 			for (this.currentRepetition = 0; this.currentRepetition < this.maxRepetition; this.currentRepetition++) {
 				this.globalProblemsCount = 0;

diff --git a/jdt-patch/e415/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/Main.java b/jdt-patch/e415/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/Main.java
@@ -1495,6 +1495,9 @@ public boolean accept(File dir, String name) {
 }
 
 public static void main(String[] argv) {
+	// GROOVY add
+	if (System.getProperty("groovy.antlr4") == null) System.setProperty("groovy.antlr4", "true"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+	// GROOVY end
 	new Main(new PrintWriter(System.out), new PrintWriter(System.err), true/*systemExit*/, null/*options*/, null/*progress*/).compile(argv);
 }
 
@@ -1757,9 +1760,6 @@ public boolean compile(String[] argv) {
 		if (this.progress != null)
 			this.progress.begin(this.filenames == null ? 0 : this.filenames.length * this.maxRepetition);
 		if (this.proceed) {
-//				if (this.verbose) {
-//					System.out.println(new CompilerOptions(this.options));
-//				}
 			if (this.showProgress) this.logger.compiling();
 			for (this.currentRepetition = 0; this.currentRepetition < this.maxRepetition; this.currentRepetition++) {
 				this.globalProblemsCount = 0;