[jboss-cvs] JBossAS SVN: r68225 - in branches/JBPAPP_4_3_tmp: tools/etc/buildmagic and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Dec 13 02:27:20 EST 2007
Author: dbhole
Date: 2007-12-13 02:27:20 -0500 (Thu, 13 Dec 2007)
New Revision: 68225
Added:
branches/JBPAPP_4_3_tmp/build/build.properties
Modified:
branches/JBPAPP_4_3_tmp/build/build-release.xml
branches/JBPAPP_4_3_tmp/build/build-thirdparty.xml
branches/JBPAPP_4_3_tmp/build/build.xml
branches/JBPAPP_4_3_tmp/tools/etc/buildmagic/build-common.xml
branches/JBPAPP_4_3_tmp/tools/etc/buildmagic/buildmagic.ent
branches/JBPAPP_4_3_tmp/tools/etc/buildmagic/common.xml
branches/JBPAPP_4_3_tmp/tools/etc/buildmagic/version-info.xml
Log:
Fix JBPAPP-449: Build EAP 4.3 without the need for additional switches
Modified: branches/JBPAPP_4_3_tmp/build/build-release.xml
===================================================================
--- branches/JBPAPP_4_3_tmp/build/build-release.xml 2007-12-13 04:43:47 UTC (rev 68224)
+++ branches/JBPAPP_4_3_tmp/build/build-release.xml 2007-12-13 07:27:20 UTC (rev 68225)
@@ -73,13 +73,13 @@
<property name="cvs.module" value="jboss-${release.version.major}.${release.version.minor}.x"/>
<!-- Set the cvs.tag based on the release.version.* properties -->
<!-- Set the cvs.tag based on the release.version.* properties -->
- <condition property="cvs.tag" value="JBoss_${release.version.major}_${release.version.minor}_${release.version.revision}_${release.version.tag}">
+ <condition property="cvs.tag" value="JBPAPP_${release.version.major}_${release.version.minor}_${release.version.revision}_${release.version.tag}">
<isset property="release.version.tag"/>
</condition>
<condition property="version" value="${release.version.major}.${release.version.minor}.${release.version.revision}.${release.version.tag}">
<isset property="release.version.tag"/>
</condition>
- <condition property="cvs.tag" value="JBoss_${release.version.major}_${release.version.minor}_${release.version.revision}">
+ <condition property="cvs.tag" value="JBPAPP_${release.version.major}_${release.version.minor}_${release.version.revision}">
<not>
<isset property="release.version.tag"/>
</not>
Modified: branches/JBPAPP_4_3_tmp/build/build-thirdparty.xml
===================================================================
--- branches/JBPAPP_4_3_tmp/build/build-thirdparty.xml 2007-12-13 04:43:47 UTC (rev 68224)
+++ branches/JBPAPP_4_3_tmp/build/build-thirdparty.xml 2007-12-13 07:27:20 UTC (rev 68225)
@@ -4,6 +4,7 @@
<!-- Property File definitions -->
<property file="local.properties"/>
+ <property file="build.properties"/>
<property file="synchronize.properties"/>
<property environment="env"/>
Added: branches/JBPAPP_4_3_tmp/build/build.properties
===================================================================
--- branches/JBPAPP_4_3_tmp/build/build.properties (rev 0)
+++ branches/JBPAPP_4_3_tmp/build/build.properties 2007-12-13 07:27:20 UTC (rev 68225)
@@ -0,0 +1,10 @@
+# This file defines default property set for build variables
+
+version.major=4
+version.minor=3
+version.revision=0
+version.tag=GA
+version.name=EAP
+
+build.soa=true
+jbosstest.test.soa=true
Modified: branches/JBPAPP_4_3_tmp/build/build.xml
===================================================================
--- branches/JBPAPP_4_3_tmp/build/build.xml 2007-12-13 04:43:47 UTC (rev 68224)
+++ branches/JBPAPP_4_3_tmp/build/build.xml 2007-12-13 07:27:20 UTC (rev 68225)
@@ -34,6 +34,19 @@
<!-- Initialization -->
<!-- ================================================================== -->
+ <condition property="build.properties.file.exists">
+ <available file="build.properties" type="file"/>
+ </condition>
+
+ <fail unless="build.properties.file.exists">
+ build.properties file not found.
+Please ensure that build.properties exists in the build dir of the checkout tree.
+ </fail>
+
+
+ <!-- Read in properties file for configuration to go smoothly -->
+ <property file="build.properties"/>
+
<!--
| Initialize the build system. Must depend on '_buildmagic:init'.
| Other targets should depend on 'init' or things will mysteriously fail.
@@ -42,7 +55,6 @@
<target name="init" unless="init.disable" depends="_buildmagic:init">
</target>
-
<!-- ================================================================== -->
<!-- Configuration -->
<!-- ================================================================== -->
@@ -214,6 +226,7 @@
version.tag,
version.name,
version.cvstag,
+ build.soa,
specification.title,
specification.version,
Modified: branches/JBPAPP_4_3_tmp/tools/etc/buildmagic/build-common.xml
===================================================================
--- branches/JBPAPP_4_3_tmp/tools/etc/buildmagic/build-common.xml 2007-12-13 04:43:47 UTC (rev 68224)
+++ branches/JBPAPP_4_3_tmp/tools/etc/buildmagic/build-common.xml 2007-12-13 07:27:20 UTC (rev 68225)
@@ -70,6 +70,7 @@
<!-- Include user and project property overrides. -->
<import file="version-info.xml" />
<property file="${project.build}/local.properties"/>
+ <property file="${project.build}/build.properties"/>
<available file="${module.root}/etc/local.properties-example"
property="init.have-local-properties"/>
@@ -778,6 +779,7 @@
version.tag,
version.name,
version.cvstag,
+ build.soa,
specification.title,
specification.version,
Modified: branches/JBPAPP_4_3_tmp/tools/etc/buildmagic/buildmagic.ent
===================================================================
--- branches/JBPAPP_4_3_tmp/tools/etc/buildmagic/buildmagic.ent 2007-12-13 04:43:47 UTC (rev 68224)
+++ branches/JBPAPP_4_3_tmp/tools/etc/buildmagic/buildmagic.ent 2007-12-13 07:27:20 UTC (rev 68225)
@@ -53,6 +53,7 @@
<!-- Setup the module environment. -->
<property name="module.root" value="${basedir}"/>
<property file="${module.root}/local.properties"/>
+ <property file="${project.build}/build.properties"/>
<property name="module.source" value="${module.root}/src"/>
<property name="module.output" value="${module.root}/output"/>
<property name="module.tools" value="${module.root}/tools"/>
@@ -104,7 +105,7 @@
<property name="version.tag" value="GA"/>
<property name="version.name" value="Trinity"/>
<!-- This must be set to the CVS tag for any release -->
- <property name="version.cvstag" value="JBoss_${version.major}_${version.minor}_${version.revision}_${version.tag}" />
+ <property name="version.cvstag" value="JBPAPP_${version.major}_${version.minor}_${version.revision}_${version.tag}" />
<!-- Manifest version info -->
<property name="specification.title" value="JBoss"/>
@@ -909,6 +910,7 @@
version.tag,
version.name,
version.cvstag,
+ build.soa,
specification.title,
specification.version,
Modified: branches/JBPAPP_4_3_tmp/tools/etc/buildmagic/common.xml
===================================================================
--- branches/JBPAPP_4_3_tmp/tools/etc/buildmagic/common.xml 2007-12-13 04:43:47 UTC (rev 68224)
+++ branches/JBPAPP_4_3_tmp/tools/etc/buildmagic/common.xml 2007-12-13 07:27:20 UTC (rev 68225)
@@ -37,6 +37,7 @@
<!-- Setup the project environment. -->
<property file="${project.build}/local.properties"/>
+ <property file="${project.build}/build.properties"/>
<property name="project.tools" value="${project.root}/tools"/>
<property name="project.thirdparty" value="${project.root}/thirdparty"/>
Modified: branches/JBPAPP_4_3_tmp/tools/etc/buildmagic/version-info.xml
===================================================================
--- branches/JBPAPP_4_3_tmp/tools/etc/buildmagic/version-info.xml 2007-12-13 04:43:47 UTC (rev 68224)
+++ branches/JBPAPP_4_3_tmp/tools/etc/buildmagic/version-info.xml 2007-12-13 07:27:20 UTC (rev 68225)
@@ -20,7 +20,7 @@
<property name="version.tag" value="GA"/>
<property name="version.name" value="Trinity"/>
<!-- This must be set to the CVS tag for any release -->
- <property name="version.cvstag" value="JBoss_${version.major}_${version.minor}_${version.revision}_${version.tag}"/>
+ <property name="version.cvstag" value="JBPAPP_${version.major}_${version.minor}_${version.revision}_${version.tag}"/>
<!-- Manifest version info -->
<property name="specification.title" value="JBoss"/>
More information about the jboss-cvs-commits
mailing list