[jboss-svn-commits] JBL Code SVN: r15691 - in labs/jbossrules/trunk/drools-eclipse: drools-eclipse-test and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Oct 9 13:21:35 EDT 2007
Author: mark.proctor at jboss.com
Date: 2007-10-09 13:21:35 -0400 (Tue, 09 Oct 2007)
New Revision: 15691
Modified:
labs/jbossrules/trunk/drools-eclipse/build.properties
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/test.xml
labs/jbossrules/trunk/drools-eclipse/genericTargets.xml
labs/jbossrules/trunk/drools-eclipse/package.xml
labs/jbossrules/trunk/drools-eclipse/pom.xml
Log:
-eclipse build automation now works with Eclipse 3.3
Modified: labs/jbossrules/trunk/drools-eclipse/build.properties
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/build.properties 2007-10-09 16:36:16 UTC (rev 15690)
+++ labs/jbossrules/trunk/drools-eclipse/build.properties 2007-10-09 17:21:35 UTC (rev 15691)
@@ -41,9 +41,9 @@
eclipseGefURL=http://download.eclipse.org//tools/gef/downloads/drops
eclipseURL=http://download.eclipse.org/eclipse/downloads/drops
-eclipseBuildRevision=R-3.2.2-200702121330
-eclipseGefBuildRevision=R-3.2.2-200702081315
-eclipseBuildId=3.2.2
+eclipseBuildRevision=R-3.3.1-200709211145
+eclipseGefBuildRevision=R-3.3.1-200709241000
+eclipseBuildId=3.3.1
# We don't want any SCM automation
skipFetch=true
@@ -64,9 +64,9 @@
#compilerArg=
# Default value for the version of the source code. This value is used when compiling plug-ins that do not set the Bundle-RequiredExecutionEnvironment or set javacSource in build.properties
-javacSource=1.4
+javacSource=1.5
# Default value for the version of the byte code targeted. This value is used when compiling plug-ins that do not set the Bundle-RequiredExecutionEnvironment or set javacTarget in build.properties.
-javacTarget=1.4
+javacTarget=1.5
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/test.xml
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/test.xml 2007-10-09 16:36:16 UTC (rev 15690)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/test.xml 2007-10-09 17:21:35 UTC (rev 15691)
@@ -2,7 +2,7 @@
<project name="testsuite" default="run" basedir=".">
<property name="eclipse-home" value="${baseLocation}"/>
<property name="plugin-name" value="org.drools.eclipse"/>
- <property name="library-file" location="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml"/>
+ <property name="library-file" location="${eclipse-home}/plugins/org.eclipse.test_3.2.0/library.xml"/>
<!-- This target holds all initialization code that needs to be done for
all tests that are to be run. Initialization for individual tests
Modified: labs/jbossrules/trunk/drools-eclipse/genericTargets.xml
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/genericTargets.xml 2007-10-09 16:36:16 UTC (rev 15690)
+++ labs/jbossrules/trunk/drools-eclipse/genericTargets.xml 2007-10-09 17:21:35 UTC (rev 15691)
@@ -24,6 +24,7 @@
<property name="generateVersionsLists" value="true" />
<property name="groupConfigurations" value="false"/>
<property name="pluginPath" value=""/>
+<property name="filteredDependencyCheck" value="false"/>
<!-- ===================================================================== -->
<!-- Fetch a single element (feature, plugin, fragment) -->
@@ -74,9 +75,13 @@
generateJnlp="${generateJnlp}"
signJars="${signJars}"
generateFeatureVersionSuffix="${generateFeatureVersionSuffix}"
+ significantVersionDigits="${significantVersionDigits}"
+ generatedVersionLength="${generatedVersionLength}"
generateVersionsLists="${generateVersionsLists}"
groupConfiguration="${groupConfigurations}"
pluginPath="${pluginPath}"
+ filteredDependencyCheck="${filteredDependencyCheck}"
+ platformProperties="${platformProperties}"
/>
</target>
Modified: labs/jbossrules/trunk/drools-eclipse/package.xml
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/package.xml 2007-10-09 16:36:16 UTC (rev 15690)
+++ labs/jbossrules/trunk/drools-eclipse/package.xml 2007-10-09 17:21:35 UTC (rev 15691)
@@ -5,17 +5,17 @@
<mkdir dir="${tempDirectory}"/>
</target>
- <target name="retrieveMapFiles">
- <available property="mapsFetched" file="${workingDirectory}/all.maps"/>
+ <target name="retrieveMapFiles" unless="skipMaps">
+ <available property="mapsFetched" file="${workingDirectory}/all.maps"/>
<ant antfile="${customTargets}" target="getMapFiles" />
<concat destfile="${workingDirectory}/all.maps">
<fileset dir="${downloadDirectory}" includes="**/*.map"/>
</concat>
</target>
-
+
<!-- take the content of all.maps, retrieve the files according to the filtering options (config, content),
and generate a directory.txt for the rest of the process using config as a key, and containing the name of the zip and the directory -->
- <target name="retrieveFiles">
+ <target name="retrieveFiles" unless="skipFetch">
<eclipse.fetchFilesGenerator map="${workingDirectory}/all.maps"
workingDirectory="${workingDirectory}"
configInfo="${config}"
@@ -23,9 +23,9 @@
componentFilter="${componentFilter}"/>
<ant antfile="fetch.xml" dir="${workingDirectory}" />
</target>
-
+
<!-- Process the directory.txt to create unzipper.xml, and run unzipper.xml-->
- <target name="prepareResources">
+ <target name="prepareResources" unless="skipUnzip">
<eclipse.unzipperBuilder workingDirectory="${workingDirectory}"
configInfo="${config}"
packagePropertyFile="${packagingPropertyFile}"/>
@@ -34,27 +34,51 @@
<!-- Generate an assemble script (assemble.xml) for the given features -->
<target name="generateAssembleScripts">
+ <echo message="${target}"/>
<eclipse.assembler featureList="${featureList}"
workingDirectory="${workingDirectory}"
configInfo="${config}"
- baseLocation="${tempDirectory}/${featurePaths}"
+ baseLocation="${target}"
packagePropertyFile="${packagingPropertyFile}"
deltaPack="${deltaPack}"
- archivesFormat="${archivesFormat}"/>
+ archivesFormat="${archivesFormat}"
+ filteredDependencyCheck="${filteredDependencyCheck}"
+ normalize="${normalizeWhilePackaging}"/>
</target>
<!-- Call the assemble.xml script -->
<target name="callAssembleScripts">
<ant antfile="package.all.xml" dir="${workingDirectory}"/>
</target>
-
-
+
<target name="main" description="Start the packager for a given config">
- <property file="${packagingInfo}/packager.properties"/>
- <property name="customTargets" location="${packagingInfo}/customTargets.xml"/>
- <property name="packagingPropertyFile" location="${packagingInfo}/${packagingProperties}"/>
+ <property file="${packagingInfo}/packager.properties" />
+ <property name="customTargets" location="${packagingInfo}/customTargets.xml" />
+ <property name="packagingPropertyFile" location="${packagingInfo}/${packagingProperties}" />
- <antcall target="init"/>
+ <condition property="skipMaps" value="true">
+ <isset property="prefilledTarget" />
+ </condition>
+ <condition property="skipFetch" value="true">
+ <isset property="prefilledTarget" />
+ </condition>
+ <condition property="skipUnzip" value="true">
+ <isset property="prefilledTarget" />
+ </condition>
+
+ <!-- Compatibility -->
+ <property name="filteredDependencyCheck" value="false"/>
+ <condition property="skipMaps" value="true">
+ <isset property="localMaps"/>
+ </condition>
+ <condition property="target" value="${tempDirectory}/${featurePaths}">
+ <isset property="featurePaths"/>
+ </condition>
+ <property name="normalizeWhilePackaging" value="true"/>
+
+ <!-- End of compatibility -->
+
+ <antcall target="init" />
<antcall target="retrieveMapFiles"/>
<antcall target="retrieveFiles"/>
<antcall target="prepareResources"/>
Modified: labs/jbossrules/trunk/drools-eclipse/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/pom.xml 2007-10-09 16:36:16 UTC (rev 15690)
+++ labs/jbossrules/trunk/drools-eclipse/pom.xml 2007-10-09 17:21:35 UTC (rev 15691)
@@ -69,7 +69,7 @@
<property name="localEclipseDrop" value="${localEclipseDrop}" />
</ant>
- <java jar="${eclipse.home}/startup.jar"
+ <java jar="${eclipse.home}/plugins/org.eclipse.equinox.launcher_1.0.1.R33x_v20070828.jar"
fork="true"
failonerror="true"
maxmemory="128m">
@@ -163,7 +163,7 @@
<echo>-application org.eclipse.ant.core.antRunner -Dbaseos=${baseos} -Dbasews=${basews} -Dbasearch=${basearch} ${mavenTestPhase}</echo>
- <java jar="${eclipse.home}/startup.jar"
+ <java jar="${eclipse.home}/plugins/org.eclipse.equinox.launcher_1.0.1.R33x_v20070828.jar"
fork="true"
failonerror="true"
maxmemory="128m">
More information about the jboss-svn-commits
mailing list