Skip to content

Commit

Permalink
Building greclipe maven batch compiler for 2.3.0 and deploy snapshot.
Browse files Browse the repository at this point in the history
  • Loading branch information
kdvolder committed May 21, 2014
1 parent 8e2504b commit 3405717
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 8 deletions.
2 changes: 1 addition & 1 deletion extras/build-all.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

#rm -fr ~/.m2/repository
# rm -fr ~/.m2/repository

echo Building groovy-eclipse-batch and installing to maven local
cd groovy-eclipse-batch-builder
Expand Down
2 changes: 1 addition & 1 deletion extras/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
echo Building groovy-eclipse-batch and deploying or staging to codehaus
cd groovy-eclipse-batch-builder
#ant extract-create-install
#ant extract-create-publish
ant extract-create-publish

echo Deploying/staging groovy-eclipse-compiler to codehaus
cd ../groovy-eclipse-compiler
Expand Down
6 changes: 4 additions & 2 deletions extras/groovy-eclipse-batch-builder/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,20 @@ version1.8=1.8.6-01
version2.0=2.0.7-03
version2.1=2.1.8-01
version2.2=2.2.1-01-SNAPSHOT
version2.3=2.3.0-01-SNAPSHOT

# uncomment to do a particular build
# only one should be uncommented at a time
#do-17-build=true
#do-18-build=true
#do-20-build=true
#do-21-build=true
do-22-build=true
#do-22-build=true
do-23-build=true

# Location of the plugins directory for the eclipse install
#eclipse.install.plugins=/Users/andrew/Eclipse/Installations/Eclipse4.3.RC3/plugins
eclipse.install.plugins=/home/kdvolder/Applications/eclipse-431/plugins
eclipse.install.plugins=/home/kdvolder/Applications/eclipse-432/plugins

# cloned git repo of groovy-eclipse
# git.repo.loc=/Users/andrew/Eclipse/git-repos/groovy-eclipse
Expand Down
15 changes: 13 additions & 2 deletions extras/groovy-eclipse-batch-builder/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
target: -init
create properties and filesets
- - - - - - - - - - - - - - - - - -->
<target name="-init" depends="-fail-if-no-version-specified,-init17,-init18,-init20,-init21,-init22">
<target name="-init" depends="-fail-if-no-version-specified,-init17,-init18,-init20,-init21,-init22,-init23">
<property name="jar.prefix" value="groovy-eclipse-batch"/>

<property name="jar.name" value="${jar.prefix}-${version}.jar"/>
Expand Down Expand Up @@ -157,7 +157,7 @@
<fileset dir="${git.repo.loc}/base/org.eclipse.jdt.groovy.core/bin" id="jdt.groovy.core.class.files">
<include name="**/*.*" />
</fileset>
<fileset dir="${git.repo.loc}/jdt-patch/e43/org.eclipse.jdt.core/bin" id="jdt.core.class.files">
<fileset dir="${git.repo.loc}/jdt-patch/e43j8/org.eclipse.jdt.core/bin" id="jdt.core.class.files">
<include name="**/*.*" />
</fileset>
<!-- Ensure that this comes after the core groocy compiler files because the groovy-eclipse.jar must overwrite the groovy jar -->
Expand Down Expand Up @@ -217,6 +217,16 @@
<property name="groovy.folder" value="org.codehaus.groovy22"/>
</target>

<!-- - - - - - - - - - - - - - - - - -
target: -init23
- - - - - - - - - - - - - - - - - -->
<target name="-init23" if="do-23-build">
<echo message="Building groovy 2.3.x"/>
<property name="version" value="${version2.3}"/>
<property name="groovy.folder" value="org.codehaus.groovy23"/>
</target>


<target name="-check-build-version">
<property file="build.properties"/>
<condition property="no-version-specified">
Expand All @@ -227,6 +237,7 @@
<isset property="do-20-build"/>
<isset property="do-21-build"/>
<isset property="do-22-build"/>
<isset property="do-23-build"/>
</or>
</not>
</condition>
Expand Down
4 changes: 2 additions & 2 deletions extras/groovy-eclipse-compiler-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<groovy.xx.version>2.2.1-01-SNAPSHOT</groovy.xx.version>
<groovy.all.version>2.2.1</groovy.all.version> <!-- groovy all jar version to use for tests -->
<groovy.xx.version>2.3.0-01-SNAPSHOT</groovy.xx.version>
<groovy.all.version>2.3.0</groovy.all.version> <!-- groovy all jar version to use for tests -->
<!-- only one of the below is actually used at any time and needs to be
replaced to run tests with different compiler. So we it it changed to use
just one property groovy.xx.version to represent all of them <groovy.22.version>2.2.0-01-SNAPSHOT</groovy.22.version>
Expand Down

0 comments on commit 3405717

Please sign in to comment.