logging-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject svn commit: r1544833 - in /logging/log4net/trunk: ./ src/buildsupport/
Date Sat, 23 Nov 2013 16:59:17 GMT
Author: bodewig
Date: Sat Nov 23 16:59:17 2013
New Revision: 1544833

URL: http://svn.apache.org/r1544833
Log:
compiling the examples is going to become messy, not only are there four compilers involved,
but each example may require additional references

Added:
    logging/log4net/trunk/examples.build
      - copied, changed from r1544817, logging/log4net/trunk/extensions.build
Modified:
    logging/log4net/trunk/default.build
    logging/log4net/trunk/extensions.build
    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/tests.build

Modified: logging/log4net/trunk/default.build
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/default.build?rev=1544833&r1=1544832&r2=1544833&view=diff
==============================================================================
--- logging/log4net/trunk/default.build (original)
+++ logging/log4net/trunk/default.build Sat Nov 23 16:59:17 2013
@@ -15,7 +15,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY 
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<project name="log4net" default="compile-all" xmlnds="http://tempuri.org/nant-vs.xsd">
+<project name="log4net" default="compile-all" xmlns="http://tempuri.org/nant-vs.xsd">
   <!-- Global project settings -->
   <property name="log4net.basedir" value="." />
   <property name="project.build.config" value="debug" />

Copied: logging/log4net/trunk/examples.build (from r1544817, logging/log4net/trunk/extensions.build)
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/examples.build?p2=logging/log4net/trunk/examples.build&p1=logging/log4net/trunk/extensions.build&r1=1544817&r2=1544833&rev=1544833&view=diff
==============================================================================
--- logging/log4net/trunk/extensions.build (original)
+++ logging/log4net/trunk/examples.build Sat Nov 23 16:59:17 2013
@@ -15,31 +15,40 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY 
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<project name="log4net-extensions" default="compile-all" xmlnds="http://tempuri.org/nant-vs.xsd">
+<project name="log4net-examples" default="compile-all" xmlns="http://tempuri.org/nant-vs.xsd">
     <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.Ext.EventID"/>
+    <property name="current.assembly" value="SampleAppendersApp"/>
     <!-- Include log4net helpers -->
     <include buildfile="${log4net.basedir}/src/buildsupport/log4net.include" />
     <include buildfile="${log4net.basedir}/src/buildsupport/multi-framework-compilation.include"
/>
     <!-- Targets that should always be executed -->
+    <property name="bin.dir" value="${build.dir}/bin/examples/cs"/>
     <call target="set-build-configuration" />
     <call target="set-framework-configuration" />
 
-    <!-- Target for compiling the extensions on all frameworks -->
+    <!-- Target for compiling the examples on all frameworks -->
     <target name="compile-all"
-            description="Builds all log4net extensions"
+            description="Builds all log4net extamples"
             depends="-compile-all"/>
 
     <target name="-compile-for-one-framework" depends="check-log4net-basedir, clean-current-bin-dir,
check-log4net-assembly">
 
       <foreach item="String" delim=","
-               in="log4net.Ext.EventID,log4net.Ext.MarshalByRef"
+               in="Appenders/SampleAppendersApp,Appenders/WmiAppender"
                property="dir">
         <do>
-          <property name="current.assembly" value="${dir}"/>
-          <property name="current.sources" value="extensions/${dir}"/>
+          <property name="lastSlash"
+                    value="${string::last-index-of(dir, '/')}"/>
+          <property name="start"
+                    value="${int::parse(lastSlash) + 1}"/>
+          <property name="len"
+                    value="${string::get-length(dir) - int::parse(lastSlash) - 1}"/>
+          <property name="current.assembly"
+                    value="${string::substring(dir, int::parse(start), len)}"/>
+          <echo message="${current.assembly}"/>
+          <property name="current.sources" value="examples/cs/${dir}"/>
           <property name="current.keyfile" value="log4net.snk"/>
           <property name="current.bin.subdir" value=""/>
           <property name="warnaserror" value="false"/>

Modified: logging/log4net/trunk/extensions.build
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/extensions.build?rev=1544833&r1=1544832&r2=1544833&view=diff
==============================================================================
--- logging/log4net/trunk/extensions.build (original)
+++ logging/log4net/trunk/extensions.build Sat Nov 23 16:59:17 2013
@@ -15,7 +15,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY 
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<project name="log4net-extensions" default="compile-all" xmlnds="http://tempuri.org/nant-vs.xsd">
+<project name="log4net-extensions" default="compile-all" xmlns="http://tempuri.org/nant-vs.xsd">
     <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" />

Modified: logging/log4net/trunk/src/buildsupport/check-environment.include
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/buildsupport/check-environment.include?rev=1544833&r1=1544832&r2=1544833&view=diff
==============================================================================
--- logging/log4net/trunk/src/buildsupport/check-environment.include (original)
+++ logging/log4net/trunk/src/buildsupport/check-environment.include Sat Nov 23 16:59:17 2013
@@ -15,7 +15,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY 
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<project name="log4net-checkss" xmlnds="http://tempuri.org/nant-vs.xsd">
+<project name="log4net-checkss" xmlns="http://tempuri.org/nant-vs.xsd">
 
     <!-- ========================================================
          Targets that check various proprties and create directories

Modified: logging/log4net/trunk/src/buildsupport/compilation.include
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/buildsupport/compilation.include?rev=1544833&r1=1544832&r2=1544833&view=diff
==============================================================================
--- logging/log4net/trunk/src/buildsupport/compilation.include (original)
+++ logging/log4net/trunk/src/buildsupport/compilation.include Sat Nov 23 16:59:17 2013
@@ -15,7 +15,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY 
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<project name="log4net-compilation" xmlnds="http://tempuri.org/nant-vs.xsd">
+<project name="log4net-compilation" xmlns="http://tempuri.org/nant-vs.xsd">
 
     <resourcefileset id="nl-files" failonempty="true">
       <include name="${log4net.basedir}/NOTICE" />
@@ -50,7 +50,8 @@ limitations under the License.
 
       <csc if="${current.build.config.release}"
            keyfile="${path::combine(log4net.basedir, current.keyfile)}"
-           nostdlib="true" noconfig="true" warnaserror="true" target="library"
+           nostdlib="true" noconfig="true" target="library"
+           warnaserror="${property::exists('warnaserror') and warnaserror}"
            debug="${current.build.debug}"
            define="${current.build.defines.csc}"
            output="${current.bin.dir}/${current.bin.subdir}${current.assembly}.dll"

Modified: logging/log4net/trunk/src/buildsupport/configure-framework.include
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/buildsupport/configure-framework.include?rev=1544833&r1=1544832&r2=1544833&view=diff
==============================================================================
--- logging/log4net/trunk/src/buildsupport/configure-framework.include (original)
+++ logging/log4net/trunk/src/buildsupport/configure-framework.include Sat Nov 23 16:59:17
2013
@@ -15,7 +15,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY 
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<project name="log4net-framework-config" xmlnds="http://tempuri.org/nant-vs.xsd">
+<project name="log4net-framework-config" xmlns="http://tempuri.org/nant-vs.xsd">
     <target name="set-framework-configuration" depends="check-current-build-config">
         <if test="${not target::exists('set-' + framework::get-target-framework() + '-runtime-configuration')}">
             <fail message="The current target framework (${framework::get-description(framework::get-target-framework())})
is not supported by log4net." />

Modified: logging/log4net/trunk/src/buildsupport/log4net.include
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/buildsupport/log4net.include?rev=1544833&r1=1544832&r2=1544833&view=diff
==============================================================================
--- logging/log4net/trunk/src/buildsupport/log4net.include (original)
+++ logging/log4net/trunk/src/buildsupport/log4net.include Sat Nov 23 16:59:17 2013
@@ -15,7 +15,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY 
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<project name="log4net-helpers" xmlnds="http://tempuri.org/nant-vs.xsd">
+<project name="log4net-helpers" xmlns="http://tempuri.org/nant-vs.xsd">
     <property name="build.dir" value="${log4net.basedir}/build"/>
     <property name="generated.src.dir" value="${build.dir}/generated-src"/>
 

Modified: logging/log4net/trunk/tests.build
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/tests.build?rev=1544833&r1=1544832&r2=1544833&view=diff
==============================================================================
--- logging/log4net/trunk/tests.build (original)
+++ logging/log4net/trunk/tests.build Sat Nov 23 16:59:17 2013
@@ -15,7 +15,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY 
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<project name="log4net-tests" default="runtests" xmlnds="http://tempuri.org/nant-vs.xsd">
+<project name="log4net-tests" default="runtests" xmlns="http://tempuri.org/nant-vs.xsd">
     <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" />



Mime
View raw message