nicko 2005/02/13 19:17:06
Modified: . log4net.build log4net.include
Log:
Cnaged CORE build to CLI_1_0. Updated package target
Revision Changes Path
1.12 +20 -21 logging-log4net/log4net.build
Index: log4net.build
===================================================================
RCS file: /home/cvs/logging-log4net/log4net.build,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- log4net.build 7 Feb 2005 20:48:23 -0000 1.11
+++ log4net.build 14 Feb 2005 03:17:06 -0000 1.12
@@ -175,7 +175,7 @@
</if>
<if test="${framework::exists('net-1.0')}">
<call target="compile-net-1.0" />
- <call target="compile-core" />
+ <call target="compile-cli-1.0" />
</if>
<if test="${not framework::exists('net-1.0')}">
<if test="${property::exists('project.build.package') and
project.build.package}">
@@ -201,12 +201,15 @@
</if>
<if test="${not framework::exists('net-2.0')}">
<if test="${property::exists('project.build.package') and
project.build.package}">
+ <!-- .NET 2.0 Build Skipped for Package
<fail message="The .NET Framework 2.0 is not available." />
+ -->
+ <echo message="The .NET Framework 2.0 is not available.
Build skipped during package." />
</if>
<if test="${not(property::exists('project.build.package') and
project.build.package)}">
<echo message="The .NET Framework 2.0 is not available.
Build skipped." />
</if>
- </if>
+ </if>
<if test="${framework::exists('mono-1.0')}">
<call target="compile-mono-1.0" />
</if>
@@ -462,17 +465,19 @@
</if>
</target>
<!--
- This version is built targeting .NET 1.0, but does not contain any
- classes that are .NET 1.0 or Windows-specific.
+ This version is built to run on any CLI 1.0 (ECMA 335) standard
runtime.
+ The build excludes any code that is platform specific.
+ The .NET 1.0 compiler and library are used to build the assembly.
- Therefore, the log4net Core is runtime compatible with the following
- frameworks :
+ The log4net CLI 1.0 assembly is runtime compatible with the
following frameworks :
* Microsoft .NET Framework 1.0 (and higher)
* Mono 1.0 (and higher)
- We only provide this "flavor" of log4net in release configuration.
+ We only provide this "flavor" of log4net in release configuration
because
+ debugging information is not standardized and would be too closely
tied to
+ a specific implementation.
-->
- <target name="compile-core" description="Builds Core version"
depends="set-core-configuration, check-log4net-basedir"
if="${current.build.config.release}">
+ <target name="compile-cli-1.0" description="Builds CLI 1.0 version"
depends="set-cli-1.0-configuration, check-log4net-basedir,
clean-current-bin-dir" if="${current.build.config.release}">
<delete>
<fileset basedir="${current.bin.dir}">
<include name="log4net.*" />
@@ -518,7 +523,7 @@
<!-- Target for generating docs for all runtime configurations -->
<target name="generate-sdkdoc-all" depends="check-current-build-config">
<echo message="Generating SDK documentation temporarily disabled." />
- <!--
+ <!--
<echo message="Generating SDK documentation based on the
${current.build.config} build configuration for all runtime configurations." />
<if test="${framework::exists('netcf-1.0')}">
<call target="set-netcf-1.0-runtime-configuration" />
@@ -532,7 +537,7 @@
<call target="set-net-1.1-runtime-configuration" />
<call target="generate-sdkdoc" />
</if>
- -->
+ -->
<!-- NAnt doesn't yet come with a version of NDoc that can handle
.NET 2.0 assemblies -->
<!-- Mono 1.0 does not support extracting xml documentation -->
<!-- SSCLI 1.0 does not support extracting xml documentation -->
@@ -641,8 +646,8 @@
<fileset basedir="src">
<include name="**/*" />
<exclude name="**/obj/**" />
- <exclude name="log4net.csproj.user" />
- <exclude name="log4net.suo" />
+ <exclude name="*.csproj.user" />
+ <exclude name="*.suo" />
<exclude name="log4net.ndoc" />
<exclude name="log4net*.xml" />
<exclude name="**/*.sln.old" />
@@ -670,25 +675,19 @@
<mkdir dir="${current.package.dir}/doc" />
<copy todir="${current.package.dir}/doc" includeemptydirs="false">
<fileset basedir="doc">
- <include name="*" />
- </fileset>
- </copy>
- <mkdir dir="${current.package.dir}/doc/manual" />
- <copy todir="${current.package.dir}/doc/manual"
includeemptydirs="false">
- <fileset basedir="doc/manual">
- <include name="*" />
+ <include name="**/*" />
</fileset>
</copy>
</target>
<target name="package-release-files" depends="check-current-package-dir,
check-log4net-basedir">
<copy todir="${current.package.dir}">
<fileset basedir=".">
- <include name="index.html" />
+ <!-- <include name="index.html" /> -->
<include name="build.cmd" />
<include name="ChangeLog.txt" />
<include name="log4net.build" />
<include name="log4net.include" />
- <include name="releasenotes.html" />
+ <!-- <include name="releasenotes.html" /> -->
<include name="LICENSE.txt" />
<include name="log4net.snk" />
</fileset>
1.8 +17 -17 logging-log4net/log4net.include
Index: log4net.include
===================================================================
RCS file: /home/cvs/logging-log4net/log4net.include,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- log4net.include 7 Feb 2005 20:48:23 -0000 1.7
+++ log4net.include 14 Feb 2005 03:17:06 -0000 1.8
@@ -43,10 +43,10 @@
<if test="${not property::exists('sdkdoc.dir')}">
<property name="sdkdoc.dir" value="${doc.dir}/sdk" />
</if>
- <!--
- Temporarily disabled SDK generation through NAnt build
+ <!--
+ Temporarily disabled SDK generation through NAnt build
<mkdir dir="${sdkdoc.dir}" />
- -->
+ -->
</target>
<target name="check-sdkdoc-debug">
<if test="${not property::exists('sdkdoc.debug')}">
@@ -85,10 +85,10 @@
<if test="${not property::exists('current.sdkdoc.dir')}">
<fail message="The current sdk document directory has not been
specified." />
</if>
- <!--
- Temporarily disabled SDK generation through NAnt build
- <mkdir dir="${sdkdoc.dir}" />
- -->
+ <!--
+ Temporarily disabled SDK generation through NAnt build
+ <mkdir dir="${sdkdoc.dir}" />
+ -->
</target>
<target name="check-current-sdkdoc-debug">
<if test="${not property::exists('current.sdkdoc.debug')}">
@@ -128,11 +128,11 @@
</target>
<target name="clean-current-sdkdoc-dir"
depends="check-current-sdkdoc-dir" description="cleaning the current SDK
documentation directory">
<echo message="Cleaning the ${current.sdkdoc.dir} SDK documentation
directory." />
- <!--
- Temporarily disabled SDK generation through NAnt build
+ <!--
+ Temporarily disabled SDK generation through NAnt build
<delete dir="${current.sdkdoc.dir}"
if="${directory::exists(current.sdkdoc.dir)}" />
<mkdir dir="${current.sdkdoc.dir}" />
- -->
+ -->
</target>
<!-- Targets for setting up the environment -->
<target name="set-build-configuration"
depends="check-current-build-config">
@@ -246,15 +246,15 @@
<property name="current.sdkdoc.dir"
value="${sdkdoc.dir}/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"
/>
<property name="current.sdkdoc.debug" value="${sdkdoc.debug}"
dynamic="true" />
</target>
- <target name="set-core-configuration">
+ <target name="set-cli-1.0-configuration" depends="check-bin-dir">
<property name="nant.settings.currentframework" value="net-1.0" />
<property name="current.build.debug" value="${build.debug}"
dynamic="true" />
- <property name="current.build.defines.csc"
value="${build.defines.csc},CORE" dynamic="true" />
- <property name="current.build.defines.jsc"
value="${build.defines.jsc},CORE" dynamic="true" />
- <property name="current.build.defines.vbc"
value="${build.defines.vbc},CORE=True" dynamic="true" />
- <property name="current.build.defines.vjc"
value="${build.defines.vjc},CORE" dynamic="true" />
- <property name="current.build.defines.cl" value="${build.defines.cl}
/D CORE" dynamic="true" />
- <property name="current.bin.dir" value="${bin.dir}" />
+ <property name="current.build.defines.csc"
value="${build.defines.csc},CLI,CLI_1_0" dynamic="true" />
+ <property name="current.build.defines.jsc"
value="${build.defines.jsc},CLI,CLI_1_0" dynamic="true" />
+ <property name="current.build.defines.vbc"
value="${build.defines.vbc},CLI=True,CLI_1_0=True" dynamic="true" />
+ <property name="current.build.defines.vjc"
value="${build.defines.vjc},CLI,CLI_1_0" dynamic="true" />
+ <property name="current.build.defines.cl" value="${build.defines.cl}
/D CLI /D CLI_1_0" dynamic="true" />
+ <property name="current.bin.dir"
value="${bin.dir}/cli/1.0/${current.build.config}" />
<property name="current.sdkdoc.dir" value="${sdkdoc.dir}" />
<property name="current.sdkdoc.debug" value="${sdkdoc.debug}"
dynamic="true" />
</target>
