You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by bo...@apache.org on 2013/11/29 18:07:48 UTC
svn commit: r1546611 - in /logging/log4net/trunk: examples.build
src/buildsupport/configure-framework.include
Author: bodewig
Date: Fri Nov 29 17:07:47 2013
New Revision: 1546611
URL: http://svn.apache.org/r1546611
Log:
Compile the JScript stuff as well
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=1546611&r1=1546610&r2=1546611&view=diff
==============================================================================
--- logging/log4net/trunk/examples.build (original)
+++ logging/log4net/trunk/examples.build Fri Nov 29 17:07:47 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/Console,AppPerformance/NotLogging,Remoting/RemotingClient,Remoting/RemotingServer,Repository/SharedModule,Repository/SimpleModule"
+ in="Layouts/SampleLayoutsApp,Tutorials/ConsoleApp,AppPerformance/NotLogging,Remoting/RemotingClient,Remoting/RemotingServer,Repository/SharedModule,Repository/SimpleModule"
property="dir">
<do>
<property name="lastSlash"
@@ -208,10 +208,139 @@ limitations under the License.
<include name="${current.bin.dir}/SharedModule.dll"/>
</references>
</csc>
+ <call target="-compile-js-examples"/>
<!-- reset so clean-current-bin-dir will not create strange
subdirs when compiling the next framework -->
<property name="current.assembly" value=""/>
+ <property name="bin.dir" value="${build.dir}/bin/examples/cs"/>
</target>
+ <target name="-compile-js-examples" if="${can.compile.js}">
+ <property name="current.assembly" value=""/>
+ <property name="bin.dir" value="${build.dir}/bin/examples/js"/>
+ <call target="-set-framework-configuration"/>
+ <call target="clean-current-bin-dir"/>
+ <jsc nostdlib="true" warnaserror="false" target="exe" debug="true"
+ define="${current.build.defines.jsc}"
+ output="${current.bin.dir}/ConsoleApp.exe">
+ <sources basedir="${log4net.basedir}">
+ <include name="src/examples/js/Tutorials/ConsoleApp/**/*.js" />
+ <include name="src/log4net/AssemblyVersionInfo.js"/>
+ </sources>
+ <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>
+ </jsc>
+ <jsc nostdlib="true" warnaserror="false" target="library" debug="true"
+ define="${current.build.defines.jsc}"
+ output="${current.bin.dir}/SharedModule.dll">
+ <sources basedir="${log4net.basedir}">
+ <include name="src/examples/js/Repository/SharedModule/**/*.js" />
+ <include name="src/log4net/AssemblyVersionInfo.js"/>
+ </sources>
+ <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"/>
+ </references>
+ </jsc>
+ <jsc nostdlib="true" warnaserror="false" target="library" debug="true"
+ define="${current.build.defines.jsc}"
+ output="${current.bin.dir}/SimpleModule.dll">
+ <sources basedir="${log4net.basedir}">
+ <include name="src/examples/js/Repository/SimpleModule/**/*.js" />
+ <include name="src/log4net/AssemblyVersionInfo.js"/>
+ </sources>
+ <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"/>
+ </references>
+ </jsc>
+ <jsc nostdlib="true" warnaserror="false" target="exe" debug="true"
+ define="${current.build.defines.jsc}"
+ output="${current.bin.dir}/SimpleApp.exe">
+ <sources basedir="${log4net.basedir}">
+ <include name="src/examples/js/Repository/SimpleApp/**/*.js" />
+ <include name="src/log4net/AssemblyVersionInfo.js"/>
+ </sources>
+ <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>
+ </jsc>
+ </target>
+
+ <!--target name="-compile-cpp-examples">
+ <property name="bin.dir" value="${build.dir}/bin/examples/cpp"/>
+ <call target="clean-current-bin-dir"/>
+ <cl nostdlib="true" noconfig="true"
+ warnaserror="false"
+ target="library"
+ debug="true"
+ define="${current.build.defines.csc}"
+ 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"/>
+ </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" />
+ <include name="${current.bin.dir}/SimpleModule.dll"/>
+ <include name="${current.bin.dir}/SharedModule.dll"/>
+ </references>
+ </cl>
+ </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=1546611&r1=1546610&r2=1546611&view=diff
==============================================================================
--- logging/log4net/trunk/src/buildsupport/configure-framework.include (original)
+++ logging/log4net/trunk/src/buildsupport/configure-framework.include Fri Nov 29 17:07:47 2013
@@ -31,6 +31,7 @@ limitations under the License.
<property name="current.build.has.systemcore" value="false"/>
<property name="current.build.has.systemweb" value="true"/>
<property name="current.build.has.systemconfiguration" value="true"/>
+ <property name="can.compile.js" value="true"/>
<call target="-set-framework-configuration"/>
</target>
<!-- uses NET_2_0 defines plus FRAMEWORK_3_5-->
@@ -43,6 +44,7 @@ limitations under the License.
<property name="current.build.has.systemcore" value="true"/>
<property name="current.build.has.systemweb" value="true"/>
<property name="current.build.has.systemconfiguration" value="true"/>
+ <property name="can.compile.js" value="true"/>
<call target="-set-framework-configuration"/>
</target>
<!-- uses NET_2_0 defines plus FRAMEWORK_3_5 and CLIENT_PROFILE-->
@@ -55,6 +57,7 @@ limitations under the License.
<property name="current.build.has.systemcore" value="true"/>
<property name="current.build.has.systemweb" value="false"/>
<property name="current.build.has.systemconfiguration" value="true"/>
+ <property name="can.compile.js" value="true"/>
<call target="-set-framework-configuration"/>
</target>
<!-- uses NET_3_5 plus FRAMEWORK_4_0_OR_ABOVE defines -->
@@ -67,6 +70,7 @@ limitations under the License.
<property name="current.build.has.systemcore" value="true"/>
<property name="current.build.has.systemweb" value="true"/>
<property name="current.build.has.systemconfiguration" value="true"/>
+ <property name="can.compile.js" value="true"/>
<call target="-set-framework-configuration"/>
</target>
<!-- uses NET_3_5 plus FRAMEWORK_4_0_OR_ABOVE and CLIENT_PROFILE defines -->
@@ -79,6 +83,7 @@ limitations under the License.
<property name="current.build.has.systemcore" value="true"/>
<property name="current.build.has.systemweb" value="false"/>
<property name="current.build.has.systemconfiguration" value="true"/>
+ <property name="can.compile.js" value="true"/>
<call target="-set-framework-configuration"/>
</target>
<target name="set-netcf-2.0-runtime-configuration">
@@ -90,6 +95,7 @@ limitations under the License.
<property name="current.build.has.systemcore" value="false"/>
<property name="current.build.has.systemweb" value="false"/>
<property name="current.build.has.systemconfiguration" value="false"/>
+ <property name="can.compile.js" value="true"/>
<call target="-set-framework-configuration"/>
</target>
<target name="set-mono-2.0-runtime-configuration">
@@ -101,6 +107,7 @@ limitations under the License.
<property name="current.build.has.systemcore" value="false"/>
<property name="current.build.has.systemweb" value="true"/>
<property name="current.build.has.systemconfiguration" value="true"/>
+ <property name="can.compile.js" 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">