From 4a41cf64eb339cc38d04603ac8faaee797331dc9 Mon Sep 17 00:00:00 2001 From: Steven Shaw Date: Sun, 26 Nov 2006 20:49:25 +0000 Subject: No longer refer to Mono as 20. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@479426 13f79535-47bb-0310-9956-ffa450edef68 --- dotnet/README.txt | 6 ++-- dotnet/build-mono | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++ dotnet/build-mono20 | 84 ---------------------------------------------------- dotnet/release | 6 ++-- 4 files changed, 91 insertions(+), 90 deletions(-) create mode 100755 dotnet/build-mono delete mode 100755 dotnet/build-mono20 (limited to 'dotnet') diff --git a/dotnet/README.txt b/dotnet/README.txt index ce808a8b35..10a755b9a7 100644 --- a/dotnet/README.txt +++ b/dotnet/README.txt @@ -39,7 +39,7 @@ To build .NET 1.1 executables via MsBee (to bin/FX_1_1/Debug): To build for Mono on Linux (to build/mono20): - $ build-mono20 + $ build-mono Releasing @@ -59,7 +59,7 @@ Generates ./build/release/Qpid.NET-1.0M1-dotnet20.zip For Mono - $ release mono20 1.0M1 + $ release mono 1.0M1 -Generates ./build/release/Qpid.NET-1.0M1-mono20.zip +Generates ./build/release/Qpid.NET-1.0M1-mono.zip diff --git a/dotnet/build-mono b/dotnet/build-mono new file mode 100755 index 0000000000..83a8198307 --- /dev/null +++ b/dotnet/build-mono @@ -0,0 +1,85 @@ +#!/bin/bash +# +# Low brow build script for Mono 2.0. +# Uses metadata available in VS2005 project files. +# +# Replace with Mono's new XBuild when details are fully released. +# Note: XBuild is a clone of MSBuild. +# + +#MCS_FLAGS="-debug+" +MCS_FLAGS="-optimize" +outDir=$PWD/build/mono + +FindExternalReferences() +{ + assembly=$1 + grep HintPath $assembly.csproj | sed -e 's-.*\(.*\)-\1-' -e 's-\\-/-g' | + while read ref; do + echo $PWD/$ref + done +} + +Build() +{ + assembly=$1; shift + + echo "====================================================" + echo Building $assembly + references=$(grep 'tmp.build.sources + externalReferences=$(FindExternalReferences $assembly) + # Strip Control-M characters from external references... + externalReferences=$(echo $externalReferences | sed 's/\r//g') + echo "externalReferences = [$externalReferences]" + echo "regularRefs = [$regularRefs]" + echo PWD=$PWD + + # construct "-r" argument. + fullrefs="" + for ref in $regularRefs $externalReferences; do + if [[ -z $fullrefs ]]; then + fullrefs="-r:$ref" + else + fullrefs="$fullrefs,$ref" + fi + done + echo "fullrefs = [$fullrefs]" + + # Copy external references to output directory. + for ref in $externalReferences; do + cp $ref $outDir + done + + # Strip Control-M character here too. Not sure how they get there... + echo $fullrefs >tmp.references + mcs $MCS_FLAGS -out:$outDir/$assembly.dll -target:library @tmp.references @tmp.build.sources + ) +} + +mkdir -p $outDir + +# Tried to magically get projects from Qpid.NET.sln but wrong order for building.. +#for project in $(grep ^Project Qpid.NET.sln | sed 's/.*\\\(.*\).csproj.*/\1/'); do +# Build $project +#done + +Build Qpid.Messaging && + Build Qpid.Buffer && + Build Qpid.Codec && + Build Qpid.Common && + Build Qpid.Common.Tests && + Build Qpid.Client && + Build Qpid.Client.Transport.Socket.Blocking && + Build Qpid.Client.Tests diff --git a/dotnet/build-mono20 b/dotnet/build-mono20 deleted file mode 100755 index 52558c8426..0000000000 --- a/dotnet/build-mono20 +++ /dev/null @@ -1,84 +0,0 @@ -#!/bin/bash -# -# Low brow build script for Mono 2.0. -# Uses metadata available in VS2005 project files. -# -# Replace with Mono's new XBuild when details are fully released. -# Note: XBuild is a clone of MSBuild. -# - -MCS_FLAGS="-debug+" - -FindExternalReferences() -{ - assembly=$1 - grep HintPath $assembly.csproj | sed -e 's-.*\(.*\)-\1-' -e 's-\\-/-g' | - while read ref; do - echo $PWD/$ref - done -} - -Build() -{ - assembly=$1; shift - - echo "====================================================" - echo Building $assembly - references=$(grep 'tmp.build.sources - externalReferences=$(FindExternalReferences $assembly) - # Strip Control-M characters from external references... - externalReferences=$(echo $externalReferences | sed 's/\r//g') - echo "externalReferences = [$externalReferences]" - echo "regularRefs = [$regularRefs]" - echo PWD=$PWD - - # construct "-r" argument. - fullrefs="" - for ref in $regularRefs $externalReferences; do - if [[ -z $fullrefs ]]; then - fullrefs="-r:$ref" - else - fullrefs="$fullrefs,$ref" - fi - done - echo "fullrefs = [$fullrefs]" - - # Copy external references to output directory. - for ref in $externalReferences; do - cp $ref $outDir - done - - # Strip Control-M character here too. Not sure how they get there... - echo $fullrefs >tmp.references - mcs $MCS_FLAGS -out:$outDir/$assembly.dll -target:library @tmp.references @tmp.build.sources - ) -} - -outDir=$PWD/build/mono20 -mkdir -p $outDir - -# Tried to magically get projects from Qpid.NET.sln but wrong order for building.. -#for project in $(grep ^Project Qpid.NET.sln | sed 's/.*\\\(.*\).csproj.*/\1/'); do -# Build $project -#done - -Build Qpid.Messaging && - Build Qpid.Buffer && - Build Qpid.Codec && - Build Qpid.Common && - Build Qpid.Common.Tests && - Build Qpid.Client && - Build Qpid.Client.Transport.Socket.Blocking && - Build Qpid.Client.Tests diff --git a/dotnet/release b/dotnet/release index d4ecd84ede..077499aa89 100644 --- a/dotnet/release +++ b/dotnet/release @@ -2,7 +2,7 @@ Usage() { - echo "usage: $0 dotnet11|dotnet20|mono20 release-number (e.g. 2.0.1)" + echo "usage: $0 dotnet11|dotnet20|mono release-number (e.g. 2.0.1)" exit 2 } @@ -17,8 +17,8 @@ if [[ $dotNetVersion == "dotnet11" ]]; then binDir=Qpid.Client.Tests/bin/FX1_1/Release elif [[ $dotNetVersion == "dotnet20" ]]; then binDir=qpid.client.tests/bin/release -elif [[ $dotNetVersion == "mono20" ]]; then - binDir=build/mono20 +elif [[ $dotNetVersion == "mono" ]]; then + binDir=build/mono else Usage fi -- cgit v1.2.1