Tests: split up current.bin.dir to allow better handling of installing nunit
Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/69cf902e Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/69cf902e Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/69cf902e Branch: refs/heads/feature/RollingFileAppender-NG Commit: 69cf902e98ffa58e7a32a1dc01984e090e67d659 Parents: 51c3269 Author: Dominik Psenner <[email protected]> Authored: Tue Jul 4 17:16:41 2017 +0200 Committer: Dominik Psenner <[email protected]> Committed: Tue Jul 4 17:16:41 2017 +0200 ---------------------------------------------------------------------- log4net.include | 51 ++++++++++++++++++++++++++++++++++----------------- tests/nant.build | 4 ++-- 2 files changed, 36 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/69cf902e/log4net.include ---------------------------------------------------------------------- diff --git a/log4net.include b/log4net.include index 4e558e5..7cfe8e1 100644 --- a/log4net.include +++ b/log4net.include @@ -197,7 +197,8 @@ limitations under the License. <property name="current.build.defines.vbc" value="${build.defines.vbc},NET=True,NET_1_0=True" dynamic="true" /> <property name="current.build.defines.vjc" value="${build.defines.vjc},NET,NET_1_0" dynamic="true" /> <property name="current.build.defines.cl" value="${build.defines.cl} /D NET /D NET_1_0" dynamic="true" /> - <property name="current.bin.dir" value="${bin.dir}/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}" /> + <property name="current.build.configuration.dir" value="${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}" /> + <property name="current.bin.dir" value="${bin.dir}/${current.build.configuration.dir}"/> <property name="log4net.output.dir" value="${log4net.basedir}/${current.bin.dir}" /> <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" /> @@ -211,7 +212,8 @@ limitations under the License. <property name="current.build.defines.vbc" value="${build.defines.vbc},NET=True,NET_1_1=True" dynamic="true" /> <property name="current.build.defines.vjc" value="${build.defines.vjc},NET,NET_1_1" dynamic="true" /> <property name="current.build.defines.cl" value="${build.defines.cl} /D NET /D NET_1_1" dynamic="true" /> - <property name="current.bin.dir" value="${bin.dir}/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}" /> + <property name="current.build.configuration.dir" value="${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}" /> + <property name="current.bin.dir" value="${bin.dir}/${current.build.configuration.dir}"/> <property name="log4net.output.dir" value="${log4net.basedir}/${current.bin.dir}" /> <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" /> @@ -225,7 +227,8 @@ limitations under the License. <property name="current.build.defines.vbc" value="${build.defines.vbc},NET=True,NET_2_0=True" dynamic="true" /> <property name="current.build.defines.vjc" value="${build.defines.vjc},NET,NET_2_0" dynamic="true" /> <property name="current.build.defines.cl" value="${build.defines.cl} /D NET /D NET_2_0" dynamic="true" /> - <property name="current.bin.dir" value="${bin.dir}/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}" /> + <property name="current.build.configuration.dir" value="${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}" /> + <property name="current.bin.dir" value="${bin.dir}/${current.build.configuration.dir}"/> <property name="log4net.output.dir" value="${log4net.basedir}/${current.bin.dir}" /> <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" /> @@ -240,7 +243,8 @@ limitations under the License. <property name="current.build.defines.vbc" value="${build.defines.vbc},NET=True,NET_2_0=True,NET_3_5=True" dynamic="true" /> <property name="current.build.defines.vjc" value="${build.defines.vjc},NET,NET_2_0,NET_3_5" dynamic="true" /> <property name="current.build.defines.cl" value="${build.defines.cl} /D NET /D NET_2_0 /D NET_3_5" dynamic="true" /> - <property name="current.bin.dir" value="${bin.dir}/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}" /> + <property name="current.build.configuration.dir" value="${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}" /> + <property name="current.bin.dir" value="${bin.dir}/${current.build.configuration.dir}"/> <property name="log4net.output.dir" value="${log4net.basedir}/${current.bin.dir}" /> <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" /> @@ -255,7 +259,8 @@ limitations under the License. <property name="current.build.defines.vbc" value="${build.defines.vbc},NET=True,NET_2_0=True,NET_3_5=True,CLIENT_PROFILE=True" dynamic="true" /> <property name="current.build.defines.vjc" value="${build.defines.vjc},NET,NET_2_0,NET_3_5,CLIENT_PROFILE" dynamic="true" /> <property name="current.build.defines.cl" value="${build.defines.cl} /D NET /D NET_2_0 /D NET_3_5 /D CLIENT_PROFILE" dynamic="true" /> - <property name="current.bin.dir" value="${bin.dir}/${framework::get-family(framework::get-target-framework())}-cp/${framework::get-version(framework::get-target-framework())}/${current.build.config}" /> + <property name="current.build.configuration.dir" value="${framework::get-family(framework::get-target-framework())}-cp/${framework::get-version(framework::get-target-framework())}/${current.build.config}" /> + <property name="current.bin.dir" value="${bin.dir}/${current.build.configuration.dir}"/> <property name="log4net.output.dir" value="${log4net.basedir}/${current.bin.dir}" /> <property name="current.sdkdoc.dir" value="${sdkdoc.dir}/${framework::get-family(framework::get-target-framework())}-cp/${framework::get-version(framework::get-target-framework())}" /> <property name="current.sdkdoc.debug" value="${sdkdoc.debug}" dynamic="true" /> @@ -270,7 +275,8 @@ limitations under the License. <property name="current.build.defines.vbc" value="${build.defines.vbc},NET=True,NET_2_0=True,NET_4_0=True" dynamic="true" /> <property name="current.build.defines.vjc" value="${build.defines.vjc},NET,NET_2_0,NET_4_0" dynamic="true" /> <property name="current.build.defines.cl" value="${build.defines.cl} /D NET /D NET_2_0 /D NET_4_0" dynamic="true" /> - <property name="current.bin.dir" value="${bin.dir}/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}" /> + <property name="current.build.configuration.dir" value="${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}" /> + <property name="current.bin.dir" value="${bin.dir}/${current.build.configuration.dir}"/> <property name="log4net.output.dir" value="${log4net.basedir}/${current.bin.dir}" /> <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" /> @@ -285,7 +291,8 @@ limitations under the License. <property name="current.build.defines.vbc" value="${build.defines.vbc},NET=True,NET_2_0=True,NET_4_0=True,CLIENT_PROFILE=True" dynamic="true" /> <property name="current.build.defines.vjc" value="${build.defines.vjc},NET,NET_2_0,NET_4_0,CLIENT_PROFILE" dynamic="true" /> <property name="current.build.defines.cl" value="${build.defines.cl} /D NET /D NET_2_0 /D NET_4_0 /D CLIENT_PROFILE" dynamic="true" /> - <property name="current.bin.dir" value="${bin.dir}/${framework::get-family(framework::get-target-framework())}-cp/${framework::get-version(framework::get-target-framework())}/${current.build.config}" /> + <property name="current.build.configuration.dir" value="${framework::get-family(framework::get-target-framework())}-cp/${framework::get-version(framework::get-target-framework())}/${current.build.config}" /> + <property name="current.bin.dir" value="${bin.dir}/${current.build.configuration.dir}"/> <property name="log4net.output.dir" value="${log4net.basedir}/${current.bin.dir}" /> <property name="current.sdkdoc.dir" value="${sdkdoc.dir}/${framework::get-family(framework::get-target-framework())}-cp/${framework::get-version(framework::get-target-framework())}" /> <property name="current.sdkdoc.debug" value="${sdkdoc.debug}" dynamic="true" /> @@ -300,7 +307,8 @@ limitations under the License. <property name="current.build.defines.vbc" value="${build.defines.vbc},NET=True,NET_2_0=True,NET_4_0=True,NET_4_5=True" dynamic="true" /> <property name="current.build.defines.vjc" value="${build.defines.vjc},NET,NET_2_0,NET_4_0,NET_4_5" dynamic="true" /> <property name="current.build.defines.cl" value="${build.defines.cl} /D NET /D NET_2_0 /D NET_4_0 /D NET_4_5" dynamic="true" /> - <property name="current.bin.dir" value="${bin.dir}/${framework::get-family(framework::get-target-framework())}/4.5/${current.build.config}" /> + <property name="current.build.configuration.dir" value="${framework::get-family(framework::get-target-framework())}/4.5/${current.build.config}" /> + <property name="current.bin.dir" value="${bin.dir}/${current.build.configuration.dir}"/> <property name="log4net.output.dir" value="${log4net.basedir}/${current.bin.dir}" /> <property name="current.sdkdoc.dir" value="${sdkdoc.dir}/${framework::get-family(framework::get-target-framework())}/4.5" /> <property name="current.sdkdoc.debug" value="${sdkdoc.debug}" dynamic="true" /> @@ -314,7 +322,8 @@ limitations under the License. <property name="current.build.defines.vbc" value="${build.defines.vbc},NETCF=True,NETCF_1_0=True" dynamic="true" /> <property name="current.build.defines.vjc" value="${build.defines.vjc},NETCF,NETCF_1_0" dynamic="true" /> <property name="current.build.defines.cl" value="${build.defines.cl} /D NETCF /D NETCF_1_0" dynamic="true" /> - <property name="current.bin.dir" value="${bin.dir}/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}" /> + <property name="current.build.configuration.dir" value="${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}" /> + <property name="current.bin.dir" value="${bin.dir}/${current.build.configuration.dir}"/> <property name="log4net.output.dir" value="${log4net.basedir}/${current.bin.dir}" /> <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" /> @@ -328,7 +337,8 @@ limitations under the License. <property name="current.build.defines.vbc" value="${build.defines.vbc},NETCF=True,NETCF_2_0=True" dynamic="true" /> <property name="current.build.defines.vjc" value="${build.defines.vjc},NETCF,NETCF_2_0" dynamic="true" /> <property name="current.build.defines.cl" value="${build.defines.cl} /D NETCF /D NETCF_2_0" dynamic="true" /> - <property name="current.bin.dir" value="${bin.dir}/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}" /> + <property name="current.build.configuration.dir" value="${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}" /> + <property name="current.bin.dir" value="${bin.dir}/${current.build.configuration.dir}"/> <property name="log4net.output.dir" value="${log4net.basedir}/${current.bin.dir}" /> <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" /> @@ -342,7 +352,8 @@ limitations under the License. <property name="current.build.defines.vbc" value="${build.defines.vbc},MONO=True,MONO_1_0=True" dynamic="true" /> <property name="current.build.defines.vjc" value="${build.defines.vjc},MONO,MONO_1_0" dynamic="true" /> <property name="current.build.defines.cl" value="${build.defines.cl} /D MONO /D MONO_1_0" dynamic="true" /> - <property name="current.bin.dir" value="${bin.dir}/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}" /> + <property name="current.build.configuration.dir" value="${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}" /> + <property name="current.bin.dir" value="${bin.dir}/${current.build.configuration.dir}"/> <property name="log4net.output.dir" value="${log4net.basedir}/${current.bin.dir}" /> <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" /> @@ -356,7 +367,8 @@ limitations under the License. <property name="current.build.defines.vbc" value="${build.defines.vbc},MONO=True,MONO_2_0=True" dynamic="true" /> <property name="current.build.defines.vjc" value="${build.defines.vjc},MONO,MONO_2_0" dynamic="true" /> <property name="current.build.defines.cl" value="${build.defines.cl} /D MONO /D MONO_2_0" dynamic="true" /> - <property name="current.bin.dir" value="${bin.dir}/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}" /> + <property name="current.build.configuration.dir" value="${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}" /> + <property name="current.bin.dir" value="${bin.dir}/${current.build.configuration.dir}"/> <property name="log4net.output.dir" value="${log4net.basedir}/${current.bin.dir}" /> <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" /> @@ -370,7 +382,8 @@ limitations under the License. <property name="current.build.defines.vbc" value="${build.defines.vbc},MONO=True,MONO_2_0=True" dynamic="true" /> <property name="current.build.defines.vjc" value="${build.defines.vjc},MONO,MONO_2_0" dynamic="true" /> <property name="current.build.defines.cl" value="${build.defines.cl} /D MONO /D MONO_2_0" dynamic="true" /> - <property name="current.bin.dir" value="${bin.dir}/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}" /> + <property name="current.build.configuration.dir" value="${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}" /> + <property name="current.bin.dir" value="${bin.dir}/${current.build.configuration.dir}"/> <property name="log4net.output.dir" value="${log4net.basedir}/${current.bin.dir}" /> <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" /> @@ -384,7 +397,8 @@ limitations under the License. <property name="current.build.defines.vbc" value="${build.defines.vbc},MONO=True,MONO_2_0=True,MONO_4_0=True" dynamic="true" /> <property name="current.build.defines.vjc" value="${build.defines.vjc},MONO,MONO_2_0,MONO_4_0" dynamic="true" /> <property name="current.build.defines.cl" value="${build.defines.cl} /D MONO /D MONO_2_0 /D MONO_4_0" dynamic="true" /> - <property name="current.bin.dir" value="${bin.dir}/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}" /> + <property name="current.build.configuration.dir" value="${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}" /> + <property name="current.bin.dir" value="${bin.dir}/${current.build.configuration.dir}"/> <property name="log4net.output.dir" value="${log4net.basedir}/${current.bin.dir}" /> <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" /> @@ -398,7 +412,8 @@ limitations under the License. <property name="current.build.defines.vbc" value="${build.defines.vbc},MONO=True,MONO_2_0=True,MONO_4_0=True,MONO_4_5=True" dynamic="true" /> <property name="current.build.defines.vjc" value="${build.defines.vjc},MONO,MONO_2_0,MONO_4_0,MONO_4_5" dynamic="true" /> <property name="current.build.defines.cl" value="${build.defines.cl} /D MONO /D MONO_2_0 /D MONO_4_0 /D MONO_4_5" dynamic="true" /> - <property name="current.bin.dir" value="${bin.dir}/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}" /> + <property name="current.build.configuration.dir" value="${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}" /> + <property name="current.bin.dir" value="${bin.dir}/${current.build.configuration.dir}"/> <property name="log4net.output.dir" value="${log4net.basedir}/${current.bin.dir}" /> <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" /> @@ -412,7 +427,8 @@ limitations under the License. <property name="current.build.defines.vbc" value="${build.defines.vbc},SSCLI=True,SSCLI_1_0=True" dynamic="true" /> <property name="current.build.defines.vjc" value="${build.defines.vjc},SSCLI,SSCLI_1_0" dynamic="true" /> <property name="current.build.defines.cl" value="${build.defines.cl} /D SSCLI /D SSCLI_1_0" dynamic="true" /> - <property name="current.bin.dir" value="${bin.dir}/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}" /> + <property name="current.build.configuration.dir" value="${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}" /> + <property name="current.bin.dir" value="${bin.dir}/${current.build.configuration.dir}"/> <property name="log4net.output.dir" value="${log4net.basedir}/${current.bin.dir}" /> <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" /> @@ -426,7 +442,8 @@ limitations under the License. <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.build.configuration.dir" value="cli/1.0/${current.build.config}" /> + <property name="current.bin.dir" value="${bin.dir}/${current.build.configuration.dir}"/> <property name="log4net.output.dir" value="${log4net.basedir}/${current.bin.dir}" /> <property name="current.sdkdoc.dir" value="${sdkdoc.dir}" /> <property name="current.sdkdoc.debug" value="${sdkdoc.debug}" dynamic="true" /> http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/69cf902e/tests/nant.build ---------------------------------------------------------------------- diff --git a/tests/nant.build b/tests/nant.build index da178a5..f787bf5 100644 --- a/tests/nant.build +++ b/tests/nant.build @@ -25,13 +25,13 @@ limitations under the License. <call target="set-build-configuration" /> <target name="install-nunit"> - <if test="${not file::exists('lib/${current.bin.dir}/nunit.framework.dll')}"> + <if test="${not file::exists('lib/${current.build.configuration.dir}/nunit.framework.dll')}"> <get src="https://github.com/nunit/nunitv2/releases/download/2.6.4/NUnit-2.6.4.zip"; dest="${environment::get-folder-path('InternetCache')}/nunit.zip"/> <unzip zipfile="${environment::get-folder-path('InternetCache')}/nunit.zip" todir="${environment::get-folder-path('InternetCache')}/nunit.tmp"/> <copy file="${environment::get-folder-path('InternetCache')}/nunit.tmp/NUnit-2.6.4/bin/nunit.framework.dll" - todir="lib/${current.bin.dir}"/> + todir="lib/${current.build.configuration.dir}"/> </if> </target>
