Author: nickboldt Date: 2010-05-18 00:50:43 -0400 (Tue, 18 May 2010) New Revision: 22163 Removed: trunk/hibernatetools/releng/build.properties.example.linux trunk/hibernatetools/releng/build.properties.example.windows Modified: trunk/hibernatetools/releng/build.properties trunk/hibernatetools/releng/build.xml Log: merge from branch Modified: trunk/hibernatetools/releng/build.properties =================================================================== --- trunk/hibernatetools/releng/build.properties 2010-05-18 04:40:16 UTC (rev 22162) +++ trunk/hibernatetools/releng/build.properties 2010-05-18 04:50:43 UTC (rev 22163) @@ -14,7 +14,7 @@ # on windows or mac, use testLocal; on linux use test (requires Xvnc or Xvfb) # "test" step disabled since they require junit4/swtbot and that's not working yet in Athena :: https://bugs.eclipse.org/bugs/show_bug.cgi?id=277593 -build.steps=buildUpdate,buildTests,generateDigests,publish,cleanup +build.steps=buildUpdate,buildTests,generateDigests,test,publish,cleanup JAVA14_HOME=${JAVA_HOME} JAVA50_HOME=${JAVA_HOME} @@ -23,13 +23,15 @@ # 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://repository.jboss.org/eclipse/galileo/repos/jst-sdk-buildrepo-R-3.1... http://repository.jboss.org/eclipse/galileo/repos/wst-sdk-buildrepo-R-3.1... +#http://download.eclipse.org/technology/swtbot/galileo/dev-build/update-site +#http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site 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+\ @@ -38,19 +40,24 @@ 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.eclipse.jpt.core+org.eclipse.jpt.db+org.eclipse.jpt.utility+org.eclipse.jpt.ui +#org.eclipse.swtbot.junit4+org.eclipse.swtbot.ant.optional.junit4+org.eclipse.swtbot.eclipse.junit4.headless+org.eclipse.swtbot.eclipse.core+org.eclipse.swtbot.eclipse+org.eclipse.swtbot+org.eclipse.swtbot.eclipse.test.junit4 dependencyURLs=http://downloads.sourceforge.net/sourceforge/hibernate/hib... +#http://repository.jboss.org/eclipse/galileo/org.eclipse.swtbot.eclipse.test.junit4-2.0.0.512-dev-e35.zip,\ +#http://repository.jboss.org/eclipse/galileo/org.eclipse.swtbot.eclipse-2.0.0.512-dev-e35.zip flattenDependencies=true parallelCompilation=true generateFeatureVersionSuffix=true individualSourceBundles=true +enableSWTBot=true + # don't suppress cleanup if tests fail noclean=false # do not sign or pack jars -#skipPack=true +skipPack=true skipSign=true domainNamespace=* Deleted: trunk/hibernatetools/releng/build.properties.example.linux =================================================================== --- trunk/hibernatetools/releng/build.properties.example.linux 2010-05-18 04:40:16 UTC (rev 22162) +++ trunk/hibernatetools/releng/build.properties.example.linux 2010-05-18 04:50:43 UTC (rev 22163) @@ -1,67 +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.hibernatetools -zipPrefix=HibernateTools -incubation= -buildType=N -version=3.3.0 - -mainFeatureToBuildID=org.hibernate.eclipse.sdk.feature -testFeatureToBuildID=org.hibernate.eclipse.test.feature - -# on windows or mac, use testLocal; on linux use test (requires Xvnc or Xvfb) -# "test" step disabled since they require junit4/swtbot and that's not working yet in Athena :: https://bugs.eclipse.org/bugs/show_bug.cgi?id=277593 -build.steps=buildUpdate,buildTests,generateDigests,publish,cleanup - -# Re-use local sources? -#localSourceCheckoutDir=/home/nboldt/eclipse/workspace-jboss/jbosstools-trunk/hibernatetools -relengBuilderDir=/home/nboldt/eclipse/workspace-jboss/jbosstools-trunk/hibernatetools/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 - -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.eclipse.jpt.core+org.eclipse.jpt.db+org.eclipse.jpt.utility+org.eclipse.jpt.ui - -dependencyURLs=http://downloads.sourceforge.net/sourceforge/hibernate/hibernate-3.0.3.zip - -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.hibernate.eclipse -projRelengName=org.hibernate.eclipse.releng - -## END PROJECT BUILD PROPERTIES ## Deleted: trunk/hibernatetools/releng/build.properties.example.windows =================================================================== --- trunk/hibernatetools/releng/build.properties.example.windows 2010-05-18 04:40:16 UTC (rev 22162) +++ trunk/hibernatetools/releng/build.properties.example.windows 2010-05-18 04:50:43 UTC (rev 22163) @@ -1,71 +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.hibernatetools -zipPrefix=HibernateTools -incubation= -buildType=N -version=3.3.0 - -mainFeatureToBuildID=org.hibernate.eclipse.sdk.feature -testFeatureToBuildID=org.hibernate.eclipse.test.feature - -# on windows or mac, use testLocal; on linux use test (requires Xvnc or Xvfb) -# "testLocal" step disabled since they require junit4/swtbot and that's not working yet in Athena :: https://bugs.eclipse.org/bugs/show_bug.cgi?id=277593 -build.steps=buildUpdate,buildTests,generateDigests,publish,cleanup - -# Re-use local sources? -localSourceCheckoutDir=C:/workspace2 - -# For windows, must be explicit about paths using correct slashes (/); dirs with spaces should be avoided -writableBuildRoot=C:/tmp/build - -relengBuilderDir=C:/workspace2/jbosstools-trunk/hibernatetools/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 - -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.eclipse.jpt.core+org.eclipse.jpt.db+org.eclipse.jpt.utility+org.eclipse.jpt.ui - -dependencyURLs=http://downloads.sourceforge.net/sourceforge/hibernate/hibernate-3.0.3.zip - -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.hibernate.eclipse -projRelengName=org.hibernate.eclipse.releng - -## END PROJECT BUILD PROPERTIES ## Modified: trunk/hibernatetools/releng/build.xml =================================================================== --- trunk/hibernatetools/releng/build.xml 2010-05-18 04:40:16 UTC (rev 22162) +++ trunk/hibernatetools/releng/build.xml 2010-05-18 04:50:43 UTC (rev 22163) @@ -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>