logging-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject svn commit: r1544065 - in /logging/log4net/trunk: ./ src/buildsupport/ src/log4net.Tests/ src/log4net/ tests/
Date Thu, 21 Nov 2013 08:32:33 GMT
Author: bodewig
Date: Thu Nov 21 08:32:33 2013
New Revision: 1544065

URL: http://svn.apache.org/r1544065
Log:
Move build output and remove tests subdir

Added:
    logging/log4net/trunk/default.build
      - copied, changed from r1544049, logging/log4net/trunk/log4net.build
    logging/log4net/trunk/tests.build
      - copied, changed from r1544049, logging/log4net/trunk/tests/nant.build
Removed:
    logging/log4net/trunk/log4net.build
    logging/log4net/trunk/tests/
Modified:
    logging/log4net/trunk/src/buildsupport/check-environment.include
    logging/log4net/trunk/src/buildsupport/compilation.include
    logging/log4net/trunk/src/buildsupport/configure-framework.include
    logging/log4net/trunk/src/buildsupport/log4net.include
    logging/log4net/trunk/src/log4net.Tests/log4net.Tests.vs2008.csproj
    logging/log4net/trunk/src/log4net.Tests/log4net.Tests.vs2010.csproj
    logging/log4net/trunk/src/log4net/log4net.vs2008.csproj
    logging/log4net/trunk/src/log4net/log4net.vs2010.csproj

Copied: logging/log4net/trunk/default.build (from r1544049, logging/log4net/trunk/log4net.build)
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/default.build?p2=logging/log4net/trunk/default.build&p1=logging/log4net/trunk/log4net.build&r1=1544049&r2=1544065&rev=1544065&view=diff
==============================================================================
--- logging/log4net/trunk/log4net.build (original)
+++ logging/log4net/trunk/default.build Thu Nov 21 08:32:33 2013
@@ -21,6 +21,7 @@ limitations under the License.
   <property name="project.build.config" value="debug" />
   <property name="project.build.package" value="false" />
   <property name="package.version" value="1.3.0"/>
+  <property name="current.assembly" value="log4net"/>
 
   <!-- Include log4net helpers -->
   <include buildfile="${log4net.basedir}/src/buildsupport/log4net.include" />
@@ -210,8 +211,8 @@ limitations under the License.
     <property name="current.sources" value="log4net"/>
     <property name="current.keyfile" value="log4net.snk"/>
     <property name="current.bin.subdir" value=""/>
-    <property name="current.assembly" value="log4net"/>
     <property name="warnaserror" value="true"/>
+    <property name="with.generated.assemblyinfo" value="true"/>
 
     <call target="parameterized-compilation" />
 

Modified: logging/log4net/trunk/src/buildsupport/check-environment.include
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/buildsupport/check-environment.include?rev=1544065&r1=1544064&r2=1544065&view=diff
==============================================================================
--- logging/log4net/trunk/src/buildsupport/check-environment.include (original)
+++ logging/log4net/trunk/src/buildsupport/check-environment.include Thu Nov 21 08:32:33 2013
@@ -25,7 +25,7 @@ limitations under the License.
          ========================================================= -->
     <target name="-check-bin-dir">
         <if test="${not property::exists('bin.dir')}">
-            <property name="bin.dir" value="bin" />
+            <property name="bin.dir" value="${build.dir}/bin" />
         </if>
         <mkdir dir="${bin.dir}" />
     </target>
@@ -129,12 +129,12 @@ limitations under the License.
         </if>
     </target>
     <target name="-check-log4net-output-dir">
-        <if test="${not property::exists('log4net.output.dir')}">
+        <if test="${not property::exists('log4net.main.output.dir')}">
             <fail message="The log4net output directory has not been specified." />
         </if>
     </target>
     <target name="check-log4net-assembly" depends="check-current-build-config, -check-log4net-output-dir">
-        <if test="${not file::exists(path::combine(log4net.output.dir, 'log4net.dll'))}">
+        <if test="${not file::exists(path::combine(log4net.main.output.dir, 'log4net.dll'))}">
             <fail message="The log4net '${current.build.config}' assembly for ${framework::get-description(framework::get-target-framework())}
is not available." />
         </if>
     </target>

Modified: logging/log4net/trunk/src/buildsupport/compilation.include
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/buildsupport/compilation.include?rev=1544065&r1=1544064&r2=1544065&view=diff
==============================================================================
--- logging/log4net/trunk/src/buildsupport/compilation.include (original)
+++ logging/log4net/trunk/src/buildsupport/compilation.include Thu Nov 21 08:32:33 2013
@@ -37,14 +37,15 @@ limitations under the License.
         <include
             name="${log4net.basedir}/lib/test/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/*.dll"

             if="${property::exists('with.test.assemblies') and with.test.assemblies}"/>
-        <include name="${log4net.basedir}lib/test/*.dll"
+        <include name="${log4net.basedir}/lib/test/*.dll"
                  if="${property::exists('with.test.assemblies') and with.test.assemblies}"/>
-        <include name="${log4net.basedir}/${current.bin.dir}/log4net.dll" frompath="false"
+        <include name="${log4net.main.output.dir}/log4net.dll" frompath="false"
                  if="${property::exists('with.log4net') and with.log4net}"/>
       </assemblyfileset>
       <fileset id="sources" basedir="${log4net.basedir}">
         <include name="src/${current.sources}/**/*.cs" />
-        <include name="${generated.src.dir}/**/*.cs" />
+        <include name="${generated.src.dir}/**/*.cs" if="${property::exists('with.generated.assemblyinfo')
and with.generated.assemblyinfo}"/>
+        <include name="src/log4net/AssemblyVersionInfo.cs" if="${property::exists('with.assemblyversioninfo')
and with.assemblyversioninfo}"/>
       </fileset>
 
       <csc if="${current.build.config.release}"

Modified: logging/log4net/trunk/src/buildsupport/configure-framework.include
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/buildsupport/configure-framework.include?rev=1544065&r1=1544064&r2=1544065&view=diff
==============================================================================
--- logging/log4net/trunk/src/buildsupport/configure-framework.include (original)
+++ logging/log4net/trunk/src/buildsupport/configure-framework.include Thu Nov 21 08:32:33
2013
@@ -105,7 +105,7 @@ limitations under the License.
     </target>
     <target name="-set-framework-configuration" depends="-check-bin-dir, -check-sdkdoc-dir,
-check-sdkdoc-debug, check-current-build-config, -check-build-debug, -check-build-defines">
         <property name="current.build.debug" value="${build.debug}" 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.bin.dir" value="${bin.dir}/${current.assembly}/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}"
/>
         <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" />
         <property name="current.build.defines.csc" value="${build.defines.csc},${current.build.platform}${current.build.api}"
dynamic="true" />

Modified: logging/log4net/trunk/src/buildsupport/log4net.include
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/buildsupport/log4net.include?rev=1544065&r1=1544064&r2=1544065&view=diff
==============================================================================
--- logging/log4net/trunk/src/buildsupport/log4net.include (original)
+++ logging/log4net/trunk/src/buildsupport/log4net.include Thu Nov 21 08:32:33 2013
@@ -22,7 +22,11 @@ limitations under the License.
     <!-- The path to the log4net output directory for current build/runtime -->
     <property 
         name="log4net.output.dir" 
-        value="${log4net.basedir}/bin/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}"
+        value="${build.dir}/bin/${current.assembly}/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}"
+        dynamic="true" />
+    <property 
+        name="log4net.main.output.dir" 
+        value="${build.dir}/bin/log4net/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}"
         dynamic="true" />
 
     <include buildfile="check-environment.include" />

Modified: logging/log4net/trunk/src/log4net.Tests/log4net.Tests.vs2008.csproj
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/log4net.Tests/log4net.Tests.vs2008.csproj?rev=1544065&r1=1544064&r2=1544065&view=diff
==============================================================================
--- logging/log4net/trunk/src/log4net.Tests/log4net.Tests.vs2008.csproj (original)
+++ logging/log4net/trunk/src/log4net.Tests/log4net.Tests.vs2008.csproj Thu Nov 21 08:32:33
2013
@@ -51,7 +51,7 @@
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>..\bin\Debug\</OutputPath>
+    <OutputPath>..\..\build\bin\log4net.Tests\net\2.0\debug\</OutputPath>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
     <BaseAddress>285212672</BaseAddress>
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
@@ -71,7 +71,7 @@
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>..\bin\Release\</OutputPath>
+    <OutputPath>..\..\build\bin\log4net.Tests\net\2.0\release\</OutputPath>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
     <BaseAddress>285212672</BaseAddress>
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
@@ -93,7 +93,7 @@
   <ItemGroup>
     <Reference Include="nunit.framework, Version=2.5.2.9222, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77,
processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\ibatisnet-3\External-Bin\Net\2.0\nunit.framework.dll</HintPath>
+      <HintPath>..\..\lib\test\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System">
       <Name>System</Name>
@@ -113,7 +113,7 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\src\log4net\AssemblyVersionInfo.cs">
+    <Compile Include="..\log4net\AssemblyVersionInfo.cs">
       <Link>AssemblyVersionInfo.cs</Link>
       <SubType>Code</SubType>
     </Compile>
@@ -200,7 +200,7 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\src\log4net\log4net.vs2008.csproj">
+    <ProjectReference Include="..\\log4net\log4net.vs2008.csproj">
       <Project>{181FE707-E161-4722-9F38-6AAAB6FAA106}</Project>
       <Name>log4net.vs2008</Name>
     </ProjectReference>

Modified: logging/log4net/trunk/src/log4net.Tests/log4net.Tests.vs2010.csproj
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/log4net.Tests/log4net.Tests.vs2010.csproj?rev=1544065&r1=1544064&r2=1544065&view=diff
==============================================================================
--- logging/log4net/trunk/src/log4net.Tests/log4net.Tests.vs2010.csproj (original)
+++ logging/log4net/trunk/src/log4net.Tests/log4net.Tests.vs2010.csproj Thu Nov 21 08:32:33
2013
@@ -66,7 +66,7 @@
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>..\bin\Debug\</OutputPath>
+    <OutputPath>..\..\build\bin\log4net.Tests\net\4.0\debug\</OutputPath>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
     <BaseAddress>285212672</BaseAddress>
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
@@ -87,7 +87,7 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>..\bin\Release\</OutputPath>
+    <OutputPath>..\..\build\bin\log4net.Tests\net\4.0\release\</OutputPath>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
     <BaseAddress>285212672</BaseAddress>
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
@@ -110,7 +110,7 @@
   <ItemGroup>
     <Reference Include="nunit.framework, Version=2.5.2.9222, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77,
processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\ibatisnet-3\External-Bin\Net\2.0\nunit.framework.dll</HintPath>
+      <HintPath>..\..\lib\test\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System">
       <Name>System</Name>
@@ -130,7 +130,7 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\src\log4net\AssemblyVersionInfo.cs">
+    <Compile Include="..\log4net\AssemblyVersionInfo.cs">
       <Link>AssemblyVersionInfo.cs</Link>
       <SubType>Code</SubType>
     </Compile>
@@ -230,7 +230,7 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\src\lognet\log4net.vs2010.csproj">
+    <ProjectReference Include="..\lognet\log4net.vs2010.csproj">
       <Project>{181fe707-e161-4722-9f38-6aaab6faa106}</Project>
       <Name>log4net.vs2010</Name>
     </ProjectReference>
@@ -242,4 +242,4 @@
     <PostBuildEvent>
     </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>

Modified: logging/log4net/trunk/src/log4net/log4net.vs2008.csproj
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/log4net/log4net.vs2008.csproj?rev=1544065&r1=1544064&r2=1544065&view=diff
==============================================================================
--- logging/log4net/trunk/src/log4net/log4net.vs2008.csproj (original)
+++ logging/log4net/trunk/src/log4net/log4net.vs2008.csproj Thu Nov 21 08:32:33 2013
@@ -50,7 +50,7 @@
     <OldToolsVersion>2.0</OldToolsVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>..\..\build\bin\net\2.0\debug\</OutputPath>
+    <OutputPath>..\..\build\bin\log4net\net\2.0\debug\</OutputPath>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
     <BaseAddress>285212672</BaseAddress>
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
@@ -69,7 +69,7 @@
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>..\..\build\bin\net\2.0\release\</OutputPath>
+    <OutputPath>..\..\build\bin\log4net\net\2.0\release\</OutputPath>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
     <BaseAddress>285212672</BaseAddress>
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>

Modified: logging/log4net/trunk/src/log4net/log4net.vs2010.csproj
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/log4net/log4net.vs2010.csproj?rev=1544065&r1=1544064&r2=1544065&view=diff
==============================================================================
--- logging/log4net/trunk/src/log4net/log4net.vs2010.csproj (original)
+++ logging/log4net/trunk/src/log4net/log4net.vs2010.csproj Thu Nov 21 08:32:33 2013
@@ -66,7 +66,7 @@
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>..\..\build\bin\net\2.0\debug\</OutputPath>
+    <OutputPath>..\..\build\bin\log4net\net\2.0\debug\</OutputPath>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
     <BaseAddress>285212672</BaseAddress>
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
@@ -86,7 +86,7 @@
     <CodeAnalysisRuleSet>SecurityRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>..\..\build\bin\net\2.0\release\</OutputPath>
+    <OutputPath>..\..\build\bin\log4net\net\2.0\release\</OutputPath>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
     <BaseAddress>285212672</BaseAddress>
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>

Copied: logging/log4net/trunk/tests.build (from r1544049, logging/log4net/trunk/tests/nant.build)
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/tests.build?p2=logging/log4net/trunk/tests.build&p1=logging/log4net/trunk/tests/nant.build&r1=1544049&r2=1544065&rev=1544065&view=diff
==============================================================================
--- logging/log4net/trunk/tests/nant.build (original)
+++ logging/log4net/trunk/tests.build Thu Nov 21 08:32:33 2013
@@ -16,9 +16,10 @@ See the License for the specific languag
 limitations under the License.
 -->
 <project name="log4net-tests" default="runtests" xmlnds="http://tempuri.org/nant-vs.xsd">
-    <property name="log4net.basedir" value="../" readonly="false" />
+    <property name="log4net.basedir" value="." readonly="false" />
     <property name="project.build.config" value="debug" readonly="false" />
     <property name="project.build.package" value="false" readonly="false" />
+    <property name="current.assembly" value="log4net.Tests"/>
     <!-- Include log4net helpers -->
     <include buildfile="${log4net.basedir}/src/buildsupport/log4net.include" />
     <!-- Targets that should always be executed -->
@@ -67,7 +68,7 @@ limitations under the License.
         <in>
           <items>
             <!-- copy log4net build output -->
-            <include name="${log4net.basedir}/${current.bin.dir}"/>
+            <include name="${log4net.main.output.dir}"/>
             <!-- copy referenced libraries to build output -->
             <include name="${log4net.basedir}/lib/test"/>
             <include name="${log4net.basedir}/lib/test/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
@@ -85,9 +86,10 @@ limitations under the License.
       <property name="current.sources" value="log4net.Tests"/>
       <property name="current.keyfile" value="log4net.snk"/>
       <property name="current.bin.subdir" value=""/>
-      <property name="current.assembly" value="log4net.Tests"/>
+      <property name="warnaserror" value="false"/>
       <property name="with.test.assemblies" value="true"/>
       <property name="with.log4net" value="true"/>
+      <property name="with.assemblyversioninfo" value="true"/>
 
       <call target="parameterized-compilation" />
     </target>



Mime
View raw message