Author: nickboldt Date: 2009-11-09 20:33:08 -0500 (Mon, 09 Nov 2009) New Revision: 18534 Added: trunk/common/releng/build.properties.example.hudson.qa.jboss.com Modified: trunk/common/releng/build.properties trunk/common/releng/build.properties.example.linux trunk/common/releng/build.xml Log: fix properties Modified: trunk/common/releng/build.properties =================================================================== --- trunk/common/releng/build.properties 2009-11-10 00:25:09 UTC (rev 18533) +++ trunk/common/releng/build.properties 2009-11-10 01:33:08 UTC (rev 18534) @@ -7,24 +7,19 @@ zipPrefix=Common incubation= buildType=N -version=2.0.0 +version=1.0.0 -mainFeatureToBuildID=org.jboss.tools.common.feature -#mainFeatureToBuildID=org.jboss.tools.common.sdk.feature -#testFeatureToBuildID=org.jboss.tools.common.tests.feature +mainFeatureToBuildID=org.jboss.tools.common.all.sdk.feature +testFeatureToBuildID=org.jboss.tools.common.all.tests.feature -#build.steps=buildUpdate,buildTests,generateDigests,test,publish,cleanup -build.steps=buildUpdate,publish,cleanup +build.steps=buildUpdate,buildTests,generateDigests,test,publish,cleanup -# Re-use local sources? -localSourceCheckoutDir=/home/nboldt/eclipse/workspace-jboss/jbosstools-trunk/common -relengBuilderDir=/home/nboldt/eclipse/workspace-jboss/jbosstools-trunk/common/releng -relengBaseBuilderDir=/home/nboldt/eclipse/workspace-jboss/org.eclipse.releng.basebuilder -relengCommonBuilderDir=/home/nboldt/eclipse/workspace-jboss/org.eclipse.dash.common.releng +# JBoss Hudson Variables defined in /home/hudson/config_repository/resources/common.variables +JAVA_HOME=${JAVA_HOME_PARENT} +JAVA14_HOME=${JAVA_HOME_PARENT} +JAVA50_HOME=${JAVA_HOME_PARENT} +JAVA60_HOME=${JAVA_HOME_PARENT} -JAVA_HOME=/usr/lib/jvm/java -JAVA50_HOME=/usr/lib/jvm/java - dependencyURLs=\ http://repository.jboss.org/eclipse/galileo/GEF-runtime-3.5.1.zip,\ http://repository.jboss.org/eclipse/galileo/emf-runtime-2.5.0.zip,\ @@ -34,8 +29,8 @@ http://repository.jboss.org/eclipse/galileo/eclipse-SDK-3.5.1-linux-gtk.t... # use precompiled binaries from latest build as input to this build -#repositoryURLs=http://download.eclipse.org/releases/galileo/,http://download.jboss.org/jbosstools/updates/nightly/trunk/ -#pluginIDsToInstall= +repositoryURLs=http://download.eclipse.org/releases/galileo/,http://download.jboss.org/jbosstools/updates/nightly/trunk/ +pluginIDsToInstall=org.jboss.tools.vpe.resref+org.jboss.tools.jst.web.ui+org.eclipse.core.net flattenDependencies=true parallelCompilation=true @@ -43,7 +38,7 @@ individualSourceBundles=true domainNamespace=* -projNamespace=org.jboss.tools.jmx -projRelengName=org.jboss.tools.jmx.releng +projNamespace=org.jboss.tools.common +projRelengName=org.jboss.tools.common.releng ## END PROJECT BUILD PROPERTIES ## Added: trunk/common/releng/build.properties.example.hudson.qa.jboss.com =================================================================== --- trunk/common/releng/build.properties.example.hudson.qa.jboss.com (rev 0) +++ trunk/common/releng/build.properties.example.hudson.qa.jboss.com 2009-11-10 01:33:08 UTC (rev 18534) @@ -0,0 +1,44 @@ +## 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.common +zipPrefix=Common +incubation= +buildType=N +version=1.0.0 + +mainFeatureToBuildID=org.jboss.tools.common.all.sdk.feature +testFeatureToBuildID=org.jboss.tools.common.all.tests.feature + +build.steps=buildUpdate,buildTests,generateDigests,test,publish,cleanup + +# JBoss Hudson Variables defined in /home/hudson/config_repository/resources/common.variables +JAVA_HOME=${JAVA_HOME_PARENT} +JAVA14_HOME=${JAVA_HOME_PARENT} +JAVA50_HOME=${JAVA_HOME_PARENT} +JAVA60_HOME=${JAVA_HOME_PARENT} + +dependencyURLs=\ +http://repository.jboss.org/eclipse/galileo/GEF-runtime-3.5.1.zip,\ +http://repository.jboss.org/eclipse/galileo/emf-runtime-2.5.0.zip,\ +http://repository.jboss.org/eclipse/galileo/xsd-runtime-2.5.0.zip,\ +http://repository.jboss.org/eclipse/galileo/wtp-R-3.1.1-20090917225226.zip,\ +http://repository.jboss.org/eclipse/galileo/dtp_1.7.1.zip,\ +http://repository.jboss.org/eclipse/galileo/eclipse-SDK-3.5.1-linux-gtk.tar.gz + +# use precompiled binaries from latest build as input to this build +repositoryURLs=http://download.eclipse.org/releases/galileo/,http://download.jboss.org/jbosstools/updates/nightly/trunk/ +pluginIDsToInstall=org.jboss.tools.vpe.resref+org.jboss.tools.jst.web.ui+org.eclipse.core.net + +flattenDependencies=true +parallelCompilation=true +generateFeatureVersionSuffix=true +individualSourceBundles=true + +domainNamespace=* +projNamespace=org.jboss.tools.common +projRelengName=org.jboss.tools.common.releng + +## END PROJECT BUILD PROPERTIES ## Property changes on: trunk/common/releng/build.properties.example.hudson.qa.jboss.com ___________________________________________________________________ Name: svn:executable + * Modified: trunk/common/releng/build.properties.example.linux =================================================================== --- trunk/common/releng/build.properties.example.linux 2009-11-10 00:25:09 UTC (rev 18533) +++ trunk/common/releng/build.properties.example.linux 2009-11-10 01:33:08 UTC (rev 18534) @@ -7,14 +7,12 @@ zipPrefix=Common incubation= buildType=N -version=2.0.0 +version=1.0.0 -mainFeatureToBuildID=org.jboss.tools.common.feature -#mainFeatureToBuildID=org.jboss.tools.common.sdk.feature -#testFeatureToBuildID=org.jboss.tools.common.tests.feature +mainFeatureToBuildID=org.jboss.tools.common.all.sdk.feature +testFeatureToBuildID=org.jboss.tools.common.all.tests.feature -#build.steps=buildUpdate,buildTests,generateDigests,test,publish,cleanup -build.steps=buildUpdate,publish,cleanup +build.steps=buildUpdate,buildTests,generateDigests,test,publish,cleanup # Re-use local sources? localSourceCheckoutDir=/home/nboldt/eclipse/workspace-jboss/jbosstools-trunk/common @@ -34,8 +32,8 @@ http://repository.jboss.org/eclipse/galileo/eclipse-SDK-3.5.1-linux-gtk.t... # use precompiled binaries from latest build as input to this build -#repositoryURLs=http://download.eclipse.org/releases/galileo/,http://download.jboss.org/jbosstools/updates/nightly/trunk/ -#pluginIDsToInstall= +repositoryURLs=http://download.eclipse.org/releases/galileo/,http://download.jboss.org/jbosstools/updates/nightly/trunk/ +pluginIDsToInstall=org.jboss.tools.vpe.resref+org.jboss.tools.jst.web.ui+org.eclipse.core.net flattenDependencies=true parallelCompilation=true @@ -43,7 +41,7 @@ individualSourceBundles=true domainNamespace=* -projNamespace=org.jboss.tools.jmx -projRelengName=org.jboss.tools.jmx.releng +projNamespace=org.jboss.tools.common +projRelengName=org.jboss.tools.common.releng ## END PROJECT BUILD PROPERTIES ## Modified: trunk/common/releng/build.xml =================================================================== --- trunk/common/releng/build.xml 2009-11-10 00:25:09 UTC (rev 18533) +++ trunk/common/releng/build.xml 2009-11-10 01:33:08 UTC (rev 18534) @@ -9,7 +9,7 @@ --> <!-- load properties and set timestamp for the build --> - <property file="build.properties.example.linux" /> + <property file="build.properties" /> <tstamp> <format property="buildTimestamp" pattern="yyyyMMddHHmm" /> </tstamp>