summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRupert Smith <rupertlssmith@apache.org>2008-01-14 15:06:45 +0000
committerRupert Smith <rupertlssmith@apache.org>2008-01-14 15:06:45 +0000
commitccdef42a62b87b43318e20584fa7ffb1b92c417d (patch)
treefc0f87f33c5a118df8e685b1a132586d2fcb8667
parent8cfc8befef86eca3686fd2c6720da03fb587ec6c (diff)
downloadqpid-python-ccdef42a62b87b43318e20584fa7ffb1b92c417d.tar.gz
Qpid-731: Fixed assembly version to reflect M2.1 as 0.2.1. Also subversion revision number gets output into assembly comments during builds.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@611826 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--dotnet/Qpid.Buffer.Tests/Properties/AssemblyInfo.cs10
-rw-r--r--dotnet/Qpid.Buffer/Properties/AssemblyInfo.cs10
-rw-r--r--dotnet/Qpid.Client.Tests/Properties/AssemblyInfo.cs10
-rw-r--r--dotnet/Qpid.Client.Transport.Socket.Blocking/Properties/AssemblyInfo.cs10
-rw-r--r--dotnet/Qpid.Client/Properties/AssemblyInfo.cs10
-rw-r--r--dotnet/Qpid.Codec/Properties/AssemblyInfo.cs10
-rw-r--r--dotnet/Qpid.Common.Tests/Properties/AssemblyInfo.cs10
-rw-r--r--dotnet/Qpid.Common/Properties/AssemblyInfo.cs10
-rw-r--r--dotnet/Qpid.Messaging/Properties/AssemblyInfo.cs10
-rw-r--r--dotnet/Qpid.Sasl.Tests/Properties/AssemblyInfo.cs10
-rw-r--r--dotnet/Qpid.Sasl/Properties/AssemblyInfo.cs10
-rw-r--r--dotnet/TestClient/Properties/AssemblyInfo.cs10
-rw-r--r--dotnet/TopicListener/Properties/AssemblyInfo.cs10
-rw-r--r--dotnet/TopicPublisher/Properties/AssemblyInfo.cs10
-rw-r--r--dotnet/default.build123
15 files changed, 177 insertions, 86 deletions
diff --git a/dotnet/Qpid.Buffer.Tests/Properties/AssemblyInfo.cs b/dotnet/Qpid.Buffer.Tests/Properties/AssemblyInfo.cs
index 1191d49954..34bd44501b 100644
--- a/dotnet/Qpid.Buffer.Tests/Properties/AssemblyInfo.cs
+++ b/dotnet/Qpid.Buffer.Tests/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
@@ -6,11 +6,11 @@ using System.Runtime.InteropServices;
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Apache.Qpid.Buffer.Tests")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyDescription("Built from svn revision number: 611749:611758M")]
[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
+[assembly: AssemblyCompany("Apache")]
[assembly: AssemblyProduct("Apache.Qpid.Buffer.Tests")]
-[assembly: AssemblyCopyright("Copyright © 2007")]
+[assembly: AssemblyCopyright("Apache Software Foundation")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyVersion("0.2.1.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/dotnet/Qpid.Buffer/Properties/AssemblyInfo.cs b/dotnet/Qpid.Buffer/Properties/AssemblyInfo.cs
index 4dd92ccdc2..49f969e66b 100644
--- a/dotnet/Qpid.Buffer/Properties/AssemblyInfo.cs
+++ b/dotnet/Qpid.Buffer/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-/*
+/*
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -24,11 +24,11 @@ using System.Runtime.InteropServices;
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Apache.Qpid.ByteBuffer")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyDescription("Built from svn revision number: 611749:611758M")]
[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Apache Qpid")]
+[assembly: AssemblyCompany("Apache")]
[assembly: AssemblyProduct("Apache.Qpid.ByteBuffer")]
-[assembly: AssemblyCopyright("Copyright (c) 2006 The Apache Software Foundation")]
+[assembly: AssemblyCopyright("Apache Software Foundation")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@@ -49,5 +49,5 @@ using System.Runtime.InteropServices;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyVersion("0.2.1.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/dotnet/Qpid.Client.Tests/Properties/AssemblyInfo.cs b/dotnet/Qpid.Client.Tests/Properties/AssemblyInfo.cs
index b3648391c1..60a9553d0b 100644
--- a/dotnet/Qpid.Client.Tests/Properties/AssemblyInfo.cs
+++ b/dotnet/Qpid.Client.Tests/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-/*
+/*
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -27,11 +27,11 @@ using log4net.Config;
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Apache.Qpid.Client.Tests")]
-[assembly: AssemblyDescription("Test Suite for Qpid Clients")]
+[assembly: AssemblyDescription("Built from svn revision number: 611749:611758M")]
[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Apache Qpid")]
+[assembly: AssemblyCompany("Apache")]
[assembly: AssemblyProduct("Apache.Qpid.Client.Tests")]
-[assembly: AssemblyCopyright("Copyright (c) 2006 The Apache Software Foundation")]
+[assembly: AssemblyCopyright("Apache Software Foundation")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@@ -50,4 +50,4 @@ using log4net.Config;
// Build Number
// Revision
//
-[assembly: AssemblyVersion("0.5.*")]
+[assembly: AssemblyVersion("0.2.1.0")]
diff --git a/dotnet/Qpid.Client.Transport.Socket.Blocking/Properties/AssemblyInfo.cs b/dotnet/Qpid.Client.Transport.Socket.Blocking/Properties/AssemblyInfo.cs
index 00f366b5a9..7308f4fbf9 100644
--- a/dotnet/Qpid.Client.Transport.Socket.Blocking/Properties/AssemblyInfo.cs
+++ b/dotnet/Qpid.Client.Transport.Socket.Blocking/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-/*
+/*
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -24,11 +24,11 @@ using System.Runtime.InteropServices;
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Apache.Qpid.Transport.Blocking")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyDescription("Built from svn revision number: 611749:611758M")]
[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Apache Qpid")]
+[assembly: AssemblyCompany("Apache")]
[assembly: AssemblyProduct("Apache.Qpid.Transport.Blocking")]
-[assembly: AssemblyCopyright("Copyright (c) 2006 The Apache Software Foundation")]
+[assembly: AssemblyCopyright("Apache Software Foundation")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@@ -49,5 +49,5 @@ using System.Runtime.InteropServices;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyVersion("0.2.1.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/dotnet/Qpid.Client/Properties/AssemblyInfo.cs b/dotnet/Qpid.Client/Properties/AssemblyInfo.cs
index 8722a02db9..4817ae90d1 100644
--- a/dotnet/Qpid.Client/Properties/AssemblyInfo.cs
+++ b/dotnet/Qpid.Client/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-/*
+/*
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -24,11 +24,11 @@ using System.Runtime.InteropServices;
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Apache.Qpid.Client")]
-[assembly: AssemblyDescription("Qpid Client API implementation")]
+[assembly: AssemblyDescription("Built from svn revision number: 611749:611758M")]
[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Apache Qpid")]
+[assembly: AssemblyCompany("Apache")]
[assembly: AssemblyProduct("Apache.Qpid.Client")]
-[assembly: AssemblyCopyright("Copyright (c) 2006 The Apache Software Foundation")]
+[assembly: AssemblyCopyright("Apache Software Foundation")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@@ -49,4 +49,4 @@ using System.Runtime.InteropServices;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("0.5.*")]
+[assembly: AssemblyVersion("0.2.1.0")]
diff --git a/dotnet/Qpid.Codec/Properties/AssemblyInfo.cs b/dotnet/Qpid.Codec/Properties/AssemblyInfo.cs
index aa1d6a662e..460212fdf6 100644
--- a/dotnet/Qpid.Codec/Properties/AssemblyInfo.cs
+++ b/dotnet/Qpid.Codec/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-/*
+/*
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -24,11 +24,11 @@ using System.Runtime.InteropServices;
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Apache.Qpid.Codec")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyDescription("Built from svn revision number: 611749:611758M")]
[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Apache Qpid")]
+[assembly: AssemblyCompany("Apache")]
[assembly: AssemblyProduct("Apache.Qpid.Codec")]
-[assembly: AssemblyCopyright("Copyright (c) 2006 The Apache Software Foundation")]
+[assembly: AssemblyCopyright("Apache Software Foundation")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@@ -49,5 +49,5 @@ using System.Runtime.InteropServices;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyVersion("0.2.1.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/dotnet/Qpid.Common.Tests/Properties/AssemblyInfo.cs b/dotnet/Qpid.Common.Tests/Properties/AssemblyInfo.cs
index 32dcae60ae..42cca5164a 100644
--- a/dotnet/Qpid.Common.Tests/Properties/AssemblyInfo.cs
+++ b/dotnet/Qpid.Common.Tests/Properties/AssemblyInfo.cs
@@ -1,14 +1,14 @@
-using System.Reflection;
+using System.Reflection;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Apache.Qpid.Common.Tests")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyDescription("Built from svn revision number: 611749:611758M")]
[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Apache Qpid")]
+[assembly: AssemblyCompany("Apache")]
[assembly: AssemblyProduct("Apache.Qpid.Common.Tests")]
-[assembly: AssemblyCopyright("Copyright (c) 2006 The Apache Software Foundation")]
+[assembly: AssemblyCopyright("Apache Software Foundation")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyVersion("0.2.1.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/dotnet/Qpid.Common/Properties/AssemblyInfo.cs b/dotnet/Qpid.Common/Properties/AssemblyInfo.cs
index e876015bc3..1d142ed227 100644
--- a/dotnet/Qpid.Common/Properties/AssemblyInfo.cs
+++ b/dotnet/Qpid.Common/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-/*
+/*
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -24,11 +24,11 @@ using System.Runtime.InteropServices;
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Apache.Qpid.Common")]
-[assembly: AssemblyDescription("Common AMQ Framing Code")]
+[assembly: AssemblyDescription("Built from svn revision number: 611749:611758M")]
[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Apache Qpid")]
+[assembly: AssemblyCompany("Apache")]
[assembly: AssemblyProduct("Apache.Qpid.Common")]
-[assembly: AssemblyCopyright("Copyright © J.P. Morgan Chase & Co. 2006")]
+[assembly: AssemblyCopyright("Apache Software Foundation")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@@ -49,4 +49,4 @@ using System.Runtime.InteropServices;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("0.5.*")]
+[assembly: AssemblyVersion("0.2.1.0")]
diff --git a/dotnet/Qpid.Messaging/Properties/AssemblyInfo.cs b/dotnet/Qpid.Messaging/Properties/AssemblyInfo.cs
index 8683ad08b2..ad7dd7ef08 100644
--- a/dotnet/Qpid.Messaging/Properties/AssemblyInfo.cs
+++ b/dotnet/Qpid.Messaging/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-/*
+/*
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -25,11 +25,11 @@ using System.Runtime.InteropServices;
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Apache.Qpid.Messaging")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyDescription("Built from svn revision number: 611749:611758M")]
[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Apache Qpid")]
+[assembly: AssemblyCompany("Apache")]
[assembly: AssemblyProduct("Apache.Qpid.Messaging")]
-[assembly: AssemblyCopyright("Copyright (c) 2006 The Apache Software Foundation")]
+[assembly: AssemblyCopyright("Apache Software Foundation")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@@ -50,7 +50,7 @@ using System.Runtime.InteropServices;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyVersion("0.2.1.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: CLSCompliant(true)]
diff --git a/dotnet/Qpid.Sasl.Tests/Properties/AssemblyInfo.cs b/dotnet/Qpid.Sasl.Tests/Properties/AssemblyInfo.cs
index 657b15e3ea..ba733ddcbf 100644
--- a/dotnet/Qpid.Sasl.Tests/Properties/AssemblyInfo.cs
+++ b/dotnet/Qpid.Sasl.Tests/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
@@ -6,11 +6,11 @@ using System.Runtime.InteropServices;
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Apache.Qpid.Sasl.Tests")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyDescription("Built from svn revision number: 611749:611758M")]
[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
+[assembly: AssemblyCompany("Apache")]
[assembly: AssemblyProduct("Apache.Qpid.Sasl.Tests")]
-[assembly: AssemblyCopyright("Copyright © 2007")]
+[assembly: AssemblyCopyright("Apache Software Foundation")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyVersion("0.2.1.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/dotnet/Qpid.Sasl/Properties/AssemblyInfo.cs b/dotnet/Qpid.Sasl/Properties/AssemblyInfo.cs
index f38725e53f..edc1fa998d 100644
--- a/dotnet/Qpid.Sasl/Properties/AssemblyInfo.cs
+++ b/dotnet/Qpid.Sasl/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
@@ -7,11 +7,11 @@ using System.Runtime.InteropServices;
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Apache.Qpid.Sasl")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyDescription("Built from svn revision number: 611749:611758M")]
[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Apache Qpid")]
+[assembly: AssemblyCompany("Apache")]
[assembly: AssemblyProduct("Apache.Qpid.Sasl")]
-[assembly: AssemblyCopyright("Copyright © 2007 The Apache Software Foundation")]
+[assembly: AssemblyCopyright("Apache Software Foundation")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@@ -32,6 +32,6 @@ using System.Runtime.InteropServices;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyVersion("0.2.1.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: CLSCompliant(true)]
diff --git a/dotnet/TestClient/Properties/AssemblyInfo.cs b/dotnet/TestClient/Properties/AssemblyInfo.cs
index becfda4a69..ad3a0a2eb3 100644
--- a/dotnet/TestClient/Properties/AssemblyInfo.cs
+++ b/dotnet/TestClient/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
@@ -6,11 +6,11 @@ using System.Runtime.InteropServices;
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("TestClient")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyDescription("Built from svn revision number: 611749:611758M")]
[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("J.P. Morgan Chase & Co.")]
+[assembly: AssemblyCompany("Apache")]
[assembly: AssemblyProduct("TestClient")]
-[assembly: AssemblyCopyright("Copyright © J.P. Morgan Chase & Co. 2007")]
+[assembly: AssemblyCopyright("Apache Software Foundation")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
-[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyVersion("0.2.1.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/dotnet/TopicListener/Properties/AssemblyInfo.cs b/dotnet/TopicListener/Properties/AssemblyInfo.cs
index 8672df7059..7e5ab19273 100644
--- a/dotnet/TopicListener/Properties/AssemblyInfo.cs
+++ b/dotnet/TopicListener/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
@@ -6,11 +6,11 @@ using System.Runtime.InteropServices;
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("TopicListener")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyDescription("Built from svn revision number: 611749:611758M")]
[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("J.P. Morgan Chase & Co.")]
+[assembly: AssemblyCompany("Apache")]
[assembly: AssemblyProduct("TopicListener")]
-[assembly: AssemblyCopyright("Copyright © J.P. Morgan Chase & Co. 2007")]
+[assembly: AssemblyCopyright("Apache Software Foundation")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
-[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyVersion("0.2.1.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/dotnet/TopicPublisher/Properties/AssemblyInfo.cs b/dotnet/TopicPublisher/Properties/AssemblyInfo.cs
index 85442960ed..d58c3d0dbd 100644
--- a/dotnet/TopicPublisher/Properties/AssemblyInfo.cs
+++ b/dotnet/TopicPublisher/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
@@ -6,11 +6,11 @@ using System.Runtime.InteropServices;
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("TopicPublisher")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyDescription("Built from svn revision number: 611749:611758M")]
[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("J.P. Morgan Chase & Co.")]
+[assembly: AssemblyCompany("Apache")]
[assembly: AssemblyProduct("TopicPublisher")]
-[assembly: AssemblyCopyright("Copyright © J.P. Morgan Chase & Co. 2007")]
+[assembly: AssemblyCopyright("Apache Software Foundation")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
-[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyVersion("0.2.1.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/dotnet/default.build b/dotnet/default.build
index 3c96b09c55..543e5999d7 100644
--- a/dotnet/default.build
+++ b/dotnet/default.build
@@ -1,11 +1,21 @@
<?xml version="1.0"?>
<project name="Qpid.NET" default="build">
+
+ <!-- Determines the formatter to use to format output of test results. -->
<property name="nant.formatter" value="Plain" />
- <!--
- Build debug or release build?
- -->
+
+ <!-- Determines whether a 'debug' or 'release' build is to be done. Defaults to 'debug' -->
<property name="build.config" value="debug" />
+ <!-- Sets the build version accross all assemblies in the project. -->
+ <property name="build.version.major" value="0"/>
+ <property name="build.version.minor" value="2"/>
+ <property name="build.version.build" value="1"/>
+ <property name="build.version.revision" value="0"/>
+ <property name="build.company" value="Apache"/>
+ <property name="build.copyright" value="Apache Software Foundation"/>
+ <property name="build.description" value="Built from svn revision number: "/>
+
<!--
Fileset with build files for each core assembly
-->
@@ -36,24 +46,107 @@
<include name="TopicPublisher/default.build" />
<include name="TestClient/default.build" />
</fileset>
- <!--
- Prepare environment for a debug build
- -->
+
+ <!-- Runs 'svnversion' to get the repository revision into the build property 'build.svnversion'. -->
+ <target name="svnversion" description="Runs svnversion to get the current repository version into a build script property.">
+ <exec program="svnversion.exe" output="svnversion_tmp.txt">
+ <arg value="-n"/>
+ </exec>
+
+ <loadfile file="svnversion_tmp.txt" property="build.svnversion"/>
+ <delete file="svnversion_tmp.txt"/>
+
+ <!-- For some competely retarted reason the '-n' parameter to svnversion doesn't really work under windows...
+ Here is some code to strip the unwanted newlines. -->
+ <script language="C#">
+ <code><![CDATA[
+ public static void ScriptMain(Project project)
+ {
+ project.Properties["build.svnversion"] = project.Properties["build.svnversion"].Trim("\n\r".ToCharArray());
+ }
+ ]]>
+ </code>
+ </script>
+
+ </target>
+
+ <!-- Performs a regex find-and-replace on assembly info files, substituting in a version number. -->
+ <target name="setversion" description="Stamp the version info onto assemblyinfo.cs files" depends="svnversion">
+
+ <echo>build.svnversion = ${build.svnversion}</echo>
+
+ <foreach item="File" property="filename">
+ <in>
+ <items basedir=".">
+ <include name="**\AssemblyInfo.cs"></include>
+ </items>
+ </in>
+ <do>
+ <script language="C#">
+ <code><![CDATA[
+ public static void ScriptMain(Project project)
+ {
+ // Read in the entire file to perform the substitution in.
+ StreamReader reader = new StreamReader(project.Properties["filename"]);
+ string contents = reader.ReadToEnd();
+ reader.Close();
+
+ // Substitute the version numbers.
+ string replacement = string.Format(
+ "[assembly: AssemblyVersion(\"{0}.{1}.{2}.{3}\")]",
+ project.Properties["build.version.major"],
+ project.Properties["build.version.minor"],
+ project.Properties["build.version.build"],
+ project.Properties["build.version.revision"]
+ );
+ contents = Regex.Replace(contents, @"\[assembly: AssemblyVersion\("".*""\)\]", replacement);
+
+ // Substitute the company name and copyright.
+ replacement = string.Format(
+ "[assembly: AssemblyCompany(\"{0}\")]",
+ project.Properties["build.company"]
+ );
+ contents = Regex.Replace(contents, @"\[assembly: AssemblyCompany\("".*""\)\]", replacement);
+
+ replacement = string.Format(
+ "[assembly: AssemblyCopyright(\"{0}\")]",
+ project.Properties["build.copyright"]
+ );
+ contents = Regex.Replace(contents, @"\[assembly: AssemblyCopyright\("".*""\)\]", replacement);
+
+ // Update the description.
+ replacement = string.Format(
+ "[assembly: AssemblyDescription(\"{0} {1}\")]",
+ project.Properties["build.description"],
+ project.Properties["build.svnversion"]
+ );
+ contents = Regex.Replace(contents, @"\[assembly: AssemblyDescription\("".*""\)\]", replacement);
+
+ // Write out the file with the substituted version.
+ StreamWriter writer = new StreamWriter(project.Properties["filename"], false);
+ writer.Write(contents);
+ writer.Close();
+ }
+ ]]>
+ </code>
+ </script>
+ </do>
+ </foreach>
+ </target>
+
+ <!-- Prepare environment for a debug build. -->
<target name="debug">
<property name="build.debug" value="true" />
<property name="build.defines" value="DEBUG;TRACE"/>
</target>
- <!--
- Prepare environment for a release build
- -->
+
+ <!-- Prepare environment for a release build. -->
<target name="release">
<property name="build.debug" value="false" />
<property name="build.defines" value=""/>
</target>
- <!--
- prepare environment for build
- -->
+ <!-- Prepare environment for build. -->
<target name="init">
<property name="base.dir" value="${project::get-base-directory()}" />
<property name="build.dir" value="${base.dir}/bin/${framework::get-target-framework()}/${build.config}" />
@@ -64,10 +157,8 @@
<delete dir="${build.dir}" failonerror="false" />
</target>
- <!--
- Do the build
- -->
- <target name="build" depends="init">
+ <!-- Do the build. -->
+ <target name="build" depends="init, setversion">
<!-- make sure output folder exists -->
<mkdir dir="${build.dir}" />
<!-- copy reference assemblies over to the output dir -->