logging-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject svn commit: r1546651 - in /logging/log4net/trunk: examples.build src/buildsupport/configure-framework.include src/examples/vb/Tutorials/WebApp/AssemblyVersionInfo.vb
Date Fri, 29 Nov 2013 21:14:18 GMT
Author: bodewig
Date: Fri Nov 29 21:14:17 2013
New Revision: 1546651

URL: http://svn.apache.org/r1546651
Log:
compile VB examples

Removed:
    logging/log4net/trunk/src/examples/vb/Tutorials/WebApp/AssemblyVersionInfo.vb
Modified:
    logging/log4net/trunk/examples.build
    logging/log4net/trunk/src/buildsupport/configure-framework.include

Modified: logging/log4net/trunk/examples.build
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/examples.build?rev=1546651&r1=1546650&r2=1546651&view=diff
==============================================================================
--- logging/log4net/trunk/examples.build (original)
+++ logging/log4net/trunk/examples.build Fri Nov 29 21:14:17 2013
@@ -46,7 +46,7 @@ limitations under the License.
            compiles --> 
       <property name="current.bin.dir" value="${bin.dir}/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
       <foreach item="String" delim=","
-               in="Layouts/SampleLayoutsApp,Tutorials/ConsoleApp,AppPerformance/NotLogging,Remoting/RemotingClient,Remoting/RemotingServer,Repository/SharedModule,Repository/SimpleModule"
+               in="Layouts/SampleLayoutsApp,Tutorials/ConsoleApp,Performance/NotLogging,Remoting/RemotingClient,Remoting/RemotingServer,Repository/SharedModule,Repository/SimpleModule"
                property="dir">
         <do>
           <property name="lastSlash"
@@ -209,6 +209,7 @@ limitations under the License.
         </references>
       </csc>
       <call target="-compile-js-examples"/>
+      <call target="-compile-vb-examples"/>
 
       <!-- reset so clean-current-bin-dir will not create strange
            subdirs when compiling the next framework -->
@@ -310,19 +311,89 @@ limitations under the License.
       </jsc>
     </target>
 
-    <!--target name="-compile-cpp-examples">
-      <property name="bin.dir" value="${build.dir}/bin/examples/cpp"/>
+    <target name="-compile-vb-examples" if="${can.compile.vb}">
+      <property name="current.assembly" value=""/>
+      <property name="bin.dir" value="${build.dir}/bin/examples/vb"/>
+      <call target="-set-framework-configuration"/>
       <call target="clean-current-bin-dir"/>
-      <cl nostdlib="true" noconfig="true"
+      <foreach item="String" delim=","
+               in="Tutorials/ConsoleApp,Performance/NotLogging,Repository/SharedModule,Repository/SimpleModule"
+               property="dir">
+        <do>
+          <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="loop.assembly"
+                    value="${string::substring(dir, int::parse(start), len)}"/>
+          <vbc nostdlib="true"
+               warnaserror="false" target="library" debug="true"
+               define="${current.build.defines.vbc}"
+               output="${current.bin.dir}/${loop.assembly}.dll"
+               doc="${current.bin.dir}/${loop.assembly}.xml">
+            <sources basedir="${log4net.basedir}">
+              <include name="src/examples/vb/${dir}/**/*.vb" />
+              <include name="src/log4net/AssemblyVersionInfo.vb"/>
+            </sources>
+            <resources refid="nl-files"/>
+            <references>
+              <include name="mscorlib.dll"/>
+              <include name="System.dll" />
+              <include name="System.Core.dll" if="${current.build.has.systemcore}"/>
+              <include name="System.Data.dll" />
+              <include name="System.Web.dll" if="${current.build.has.systemweb}"/>
+              <include name="System.Xml.dll" />
+              <include name="System.Runtime.Remoting.dll" />
+              <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="System.Drawing.dll" />
+            </references>
+          </vbc>
+        </do>
+      </foreach>
+      <vbc nostdlib="true"
            warnaserror="false"
            target="library"
            debug="true"
-           define="${current.build.defines.csc}"
+           define="${current.build.defines.vbc}"
+           output="${current.bin.dir}/SimpleApp.dll"
+           doc="${current.bin.dir}/SimpleApp.xml">
+        <sources basedir="${log4net.basedir}">
+          <include name="src/examples/vb/Repository/SimpleApp/**/*.vb" />
+          <include name="src/log4net/AssemblyVersionInfo.vb"/>
+        </sources>
+        <resources refid="nl-files"/>
+        <references>
+          <include name="mscorlib.dll"/>
+          <include name="System.dll" />
+          <include name="System.Core.dll" if="${current.build.has.systemcore}"/>
+          <include name="System.Data.dll" />
+          <include name="System.Web.dll" if="${current.build.has.systemweb}"/>
+          <include name="System.Xml.dll" />
+          <include name="System.Runtime.Remoting.dll" />
+          <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="${current.bin.dir}/SimpleModule.dll"/>
+          <include name="${current.bin.dir}/SharedModule.dll"/>
+        </references>
+      </vbc>
+      <vbc nostdlib="true"
+           warnaserror="false"
+           target="library"
+           debug="true"
+           define="${current.build.defines.vbc}"
            output="${current.bin.dir}/WebApp.dll"
            doc="${current.bin.dir}/WebApp.xml">
         <sources basedir="${log4net.basedir}">
-          <include name="src/examples/cs/Tutorials/WebApp/**/*.cs" />
-          <include name="src/log4net/AssemblyVersionInfo.cs"/>
+          <include name="src/examples/vb/Tutorials/WebApp/**/*.vb" />
+          <exclude name="src/examples/vb/Tutorials/WebApp/Global.asax.vb" />
+          <include name="src/log4net/AssemblyVersionInfo.vb"/>
         </sources>
         <resources refid="nl-files"/>
         <references>
@@ -341,6 +412,6 @@ limitations under the License.
           <include name="${current.bin.dir}/SimpleModule.dll"/>
           <include name="${current.bin.dir}/SharedModule.dll"/>
         </references>
-      </cl>
-    </target-->
+      </vbc>
+    </target>
 </project>

Modified: logging/log4net/trunk/src/buildsupport/configure-framework.include
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/buildsupport/configure-framework.include?rev=1546651&r1=1546650&r2=1546651&view=diff
==============================================================================
--- logging/log4net/trunk/src/buildsupport/configure-framework.include (original)
+++ logging/log4net/trunk/src/buildsupport/configure-framework.include Fri Nov 29 21:14:17
2013
@@ -32,6 +32,7 @@ limitations under the License.
       <property name="current.build.has.systemweb" value="true"/>
       <property name="current.build.has.systemconfiguration" value="true"/>
       <property name="can.compile.js" value="true"/>
+      <property name="can.compile.vb" value="true"/>
       <call target="-set-framework-configuration"/>
     </target>
     <!-- uses NET_2_0 defines plus FRAMEWORK_3_5-->
@@ -45,6 +46,7 @@ limitations under the License.
       <property name="current.build.has.systemweb" value="true"/>
       <property name="current.build.has.systemconfiguration" value="true"/>
       <property name="can.compile.js" value="true"/>
+      <property name="can.compile.vb" value="true"/>
       <call target="-set-framework-configuration"/>
     </target>
     <!-- uses NET_2_0 defines plus FRAMEWORK_3_5 and CLIENT_PROFILE-->
@@ -58,6 +60,7 @@ limitations under the License.
       <property name="current.build.has.systemweb" value="false"/>
       <property name="current.build.has.systemconfiguration" value="true"/>
       <property name="can.compile.js" value="true"/>
+      <property name="can.compile.vb" value="true"/>
       <call target="-set-framework-configuration"/>
     </target>
     <!-- uses NET_3_5 plus FRAMEWORK_4_0_OR_ABOVE defines -->
@@ -71,6 +74,7 @@ limitations under the License.
       <property name="current.build.has.systemweb" value="true"/>
       <property name="current.build.has.systemconfiguration" value="true"/>
       <property name="can.compile.js" value="true"/>
+      <property name="can.compile.vb" value="true"/>
       <call target="-set-framework-configuration"/>
     </target>
     <!-- uses NET_3_5 plus FRAMEWORK_4_0_OR_ABOVE and CLIENT_PROFILE defines -->
@@ -84,6 +88,7 @@ limitations under the License.
       <property name="current.build.has.systemweb" value="false"/>
       <property name="current.build.has.systemconfiguration" value="true"/>
       <property name="can.compile.js" value="true"/>
+      <property name="can.compile.vb" value="true"/>
       <call target="-set-framework-configuration"/>
     </target>
     <target name="set-netcf-2.0-runtime-configuration">
@@ -96,6 +101,7 @@ limitations under the License.
       <property name="current.build.has.systemweb" value="false"/>
       <property name="current.build.has.systemconfiguration" value="false"/>
       <property name="can.compile.js" value="true"/>
+      <property name="can.compile.vb" value="true"/>
       <call target="-set-framework-configuration"/>
     </target>
     <target name="set-mono-2.0-runtime-configuration">
@@ -108,6 +114,7 @@ limitations under the License.
       <property name="current.build.has.systemweb" value="true"/>
       <property name="current.build.has.systemconfiguration" value="true"/>
       <property name="can.compile.js" value="false"/>
+      <property name="can.compile.vb" value="false"/>
       <call target="-set-framework-configuration"/>
     </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">



Mime
View raw message