JBoss Tools SVN: r21663 - trunk.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2010-04-24 07:17:51 -0400 (Sat, 24 Apr 2010)
New Revision: 21663
Modified:
trunk/
Log:
Removed merge tracking for "svnmerge" for
https://svn.jboss.org/repos/jbosstools/branches/ganymede
Property changes on: trunk
___________________________________________________________________
Name: svnmerge-integrated
- /branches/modular_build:1-21059 /branches/ganymede:1-7797 /branches/jbosstools-2.1.x:1-7998,8009-8012,8078-8079
+ /branches/modular_build:1-21059 /branches/jbosstools-2.1.x:1-7998,8009-8012,8078-8079
14 years
JBoss Tools SVN: r21662 - trunk.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2010-04-24 07:13:36 -0400 (Sat, 24 Apr 2010)
New Revision: 21662
Modified:
trunk/
Log:
Removed merge tracking for "svnmerge" for
https://svn.jboss.org/repos/jbosstools/branches/ganymede/trunk
Property changes on: trunk
___________________________________________________________________
Name: svnmerge-integrated
- /branches/modular_build:1-21059 /branches/ganymede:1-7797 /branches/ganymede/trunk:1-8005 /branches/jbosstools-2.1.x:1-7998,8009-8012,8078-8079
+ /branches/modular_build:1-21059 /branches/ganymede:1-7797 /branches/jbosstools-2.1.x:1-7998,8009-8012,8078-8079
14 years
JBoss Tools SVN: r21661 - trunk/bpel/releng.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-04-24 01:57:39 -0400 (Sat, 24 Apr 2010)
New Revision: 21661
Modified:
trunk/bpel/releng/build.properties
trunk/bpel/releng/testing.properties
Log:
tweak settings
Modified: trunk/bpel/releng/build.properties
===================================================================
--- trunk/bpel/releng/build.properties 2010-04-24 05:22:55 UTC (rev 21660)
+++ trunk/bpel/releng/build.properties 2010-04-24 05:57:39 UTC (rev 21661)
@@ -12,25 +12,9 @@
mainFeatureToBuildID=org.jboss.tools.bpel.sdk.feature
testFeatureToBuildID=org.jboss.tools.bpel.tests.feature
-# to (re)generate map and psfs, use these settings
-#build.steps=dir2svnmap,map2psf
-#dir2map.reporoot = http://anonsvn.jboss.org/repos
-#dir2map.repopath = jbosstools/trunk/bpel
-#dir2map.dir = /home/nboldt/eclipse/workspace-jboss/jbosstools-trunk/bpel
-#dir2map.map = /home/nboldt/eclipse/workspace-jboss/jbosstools-trunk/bpel/releng/maps/project.map
-
# on windows or mac, use testLocal; on linux use test (requires Xvnc or Xvfb)
build.steps=buildUpdate,buildTests,generateDigests,test,publish,cleanup
-# note: to run tests locally, these plugins must be pre-checked out into the local source folder:
-#org.jboss.tools.common.test -> /path/to/common/tests/org.jboss.tools.common.test/
-#org.jboss.tools.common -> /path/to/common/plugins/org.jboss.tools.common/
-#org.jboss.tools.tests -> /path/to/tests/tests/org.jboss.tools.tests/
-#localSourceCheckoutDir=/home/nboldt/eclipse/workspace-jboss/jbosstools-trunk/bpel
-#relengBuilderDir=/home/nboldt/eclipse/workspace-jboss/jbosstools-trunk/bpel/releng
-#relengBaseBuilderDir=/home/nboldt/eclipse/workspace-jboss/org.eclipse.releng.basebuilder
-#relengCommonBuilderDir=/home/nboldt/eclipse/workspace-jboss/org.eclipse.dash.common.releng
-
JAVA14_HOME=${JAVA_HOME}
JAVA50_HOME=${JAVA_HOME}
JAVA60_HOME=${JAVA_HOME}
@@ -38,11 +22,12 @@
# To make the build go faster, use locally cached zips instead of galileo site
repositoryURLs=\
http://download.jboss.org/jbosstools/updates/nightly/trunk/,\
-http://download.eclipse.org/releases/galileo/,\
+http://download.jboss.org/jbosstools/updates/galileo/,\
http://repository.jboss.org/eclipse/galileo/repos/eclipse-Update-3.5.2-20...
http://repository.jboss.org/eclipse/galileo/repos/GEF-Update-3.5.2.zip,\
http://repository.jboss.org/eclipse/galileo/repos/dtp-Updates-1.7.2-20100...
http://repository.jboss.org/eclipse/galileo/repos/emf-xsd-Update-2.5.0.zip
+#http://download.eclipse.org/releases/galileo/
# required if building bpel.compare.ui: org.eclipse.gmf.runtime.diagram.ui+org.eclipse.emf.compare.match+org.eclipse.emf.compare.diff+org.eclipse.emf.compare.ui+\
IUsToInstall=org.eclipse.sdk.feature.group+org.eclipse.sdk.ide+org.eclipse.core.net+org.eclipse.equinox.common+org.eclipse.core.runtime+org.eclipse.debug.core+org.eclipse.rcp.feature.group+\
Modified: trunk/bpel/releng/testing.properties
===================================================================
--- trunk/bpel/releng/testing.properties 2010-04-24 05:22:55 UTC (rev 21660)
+++ trunk/bpel/releng/testing.properties 2010-04-24 05:57:39 UTC (rev 21661)
@@ -8,3 +8,4 @@
# could also add things like: -Xbootclasspath/a:/path/to/emma.jar ?
Xflags= -Xms512m -Xmx1024m -XX:PermSize=128m -XX:MaxPermSize=256m
+Dflags=
\ No newline at end of file
14 years
JBoss Tools SVN: r21660 - in branches/jbosstools-3.1.x/cdi: tests/org.jboss.tools.cdi.core.test and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-04-24 01:22:55 -0400 (Sat, 24 Apr 2010)
New Revision: 21660
Modified:
branches/jbosstools-3.1.x/cdi/plugins/org.jboss.tools.cdi.core/build.properties
branches/jbosstools-3.1.x/cdi/tests/org.jboss.tools.cdi.core.test/META-INF/MANIFEST.MF
branches/jbosstools-3.1.x/cdi/tests/org.jboss.tools.cdi.core.test/build.properties
branches/jbosstools-3.1.x/cdi/tests/org.jboss.tools.cdi.ui.test/META-INF/MANIFEST.MF
branches/jbosstools-3.1.x/cdi/tests/org.jboss.tools.cdi.ui.test/build.properties
Log:
backport build.properties and manifest.mf changes from trunk for cdi tests
Modified: branches/jbosstools-3.1.x/cdi/plugins/org.jboss.tools.cdi.core/build.properties
===================================================================
--- branches/jbosstools-3.1.x/cdi/plugins/org.jboss.tools.cdi.core/build.properties 2010-04-24 05:02:58 UTC (rev 21659)
+++ branches/jbosstools-3.1.x/cdi/plugins/org.jboss.tools.cdi.core/build.properties 2010-04-24 05:22:55 UTC (rev 21660)
@@ -8,8 +8,9 @@
about.html
src.includes = src/,\
plugin.xml,\
+ about.html,\
images/,\
+ plugin.properties,\
+ META-INF/,\
build.properties,\
- about.html,\
- .settings/,\
- plugin.properties
+ .settings/
Modified: branches/jbosstools-3.1.x/cdi/tests/org.jboss.tools.cdi.core.test/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.1.x/cdi/tests/org.jboss.tools.cdi.core.test/META-INF/MANIFEST.MF 2010-04-24 05:02:58 UTC (rev 21659)
+++ branches/jbosstools-3.1.x/cdi/tests/org.jboss.tools.cdi.core.test/META-INF/MANIFEST.MF 2010-04-24 05:22:55 UTC (rev 21660)
@@ -13,3 +13,4 @@
org.jboss.tools.common
Export-Package: org.jboss.tools.cdi.core.test,
org.jboss.tools.cdi.core.test.tck
+Bundle-ClassPath: cdi-core-test.jar
Modified: branches/jbosstools-3.1.x/cdi/tests/org.jboss.tools.cdi.core.test/build.properties
===================================================================
--- branches/jbosstools-3.1.x/cdi/tests/org.jboss.tools.cdi.core.test/build.properties 2010-04-24 05:02:58 UTC (rev 21659)
+++ branches/jbosstools-3.1.x/cdi/tests/org.jboss.tools.cdi.core.test/build.properties 2010-04-24 05:22:55 UTC (rev 21660)
@@ -1,6 +1,7 @@
source.. = src/
-output.. = bin/
+output.cdi-core-test.jar = bin/
bin.includes = META-INF/,\
- .,\
+ cdi-core-test.jar,\
resources/,\
projects/
+source.cdi-core-test.jar = src/
Modified: branches/jbosstools-3.1.x/cdi/tests/org.jboss.tools.cdi.ui.test/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.1.x/cdi/tests/org.jboss.tools.cdi.ui.test/META-INF/MANIFEST.MF 2010-04-24 05:02:58 UTC (rev 21659)
+++ branches/jbosstools-3.1.x/cdi/tests/org.jboss.tools.cdi.ui.test/META-INF/MANIFEST.MF 2010-04-24 05:22:55 UTC (rev 21660)
@@ -18,3 +18,5 @@
org.jboss.tools.common,
org.eclipse.osgi,
org.eclipse.core.runtime
+Bundle-ClassPath: cdi-ui-test.jar
+Export-Package: org.jboss.tools.cdi.ui.test
Modified: branches/jbosstools-3.1.x/cdi/tests/org.jboss.tools.cdi.ui.test/build.properties
===================================================================
--- branches/jbosstools-3.1.x/cdi/tests/org.jboss.tools.cdi.ui.test/build.properties 2010-04-24 05:02:58 UTC (rev 21659)
+++ branches/jbosstools-3.1.x/cdi/tests/org.jboss.tools.cdi.ui.test/build.properties 2010-04-24 05:22:55 UTC (rev 21660)
@@ -1,5 +1,5 @@
-source.. = src/
-output.. = bin/
bin.includes = META-INF/,\
- .,\
- resources/
+ resources/,\
+ cdi-ui-test.jar
+source.cdi-ui-test.jar = src/
+jars.compile.order = cdi-ui-test.jar
14 years
JBoss Tools SVN: r21659 - branches/modular_build/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-04-24 01:02:58 -0400 (Sat, 24 Apr 2010)
New Revision: 21659
Modified:
branches/modular_build/build/build.xml
Log:
improve failonerror handling in case svn dies trying to <info> or <update>
Modified: branches/modular_build/build/build.xml
===================================================================
--- branches/modular_build/build/build.xml 2010-04-24 04:55:21 UTC (rev 21658)
+++ branches/modular_build/build/build.xml 2010-04-24 05:02:58 UTC (rev 21659)
@@ -161,13 +161,13 @@
<if>
<equals arg1="@{op}" arg2="up" />
<then>
- <svn javahl="false" svnkit="true">
+ <svn javahl="false" svnkit="true" failonerror="false">
<update recurse="${svn.recurse}" dir="@{COMPONENT}" />
</svn>
</then>
<else>
<echo level="info">Fetch sources from ${svn.root}/@{COMPONENT} into ${WORKINGDIR}/@{COMPONENT}</echo>
- <svn javahl="false" svnkit="true">
+ <svn javahl="false" svnkit="true" failonerror="true">
<checkout recurse="${svn.recurse}"
url="${svn.root}/@{COMPONENT}"
destpath="${WORKINGDIR}/@{COMPONENT}"
@@ -177,11 +177,16 @@
</if>
<!-- Store svn info so we can compare it later and thus not need to update or checkout every time -->
- <svn javahl="false" svnkit="true">
+ <svn javahl="false" svnkit="true" failonerror="false">
<info target="${WORKINGDIR}/@{COMPONENT}" propprefix="svn.info.@{COMPONENT}" />
</svn>
- <echo file="svn.info-(a){COMPONENT}.txt">svn.info.(a){COMPONENT}.rev = ${svn.info.(a){COMPONENT}.rev}
+ <if>
+ <isset property="svn.info.(a){COMPONENT}.rev" />
+ <then>
+ <echo file="svn.info-(a){COMPONENT}.txt">svn.info.(a){COMPONENT}.rev = ${svn.info.(a){COMPONENT}.rev}
</echo>
+ </then>
+ </if>
<echo file="build.cfg" message="@{COMPONENT}," append="true" />
</sequential>
</macrodef>
@@ -204,17 +209,25 @@
<then>
<property file="svn.info-(a){COMPONENT}.txt" />
<!-- check svn info; if new version found, svn up -->
- <svn javahl="false" svnkit="true">
+ <svn javahl="false" svnkit="true" failonerror="false">
<info target="${WORKINGDIR}/@{COMPONENT}"
propprefix="svn.info.(a){COMPONENT}.check"
/>
</svn>
<if>
- <not>
- <equals arg1="${svn.info.(a){COMPONENT}.rev}"
- arg2="${svn.info.(a){COMPONENT}.check.rev}"
- />
- </not>
+ <or>
+ <not>
+ <isset property="svn.info.(a){COMPONENT}.rev" />
+ </not>
+ <not>
+ <isset property="svn.info.(a){COMPONENT}.check.rev" />
+ </not>
+ <not>
+ <equals arg1="${svn.info.(a){COMPONENT}.rev}"
+ arg2="${svn.info.(a){COMPONENT}.check.rev}"
+ />
+ </not>
+ </or>
<then>
<svn.fetch component="@{COMPONENT}" op="up" />
</then>
14 years
JBoss Tools SVN: r21658 - branches/modular_build/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-04-24 00:55:21 -0400 (Sat, 24 Apr 2010)
New Revision: 21658
Modified:
branches/modular_build/build/build.xml
Log:
refactor and don't fetch bootstrap scripts unless files not present
Modified: branches/modular_build/build/build.xml
===================================================================
--- branches/modular_build/build/build.xml 2010-04-24 04:47:52 UTC (rev 21657)
+++ branches/modular_build/build/build.xml 2010-04-24 04:55:21 UTC (rev 21658)
@@ -37,7 +37,7 @@
cd /home/nboldt/workspace36/jbosstools-modular_build; ant -DCOMPONENTS=tests,common -Dbuild.if.sources.unchanged=true
-->
- <target name="run" depends="init, get.bootstrap.scripts, get.sources, get.components.to.build, install" />
+ <target name="run" depends="init, get.bootstrap.scripts, get.sources, get.components.to.build, run.build" />
<!-- override for local build -->
<condition property="isInHudson" value="true">
@@ -137,6 +137,13 @@
<available file="${COMMON_TOOLS}/apache-maven-${maven.version}/bin/mvn" type="file" property="maven.exists" />
<antcall target="get.maven" />
+
+ <condition property="bootstrap.scripts.exist" value="true">
+ <and>
+ <available file="${WORKINGDIR}/parent-pom.xml" type="file" />
+ <available file="${WORKINGDIR}/genpom.xml" type="file" />
+ </and>
+ </condition>
</target>
<target name="get.sources" description="if sources not already on disk, fetch them">
@@ -235,7 +242,7 @@
</target>
- <target name="get.bootstrap.scripts">
+ <target name="get.bootstrap.scripts" unless="bootstrap.scripts.exist">
<!-- also get files required to bootstrap the build -->
<get src="${svn.root}/parent-pom.xml" dest="${WORKINGDIR}/parent-pom.xml" usetimestamp="true" />
<get src="${svn.root}/genpom.xml" dest="${WORKINGDIR}/genpom.xml" usetimestamp="true" />
@@ -252,7 +259,7 @@
</if>
</target>
- <target name="install">
+ <target name="run.build">
<!-- could set -Dmaven.test.skip to skip tests, etc. -->
<property name="MAVEN_FLAGS" value="" />
<for param="COMPONENT" list="${COMPONENTS.to.build}" delimiter=",
14 years
JBoss Tools SVN: r21657 - branches/modular_build/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-04-24 00:47:52 -0400 (Sat, 24 Apr 2010)
New Revision: 21657
Modified:
branches/modular_build/build/build.xml
Log:
don't unpack and chmod mvn if already present
Modified: branches/modular_build/build/build.xml
===================================================================
--- branches/modular_build/build/build.xml 2010-04-24 04:22:03 UTC (rev 21656)
+++ branches/modular_build/build/build.xml 2010-04-24 04:47:52 UTC (rev 21657)
@@ -86,6 +86,20 @@
<delete dir="${java.io.tmpdir}/svnant-1.3.0.zip_" includeemptydirs="true" quiet="true" />
</target>
+ <target name="get.maven" unless="maven.exists">
+ <property name="MAVEN_MIRROR" value="http://mirror.csclub.uwaterloo.ca/apache/maven/binaries" />
+ <get usetimestamp="true"
+ dest="${COMMON_TOOLS}/apache-maven-${maven.version}-bin.tar.gz"
+ src="${MAVEN_MIRROR}/apache-maven-${maven.version}-bin.tar.gz"
+ />
+ <untar compression="gzip"
+ overwrite="false"
+ dest="${COMMON_TOOLS}"
+ src="${COMMON_TOOLS}/apache-maven-${maven.version}-bin.tar.gz"
+ />
+ <chmod perm="755" file="${COMMON_TOOLS}/apache-maven-${maven.version}/bin/mvn" />
+ </target>
+
<target name="init" depends="local">
<!-- https://jira.jboss.org/jira/browse/JBQA-3313 Use static, shared space outside workspace, instead of working directly in the workspace -->
<condition property="WORKINGDIR" value="/home/hudson/static_build_env/jbds/tools/sources" else="${basedir}">
@@ -121,17 +135,8 @@
</classpath>
</taskdef>
- <property name="MAVEN_MIRROR" value="http://mirror.csclub.uwaterloo.ca/apache/maven/binaries" />
- <get usetimestamp="true"
- dest="${COMMON_TOOLS}/apache-maven-${maven.version}-bin.tar.gz"
- src="${MAVEN_MIRROR}/apache-maven-${maven.version}-bin.tar.gz"
- />
- <untar compression="gzip"
- overwrite="false"
- dest="${COMMON_TOOLS}"
- src="${COMMON_TOOLS}/apache-maven-${maven.version}-bin.tar.gz"
- />
- <chmod perm="755" file="${COMMON_TOOLS}/apache-maven-${maven.version}/bin/mvn" />
+ <available file="${COMMON_TOOLS}/apache-maven-${maven.version}/bin/mvn" type="file" property="maven.exists" />
+ <antcall target="get.maven" />
</target>
<target name="get.sources" description="if sources not already on disk, fetch them">
@@ -193,7 +198,9 @@
<property file="svn.info-(a){COMPONENT}.txt" />
<!-- check svn info; if new version found, svn up -->
<svn javahl="false" svnkit="true">
- <info target="${WORKINGDIR}/@{COMPONENT}" propprefix="svn.info.(a){COMPONENT}.check" />
+ <info target="${WORKINGDIR}/@{COMPONENT}"
+ propprefix="svn.info.(a){COMPONENT}.check"
+ />
</svn>
<if>
<not>
14 years
JBoss Tools SVN: r21656 - branches/jbosstools-3.1.x/tests/features/org.jboss.tools.all.test.feature.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-04-24 00:22:03 -0400 (Sat, 24 Apr 2010)
New Revision: 21656
Modified:
branches/jbosstools-3.1.x/tests/features/org.jboss.tools.all.test.feature/feature.xml
Log:
add cdi plugins to test feature so PDE will build them
Modified: branches/jbosstools-3.1.x/tests/features/org.jboss.tools.all.test.feature/feature.xml
===================================================================
--- branches/jbosstools-3.1.x/tests/features/org.jboss.tools.all.test.feature/feature.xml 2010-04-24 04:17:56 UTC (rev 21655)
+++ branches/jbosstools-3.1.x/tests/features/org.jboss.tools.all.test.feature/feature.xml 2010-04-24 04:22:03 UTC (rev 21656)
@@ -305,4 +305,22 @@
version="0.0.0"
unpack="false"/>
+ <plugin
+ id="org.jboss.tools.cdi.core.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.cdi.text.ext.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.cdi.ui.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
</feature>
14 years
JBoss Tools SVN: r21655 - branches/modular_build/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-04-24 00:17:56 -0400 (Sat, 24 Apr 2010)
New Revision: 21655
Modified:
branches/modular_build/build/build.xml
Log:
disable <svn info> verbose setting
Modified: branches/modular_build/build/build.xml
===================================================================
--- branches/modular_build/build/build.xml 2010-04-24 04:08:21 UTC (rev 21654)
+++ branches/modular_build/build/build.xml 2010-04-24 04:17:56 UTC (rev 21655)
@@ -166,7 +166,7 @@
<!-- Store svn info so we can compare it later and thus not need to update or checkout every time -->
<svn javahl="false" svnkit="true">
- <info verbose="true" target="${WORKINGDIR}/@{COMPONENT}" propprefix="svn.info.@{COMPONENT}" />
+ <info target="${WORKINGDIR}/@{COMPONENT}" propprefix="svn.info.@{COMPONENT}" />
</svn>
<echo file="svn.info-(a){COMPONENT}.txt">svn.info.(a){COMPONENT}.rev = ${svn.info.(a){COMPONENT}.rev}
</echo>
14 years
JBoss Tools SVN: r21654 - branches/modular_build/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-04-24 00:08:21 -0400 (Sat, 24 Apr 2010)
New Revision: 21654
Modified:
branches/modular_build/build/build.xml
Log:
add note about -Dbuild.if.sources.unchanged=true in usage instructions
Modified: branches/modular_build/build/build.xml
===================================================================
--- branches/modular_build/build/build.xml 2010-04-24 04:04:21 UTC (rev 21653)
+++ branches/modular_build/build/build.xml 2010-04-24 04:08:21 UTC (rev 21654)
@@ -33,6 +33,8 @@
cd /home/nboldt/workspace36/jbosstools-modular_build; ant -DMAVEN_FLAGS="-Dmaven.test.skip"
or, to build specific module(s):
cd /home/nboldt/workspace36/jbosstools-modular_build; ant -DCOMPONENTS=tests,common,flow,jbpm
+ or, to rebuild even if sources have not changed:
+ cd /home/nboldt/workspace36/jbosstools-modular_build; ant -DCOMPONENTS=tests,common -Dbuild.if.sources.unchanged=true
-->
<target name="run" depends="init, get.bootstrap.scripts, get.sources, get.components.to.build, install" />
14 years