Skip to content
Permalink
Browse files
Add support for building .NET 4.0 assemblies. Dependent vendor assemb…
…lies are currently only copies of the .NET 3.5 versions. Once actual .NET 4.0 versions are available, they can be checked in.

Fixes [AMQNET-286]. (See https://issues.apache.org/activemq/browse/AMQNET-286)
  • Loading branch information
Jim Gomes committed Sep 27, 2010
1 parent e7c2374 commit 1328ddc420c1a233f7503f71c3eed9a8d70e5e0a
Showing 2 changed files with 32 additions and 34 deletions.
@@ -44,8 +44,7 @@
<property name="current.build.config" value="${if(project.release.type == 'release', 'release', 'debug')}" overwrite="false" />
<property name="current.build.framework" value="${framework::get-target-framework()}" overwrite="false" />
<property name="current.build.defines" value="${build.defines}" />
<!-- TODO: Add net-4.0 once NAnt supports it. -->
<property name="build.framework.strings" value="net-2.0,net-3.5,mono-2.0,netcf-2.0,netcf-3.5" unless="${property::exists('build.framework.strings')}"/>
<property name="build.framework.strings" value="net-2.0,net-3.5,net-4.0,mono-2.0,netcf-2.0,netcf-3.5" unless="${property::exists('build.framework.strings')}"/>
<property name="current.build.framework.assembly.dir" value="${framework::get-assembly-directory(framework::get-target-framework())}" dynamic="true" />

<property name="build.config.strings" value="${if(property::exists('configuration'), configuration, if(build.skip.release == 'true', 'debug', 'debug,release'))}" dynamic="true" />
@@ -228,7 +227,7 @@
<property name="current.build.framework.name" value=".NET 4.0" />
<property name="current.build.defines" value="${build.defines}NET,NET_2_0,NET_3_5,NET_4_0" dynamic="true" />
<property name="current.build.framework.sign" value="true" />
<property name="link.sdkdoc.version" value="SDK_v6_1" />
<property name="link.sdkdoc.version" value="SDK_v7_0" />
<property name="link.sdkdoc.web" value="true" />
<property name="nant.settings.currentframework" value="${current.build.framework}" />
</target>
@@ -469,7 +468,6 @@
<exec program="nunit-console" failonerror="true" workingdir="build/${current.build.framework}/${current.build.config}">
<arg value="${NUnit.Projectfile}" />
<arg value="-labels" />
<arg value="-exclude=LongRunning" />
<arg value="-xml=Nunit.TestOutput.xml" />
</exec>
</if>
@@ -16,47 +16,47 @@
$pkgname = "Apache.NMS.Stomp"
$pkgver = "1.5-SNAPSHOT"
$configurations = "release", "debug"
$frameworks = "mono-2.0", "net-2.0", "net-3.5", "netcf-2.0"
$frameworks = "mono-2.0", "net-2.0", "net-3.5", "net-4.0", "netcf-2.0"

write-progress "Creating package directory." "Initializing..."
if(!(test-path package))
{
md package
md package
}

if(test-path build)
{
pushd build
pushd build

$pkgdir = "..\package"
$pkgdir = "..\package"

write-progress "Packaging Application files." "Scanning..."
$zipfile = "$pkgdir\$pkgname-$pkgver-bin.zip"
zip -9 -u -j "$zipfile" ..\LICENSE.txt
zip -9 -u -j "$zipfile" ..\NOTICE.txt
foreach($configuration in $configurations)
{
foreach($framework in $frameworks)
{
zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.dll"
zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.xml"
zip -9 -u "$zipfile" "$framework\$configuration\nmsprovider*.config"
zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.dll"
zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.xml"
if($framework -ieq "mono-2.0")
{
zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.dll.mdb"
zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.dll.mdb"
}
else
{
zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.pdb"
zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.pdb"
}
}
}
write-progress "Packaging Application files." "Scanning..."
$zipfile = "$pkgdir\$pkgname-$pkgver-bin.zip"
zip -9 -u -j "$zipfile" ..\LICENSE.txt
zip -9 -u -j "$zipfile" ..\NOTICE.txt
foreach($configuration in $configurations)
{
foreach($framework in $frameworks)
{
zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.dll"
zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.xml"
zip -9 -u "$zipfile" "$framework\$configuration\nmsprovider*.config"
zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.dll"
zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.xml"
if($framework -ieq "mono-2.0")
{
zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.dll.mdb"
zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.dll.mdb"
}
else
{
zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.pdb"
zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.pdb"
}
}
}

popd
popd
}

write-progress "Packaging Source code files." "Scanning..."

0 comments on commit 1328ddc

Please sign in to comment.