3:18 p.m.
Author: nickboldt
Date: 2011-04-26 16:18:58 -0400 (Tue, 26 Apr 2011)
New Revision: 30853
Added:
branches/jbosstools-3.2.x/requirements/.gitignore
branches/jbosstools-3.2.x/requirements/jbossepp/
branches/jbosstools-3.2.x/requirements/jbossepp/build.properties
Modified:
branches/jbosstools-3.2.x/requirements/build.xml
branches/jbosstools-3.2.x/requirements/jbossas/build.properties
branches/jbosstools-3.2.x/requirements/jbossas/buildRequirement.xml
Log:
backport changes in trunk to 3.2.x branch: add jbossepp builder, jbossas6/7 builders, new
'if avail local then copy instead of wget' logic, and .gitignore file
Added: branches/jbosstools-3.2.x/requirements/.gitignore
===================================================================
--- branches/jbosstools-3.2.x/requirements/.gitignore (rev 0)
+++ branches/jbosstools-3.2.x/requirements/.gitignore 2011-04-26 20:18:58 UTC (rev 30853)
@@ -0,0 +1 @@
+download
Modified: branches/jbosstools-3.2.x/requirements/build.xml
===================================================================
--- branches/jbosstools-3.2.x/requirements/build.xml 2011-04-26 19:59:12 UTC (rev 30852)
+++ branches/jbosstools-3.2.x/requirements/build.xml 2011-04-26 20:18:58 UTC (rev 30853)
@@ -3,14 +3,69 @@
<import file="buildRequirements.xml" />
<property name="requirement.root" value="${basedir}" />
- <property name="requirement.download.root"
value="${basedir}/download" />
- <property name="requirement.build.root" value="${basedir}/target"
/>
-
+ <property name="requirement.download.root"
value="${requirement.root}/download" />
+ <property name="requirement.build.root"
value="${requirement.root}/target" />
<condition property="skipRequirementBuild">
<equals arg1="${maven.test.skip}" arg2="true"/>
</condition>
-
- <target name="default" description="description"
unless="skipRequirementBuild">
+
+ <target name="all" description="fetch all requirements defined by
subdirs with a build.properties file">
+ <if>
+ <not>
+ <isset property="requirements" />
+ </not>
+ <then>
+ <var name="requirements" value="" />
+ </then>
+ </if>
+ <!-- get all subdirs, and check each one for a build.properties file -->
+ <for param="subdir">
+ <path>
+ <dirset dir="${basedir}" excludes="bin, download, generic, lib,
target" />
+ </path>
+ <sequential>
+ <if>
+ <available file="(a){subdir}/build.properties" />
+ <then>
+ <basename file="@{subdir}" property="subdir" />
+ <var name="requirements" value="${requirements},${subdir}"
/>
+ <var name="subdir" unset="true" />
+ </then>
+ </if>
+ </sequential>
+ </for>
+ <!-- remove prefix comma -->
+ <propertyregex defaultvalue="${requirements}"
input="${requirements}" replace="\1" regexp=",(.+)"
override="true" property="requirements" />
+
+ <echo>requirements=${requirements}</echo>
+ <echo>unzipto=${requirement.build.root}</echo>
+ <buildRequirements requirements="${requirements}"
unzipto="${requirement.build.root}" />
+ </target>
+
+ <!-- if there's a mirror of the requirements stuff outside hudson, use that
instead; else work in local workspace -->
+ <target name="default" description="to fetch 1 or more requirement(s),
set -Drequirements=one,two,three" unless="skipRequirementBuild">
+ <!-- https://jira.jboss.org/jira/browse/JBQA-3313 Use static, shared space outside
workspace, instead of fetching directly to the workspace -->
+ <var name="static_build_env.jbds.requirements"
value="/home/hudson/static_build_env/jbds/requirements" />
+ <if>
+ <available file="${static_build_env.jbds.requirements}"
type="dir" />
+ <then>
+ <for list="${requirements}" param="requirement">
+ <sequential>
+ <!-- if /home/hudson/static_build_env/jbds/requirements/download/jbossas/
exists, copy into
+ ${WORKSPACE}/requirements/download/jbossas/ so no need to re-download zips -->
+ <if>
+ <available
file="${static_build_env.jbds.requirements}/download/@{requirement}" />
+ <then>
+ <copy todir="${requirement.download.root}/@{requirement}">
+ <fileset
dir="${static_build_env.jbds.requirements}/download/@{requirement}" />
+ </copy>
+ </then>
+ </if>
+ </sequential>
+ </for>
+ </then>
+ </if>
+
<echo>maven.test.skip=${maven.test.skip}</echo>
<echo>settings.offline=${settings.offline}</echo>
<echo>requirements=${requirements}</echo>
Modified: branches/jbosstools-3.2.x/requirements/jbossas/build.properties
===================================================================
--- branches/jbosstools-3.2.x/requirements/jbossas/build.properties 2011-04-26 19:59:12
UTC (rev 30852)
+++ branches/jbosstools-3.2.x/requirements/jbossas/build.properties 2011-04-26 20:18:58
UTC (rev 30853)
@@ -1,5 +1,5 @@
-#jbossas.build.uri=http://downloads.sourceforge.net/sourceforge/jboss
jbossas.build.uri=http://repository.jboss.org/sourceforge
+jbossas.build.uri2=http://downloads.sourceforge.net/sourceforge/jboss
jboss32.build.uri=${jbossas.build.uri}
jboss32.build.name=jboss-3.2.8.SP1
@@ -24,4 +24,21 @@
jboss51.build.uri=${jbossas.build.uri}
jboss51.build.name=jboss-5.1.0.GA
jboss51.build.archive=${jboss51.build.name}.zip
-jboss51.build.archive.md5=78322c75ca0c13002a04418b4a8bc920
\ No newline at end of file
+jboss51.build.archive.md5=78322c75ca0c13002a04418b4a8bc920
+
+# repository.jboss.org is now read-only, so pull from SF.net directly
+jboss60.build.uri=${jbossas.build.uri2}
+jboss60.build.name=jboss-as-distribution-6.0.0.Final
+jboss60.build.archive=${jboss60.build.name}.zip
+jboss60.build.archive.md5=81ed7c2c274881963467c11f204eedfc
+
+# reminder, when updating to something newer, also update:
+# ~/trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/
+# ~/trunk/requirements/jbossas/build.properties
+# latest downloads: http://www.jboss.org/jbossas/downloads
+# current: http://download.jboss.org/jbossas/7.0/jboss-7.0.0.Beta3/jboss-7.0.0.Beta3...
+jboss70.build.uri=http://download.jboss.org/jbossas/7.0/jboss-7.0.0.Beta3/
+jboss70.build.name=jboss-7.0.0.Beta3
+jboss70.build.archive=${jboss70.build.name}.zip
+jboss70.build.archive.md5=c2fbe3c6828a8f740930b961f45792cf
+
Modified: branches/jbosstools-3.2.x/requirements/jbossas/buildRequirement.xml
===================================================================
--- branches/jbosstools-3.2.x/requirements/jbossas/buildRequirement.xml 2011-04-26
19:59:12 UTC (rev 30852)
+++ branches/jbosstools-3.2.x/requirements/jbossas/buildRequirement.xml 2011-04-26
20:18:58 UTC (rev 30853)
@@ -45,5 +45,15 @@
<param name="build.archive"
value="${jboss51.build.archive}"/>
<param name="md5" value="${jboss51.build.archive.md5}"/>
</antcall>
+ <antcall target="build-jbossas">
+ <param name="build.uri" value="${jboss60.build.uri}"/>
+ <param name="build.archive"
value="${jboss60.build.archive}"/>
+ <param name="md5" value="${jboss60.build.archive.md5}"/>
+ </antcall>
+ <antcall target="build-jbossas">
+ <param name="build.uri" value="${jboss70.build.uri}"/>
+ <param name="build.archive"
value="${jboss70.build.archive}"/>
+ <param name="md5" value="${jboss70.build.archive.md5}"/>
+ </antcall>
</target>
</project>
Added: branches/jbosstools-3.2.x/requirements/jbossepp/build.properties
===================================================================
--- branches/jbosstools-3.2.x/requirements/jbossepp/build.properties
(rev 0)
+++ branches/jbosstools-3.2.x/requirements/jbossepp/build.properties 2011-04-26 20:18:58
UTC (rev 30853)
@@ -0,0 +1,6 @@
+jbossepp.build.uri=http://download.devel.redhat.com/released/JBossEPP/5.1.0
+build.uri=${jbossepp.build.uri}
+build.archive.root=jboss-epp-5.1.0-unsigned
+build.archive=${build.archive.root}.zip
+md5=5b29407c54b309579b2ee0e26b4a3279
+