[pgsqlclient-checkins] pgsqlclient_10 PgSqlClient.build,1.15,1.16
Status: Inactive
Brought to you by:
carlosga_fb
Menu
▾
▴
[pgsqlclient-checkins] pgsqlclient_10 PgSqlClient.build,1.15,1.16
|
From: Carlos G. Á. <car...@us...> - 2004-07-21 08:23:23
|
Update of /cvsroot/pgsqlclient/pgsqlclient_10 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10365 Modified Files: PgSqlClient.build Log Message: Updated build file Index: PgSqlClient.build =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PgSqlClient.build,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** PgSqlClient.build 14 Jun 2004 15:00:27 -0000 1.15 --- PgSqlClient.build 21 Jul 2004 08:23:14 -0000 1.16 *************** *** 20,51 **** <property name="nunit.test.dir" value="PostgreSql.Data.PgSqlClient.UnitTests\source"/> - <!-- Check for Html Help Compiler --> - <target name="check-htmlhelp-compiler"> - <ifnot propertyexists="htmlhelp.compiler"> - <readregistry property="htmlhelp.workshop.installroot" key="SOFTWARE\Microsoft\HTML Help Workshop\InstallDir" - hive="CurrentUser" failonerror="false" /> - <if propertyexists="htmlhelp.workshop.installroot"> - <property name="htmlhelp.compiler" value="${htmlhelp.workshop.installroot}\hhc.exe" readonly="false" /> - </if> - </ifnot> - <ifnot propertyexists="htmlhelp.compiler"> - <sysinfo /> - <property name="htmlhelp.compiler" value="${sys.os.folder.programfiles}\HTML Help Workshop\hhc.exe" - readonly="false" /> - </ifnot> - </target> - <!-- Check for NUnit --> ! <target name="check-nunit-framework" depends="check-htmlhelp-compiler"> ! <ifnot propertyexists="nunit.framework.dll"> ! <sysinfo /> ! <property name="nunit.framework.dll" value="${sys.os.folder.programfiles}\NUnit V2.1\bin\nunit.framework.dll" readonly="false" /> ! </ifnot> </target> <!-- Target for check build configuration --> <target name="check-build-config" depends="clean"> - <call target="check-htmlhelp-compiler" /> <call target="check-nunit-framework" /> </target> --- 20,36 ---- <property name="nunit.test.dir" value="PostgreSql.Data.PgSqlClient.UnitTests\source"/> <!-- Check for NUnit --> ! <target name="check-nunit-framework"> ! <if test="${not property::exists('nunit.framework.dll')}"> ! <sysinfo /> ! <property ! name="nunit.framework.dll" ! value="${sys.os.folder.programfiles}\NUnit 2.2\bin\nunit.framework.dll" readonly="false" /> ! </if> </target> <!-- Target for check build configuration --> <target name="check-build-config" depends="clean"> <call target="check-nunit-framework" /> </target> *************** *** 71,135 **** <!-- Build target for all existing platforms --> <target name="build-all" depends="check-build-config"> ! <call target="net-1.0" failonerror="false" /> ! <call target="net-1.1" failonerror="false" /> ! <call target="mono-1.0" failonerror="false" /> </target> <target name="net-1.0"> <!-- .NET Framework 1.0 --> ! <available type="Framework" resource="net-1.0" property="temp.framework.available" /> ! <ifnot propertytrue="temp.framework.available"> ! <echo message=".NET Framework 1.0 runtime is not available." /> ! </ifnot> ! <if propertytrue="temp.framework.available"> ! <property name="nant.settings.currentframework" value="net-1.0" /> ! <echo message="Building using .NET Framework 1.0." /> ! <call target="build-provider" force="true" /> ! <if propertyexists="htmlhelp.compiler"> ! <!-- call target="build-sdk" force="true" /--> ! </if> ! <if propertyexists="nunit.framework.dll"> ! <call target="build-nunit-tests" force="true" /> ! </if> ! <call target="distribution" force="true" /> </if> </target> <target name="net-1.1"> <!-- .NET Framework 1.1 --> ! <available type="Framework" resource="net-1.1" property="temp.framework.available" /> ! <ifnot propertytrue="temp.framework.available"> ! <echo message=".NET Framework 1.1 runtime is not available." /> ! </ifnot> ! <if propertytrue="temp.framework.available"> ! <property name="nant.settings.currentframework" value="net-1.1" /> ! <echo message="Building using .NET Framework 1.1." /> ! <call target="build-provider" force="true" /> ! <if propertyexists="htmlhelp.compiler"> ! <!-- call target="build-sdk" force="true" /--> ! </if> ! <if propertyexists="nunit.framework.dll"> ! <call target="build-nunit-tests" force="true" /> ! </if> ! <call target="distribution" force="true" /> </if> </target> ! <target name="mono-1.0"> ! <!-- Mono 1.0 --> ! <available type="Framework" resource="mono-1.0" property="temp.framework.available" /> ! <ifnot propertytrue="temp.framework.available"> ! <echo message="Mono 1.0 runtime is not available." /> ! </ifnot> ! <if propertytrue="temp.framework.available"> ! <property name="nant.settings.currentframework" value="mono-1.0" /> ! <echo message="Building using Mono 1.0." /> ! <property name="build.define" value="_MONO"/> ! <call target="build-provider-mono" force="true" /> </if> </target> ! <!-- Taget for build TLS Assembly (Microsoft .NET) --> <target name="build-tls"> <property name="build.dir" value="${base.build.dir}\${nant.settings.currentframework}" /> --- 56,121 ---- <!-- Build target for all existing platforms --> <target name="build-all" depends="check-build-config"> ! <!-- Build --> ! <if test="${framework::exists('net-1.0')}"> ! <call target="net-1.0"/> ! </if> ! <if test="${framework::exists('net-1.1')}"> ! <call target="net-1.1"/> ! </if> ! <if test="${framework::exists('net-2.0')}"> ! <call target="net-2.0"/> ! </if> ! <if test="${framework::exists('mono-1.0')}"> ! <call target="mono-1.0"/> ! </if> </target> <target name="net-1.0"> <!-- .NET Framework 1.0 --> ! <property name="nant.settings.currentframework" value="net-1.0" /> ! ! <echo message="Build using .NET Framework 1.0." /> ! <call target="build-provider"/> ! <if test="${property::exists('nunit.framework.dll')}"> ! <call target="build-nunit-tests"/> </if> + <call target="distribution"/> </target> <target name="net-1.1"> <!-- .NET Framework 1.1 --> ! <property name="nant.settings.currentframework" value="net-1.1" /> ! ! <echo message="Build using .NET Framework 1.1." /> ! <call target="build-provider"/> ! <if test="${property::exists('nunit.framework.dll')}"> ! <call target="build-nunit-tests"/> </if> + <call target="distribution"/> </target> ! <target name="net-2.0"> ! <!-- .NET Framework 2.0 --> ! <property name="nant.settings.currentframework" value="net-2.0" /> ! ! <echo message="Build using .NET Framework 2.0." /> ! <call target="build-provider"/> ! <if test="${property::exists('nunit.framework.dll')}"> ! <call target="build-nunit-tests"/> </if> + <call target="distribution"/> </target> + <target name="mono-1.0"> + <!-- mono:: 1.0 --> + <property name="nant.settings.currentframework" value="mono-1.0" /> + + <property name="build.define" value="${build.define};_MONO"/> + + <echo message="Build using mono:: 1.0." /> + <call target="build-provider-mono"/> + </target> ! <!-- Target for build TLS Assembly (Microsoft .NET) --> <target name="build-tls"> <property name="build.dir" value="${base.build.dir}\${nant.settings.currentframework}" /> *************** *** 140,144 **** <csc output="${build.dir}\Mono.Security.Protocol.Tls.dll" target="library" define="${build.define}"> <sources> ! <includes name="${tls.src.dir}/**/*.cs" /> </sources> <references> --- 126,130 ---- <csc output="${build.dir}\Mono.Security.Protocol.Tls.dll" target="library" define="${build.define}"> <sources> ! <include name="${tls.src.dir}/**/*.cs" /> </sources> <references> *************** *** 160,164 **** <csc output="${build.dir}\${project.FormalName}.dll" target="library" define="${build.define}" debug="${build.debug}"> <sources> ! <includes name="${src.dir}/**/*.cs" /> </sources> <references> --- 146,150 ---- <csc output="${build.dir}\${project.FormalName}.dll" target="library" define="${build.define}" debug="${build.debug}"> <sources> ! <include name="${src.dir}/**/*.cs" /> </sources> <references> *************** *** 168,172 **** <absolute file="System.Drawing.dll" /> <absolute file="System.XML.dll" /> ! <includes name="${build.dir}/Mono.Security.Protocol.Tls.dll" /> </references> <arg value="/resource:${resources.dir}\Toolbox\PgConnection.bmp,PostgreSql.Data.PgSqlClient.Resources.ToolBox.PgConnection.bmp" /> --- 154,158 ---- <absolute file="System.Drawing.dll" /> <absolute file="System.XML.dll" /> ! <include name="${build.dir}/Mono.Security.Protocol.Tls.dll" /> </references> <arg value="/resource:${resources.dir}\Toolbox\PgConnection.bmp,PostgreSql.Data.PgSqlClient.Resources.ToolBox.PgConnection.bmp" /> *************** *** 186,197 **** <csc output="${build.dir}\Mono.Security.Tls.dll" target="library" define="${build.define}"> <sources> ! <includes name="${tls.src.dir}/**/*.cs" /> </sources> <references> ! <includes name="${nant.settings.currentframework.frameworkassemblydirectory}/System.dll" /> ! <includes name="${nant.settings.currentframework.frameworkassemblydirectory}/System.Data.dll" /> ! <includes name="${nant.settings.currentframework.frameworkassemblydirectory}/System.Drawing.dll" /> ! <includes name="${nant.settings.currentframework.frameworkassemblydirectory}/System.XML.dll" /> </references> <arg value="/optimize+" /> --- 172,183 ---- <csc output="${build.dir}\Mono.Security.Tls.dll" target="library" define="${build.define}"> <sources> ! <include name="${tls.src.dir}/**/*.cs" /> </sources> <references> ! <include name="${nant.settings.currentframework.frameworkassemblydirectory}/System.dll" /> ! <include name="${nant.settings.currentframework.frameworkassemblydirectory}/System.Data.dll" /> ! <include name="${nant.settings.currentframework.frameworkassemblydirectory}/System.Drawing.dll" /> ! <include name="${nant.settings.currentframework.frameworkassemblydirectory}/System.XML.dll" /> </references> <arg value="/optimize+" /> *************** *** 207,219 **** <csc output="${build.dir}\${project.FormalName}.dll" target="library" define="${build.define}"> <sources> ! <includes name="${src.dir}/**/*.cs" /> </sources> <references> ! <includes name="${nant.settings.currentframework.frameworkassemblydirectory}/System.dll" /> ! <includes name="${nant.settings.currentframework.frameworkassemblydirectory}/System.Design.dll" /> ! <includes name="${nant.settings.currentframework.frameworkassemblydirectory}/System.Data.dll" /> ! <includes name="${nant.settings.currentframework.frameworkassemblydirectory}/System.Drawing.dll" /> ! <includes name="${nant.settings.currentframework.frameworkassemblydirectory}/System.XML.dll" /> ! <includes name="${build.dir}/Mono.Security.Tls.dll" /> </references> <arg value="/resource:${resources.dir}\Toolbox\PgConnection.bmp,PostgreSql.Data.PgSqlClient.Resources.ToolBox.PgConnection.bmp" /> --- 193,206 ---- <csc output="${build.dir}\${project.FormalName}.dll" target="library" define="${build.define}"> <sources> ! <include name="${src.dir}/**/*.cs" /> </sources> + <references> ! <include name="${nant.settings.currentframework.frameworkassemblydirectory}/System.dll" /> ! <include name="${nant.settings.currentframework.frameworkassemblydirectory}/System.Design.dll" /> ! <include name="${nant.settings.currentframework.frameworkassemblydirectory}/System.Data.dll" /> ! <include name="${nant.settings.currentframework.frameworkassemblydirectory}/System.Drawing.dll" /> ! <include name="${nant.settings.currentframework.frameworkassemblydirectory}/System.XML.dll" /> ! <include name="${build.dir}/Mono.Security.Tls.dll" /> </references> <arg value="/resource:${resources.dir}\Toolbox\PgConnection.bmp,PostgreSql.Data.PgSqlClient.Resources.ToolBox.PgConnection.bmp" /> *************** *** 224,240 **** </target> ! <!-- Target for build csUnit Tests --> <target name="build-nunit-tests"> <property name="build.dir" value="${base.build.dir}\${nant.settings.currentframework}" /> <copy todir="${build.dir}"> ! <fileset basedir="${nunit.test.dir}"> ! <includes name="*.config" /> </fileset> </copy> <!-- compile PostgreSql.Data.PgSqlClient.Tests --> <csc output="${build.dir}\${project.FormalName}.UnitTests.dll" target="library"> <sources> ! <includes name="${nunit.test.dir}/**/*.cs" /> </sources> <references> --- 211,228 ---- </target> ! <!-- Target for build NUnit Test Suite --> <target name="build-nunit-tests"> <property name="build.dir" value="${base.build.dir}\${nant.settings.currentframework}" /> <copy todir="${build.dir}"> ! <fileset basedir="${nunit.test.dir}/.."> ! <include name="*.config" /> </fileset> </copy> + <!-- compile PostgreSql.Data.PgSqlClient.Tests --> <csc output="${build.dir}\${project.FormalName}.UnitTests.dll" target="library"> <sources> ! <include name="${nunit.test.dir}/**/*.cs" /> </sources> <references> *************** *** 242,247 **** <absolute file="System.Data.dll" /> <absolute file="System.XML.dll" /> ! <includes name="${nunit.framework.dll}"/> ! <includes name="${build.dir}/${project.FormalName}.dll" /> </references> <arg value="/optimize+" /> --- 230,235 ---- <absolute file="System.Data.dll" /> <absolute file="System.XML.dll" /> ! <include name="${nunit.framework.dll}"/> ! <include name="${build.dir}/${project.FormalName}.dll" /> </references> <arg value="/optimize+" /> *************** *** 255,269 **** <mkdir dir="${distribution.dir}" failonerror="false" /> ! <!-- Copy needed files to distribution directory --> <copy todir="${distribution.dir}"> <fileset basedir="${build.dir}"> ! <includes name="*.dll" /> ! <includes name="*.config" /> </fileset> </copy> <copy todir="${distribution.dir}"> <fileset basedir="."> ! <includes name="*.txt" /> ! <includes name="*.html" /> </fileset> </copy> --- 243,259 ---- <mkdir dir="${distribution.dir}" failonerror="false" /> ! ! <!-- Copy needed files to distribution directory --> <copy todir="${distribution.dir}"> <fileset basedir="${build.dir}"> ! <include name="*.dll" /> ! <include name="*.config" /> </fileset> </copy> + <copy todir="${distribution.dir}"> <fileset basedir="."> ! <include name="*.txt" /> ! <include name="*.html" /> </fileset> </copy> |
