Author: bodewig
Date: Sun Mar 29 14:54:14 2015
New Revision: 1669917
URL: http://svn.apache.org/r1669917
Log:
log4net.dll => log4net-1.3.dll
Modified:
logging/log4net/trunk/default.build
logging/log4net/trunk/examples.build
logging/log4net/trunk/src/buildsupport/check-environment.include
logging/log4net/trunk/src/buildsupport/compilation.include
logging/log4net/trunk/src/buildsupport/log4net.include
Modified: logging/log4net/trunk/default.build
URL:
http://svn.apache.org/viewvc/logging/log4net/trunk/default.build?rev=1669917&r1=1669916&r2=1669917&view=diff
==============================================================================
--- logging/log4net/trunk/default.build (original)
+++ logging/log4net/trunk/default.build Sun Mar 29 14:54:14 2015
@@ -21,7 +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"/>
+ <property name="current.assembly" value="log4net-1.3"/>
<!-- Include log4net helpers -->
<include buildfile="${log4net.basedir}/src/buildsupport/log4net.include" />
Modified: logging/log4net/trunk/examples.build
URL:
http://svn.apache.org/viewvc/logging/log4net/trunk/examples.build?rev=1669917&r1=1669916&r2=1669917&view=diff
==============================================================================
--- logging/log4net/trunk/examples.build (original)
+++ logging/log4net/trunk/examples.build Sun Mar 29 14:54:14 2015
@@ -91,7 +91,7 @@ limitations under the License.
<include name="System.Configuration.dll"
if="${current.build.has.systemconfiguration}"/>
<include
name="${log4net.basedir}/lib/main/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/*.dll"
/>
<include name="${log4net.basedir}/lib/main/*.dll" />
- <include name="${log4net.main.output.dir}/log4net.dll"
frompath="false"/>
+ <include name="${log4net.main.output.dir}/log4net-1.3.dll"
frompath="false"/>
<include name="System.Windows.Forms.dll" />
<include name="System.Messaging.dll" />
</references>
@@ -119,7 +119,7 @@ limitations under the License.
<include name="System.Configuration.dll"
if="${current.build.has.systemconfiguration}"/>
<include
name="${log4net.basedir}/lib/main/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/*.dll"
/>
<include name="${log4net.basedir}/lib/main/*.dll" />
- <include name="${log4net.main.output.dir}/log4net.dll"
frompath="false"/>
+ <include name="${log4net.main.output.dir}/log4net-1.3.dll"
frompath="false"/>
<include name="${current.bin.dir}/SimpleModule.dll"/>
<include name="${current.bin.dir}/SharedModule.dll"/>
</references>
@@ -147,7 +147,7 @@ limitations under the License.
<include name="System.Configuration.dll"
if="${current.build.has.systemconfiguration}"/>
<include
name="${log4net.basedir}/lib/main/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/*.dll"
/>
<include name="${log4net.basedir}/lib/main/*.dll" />
- <include name="${log4net.main.output.dir}/log4net.dll"
frompath="false"/>
+ <include name="${log4net.main.output.dir}/log4net-1.3.dll"
frompath="false"/>
<include name="System.Management.dll" />
<include name="System.Configuration.Install.dll" />
</references>
@@ -175,7 +175,7 @@ limitations under the License.
<include name="System.Configuration.dll"
if="${current.build.has.systemconfiguration}"/>
<include
name="${log4net.basedir}/lib/main/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/*.dll"
/>
<include name="${log4net.basedir}/lib/main/*.dll" />
- <include name="${log4net.main.output.dir}/log4net.dll"
frompath="false"/>
+ <include name="${log4net.main.output.dir}/log4net-1.3.dll"
frompath="false"/>
<include
name="${build.dir}/bin/log4net.Ext.EventID/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}/log4net.Ext.EventID.dll"
/>
</references>
</csc>
@@ -202,7 +202,7 @@ limitations under the License.
<include name="System.Configuration.dll"
if="${current.build.has.systemconfiguration}"/>
<include
name="${log4net.basedir}/lib/main/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/*.dll"
/>
<include name="${log4net.basedir}/lib/main/*.dll" />
- <include name="${log4net.main.output.dir}/log4net.dll"
frompath="false"/>
+ <include name="${log4net.main.output.dir}/log4net-1.3.dll"
frompath="false"/>
<include name="System.Drawing.dll" />
<include name="${current.bin.dir}/SimpleModule.dll"/>
<include name="${current.bin.dir}/SharedModule.dll"/>
@@ -240,7 +240,7 @@ limitations under the License.
<include name="System.Configuration.dll"
if="${current.build.has.systemconfiguration}"/>
<include
name="${log4net.basedir}/lib/main/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/*.dll"
/>
<include name="${log4net.basedir}/lib/main/*.dll" />
- <include name="${log4net.main.output.dir}/log4net.dll"
frompath="false"/>
+ <include name="${log4net.main.output.dir}/log4net-1.3.dll"
frompath="false"/>
<include name="System.Drawing.dll" />
</references>
</jsc>
@@ -262,7 +262,7 @@ limitations under the License.
<include name="System.Configuration.dll"
if="${current.build.has.systemconfiguration}"/>
<include
name="${log4net.basedir}/lib/main/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/*.dll"
/>
<include name="${log4net.basedir}/lib/main/*.dll" />
- <include name="${log4net.main.output.dir}/log4net.dll"
frompath="false"/>
+ <include name="${log4net.main.output.dir}/log4net-1.3.dll"
frompath="false"/>
</references>
</jsc>
<jsc nostdlib="true" warnaserror="false" target="library" debug="true"
@@ -283,7 +283,7 @@ limitations under the License.
<include name="System.Configuration.dll"
if="${current.build.has.systemconfiguration}"/>
<include
name="${log4net.basedir}/lib/main/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/*.dll"
/>
<include name="${log4net.basedir}/lib/main/*.dll" />
- <include name="${log4net.main.output.dir}/log4net.dll"
frompath="false"/>
+ <include name="${log4net.main.output.dir}/log4net-1.3.dll"
frompath="false"/>
</references>
</jsc>
<jsc nostdlib="true" warnaserror="false" target="exe" debug="true"
@@ -304,7 +304,7 @@ limitations under the License.
<include name="System.Configuration.dll"
if="${current.build.has.systemconfiguration}"/>
<include
name="${log4net.basedir}/lib/main/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/*.dll"
/>
<include name="${log4net.basedir}/lib/main/*.dll" />
- <include name="${log4net.main.output.dir}/log4net.dll"
frompath="false"/>
+ <include name="${log4net.main.output.dir}/log4net-1.3.dll"
frompath="false"/>
<include name="${current.bin.dir}/SimpleModule.dll"/>
<include name="${current.bin.dir}/SharedModule.dll"/>
</references>
@@ -349,7 +349,7 @@ limitations under the License.
<include name="System.Configuration.dll"
if="${current.build.has.systemconfiguration}"/>
<include
name="${log4net.basedir}/lib/main/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/*.dll"
/>
<include name="${log4net.basedir}/lib/main/*.dll" />
- <include name="${log4net.main.output.dir}/log4net.dll"
frompath="false"/>
+ <include name="${log4net.main.output.dir}/log4net-1.3.dll"
frompath="false"/>
<include name="System.Drawing.dll" />
</references>
</vbc>
@@ -378,7 +378,7 @@ limitations under the License.
<include name="System.Configuration.dll"
if="${current.build.has.systemconfiguration}"/>
<include
name="${log4net.basedir}/lib/main/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/*.dll"
/>
<include name="${log4net.basedir}/lib/main/*.dll" />
- <include name="${log4net.main.output.dir}/log4net.dll"
frompath="false"/>
+ <include name="${log4net.main.output.dir}/log4net-1.3.dll"
frompath="false"/>
<include name="${current.bin.dir}/SimpleModule.dll"/>
<include name="${current.bin.dir}/SharedModule.dll"/>
</references>
@@ -407,7 +407,7 @@ limitations under the License.
<include name="System.Configuration.dll"
if="${current.build.has.systemconfiguration}"/>
<include
name="${log4net.basedir}/lib/main/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/*.dll"
/>
<include name="${log4net.basedir}/lib/main/*.dll" />
- <include name="${log4net.main.output.dir}/log4net.dll"
frompath="false"/>
+ <include name="${log4net.main.output.dir}/log4net-1.3.dll"
frompath="false"/>
<include name="System.Drawing.dll" />
<include name="${current.bin.dir}/SimpleModule.dll"/>
<include name="${current.bin.dir}/SharedModule.dll"/>
Modified: logging/log4net/trunk/src/buildsupport/check-environment.include
URL:
http://svn.apache.org/viewvc/logging/log4net/trunk/src/buildsupport/check-environment.include?rev=1669917&r1=1669916&r2=1669917&view=diff
==============================================================================
--- logging/log4net/trunk/src/buildsupport/check-environment.include (original)
+++ logging/log4net/trunk/src/buildsupport/check-environment.include Sun Mar 29
14:54:14 2015
@@ -134,7 +134,7 @@ limitations under the License.
</if>
</target>
<target name="check-log4net-assembly" depends="check-current-build-config,
-check-log4net-output-dir">
- <if test="${not file::exists(path::combine(log4net.main.output.dir,
'log4net.dll'))}">
+ <if test="${not file::exists(path::combine(log4net.main.output.dir,
'log4net-1.3.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=1669917&r1=1669916&r2=1669917&view=diff
==============================================================================
--- logging/log4net/trunk/src/buildsupport/compilation.include (original)
+++ logging/log4net/trunk/src/buildsupport/compilation.include Sun Mar 29
14:54:14 2015
@@ -39,7 +39,7 @@ limitations under the License.
if="${property::exists('with.test.assemblies') and
with.test.assemblies}"/>
<include name="${log4net.basedir}/lib/test/*.dll"
if="${property::exists('with.test.assemblies') and
with.test.assemblies}"/>
- <include name="${log4net.main.output.dir}/log4net.dll" frompath="false"
+ <include name="${log4net.main.output.dir}/log4net-1.3.dll"
frompath="false"
if="${property::exists('with.log4net') and with.log4net}"/>
</assemblyfileset>
<fileset id="sources" basedir="${log4net.basedir}">
Modified: logging/log4net/trunk/src/buildsupport/log4net.include
URL:
http://svn.apache.org/viewvc/logging/log4net/trunk/src/buildsupport/log4net.include?rev=1669917&r1=1669916&r2=1669917&view=diff
==============================================================================
--- logging/log4net/trunk/src/buildsupport/log4net.include (original)
+++ logging/log4net/trunk/src/buildsupport/log4net.include Sun Mar 29 14:54:14
2015
@@ -26,7 +26,7 @@ limitations under the License.
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}"
+
value="${build.dir}/bin/log4net-1.3/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}"
dynamic="true" />
<include buildfile="check-environment.include" />
