Skip to content
Permalink
Browse files
Remove external references to deployed assemblies.
  • Loading branch information
Jim Gomes committed Nov 3, 2009
1 parent f1d2422 commit 551cac5acda376bbab2ddea44cd2314f23b4dd09
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 55 deletions.
@@ -41,7 +41,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}" />
<property name="build.framework.strings" value="net-2.0,net-3.5,mono-2.0,netcf-2.0" />
<property name="build.framework.strings" value="net-2.0,net-3.5,mono-2.0,netcf-2.0" unless="${property::exists('build.framework.strings')}"/>
<property name="current.build.framework.assembly.dir" value="${framework::get-assembly-directory(framework::get-target-framework())}" dynamic="true" />

<if test="${build.skip.release}">
@@ -199,6 +199,18 @@
<property name="csc.optimize" value="true" />
</target>

<target name="set-net-1.1-framework-configuration">
<property name="current.build.framework" value="net-1.1" />
<property name="current.build.framework.name" value=".NET 1.1" />
<property name="current.build.defines" value="${build.defines}NET,NET_1_1" dynamic="true" />
<property name="current.build.framework.sign" value="false" />
<property name="link.sdkdoc.version" value="SDK_v1_1" />
<property name="link.sdkdoc.web" value="true" />
<if test="${framework::exists(current.build.framework)}">
<property name="nant.settings.currentframework" value="${current.build.framework}" />
</if>
</target>

<target name="set-net-2.0-framework-configuration">
<property name="current.build.framework" value="net-2.0" />
<property name="current.build.framework.name" value=".NET 2.0" />
@@ -422,47 +434,6 @@
</foreach>
</target>

<!-- ============================================================================================ -->
<!-- D E P L O Y T A R G E T S -->
<!-- ============================================================================================ -->

<target name="deploy-all" depends="generate-build-number" description="Deploy all build configurations for all runtime configurations">
<echo message="Deploying release configurations for all runtime configurations." />
<call target="set-release-configuration" />
<foreach item="String" in="${build.framework.strings}" delim="," property="current.build.framework">
<call target="deploy-target" />
</foreach>

<!-- Commit the deployed files to repository. This completes the deployment. -->
<exec program="svn" failonerror="false">
<arg value="commit" />
<arg value="deploy" />
<arg value="-m" />
<arg value="Deploy ${project.name} ${project.version.numeric}" />
</exec>
</target>

<target name="deploy-target" depends="init, conditional-deploy" />

<target name="conditional-deploy" depends="init" unless="${build.skip}"
description="Conditionaly deploy all the modules if build framework and type are supported">
<call target="deploy" />
</target>

<!-- Deploy the modules to the global repo -->
<target name="deploy" description="Deploy the artifacts into the subversion repo">
<property name="repo.dir" value="deploy/${current.build.framework}" />
<foreach item="File" property="deploy.filename">
<in>
<items refid="deploy.filenames" />
</in>
<do>
<property name="repo.task.dest" value="${path::get-file-name(deploy.filename)}" />
<copy file="${deploy.filename}" todir="${repo.dir}" unless="${file::up-to-date(deploy.filename, '${repo.dir}/${repo.task.dest}')}" />
</do>
</foreach>
</target>

<!-- ============================================================================================ -->
<!-- T E S T T A R G E T S -->
<!-- ============================================================================================ -->
@@ -102,19 +102,6 @@
<include name="${build.bin.dir}/${project.name}.dll.mdb" />
</fileset>

<fileset id="deploy.filenames">
<include name="LICENSE.txt" />
<include name="NOTICE.txt" />
<include name="${build.bin.dir}/${project.name}.dll" />
<include name="${build.bin.dir}/${project.name}.pdb" />
<include name="${build.bin.dir}/${project.name}.dll.mdb" />
<include name="${build.bin.dir}/${project.name}.xml" />
<include name="${build.bin.dir}/${project.name}.Test.dll" />
<include name="${build.bin.dir}/${project.name}.Test.pdb" />
<include name="${build.bin.dir}/${project.name}.Test.dll.mdb" />
<include name="${build.bin.dir}/${project.name}.Test.xml" />
<include name="${build.bin.dir}/nmsprovider-*.config" />
</fileset>
</target>

<target name="default" depends="download-vendor-all, install-all" />

0 comments on commit 551cac5

Please sign in to comment.