[jbosstools-commits] JBoss Tools SVN: r20551 - trunk/bpel/releng and 1 other directory.

Author: nickboldt Date: 2010-03-01 19:50:22 -0500 (Mon, 01 Mar 2010) New Revision: 20551 Removed: branches/jbosstools-3.1.x/bpel/releng/build.properties.example.hudson.qa.... branches/jbosstools-3.1.x/bpel/releng/build.properties.example.linux branches/jbosstools-3.1.x/bpel/releng/build.properties.example.windows trunk/bpel/releng/build.properties.example.hudson.qa.jboss.com trunk/bpel/releng/build.properties.example.linux trunk/bpel/releng/build.properties.example.windows Modified: branches/jbosstools-3.1.x/bpel/releng/build.properties branches/jbosstools-3.1.x/bpel/releng/build.xml trunk/bpel/releng/build.xml Log: simplify configuration - now only need one properties file, not 1 per platform! Modified: branches/jbosstools-3.1.x/bpel/releng/build.properties =================================================================== --- branches/jbosstools-3.1.x/bpel/releng/build.properties 2010-03-02 00:18:28 UTC (rev 20550) +++ branches/jbosstools-3.1.x/bpel/releng/build.properties 2010-03-02 00:50:22 UTC (rev 20551) @@ -12,9 +12,25 @@ 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} Deleted: branches/jbosstools-3.1.x/bpel/releng/build.properties.example.hudson.qa.... =================================================================== --- branches/jbosstools-3.1.x/bpel/releng/build.properties.example.hudson.qa.... 2010-03-02 00:18:28 UTC (rev 20550) +++ branches/jbosstools-3.1.x/bpel/releng/build.properties.example.hudson.qa.... 2010-03-02 00:50:22 UTC (rev 20551) @@ -1,59 +0,0 @@ -## BEGIN PROJECT BUILD PROPERTIES ## - -# this property allows ant-contrib and pde-svn-plugin to be fetched and installed automatically for you -thirdPartyDownloadLicenseAcceptance="I accept" - -projectid=jbosstools.bpel -zipPrefix=BPEL -incubation= -buildType=N -version=1.0.0 - -mainFeatureToBuildID=org.jboss.tools.bpel.sdk.feature -testFeatureToBuildID=org.jboss.tools.bpel.tests.feature - -# on windows or mac, use testLocal; on linux use test (requires Xvnc or Xvfb) -build.steps=buildUpdate,buildTests,generateDigests,test,publish,cleanup - -JAVA14_HOME=${JAVA_HOME} -JAVA50_HOME=${JAVA_HOME} -JAVA60_HOME=${JAVA_HOME} - -# 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://repository.jboss.org/eclipse/galileo/repos/eclipse-Update-R-3.5.1-200909170800.zip,\ -http://repository.jboss.org/eclipse/galileo/repos/GEF-Update-3.5.1.zip,\ -http://repository.jboss.org/eclipse/galileo/repos/dtp-Updates-1.7-20090908.zip,\ -http://repository.jboss.org/eclipse/galileo/repos/emf-xsd-Update-2.5.0.zip -#,\ -#http://repository.jboss.org/eclipse/galileo/repos/jst-buildrepo-R-3.1.1-20090917225226.zip,\ -#http://repository.jboss.org/eclipse/galileo/repos/wst-buildrepo-R-3.1.1-20090917225226.zip - -# 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+\ -org.eclipse.jst.server.generic.core+\ -org.eclipse.wst.ws_core.feature.feature.group+org.eclipse.wst.web_ui.feature.feature.group+org.eclipse.wst.ws_wsdl15.feature.feature.group+\ -org.eclipse.wst.xml_ui.feature.feature.group+org.eclipse.wst.common_ui.feature.feature.group+org.eclipse.wst.common_core.feature.feature.group+\ -org.eclipse.xsd.feature.group+org.eclipse.gef.feature.group+\ -org.mozilla.xpcom+org.jboss.tools.vpe.resref+org.jboss.tools.jst.web.ui+org.jboss.ide.eclipse.as.core+org.jboss.ide.eclipse.archives.webtools+org.jboss.tools.jmx.feature.feature.group+\ -org.jboss.tools.project.examples - -flattenDependencies=true -parallelCompilation=true -generateFeatureVersionSuffix=true -individualSourceBundles=true - -# don't suppress cleanup if tests fail -noclean=false - -# do not sign or pack jars -#skipPack=true -skipSign=true - -domainNamespace=* -projNamespace=org.jboss.tools.bpel -projRelengName=org.jboss.tools.bpel.releng - -## END PROJECT BUILD PROPERTIES ## Deleted: branches/jbosstools-3.1.x/bpel/releng/build.properties.example.linux =================================================================== --- branches/jbosstools-3.1.x/bpel/releng/build.properties.example.linux 2010-03-02 00:18:28 UTC (rev 20550) +++ branches/jbosstools-3.1.x/bpel/releng/build.properties.example.linux 2010-03-02 00:50:22 UTC (rev 20551) @@ -1,78 +0,0 @@ -## BEGIN PROJECT BUILD PROPERTIES ## - -# this property allows ant-contrib and pde-svn-plugin to be fetched and installed automatically for you -thirdPartyDownloadLicenseAcceptance="I accept" - -projectid=jbosstools.bpel -zipPrefix=BPEL -incubation= -buildType=N -version=1.0.0 - -mainFeatureToBuildID=org.jboss.tools.bpel.sdk.feature -testFeatureToBuildID=org.jboss.tools.bpel.tests.feature - -# on windows or mac, use testLocal; on linux use test (requires Xvnc or Xvfb) -build.steps=buildUpdate,buildTests,generateDigests,test,publish,cleanup - -# Re-use local sources? -# 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/ - -# 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 - -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 - -JAVA_HOME=/usr/lib/jvm/java -JAVA14_HOME=/usr/lib/jvm/java -JAVA50_HOME=/usr/lib/jvm/java -JAVA60_HOME=/usr/lib/jvm/java - -# 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://repository.jboss.org/eclipse/galileo/repos/eclipse-Update-R-3.5.1-200909170800.zip,\ -http://repository.jboss.org/eclipse/galileo/repos/GEF-Update-3.5.1.zip,\ -http://repository.jboss.org/eclipse/galileo/repos/dtp-Updates-1.7-20090908.zip,\ -http://repository.jboss.org/eclipse/galileo/repos/emf-xsd-Update-2.5.0.zip -#,\ -#http://repository.jboss.org/eclipse/galileo/repos/jst-buildrepo-R-3.1.1-20090917225226.zip,\ -#http://repository.jboss.org/eclipse/galileo/repos/wst-buildrepo-R-3.1.1-20090917225226.zip - -# 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+\ -org.eclipse.jst.server.generic.core+\ -org.eclipse.wst.ws_core.feature.feature.group+org.eclipse.wst.web_ui.feature.feature.group+org.eclipse.wst.ws_wsdl15.feature.feature.group+\ -org.eclipse.wst.xml_ui.feature.feature.group+org.eclipse.wst.common_ui.feature.feature.group+org.eclipse.wst.common_core.feature.feature.group+\ -org.eclipse.xsd.feature.group+org.eclipse.gef.feature.group+\ -org.mozilla.xpcom+org.jboss.tools.vpe.resref+org.jboss.tools.jst.web.ui+org.jboss.ide.eclipse.as.core+org.jboss.ide.eclipse.archives.webtools+org.jboss.tools.jmx.feature.feature.group+\ -org.jboss.tools.project.examples - -flattenDependencies=true -parallelCompilation=true -generateFeatureVersionSuffix=true -individualSourceBundles=true - -# don't suppress cleanup if tests fail -noclean=false - -# do not sign or pack jars -#skipPack=true -skipSign=true - -domainNamespace=* -projNamespace=org.jboss.tools.bpel -projRelengName=org.jboss.tools.bpel.releng - -## END PROJECT BUILD PROPERTIES ## Deleted: branches/jbosstools-3.1.x/bpel/releng/build.properties.example.windows =================================================================== --- branches/jbosstools-3.1.x/bpel/releng/build.properties.example.windows 2010-03-02 00:18:28 UTC (rev 20550) +++ branches/jbosstools-3.1.x/bpel/releng/build.properties.example.windows 2010-03-02 00:50:22 UTC (rev 20551) @@ -1,73 +0,0 @@ -## BEGIN PROJECT BUILD PROPERTIES ## - -# this property allows ant-contrib and pde-svn-plugin to be fetched and installed automatically for you -thirdPartyDownloadLicenseAcceptance="I accept" - -projectid=jbosstools.bpel -zipPrefix=BPEL -incubation= -buildType=N -version=1.0.0 - -mainFeatureToBuildID=org.jboss.tools.bpel.sdk.feature -testFeatureToBuildID=org.jboss.tools.bpel.tests.feature - -# on windows or mac, use testLocal; on linux use test (requires Xvnc or Xvfb) -build.steps=buildUpdate,buildTests,generateDigests,testLocal,publish,cleanup - -# Re-use local sources? -# 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/ - -# For windows, must be explicit about paths using correct slashes (/); dirs with spaces should be avoided -writableBuildRoot=C:/tmp/build -localSourceCheckoutDir=C:/workspace2 -relengBuilderDir=C:/workspace2/org.jboss.tools.bpel.releng -relengBaseBuilderDir=C:/workspace2/org.eclipse.releng.basebuilder -relengCommonBuilderDir=C:/workspace2/org.eclipse.dash.common.releng - -JAVA_HOME=C:/Progra~1/Java/jdk1.6.0_11 -JAVA14_HOME=C:/Progra~1/Java/jdk1.6.0_11 -JAVA50_HOME=C:/Progra~1/Java/jdk1.6.0_11 -JAVA60_HOME=C:/Progra~1/Java/jdk1.6.0_11 - -# 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://repository.jboss.org/eclipse/galileo/repos/eclipse-Update-R-3.5.1-200909170800.zip,\ -http://repository.jboss.org/eclipse/galileo/repos/GEF-Update-3.5.1.zip,\ -http://repository.jboss.org/eclipse/galileo/repos/dtp-Updates-1.7-20090908.zip,\ -http://repository.jboss.org/eclipse/galileo/repos/emf-xsd-Update-2.5.0.zip -#,\ -#http://repository.jboss.org/eclipse/galileo/repos/jst-buildrepo-R-3.1.1-20090917225226.zip,\ -#http://repository.jboss.org/eclipse/galileo/repos/wst-buildrepo-R-3.1.1-20090917225226.zip - -# 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+\ -org.eclipse.jst.server.generic.core+\ -org.eclipse.wst.ws_core.feature.feature.group+org.eclipse.wst.web_ui.feature.feature.group+org.eclipse.wst.ws_wsdl15.feature.feature.group+\ -org.eclipse.wst.xml_ui.feature.feature.group+org.eclipse.wst.common_ui.feature.feature.group+org.eclipse.wst.common_core.feature.feature.group+\ -org.eclipse.xsd.feature.group+org.eclipse.gef.feature.group+\ -org.mozilla.xpcom+org.jboss.tools.vpe.resref+org.jboss.tools.jst.web.ui+org.jboss.ide.eclipse.as.core+org.jboss.ide.eclipse.archives.webtools+org.jboss.tools.jmx.feature.feature.group+\ -org.jboss.tools.project.examples - -flattenDependencies=true -parallelCompilation=true -generateFeatureVersionSuffix=true -individualSourceBundles=true - -# don't suppress cleanup if tests fail -noclean=false - -# do not sign or pack jars -#skipPack=true -skipSign=true - -domainNamespace=* -projNamespace=org.jboss.tools.bpel -projRelengName=org.jboss.tools.bpel.releng - -## END PROJECT BUILD PROPERTIES ## Modified: branches/jbosstools-3.1.x/bpel/releng/build.xml =================================================================== --- branches/jbosstools-3.1.x/bpel/releng/build.xml 2010-03-02 00:18:28 UTC (rev 20550) +++ branches/jbosstools-3.1.x/bpel/releng/build.xml 2010-03-02 00:50:22 UTC (rev 20551) @@ -1,40 +1,41 @@ -<project default="run" name="org.jboss.tools.*.releng/build.xml - Run a JBoss Tools component build using the Athena CBI"> +<!-- A sample build file for use with Hudson. Note that forceContextQualifier + is being set, which overrides tag/branch values found in *.map files +--> +<project default="run"> <target name="run"> - <!-- - You must check out the following projects to your workspace: - - org.eclipse.releng.basebuilder - org.eclipse.dash.common.releng - jbosstools/trunk/<your component>/releng + <!-- 0. Set a valid path to JAVA_HOME, if Eclipse's ${java.home}/../bin/javac cannot be found --> + <property name="JAVA_HOME" value="${java.home}/.." /> - <!-- load properties and set timestamp for the build --> - <property file="build.properties" /> <tstamp> <format property="buildTimestamp" pattern="yyyyMMddHHmm" /> </tstamp> + <property name="forceContextQualifier" value="v${buildTimestamp}" /> - <!-- calculate workspaceDir as parent of this folder, the project's .releng folder (relengBuilderDir) --> - <property name="relengBuilderDir" value="${basedir}" /> - <dirname file="${relengBuilderDir}" property="workspaceDir" /> - - <!-- - can build in /tmp, eg., in /tmp/build, or in workspace, eg., - ${WORKSPACE}/build + <!-- 1. Import these projects using File > Import > Team Project Set > ./psfs/athena.psf. + 2. Close the org.eclipse.releng.basebuilder project - it does not need to compile to be of use. + 3. You can also define absolute paths for these directories, if relative paths do not work. --> - <property name="writableBuildRoot" value="/tmp/build" /> + <condition property="relengCommonBuilderDir" + value="${basedir}/../../../org.eclipse.dash.common.releng" + else="${basedir}/../org.eclipse.dash.common.releng" + > + <available file="${basedir}/../../../org.eclipse.dash.common.releng" type="dir" /> + </condition> + <condition property="relengBaseBuilderDir" + value="${basedir}/../../../org.eclipse.releng.basebuilder" + else="${basedir}/../org.eclipse.releng.basebuilder" + > + <available file="${basedir}/../../../org.eclipse.releng.basebuilder" type="dir" /> + </condition> - <!-- - can be simple path, eg., - ${writableBuildRoot}/${buildType}${buildTimestamp} or longer, eg., - ${writableBuildRoot}/${topprojectName}/${projectName}/downloads/drops/${version}/${buildType}${buildTimestamp} or - ${writableBuildRoot}/${topprojectName}/${projectName}/${subprojectName}/downloads/drops/${version}/${buildType}${buildTimestamp} + <!-- 4. To build from CVS sources using information in the ./maps/*.map files, comment these next two properties + 5. Or, to build from sources in the workspace, use these properties. You can also use absolute paths if needed. --> - <property name="buildDir" value="${writableBuildRoot}/${buildType}${buildTimestamp}-${zipPrefix}" /> + <!-- <property name="localSourceCheckoutDir" value="${basedir}/.." /> + <property name="relengBuilderDir" value="${basedir}" /> --> - <!-- invoke a new Eclipse process and launch the build from the common.releng folder --> - <property name="relengCommonBuilderDir" value="${workspaceDir}/org.eclipse.dash.common.releng" /> - <ant antfile="${relengCommonBuilderDir}/buildAll.xml" target="runEclipse" dir="${relengCommonBuilderDir}" /> - + <property file="build.properties" /> + <ant antfile="${relengCommonBuilderDir}/build.xml" /> </target> </project> Deleted: trunk/bpel/releng/build.properties.example.hudson.qa.jboss.com =================================================================== --- trunk/bpel/releng/build.properties.example.hudson.qa.jboss.com 2010-03-02 00:18:28 UTC (rev 20550) +++ trunk/bpel/releng/build.properties.example.hudson.qa.jboss.com 2010-03-02 00:50:22 UTC (rev 20551) @@ -1,59 +0,0 @@ -## BEGIN PROJECT BUILD PROPERTIES ## - -# this property allows ant-contrib and pde-svn-plugin to be fetched and installed automatically for you -thirdPartyDownloadLicenseAcceptance="I accept" - -projectid=jbosstools.bpel -zipPrefix=BPEL -incubation= -buildType=N -version=1.0.0 - -mainFeatureToBuildID=org.jboss.tools.bpel.sdk.feature -testFeatureToBuildID=org.jboss.tools.bpel.tests.feature - -# on windows or mac, use testLocal; on linux use test (requires Xvnc or Xvfb) -build.steps=buildUpdate,buildTests,generateDigests,test,publish,cleanup - -JAVA14_HOME=${JAVA_HOME} -JAVA50_HOME=${JAVA_HOME} -JAVA60_HOME=${JAVA_HOME} - -# 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://repository.jboss.org/eclipse/galileo/repos/eclipse-Update-R-3.5.1-200909170800.zip,\ -http://repository.jboss.org/eclipse/galileo/repos/GEF-Update-3.5.1.zip,\ -http://repository.jboss.org/eclipse/galileo/repos/dtp-Updates-1.7-20090908.zip,\ -http://repository.jboss.org/eclipse/galileo/repos/emf-xsd-Update-2.5.0.zip -#,\ -#http://repository.jboss.org/eclipse/galileo/repos/jst-buildrepo-R-3.1.1-20090917225226.zip,\ -#http://repository.jboss.org/eclipse/galileo/repos/wst-buildrepo-R-3.1.1-20090917225226.zip - -# 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+\ -org.eclipse.jst.server.generic.core+\ -org.eclipse.wst.ws_core.feature.feature.group+org.eclipse.wst.web_ui.feature.feature.group+org.eclipse.wst.ws_wsdl15.feature.feature.group+\ -org.eclipse.wst.xml_ui.feature.feature.group+org.eclipse.wst.common_ui.feature.feature.group+org.eclipse.wst.common_core.feature.feature.group+\ -org.eclipse.xsd.feature.group+org.eclipse.gef.feature.group+\ -org.mozilla.xpcom+org.jboss.tools.vpe.resref+org.jboss.tools.jst.web.ui+org.jboss.ide.eclipse.as.core+org.jboss.ide.eclipse.archives.webtools+org.jboss.tools.jmx.feature.feature.group+\ -org.jboss.tools.project.examples - -flattenDependencies=true -parallelCompilation=true -generateFeatureVersionSuffix=true -individualSourceBundles=true - -# don't suppress cleanup if tests fail -noclean=false - -# do not sign or pack jars -#skipPack=true -skipSign=true - -domainNamespace=* -projNamespace=org.jboss.tools.bpel -projRelengName=org.jboss.tools.bpel.releng - -## END PROJECT BUILD PROPERTIES ## Deleted: trunk/bpel/releng/build.properties.example.linux =================================================================== --- trunk/bpel/releng/build.properties.example.linux 2010-03-02 00:18:28 UTC (rev 20550) +++ trunk/bpel/releng/build.properties.example.linux 2010-03-02 00:50:22 UTC (rev 20551) @@ -1,78 +0,0 @@ -## BEGIN PROJECT BUILD PROPERTIES ## - -# this property allows ant-contrib and pde-svn-plugin to be fetched and installed automatically for you -thirdPartyDownloadLicenseAcceptance="I accept" - -projectid=jbosstools.bpel -zipPrefix=BPEL -incubation= -buildType=N -version=1.0.0 - -mainFeatureToBuildID=org.jboss.tools.bpel.sdk.feature -testFeatureToBuildID=org.jboss.tools.bpel.tests.feature - -# on windows or mac, use testLocal; on linux use test (requires Xvnc or Xvfb) -build.steps=buildUpdate,buildTests,generateDigests,test,publish,cleanup - -# Re-use local sources? -# 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/ - -# 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 - -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 - -JAVA_HOME=/usr/lib/jvm/java -JAVA14_HOME=/usr/lib/jvm/java -JAVA50_HOME=/usr/lib/jvm/java -JAVA60_HOME=/usr/lib/jvm/java - -# 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://repository.jboss.org/eclipse/galileo/repos/eclipse-Update-R-3.5.1-200909170800.zip,\ -http://repository.jboss.org/eclipse/galileo/repos/GEF-Update-3.5.1.zip,\ -http://repository.jboss.org/eclipse/galileo/repos/dtp-Updates-1.7-20090908.zip,\ -http://repository.jboss.org/eclipse/galileo/repos/emf-xsd-Update-2.5.0.zip -#,\ -#http://repository.jboss.org/eclipse/galileo/repos/jst-buildrepo-R-3.1.1-20090917225226.zip,\ -#http://repository.jboss.org/eclipse/galileo/repos/wst-buildrepo-R-3.1.1-20090917225226.zip - -# 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+\ -org.eclipse.jst.server.generic.core+\ -org.eclipse.wst.ws_core.feature.feature.group+org.eclipse.wst.web_ui.feature.feature.group+org.eclipse.wst.ws_wsdl15.feature.feature.group+\ -org.eclipse.wst.xml_ui.feature.feature.group+org.eclipse.wst.common_ui.feature.feature.group+org.eclipse.wst.common_core.feature.feature.group+\ -org.eclipse.xsd.feature.group+org.eclipse.gef.feature.group+\ -org.mozilla.xpcom+org.jboss.tools.vpe.resref+org.jboss.tools.jst.web.ui+org.jboss.ide.eclipse.as.core+org.jboss.ide.eclipse.archives.webtools+org.jboss.tools.jmx.feature.feature.group+\ -org.jboss.tools.project.examples - -flattenDependencies=true -parallelCompilation=true -generateFeatureVersionSuffix=true -individualSourceBundles=true - -# don't suppress cleanup if tests fail -noclean=false - -# do not sign or pack jars -#skipPack=true -skipSign=true - -domainNamespace=* -projNamespace=org.jboss.tools.bpel -projRelengName=org.jboss.tools.bpel.releng - -## END PROJECT BUILD PROPERTIES ## Deleted: trunk/bpel/releng/build.properties.example.windows =================================================================== --- trunk/bpel/releng/build.properties.example.windows 2010-03-02 00:18:28 UTC (rev 20550) +++ trunk/bpel/releng/build.properties.example.windows 2010-03-02 00:50:22 UTC (rev 20551) @@ -1,73 +0,0 @@ -## BEGIN PROJECT BUILD PROPERTIES ## - -# this property allows ant-contrib and pde-svn-plugin to be fetched and installed automatically for you -thirdPartyDownloadLicenseAcceptance="I accept" - -projectid=jbosstools.bpel -zipPrefix=BPEL -incubation= -buildType=N -version=1.0.0 - -mainFeatureToBuildID=org.jboss.tools.bpel.sdk.feature -testFeatureToBuildID=org.jboss.tools.bpel.tests.feature - -# on windows or mac, use testLocal; on linux use test (requires Xvnc or Xvfb) -build.steps=buildUpdate,buildTests,generateDigests,testLocal,publish,cleanup - -# Re-use local sources? -# 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/ - -# For windows, must be explicit about paths using correct slashes (/); dirs with spaces should be avoided -writableBuildRoot=C:/tmp/build -localSourceCheckoutDir=C:/workspace2 -relengBuilderDir=C:/workspace2/org.jboss.tools.bpel.releng -relengBaseBuilderDir=C:/workspace2/org.eclipse.releng.basebuilder -relengCommonBuilderDir=C:/workspace2/org.eclipse.dash.common.releng - -JAVA_HOME=C:/Progra~1/Java/jdk1.6.0_11 -JAVA14_HOME=C:/Progra~1/Java/jdk1.6.0_11 -JAVA50_HOME=C:/Progra~1/Java/jdk1.6.0_11 -JAVA60_HOME=C:/Progra~1/Java/jdk1.6.0_11 - -# 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://repository.jboss.org/eclipse/galileo/repos/eclipse-Update-R-3.5.1-200909170800.zip,\ -http://repository.jboss.org/eclipse/galileo/repos/GEF-Update-3.5.1.zip,\ -http://repository.jboss.org/eclipse/galileo/repos/dtp-Updates-1.7-20090908.zip,\ -http://repository.jboss.org/eclipse/galileo/repos/emf-xsd-Update-2.5.0.zip -#,\ -#http://repository.jboss.org/eclipse/galileo/repos/jst-buildrepo-R-3.1.1-20090917225226.zip,\ -#http://repository.jboss.org/eclipse/galileo/repos/wst-buildrepo-R-3.1.1-20090917225226.zip - -# 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+\ -org.eclipse.jst.server.generic.core+\ -org.eclipse.wst.ws_core.feature.feature.group+org.eclipse.wst.web_ui.feature.feature.group+org.eclipse.wst.ws_wsdl15.feature.feature.group+\ -org.eclipse.wst.xml_ui.feature.feature.group+org.eclipse.wst.common_ui.feature.feature.group+org.eclipse.wst.common_core.feature.feature.group+\ -org.eclipse.xsd.feature.group+org.eclipse.gef.feature.group+\ -org.mozilla.xpcom+org.jboss.tools.vpe.resref+org.jboss.tools.jst.web.ui+org.jboss.ide.eclipse.as.core+org.jboss.ide.eclipse.archives.webtools+org.jboss.tools.jmx.feature.feature.group+\ -org.jboss.tools.project.examples - -flattenDependencies=true -parallelCompilation=true -generateFeatureVersionSuffix=true -individualSourceBundles=true - -# don't suppress cleanup if tests fail -noclean=false - -# do not sign or pack jars -#skipPack=true -skipSign=true - -domainNamespace=* -projNamespace=org.jboss.tools.bpel -projRelengName=org.jboss.tools.bpel.releng - -## END PROJECT BUILD PROPERTIES ## Modified: trunk/bpel/releng/build.xml =================================================================== --- trunk/bpel/releng/build.xml 2010-03-02 00:18:28 UTC (rev 20550) +++ trunk/bpel/releng/build.xml 2010-03-02 00:50:22 UTC (rev 20551) @@ -1,40 +1,41 @@ -<project default="run" name="org.jboss.tools.*.releng/build.xml - Run a JBoss Tools component build using the Athena CBI"> +<!-- A sample build file for use with Hudson. Note that forceContextQualifier + is being set, which overrides tag/branch values found in *.map files +--> +<project default="run"> <target name="run"> - <!-- - You must check out the following projects to your workspace: - - org.eclipse.releng.basebuilder - org.eclipse.dash.common.releng - jbosstools/trunk/<your component>/releng + <!-- 0. Set a valid path to JAVA_HOME, if Eclipse's ${java.home}/../bin/javac cannot be found --> + <property name="JAVA_HOME" value="${java.home}/.." /> - <!-- load properties and set timestamp for the build --> - <property file="build.properties" /> <tstamp> <format property="buildTimestamp" pattern="yyyyMMddHHmm" /> </tstamp> + <property name="forceContextQualifier" value="v${buildTimestamp}" /> - <!-- calculate workspaceDir as parent of this folder, the project's .releng folder (relengBuilderDir) --> - <property name="relengBuilderDir" value="${basedir}" /> - <dirname file="${relengBuilderDir}" property="workspaceDir" /> - - <!-- - can build in /tmp, eg., in /tmp/build, or in workspace, eg., - ${WORKSPACE}/build + <!-- 1. Import these projects using File > Import > Team Project Set > ./psfs/athena.psf. + 2. Close the org.eclipse.releng.basebuilder project - it does not need to compile to be of use. + 3. You can also define absolute paths for these directories, if relative paths do not work. --> - <property name="writableBuildRoot" value="/tmp/build" /> + <condition property="relengCommonBuilderDir" + value="${basedir}/../../../org.eclipse.dash.common.releng" + else="${basedir}/../org.eclipse.dash.common.releng" + > + <available file="${basedir}/../../../org.eclipse.dash.common.releng" type="dir" /> + </condition> + <condition property="relengBaseBuilderDir" + value="${basedir}/../../../org.eclipse.releng.basebuilder" + else="${basedir}/../org.eclipse.releng.basebuilder" + > + <available file="${basedir}/../../../org.eclipse.releng.basebuilder" type="dir" /> + </condition> - <!-- - can be simple path, eg., - ${writableBuildRoot}/${buildType}${buildTimestamp} or longer, eg., - ${writableBuildRoot}/${topprojectName}/${projectName}/downloads/drops/${version}/${buildType}${buildTimestamp} or - ${writableBuildRoot}/${topprojectName}/${projectName}/${subprojectName}/downloads/drops/${version}/${buildType}${buildTimestamp} + <!-- 4. To build from CVS sources using information in the ./maps/*.map files, comment these next two properties + 5. Or, to build from sources in the workspace, use these properties. You can also use absolute paths if needed. --> - <property name="buildDir" value="${writableBuildRoot}/${buildType}${buildTimestamp}-${zipPrefix}" /> + <!-- <property name="localSourceCheckoutDir" value="${basedir}/.." /> + <property name="relengBuilderDir" value="${basedir}" /> --> - <!-- invoke a new Eclipse process and launch the build from the common.releng folder --> - <property name="relengCommonBuilderDir" value="${workspaceDir}/org.eclipse.dash.common.releng" /> - <ant antfile="${relengCommonBuilderDir}/buildAll.xml" target="runEclipse" dir="${relengCommonBuilderDir}" /> - + <property file="build.properties" /> + <ant antfile="${relengCommonBuilderDir}/build.xml" /> </target> </project>