From: Gert D. <dri...@us...> - 2008-08-18 09:47:37
|
Update of /cvsroot/ndoc/ndoc In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv20900 Modified Files: Tag: ndoc_1_3_patches NDoc.build.include Log Message: Support mono-2.0 as target framework. Sanitized the defines (to match other open-source projects). Index: NDoc.build.include =================================================================== RCS file: /cvsroot/ndoc/ndoc/NDoc.build.include,v retrieving revision 1.19 retrieving revision 1.19.4.1 diff -C2 -d -r1.19 -r1.19.4.1 *** NDoc.build.include 30 Sep 2004 17:30:24 -0000 1.19 --- NDoc.build.include 18 Aug 2008 09:47:42 -0000 1.19.4.1 *************** *** 175,179 **** <property name="nant.settings.currentframework" value="net-1.0" /> <property name="current.build.debug" value="${build.debug}" dynamic="true" readonly="false" /> ! <property name="current.build.defines" value="${build.defines},NET,NET_1_0" dynamic="true" readonly="false" /> <property name="current.build.optimize" value="${build.optimize}" dynamic="true" readonly="false" /> <property name="current.bin.dir" value="${build.dir}/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}" dynamic="true" /> --- 175,179 ---- <property name="nant.settings.currentframework" value="net-1.0" /> <property name="current.build.debug" value="${build.debug}" dynamic="true" readonly="false" /> ! <property name="current.build.defines" value="${build.defines},NET,NET_1_0,ONLY_1_0" dynamic="true" readonly="false" /> <property name="current.build.optimize" value="${build.optimize}" dynamic="true" readonly="false" /> <property name="current.bin.dir" value="${build.dir}/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}" dynamic="true" /> *************** *** 187,191 **** <property name="nant.settings.currentframework" value="net-1.1" /> <property name="current.build.debug" value="${build.debug}" dynamic="true" readonly="false" /> ! <property name="current.build.defines" value="${build.defines},NET,NET_1_1" dynamic="true" readonly="false" /> <property name="current.build.optimize" value="${build.optimize}" dynamic="true" readonly="false" /> <property name="current.bin.dir" value="${build.dir}/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}" dynamic="true" /> --- 187,191 ---- <property name="nant.settings.currentframework" value="net-1.1" /> <property name="current.build.debug" value="${build.debug}" dynamic="true" readonly="false" /> ! <property name="current.build.defines" value="${build.defines},NET_1_0,NET_1_1,ONLY_1_1" dynamic="true" readonly="false" /> <property name="current.build.optimize" value="${build.optimize}" dynamic="true" readonly="false" /> <property name="current.bin.dir" value="${build.dir}/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}" dynamic="true" /> *************** *** 199,203 **** <property name="nant.settings.currentframework" value="net-2.0" /> <property name="current.build.debug" value="${build.debug}" dynamic="true" readonly="false" /> ! <property name="current.build.defines" value="${build.defines},NET,NET_2_0" dynamic="true" readonly="false" /> <property name="current.build.optimize" value="${build.optimize}" dynamic="true" readonly="false" /> <property name="current.bin.dir" value="${build.dir}/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}" dynamic="true" /> --- 199,203 ---- <property name="nant.settings.currentframework" value="net-2.0" /> <property name="current.build.debug" value="${build.debug}" dynamic="true" readonly="false" /> ! <property name="current.build.defines" value="${build.defines},NET,NET_1_0,NET_1_1,NET_2_0,ONLY_2_0" dynamic="true" readonly="false" /> <property name="current.build.optimize" value="${build.optimize}" dynamic="true" readonly="false" /> <property name="current.bin.dir" value="${build.dir}/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}" dynamic="true" /> *************** *** 211,215 **** <property name="nant.settings.currentframework" value="netcf-1.0" /> <property name="current.build.debug" value="${build.debug}" dynamic="true" readonly="false" /> ! <property name="current.build.defines" value="${build.defines},NETCF,NETCF_1_0" dynamic="true" readonly="false" /> <property name="current.build.optimize" value="${build.optimize}" dynamic="true" readonly="false" /> <property name="current.bin.dir" value="${build.dir}/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}" dynamic="true" /> --- 211,215 ---- <property name="nant.settings.currentframework" value="netcf-1.0" /> <property name="current.build.debug" value="${build.debug}" dynamic="true" readonly="false" /> ! <property name="current.build.defines" value="${build.defines},NETCF,NET_1_0,NET_1_1,ONLY_1_1" dynamic="true" readonly="false" /> <property name="current.build.optimize" value="${build.optimize}" dynamic="true" readonly="false" /> <property name="current.bin.dir" value="${build.dir}/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}" dynamic="true" /> *************** *** 223,227 **** <property name="nant.settings.currentframework" value="mono-1.0" /> <property name="current.build.debug" value="${build.debug}" dynamic="true" readonly="false" /> ! <property name="current.build.defines" value="${build.defines},MONO,MONO_1_0" dynamic="true" readonly="false" /> <property name="current.build.optimize" value="${build.optimize}" dynamic="true" readonly="false" /> <property name="current.bin.dir" value="${build.dir}/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}" dynamic="true" /> --- 223,239 ---- <property name="nant.settings.currentframework" value="mono-1.0" /> <property name="current.build.debug" value="${build.debug}" dynamic="true" readonly="false" /> ! <property name="current.build.defines" value="${build.defines},MONO,NET_1_0,NET_1_1,ONLY_1_1" dynamic="true" readonly="false" /> ! <property name="current.build.optimize" value="${build.optimize}" dynamic="true" readonly="false" /> ! <property name="current.bin.dir" value="${build.dir}/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}" dynamic="true" /> ! <property name="current.sdkdoc.dir" value="${nant.project.basedir}/doc/sdk/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}" dynamic="true" /> ! <property name="current.sdkdoc.debug" value="${sdkdoc.debug}" dynamic="true" readonly="false" /> ! </target> ! <!-- ! ! --> ! <target name="set-mono-2.0-framework-configuration" depends="check-build-dir, check-current-build-config, check-build-debug, check-build-defines, check-build-optimize"> ! <property name="nant.settings.currentframework" value="mono-2.0" /> ! <property name="current.build.debug" value="${build.debug}" dynamic="true" readonly="false" /> ! <property name="current.build.defines" value="${build.defines},MONO,NET_1_0,NET_1_1,NET_2_0,ONLY_2_0" dynamic="true" readonly="false" /> <property name="current.build.optimize" value="${build.optimize}" dynamic="true" readonly="false" /> <property name="current.bin.dir" value="${build.dir}/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}" dynamic="true" /> *************** *** 235,239 **** <property name="nant.settings.currentframework" value="sscli-1.0" /> <property name="current.build.debug" value="${build.debug}" dynamic="true" readonly="false" /> ! <property name="current.build.defines" value="${build.defines},SSCLI,SSCLI_1_0" dynamic="true" readonly="false" /> <property name="current.build.optimize" value="${build.optimize}" dynamic="true" readonly="false" /> <property name="current.bin.dir" value="${build.dir}/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}" dynamic="true" /> --- 247,251 ---- <property name="nant.settings.currentframework" value="sscli-1.0" /> <property name="current.build.debug" value="${build.debug}" dynamic="true" readonly="false" /> ! <property name="current.build.defines" value="${build.defines},SSCLI,NET_1_0,NET_1_1,ONLY_1_1" dynamic="true" readonly="false" /> <property name="current.build.optimize" value="${build.optimize}" dynamic="true" readonly="false" /> <property name="current.bin.dir" value="${build.dir}/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}" dynamic="true" /> |