[jboss-cvs] JBossAS SVN: r69253 - in branches/JBPAPP_4_2_0_GA_CP: tools/etc/buildmagic and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jan 23 17:26:05 EST 2008
Author: dbhole
Date: 2008-01-23 17:26:04 -0500 (Wed, 23 Jan 2008)
New Revision: 69253
Removed:
branches/JBPAPP_4_2_0_GA_CP/build/build.properties
Modified:
branches/JBPAPP_4_2_0_GA_CP/build/build-release.xml
branches/JBPAPP_4_2_0_GA_CP/build/build-thirdparty.xml
branches/JBPAPP_4_2_0_GA_CP/build/build.xml
branches/JBPAPP_4_2_0_GA_CP/tools/etc/buildmagic/build-common.xml
branches/JBPAPP_4_2_0_GA_CP/tools/etc/buildmagic/buildmagic.ent
branches/JBPAPP_4_2_0_GA_CP/tools/etc/buildmagic/common.xml
branches/JBPAPP_4_2_0_GA_CP/tools/etc/buildmagic/version-info.xml
Log:
Reverting previous commit due to build breakage. It will be recommited
tomorrow with proper fixes.
Modified: branches/JBPAPP_4_2_0_GA_CP/build/build-release.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/build/build-release.xml 2008-01-23 22:05:01 UTC (rev 69252)
+++ branches/JBPAPP_4_2_0_GA_CP/build/build-release.xml 2008-01-23 22:26:04 UTC (rev 69253)
@@ -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="JBPAPP_${release.version.major}_${release.version.minor}_${release.version.revision}_${release.version.tag}">
+ <condition property="cvs.tag" value="JBoss_${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="JBPAPP_${release.version.major}_${release.version.minor}_${release.version.revision}">
+ <condition property="cvs.tag" value="JBoss_${release.version.major}_${release.version.minor}_${release.version.revision}">
<not>
<isset property="release.version.tag"/>
</not>
Modified: branches/JBPAPP_4_2_0_GA_CP/build/build-thirdparty.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/build/build-thirdparty.xml 2008-01-23 22:05:01 UTC (rev 69252)
+++ branches/JBPAPP_4_2_0_GA_CP/build/build-thirdparty.xml 2008-01-23 22:26:04 UTC (rev 69253)
@@ -4,7 +4,6 @@
<!-- Property File definitions -->
<property file="local.properties"/>
- <property file="build.properties"/>
<property file="synchronize.properties"/>
<property environment="env"/>
Deleted: branches/JBPAPP_4_2_0_GA_CP/build/build.properties
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/build/build.properties 2008-01-23 22:05:01 UTC (rev 69252)
+++ branches/JBPAPP_4_2_0_GA_CP/build/build.properties 2008-01-23 22:26:04 UTC (rev 69253)
@@ -1,7 +0,0 @@
-# This file defines default property set for build variables
-
-version.major=4
-version.minor=2
-version.revision=0
-version.tag=GA_CP02
-version.name=EAP
Modified: branches/JBPAPP_4_2_0_GA_CP/build/build.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/build/build.xml 2008-01-23 22:05:01 UTC (rev 69252)
+++ branches/JBPAPP_4_2_0_GA_CP/build/build.xml 2008-01-23 22:26:04 UTC (rev 69253)
@@ -34,19 +34,6 @@
<!-- 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.
@@ -55,6 +42,7 @@
<target name="init" unless="init.disable" depends="_buildmagic:init">
</target>
+
<!-- ================================================================== -->
<!-- Configuration -->
<!-- ================================================================== -->
@@ -212,7 +200,6 @@
version.tag,
version.name,
version.cvstag,
- build.soa,
specification.title,
specification.version,
Modified: branches/JBPAPP_4_2_0_GA_CP/tools/etc/buildmagic/build-common.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/tools/etc/buildmagic/build-common.xml 2008-01-23 22:05:01 UTC (rev 69252)
+++ branches/JBPAPP_4_2_0_GA_CP/tools/etc/buildmagic/build-common.xml 2008-01-23 22:26:04 UTC (rev 69253)
@@ -70,7 +70,6 @@
<!-- 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"/>
@@ -779,7 +778,6 @@
version.tag,
version.name,
version.cvstag,
- build.soa,
specification.title,
specification.version,
Modified: branches/JBPAPP_4_2_0_GA_CP/tools/etc/buildmagic/buildmagic.ent
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/tools/etc/buildmagic/buildmagic.ent 2008-01-23 22:05:01 UTC (rev 69252)
+++ branches/JBPAPP_4_2_0_GA_CP/tools/etc/buildmagic/buildmagic.ent 2008-01-23 22:26:04 UTC (rev 69253)
@@ -53,7 +53,6 @@
<!-- 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"/>
@@ -105,7 +104,7 @@
<property name="version.tag" value="GA_CP02"/>
<property name="version.name" value="Trinity"/>
<!-- This must be set to the CVS tag for any release -->
- <property name="version.cvstag" value="JBPAPP_${version.major}_${version.minor}_${version.revision}_${version.tag}" />
+ <property name="version.cvstag" value="JBoss_${version.major}_${version.minor}_${version.revision}_${version.tag}" />
<!-- Manifest version info -->
<property name="specification.title" value="JBoss"/>
@@ -910,7 +909,6 @@
version.tag,
version.name,
version.cvstag,
- build.soa,
specification.title,
specification.version,
Modified: branches/JBPAPP_4_2_0_GA_CP/tools/etc/buildmagic/common.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/tools/etc/buildmagic/common.xml 2008-01-23 22:05:01 UTC (rev 69252)
+++ branches/JBPAPP_4_2_0_GA_CP/tools/etc/buildmagic/common.xml 2008-01-23 22:26:04 UTC (rev 69253)
@@ -37,7 +37,6 @@
<!-- 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_2_0_GA_CP/tools/etc/buildmagic/version-info.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/tools/etc/buildmagic/version-info.xml 2008-01-23 22:05:01 UTC (rev 69252)
+++ branches/JBPAPP_4_2_0_GA_CP/tools/etc/buildmagic/version-info.xml 2008-01-23 22:26:04 UTC (rev 69253)
@@ -20,7 +20,7 @@
<property name="version.tag" value="GA_CP02"/>
<property name="version.name" value="Trinity"/>
<!-- This must be set to the CVS tag for any release -->
- <property name="version.cvstag" value="JBPAPP_${version.major}_${version.minor}_${version.revision}_${version.tag}"/>
+ <property name="version.cvstag" value="JBoss_${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