[jboss-svn-commits] JBL Code SVN: r10840 - labs/jbossrules/trunk/drools-eclipse.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Apr 9 22:11:21 EDT 2007
Author: mark.proctor at jboss.com
Date: 2007-04-09 22:11:21 -0400 (Mon, 09 Apr 2007)
New Revision: 10840
Modified:
labs/jbossrules/trunk/drools-eclipse/build.properties
labs/jbossrules/trunk/drools-eclipse/pom.xml
labs/jbossrules/trunk/drools-eclipse/setupEclipse.xml
Log:
JBRULES-761 Automate the Eclipse build
-now takes into account .zip and .tar.gz
Modified: labs/jbossrules/trunk/drools-eclipse/build.properties
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/build.properties 2007-04-10 01:05:42 UTC (rev 10839)
+++ labs/jbossrules/trunk/drools-eclipse/build.properties 2007-04-10 02:11:21 UTC (rev 10840)
@@ -14,7 +14,6 @@
#Set to true if you want the output to be ready for an update jar (no site.xml generated)
outputUpdateJars = false
-
# Timestamp for the build. Used in naming the build output
timestamp=007
Modified: labs/jbossrules/trunk/drools-eclipse/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/pom.xml 2007-04-10 01:05:42 UTC (rev 10839)
+++ labs/jbossrules/trunk/drools-eclipse/pom.xml 2007-04-10 02:11:21 UTC (rev 10840)
@@ -43,12 +43,12 @@
<configuration>
<tasks>
<property name="eclipse.home" value="target/eclipse" />
+
<property name="localEclipseDrop" value="${basedir}/local-eclipse-drop-mirror" />
<property name="eclipse.home" value="target/eclipse" />
- <property name="localEclipseDrop" value="${basedir}/local-eclipse-drop-mirror" />
- <echo>Dbaseos=${baseos} -Dbasews=${basews} -Dbasearch=${basearch}</echo>
+ <property name="localEclipseDrop" value="${basedir}/local-eclipse-drop-mirror" />
<delete dir="target/eclipse.build" />
@@ -141,7 +141,9 @@
</condition>
<property name="eclipse.home" value="target/eclipse" />
- <property name="localEclipseDrop" value="${basedir}/local-eclipse-drop-mirror" />
+ <property name="localEclipseDrop" value="${basedir}/local-eclipse-drop-mirror" />
+
+ <echo>-application org.eclipse.ant.core.antRunner -Dbaseos=${baseos} -Dbasews=${basews} -Dbasearch=${basearch} -DlocalEclipseDrop=${localEclipseDrop} -DrunTests=true -DmavenTestPhase=true</echo>
<java jar="${eclipse.home}/startup.jar"
fork="true"
Modified: labs/jbossrules/trunk/drools-eclipse/setupEclipse.xml
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/setupEclipse.xml 2007-04-10 01:05:42 UTC (rev 10839)
+++ labs/jbossrules/trunk/drools-eclipse/setupEclipse.xml 2007-04-10 02:11:21 UTC (rev 10840)
@@ -5,25 +5,44 @@
<property name="localEclipseDrop" value="${basedir}/local-eclipse-drop-mirror" />
<!-- set the OS name, make sure each condition is mutally exclusive -->
- <condition property="download.extension" value="win32.zip">
+ <condition property="download.type" value="win32">
<os family="windows" />
- </condition>
+ </condition>
- <condition property="download.extension" value="macosx-carbon.tar.gz">
+ <condition property="download.type" value="macosx-carbon">
<and>
<os family="mac" />
<os family="unix" />
</and>
</condition>
- <condition property="download.extension" value="linux-gtk.tar.gz">
+ <condition property="download.type" value="linux-gtk.tar.gz">
<and>
<not>
<os family="mac" />
</not>
<os family="unix" />
</and>
- </condition>
+ </condition>
+
+ <condition property="download.extension" value="zip">
+ <os family="windows" />
+ </condition>
+
+ <condition property="download.extension" value="tar.gz">
+ <and>
+ <os family="mac" />
+ <os family="unix" />
+ </and>
+ </condition>
+
+ <condition property="expandTypeZip" value="true">
+ <equals arg1="${download.extension}" arg2="zip" />
+ </condition>
+
+ <condition property="expandTypeTarGz" value="true">
+ <equals arg1="${download.extension}" arg2="tar.gz" />
+ </condition>
<!-- make sure the directory exists -->
<target name="makeLocalEclipseDropDir">
@@ -33,8 +52,8 @@
<target name="getEclipseJar" depends="checkEclipseJar" unless="skipGetEclipseJar">
<mkdir dir="${localEclipseDrop}/eclipse/${eclipseBuildRevision}" />
- <get usetimestamp="true" src="${eclipseURL}/${eclipseBuildRevision}/eclipse-SDK-${eclipseBuildId}-${download.extension}"
- dest="${localEclipseDrop}/eclipse/${eclipseBuildRevision}/eclipse-SDK-${eclipseBuildId}-${download.extension}" />
+ <get usetimestamp="true" src="${eclipseURL}/${eclipseBuildRevision}/eclipse-SDK-${eclipseBuildId}-${download.type}.${download.extension}"
+ dest="${localEclipseDrop}/eclipse/${eclipseBuildRevision}/eclipse-SDK-${eclipseBuildId}-${download.type}.${download.extension}" />
</target>
<target name="getTestJar" depends="checkTestJar" unless="skipGetTestJar">
@@ -68,10 +87,10 @@
<antcall target="getGefJar" />
</target>
- <target name="unzipEclipseJars">
- <unzip dest="${base}" overwrite="true"
- src="${localEclipseDrop}/eclipse/${eclipseBuildRevision}/eclipse-SDK-${eclipseBuildId}-${download.extension}" />
-
+ <target name="expandEclipseJars">
+ <antcall target="unzipEclipse" />
+ <antcall target="untarEclipse" />
+
<unzip dest="${base}" overwrite="true"
src="${localEclipseDrop}/eclipse/${eclipseBuildRevision}/eclipse-test-framework-${eclipseBuildId}.zip" />
@@ -79,17 +98,30 @@
src="${localEclipseDrop}/tools/gef/${eclipseGefBuildRevision}/GEF-runtime-${eclipseBuildId}.zip" />
</target>
+ <target name="unzipEclipse" if="expandTypeZip">
+ <unzip dest="${base}" overwrite="true"
+ src="${localEclipseDrop}/eclipse/${eclipseBuildRevision}/eclipse-SDK-${eclipseBuildId}-${download.type}.${download.extension}" />
+ </target>
+
+ <target name="untarEclipse" if="expandTypeTarGz">
+ <gunzip dest="${base}" overwrite="true"
+ src="${localEclipseDrop}/eclipse/${eclipseBuildRevision}/eclipse-SDK-${eclipseBuildId}-${download.type}.${download.extension}" />
+
+ <untar dest="${base}" overwrite="true"
+ src="${localEclipseDrop}/eclipse/${eclipseBuildRevision}/eclipse-SDK-${eclipseBuildId}-${download.type}.tar" />
+ </target>
+
<target name="checkEclipseDir">
<available file="${base}/eclipse" property="skipUnzipEclipseJars" />
</target>
<target name="setupLocalEclipse" depends="checkLocalEclipse" unless="skipSetupLocalEcipse">
<antcall target="setupLocalEclipseDrop" />
- <antcall target="unzipEclipseJars" />
+ <antcall target="expandEclipseJars" />
</target>
<target name="checkLocalEclipse">
- <available type="dir" file="${localEclipseDrop}/eclipse" property="skipSetupLocalEcipse" />
+ <available type="dir" file="${base}/eclipse" property="skipSetupLocalEcipse" />
</target>
</project>
\ No newline at end of file
More information about the jboss-svn-commits
mailing list