You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by rj...@apache.org on 2008/11/14 20:17:39 UTC
svn commit: r714108 - in /tomcat/connectors/trunk/jni:
build.properties.default build.properties.sample build.xml
Author: rjung
Date: Fri Nov 14 11:17:39 2008
New Revision: 714108
URL: http://svn.apache.org/viewvc?rev=714108&view=rev
Log:
User build.properties.default for tcnative like
we do for tomcat.
Remove unused version.number.
Add version details to build.properties.default
and remove from build.xml.
Added:
tomcat/connectors/trunk/jni/build.properties.default (contents, props changed)
- copied, changed from r714098, tomcat/connectors/trunk/jni/build.properties.sample
Removed:
tomcat/connectors/trunk/jni/build.properties.sample
Modified:
tomcat/connectors/trunk/jni/build.xml
Copied: tomcat/connectors/trunk/jni/build.properties.default (from r714098, tomcat/connectors/trunk/jni/build.properties.sample)
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/build.properties.default?p2=tomcat/connectors/trunk/jni/build.properties.default&p1=tomcat/connectors/trunk/jni/build.properties.sample&r1=714098&r2=714108&rev=714108&view=diff
==============================================================================
--- tomcat/connectors/trunk/jni/build.properties.sample (original)
+++ tomcat/connectors/trunk/jni/build.properties.default Fri Nov 14 11:17:39 2008
@@ -1,3 +1,10 @@
+# ----- Vesion Control Flags -----
+version.major=1
+version.minor=1
+version.build=17
+version.patch=0
+version.suffix=-dev
+
# The directory containing your binary distribution of JUnit,
# version 3.8 or later
junit.home = /usr/local/java/junit3.8.1
Propchange: tomcat/connectors/trunk/jni/build.properties.default
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tomcat/connectors/trunk/jni/build.properties.default
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: tomcat/connectors/trunk/jni/build.properties.default
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: tomcat/connectors/trunk/jni/build.xml
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/build.xml?rev=714108&r1=714107&r2=714108&view=diff
==============================================================================
--- tomcat/connectors/trunk/jni/build.xml (original)
+++ tomcat/connectors/trunk/jni/build.xml Fri Nov 14 11:17:39 2008
@@ -22,20 +22,35 @@
-->
<property file="${user.home}/.ant.properties" />
<property file="${user.home}/build.properties" />
- <property file="build.properties" />
<property file=".ant.properties" />
+ <property file="build.properties" />
+ <property file="build.properties.default"/>
<!-- Initialization properties -->
- <property name="name" value="Tomcat Native"/>
- <property name="title" value="Tomcat Native Library"/>
- <property name="version" value="1.0.0"/>
- <property name="version.number" value="100"/>
- <property name="project" value="tomcat-native"/>
+ <property name="project" value="tomcat-native" />
+ <property name="name" value="Tomcat Native" />
+ <property name="title" value="Tomcat Native Library"/>
+ <property name="year" value="2008" />
+ <property name="version.major" value="1" />
+ <property name="version.minor" value="1" />
+ <property name="version.build" value="0" />
+ <property name="version.patch" value="0" />
+ <property name="version.suffix" value="-dev" />
+
+ <property name="junit.home" value="/usr/local/junit3.8"/>
+ <property name="junit.jar" value="${junit.home}/junit.jar"/>
+ <property name="test.runner" value="junit.textui.TestRunner"/>
+
+ <property name="version" value="${version.major}.${version.minor}.${version.build}${version.suffix}" />
+ <property name="version.number" value="${version.major}.${version.minor}.${version.build}.${version.patch}" />
+ <property name="version.major.minor" value="${version.major}.${version.minor}" />
+
+ <property name="final.name" value="${project}-${version}" />
+
<property name="build.dir" value="./dist"/>
<property name="build.src" value="${build.dir}/src"/>
<property name="build.dest" value="${build.dir}/classes"/>
<property name="src.dir" value="."/>
- <property name="final.name" value="${project}-${version}"/>
<property name="dist.root" value="./dist"/>
<property name="ant.home" value="."/>
@@ -46,15 +61,13 @@
<property name="docs.src" value="./xdocs"/>
<property name="docs.dest" value="${dist.root}/doc"/>
<property name="docs.dest.print" value="${dist.root}/doc/printable"/>
- <property name="test.runner" value="junit.textui.TestRunner"/>
<property name="test.dir" value="${build.dest}/test"/>
<property name="examples.dir" value="${build.dest}/examples"/>
- <property name="junit.home" value="/usr/local/junit3.8"/>
- <property name="junit.jar" value="${junit.home}/junit.jar"/>
+
<property name="tc.library.path" value="${basedir}/native/.libs"/>
- <!-- The base directory for component sources -->
- <property name="source.home" value="java"/>
+ <!-- The base directory for component sources -->
+ <property name="source.home" value="java"/>
<!-- Build classpath -->
<path id="classpath">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r714108 - in /tomcat/connectors/trunk/jni: build.properties.default
build.properties.sample build.xml
Posted by Mark Thomas <ma...@apache.org>.
Mladen Turk wrote:
> Rainer Jung wrote:
>> Mladen Turk schrieb:
>>> We have now two branches 1.1 and trunk
>>> So in trunk the version is 1.2.x
>>>
>>> The second branch is:
>>> https://svn.apache.org/repos/asf/tomcat/connectors/branches/native/1.1.x
>>>
>>> So I suppose those changes has to go in there as well.
>>> It would be probably easier if this was done before branching, but
>>> now it is like it is.
>>
>> No problem. Should I apply them directly, or do we want to use backport
>> proposals via a STATUS file?
>>
>
> Well, this doesn't touch the code so just commit them
+1
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r714108 - in /tomcat/connectors/trunk/jni: build.properties.default
build.properties.sample build.xml
Posted by Mladen Turk <mt...@apache.org>.
Rainer Jung wrote:
> Mladen Turk schrieb:
>> We have now two branches 1.1 and trunk
>> So in trunk the version is 1.2.x
>>
>> The second branch is:
>> https://svn.apache.org/repos/asf/tomcat/connectors/branches/native/1.1.x
>>
>> So I suppose those changes has to go in there as well.
>> It would be probably easier if this was done before branching, but
>> now it is like it is.
>
> No problem. Should I apply them directly, or do we want to use backport
> proposals via a STATUS file?
>
Well, this doesn't touch the code so just commit them
Regards
--
^(TM)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r714108 - in /tomcat/connectors/trunk/jni: build.properties.default
build.properties.sample build.xml
Posted by Rainer Jung <ra...@kippdata.de>.
Mladen Turk schrieb:
> We have now two branches 1.1 and trunk
> So in trunk the version is 1.2.x
>
> The second branch is:
> https://svn.apache.org/repos/asf/tomcat/connectors/branches/native/1.1.x
>
> So I suppose those changes has to go in there as well.
> It would be probably easier if this was done before branching, but
> now it is like it is.
No problem. Should I apply them directly, or do we want to use backport
proposals via a STATUS file?
Regards,
Rainer
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r714108 - in /tomcat/connectors/trunk/jni: build.properties.default
build.properties.sample build.xml
Posted by Mladen Turk <mt...@apache.org>.
rjung@apache.org wrote:
>
> URL: http://svn.apache.org/viewvc?rev=714108&view=rev
> Log:
> User build.properties.default for tcnative like
> we do for tomcat.
> Remove unused version.number.
> Add version details to build.properties.default
> and remove from build.xml.
>
> Added:
> tomcat/connectors/trunk/jni/build.properties.default (contents, props changed)
> - copied, changed from r714098, tomcat/connectors/trunk/jni/build.properties.sample
> Removed:
> tomcat/connectors/trunk/jni/build.properties.sample
> Modified:
> tomcat/connectors/trunk/jni/build.xml
>
> +# ----- Vesion Control Flags -----
> +version.major=1
> +version.minor=1
> +version.build=17
> +version.patch=0
> +version.suffix=-dev
> +
We have now two branches 1.1 and trunk
So in trunk the version is 1.2.x
The second branch is:
https://svn.apache.org/repos/asf/tomcat/connectors/branches/native/1.1.x
So I suppose those changes has to go in there as well.
It would be probably easier if this was done before branching, but
now it is like it is.
Regards
--
^(TM)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org