Author: roberto
Date: Sat Jul 23 09:14:42 2005
New Revision: 224473
URL: http://svn.apache.org/viewcvs?rev=224473&view=rev
Log:
IBATISNET-81
~Updated NAnt build scripts with patch from Roelof Blom:
Commented out Common and DataAccess tests tasks since those need a little more
work
Added:
ibatis/trunk/cs/mapper/IBatisNet.Common.Test/DataBase-Template.config
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/IBatisNet.DataMapper.Test.build
Modified:
ibatis/trunk/cs/mapper/ (props changed)
ibatis/trunk/cs/mapper/IBatisNet.Common/ (props changed)
ibatis/trunk/cs/mapper/IBatisNet.Common.Test/ (props changed)
ibatis/trunk/cs/mapper/IBatisNet.Common/IBatisNet.Common.build
ibatis/trunk/cs/mapper/IBatisNet.DataAccess/ (props changed)
ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Extensions/ (props changed)
ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/ (props changed)
ibatis/trunk/cs/mapper/IBatisNet.DataAccess/IBatisNet.DataAccess.build
ibatis/trunk/cs/mapper/IBatisNet.DataMapper/ (props changed)
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/ (props changed)
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/NUnit/SqlMapTests/MSSQL/StatementTest.cs
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/NUnit/SqlMapTests/StatementTest.cs
ibatis/trunk/cs/mapper/IBatisNet.DataMapper/IBatisNet.DataMapper.build
ibatis/trunk/cs/mapper/iBATIS.build
Propchange: ibatis/trunk/cs/mapper/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Jul 23 09:14:42 2005
@@ -3,3 +3,5 @@
_ReSharper.DataMapper
*.resharperoptions
_ReSharper.DataAccess
+_ReSharper.IBatisNet
+build
Propchange: ibatis/trunk/cs/mapper/IBatisNet.Common/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Jul 23 09:14:42 2005
@@ -0,0 +1 @@
+obj
Propchange: ibatis/trunk/cs/mapper/IBatisNet.Common.Test/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Jul 23 09:14:42 2005
@@ -0,0 +1 @@
+obj
Added: ibatis/trunk/cs/mapper/IBatisNet.Common.Test/DataBase-Template.config
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.Common.Test/DataBase-Template.config?rev=224473&view=auto
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.Common.Test/DataBase-Template.config
(added)
+++ ibatis/trunk/cs/mapper/IBatisNet.Common.Test/DataBase-Template.config Sat
Jul 23 09:14:42 2005
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<settings>
+ <!-- User application and configured property settings go here.-->
+ <!-- To run tests, create a file named DataBase.config
+ with your own value for datasource.
+ (don't included it in the solution and don't commit it in SVN)
+ -->
+ <add key="userid" value="IBatisNet" />
+ <add key="password" value="test" />
+ <add key="database" value="IBatisNet" />
+ <add key="datasource" value="localhost" />
+ <add key="useridHibernate" value="NHibernate" />
+ <add key="databaseHibernate" value="NHibernate" />
+ <add key="driverOdbc" value="{SQL Server}" />
+ <add key="datasourceMySql" value="localhost" />
+</settings>
Modified: ibatis/trunk/cs/mapper/IBatisNet.Common/IBatisNet.Common.build
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.Common/IBatisNet.Common.build?rev=224473&r1=224472&r2=224473&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.Common/IBatisNet.Common.build (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.Common/IBatisNet.Common.build Sat Jul 23
09:14:42 2005
@@ -2,14 +2,14 @@
<project name="IBatisNet.Common" default="build">
<!--
Required properties:
- * build.dir - (path) root level to build to,
assemblies will go in ${build.dir}/bin
+ * build.dir - (path) root level to build to,
assemblies will go in ${build.dir}/${project.config}/bin
* build.debug - (true|false) debug build?
* current.build.defines - framework-specific build defines
-->
<target name="build">
<!-- build IBatisNet.Common -->
<csc target="library" define="${current.build.defines}"
warnaserror="false"
- debug="${build.debug}"
output="${build.dir}/bin/${nant.project.name}.dll"
doc="${build.dir}/bin/${nant.project.name}.xml">
+ debug="${build.debug}"
output="${build.dir}/${project.config}/bin/${nant.project.name}.dll"
doc="${build.dir}/${project.config}/bin/${nant.project.name}.xml">
<nowarn>
<warning number="${nowarn.numbers}" />
</nowarn>
@@ -19,7 +19,7 @@
<resources basedir="Resources">
<include name="**/*" />
</resources>
- <references basedir="${build.dir}/bin">
+ <references basedir="${build.dir}/${project.config}/bin">
<include name="*.dll"/>
<exclude name="${nant.project.name}.dll"/>
</references>
Propchange: ibatis/trunk/cs/mapper/IBatisNet.DataAccess/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Jul 23 09:14:42 2005
@@ -0,0 +1 @@
+obj
Propchange: ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Extensions/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Jul 23 09:14:42 2005
@@ -0,0 +1 @@
+obj
Propchange: ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Jul 23 09:14:42 2005
@@ -0,0 +1 @@
+obj
Modified: ibatis/trunk/cs/mapper/IBatisNet.DataAccess/IBatisNet.DataAccess.build
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataAccess/IBatisNet.DataAccess.build?rev=224473&r1=224472&r2=224473&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataAccess/IBatisNet.DataAccess.build
(original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataAccess/IBatisNet.DataAccess.build Sat
Jul 23 09:14:42 2005
@@ -2,21 +2,21 @@
<project name="IBatisNet.DataAccess" default="build">
<!--
Required properties:
- * build.dir - (path) root level to build to,
assemblies will go in ${build.dir}/bin
+ * build.dir - (path) root level to build to,
assemblies will go in ${build.dir}/${project.config}/bin
* build.debug - (true|false) debug build?
* current.build.defines - framework-specific build defines
-->
<target name="build">
<!-- build IBatisNet.DataAccess -->
<csc target="library" define="${current.build.defines}"
warnaserror="false"
- debug="${build.debug}"
output="${build.dir}/bin/${nant.project.name}.dll"
doc="${build.dir}/bin/${nant.project.name}.xml">
+ debug="${build.debug}"
output="${build.dir}/${project.config}/bin/${nant.project.name}.dll"
doc="${build.dir}/${project.config}/bin/${nant.project.name}.xml">
<sources failonempty="true">
<include name="**/*.cs" />
</sources>
<resources basedir="Resources">
<include name="**/*" />
</resources>
- <references basedir="${build.dir}/bin">
+ <references basedir="${build.dir}/${project.config}/bin">
<include name="*.dll"/>
<exclude name="${nant.project.name}.dll"/>
</references>
Propchange: ibatis/trunk/cs/mapper/IBatisNet.DataMapper/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Jul 23 09:14:42 2005
@@ -0,0 +1 @@
+obj
Propchange: ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Jul 23 09:14:42 2005
@@ -1 +1,2 @@
DataBase.config
+obj
Added:
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/IBatisNet.DataMapper.Test.build
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/IBatisNet.DataMapper.Test.build?rev=224473&view=auto
==============================================================================
---
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/IBatisNet.DataMapper.Test.build
(added)
+++
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/IBatisNet.DataMapper.Test.build
Sat Jul 23 09:14:42 2005
@@ -0,0 +1,95 @@
+<?xml version="1.0"?>
+<project name="IBatisNet.DataMapper.Test" default="build">
+ <!--
+ Required properties:
+ * build.dir - (path) root level to build to,
assemblies will go in ${build.dir}/${project.config}/bin
+ * build.debug - (true|false) debug build?
+ * current.build.defines - framework-specific build defines
+ -->
+ <target name="build">
+
+ <echo message="Build Directory is
${build.dir}/${project.config}/bin" />
+
+ <!-- build IBatisNet.Test -->
+ <csc target="library" define="${current.build.defines}"
warnaserror="true"
+ debug="${build.debug}"
output="${build.dir}/${project.config}/bin/${nant.project.name}.dll"
doc="${build.dir}/${project.config}/bin/${nant.project.name}.xml">
+ <nowarn>
+ <warning number="${nowarn.numbers}" />
+ </nowarn>
+ <sources failonempty="true">
+ <include name="**/*.cs" />
+ </sources>
+ <resources prefix="IBatisNet.DataMapper.Test"
dynamicprefix="true">
+ <include name="User.hbm.xml" />
+ <include name="properties.xml" />
+ <exclude name="bin/**/*.xml" />
+ </resources>
+ <references basedir="${build.dir}/${project.config}/bin">
+ <include name="*.dll"/>
+ <exclude name="${nant.project.name}.dll"/>
+ </references>
+ </csc>
+
+ <copy todir="${build.dir}">
+ <fileset basedir="${nant.project.basedir}">
+ <include name="*.config" />
+ <include name="*.jpg" />
+ </fileset>
+ </copy>
+
+ <copy flatten="true" todir="${build.dir}/${project.config}/bin">
+ <fileset basedir="${nant.project.basedir}">
+ <include name="bin/**/*.config" />
+ </fileset>
+ </copy>
+
+ <!-- delete the mapping files used for testing -->
+ <delete dir="${build.dir}/maps" failonerror="false" />
+ <mkdir dir="${build.dir}/maps" />
+
+ <echo message="Copy mapping files" />
+
+ <copy todir="${build.dir}/maps">
+ <fileset basedir="Maps">
+ <include name="**/*" />
+ </fileset>
+ </copy>
+
+ <!-- delete the script files used for testing -->
+ <delete dir="${build.dir}/Scripts" failonerror="false" />
+ <mkdir dir="${build.dir}/Scripts" />
+
+ <echo message="Copy Scripts files" />
+
+ <copy todir="${build.dir}/Scripts">
+ <fileset basedir="Scripts">
+ <include name="**/*" />
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="test" depends="build">
+ <mkdir dir="${build.dir}/testResults" />
+ <nunit2 failonerror="false">
+ <formatter type="Plain" />
+ <formatter type="Xml" usefile="true" extension=".xml"
outputdir="${build.dir}/testResults" />
+ <test
+
assemblyname="${build.dir}/${project.config}/bin/${nant.project.name}.dll"
+
appconfig="${build.dir}/${project.config}/bin/${nant.project.name}.dll.config">
+ <categories>
+ <exclude name="EmbedParameter" />
+ <exclude name="MySql" />
+ <exclude name="Oracle" />
+ <exclude name="PostgreSQL" />
+ <exclude name="StatementNamespaces" />
+ </categories>
+ </test>
+ </nunit2>
+ <nunit2report out="${build.dir}/testResults/UnitTests.html"
verbose="true">
+ <fileset>
+ <include
name="${build.dir}/testResults/*-results.xml"/>
+ </fileset>
+ </nunit2report>
+ </target>
+
+</project>
Modified:
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/NUnit/SqlMapTests/MSSQL/StatementTest.cs
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/NUnit/SqlMapTests/MSSQL/StatementTest.cs?rev=224473&r1=224472&r2=224473&view=diff
==============================================================================
---
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/NUnit/SqlMapTests/MSSQL/StatementTest.cs
(original)
+++
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/NUnit/SqlMapTests/MSSQL/StatementTest.cs
Sat Jul 23 09:14:42 2005
@@ -79,7 +79,7 @@
/// <summary>
/// Test Insert Via Insert Statement.
- /// (Test for IBATISNET-21 : Property substitutions do not
occur inside <selectKey> statement)
+ /// (Test for IBATISNET-21 : Property substitutions do not
occur inside selectKey statement)
/// </summary>
[Test]
public void TestInsertViaInsertStatement()
@@ -94,7 +94,7 @@
/// <summary>
/// Test statement with properties subtitutions
- /// (Test for IBATISNET-21 : Property substitutions do not
occur inside <selectKey> statement)
+ /// (Test for IBATISNET-21 : Property substitutions do not
occur inside selectKey statement)
/// </summary>
[Test]
public void TestInsertCategoryWithProperties()
Modified:
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/NUnit/SqlMapTests/StatementTest.cs
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/NUnit/SqlMapTests/StatementTest.cs?rev=224473&r1=224472&r2=224473&view=diff
==============================================================================
---
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/NUnit/SqlMapTests/StatementTest.cs
(original)
+++
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/NUnit/SqlMapTests/StatementTest.cs
Sat Jul 23 09:14:42 2005
@@ -307,10 +307,10 @@
Assert.AreEqual(5, ((Account) list[4]).Id);
}
- [Test]
/// <summary>
/// Test ExecuteQueryForPaginatedList
/// </summary>
+ [Test]
public void TestExecuteQueryForPaginatedList()
{
// Get List of all 5
Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper/IBatisNet.DataMapper.build
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/IBatisNet.DataMapper.build?rev=224473&r1=224472&r2=224473&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper/IBatisNet.DataMapper.build
(original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper/IBatisNet.DataMapper.build Sat
Jul 23 09:14:42 2005
@@ -2,24 +2,28 @@
<project name="IBatisNet.DataMapper" default="build">
<!--
Required properties:
- * build.dir - (path) root level to build to,
assemblies will go in ${build.dir}/bin
+ * build.dir - (path) root level to build to,
assemblies will go in ${build.dir}/${project.config}/bin
* build.debug - (true|false) debug build?
* current.build.defines - framework-specific build defines
-->
<target name="build">
<!-- build IBatisNet.DataMapper -->
<csc target="library" define="${current.build.defines}"
warnaserror="false"
- debug="${build.debug}"
output="${build.dir}/bin/${nant.project.name}.dll"
doc="${build.dir}/bin/${nant.project.name}.xml">
+ debug="${build.debug}"
output="${build.dir}/${project.config}/bin/${nant.project.name}.dll"
doc="${build.dir}/${project.config}/bin/${nant.project.name}.xml">
<nowarn>
<warning number="${nowarn.numbers}" />
</nowarn>
<sources failonempty="true">
<include name="**/*.cs" />
</sources>
+ <resources basedir="." prefix="IBatisNet.DataMapper.">
+ <include name="SqlMapConfig.xsd" />
+ <include name="SqlMap.xsd" />
+ </resources>
<resources basedir="Resources">
<include name="**/*" />
</resources>
- <references basedir="${build.dir}/bin">
+ <references basedir="${build.dir}/${project.config}/bin">
<include name="*.dll"/>
<exclude name="${nant.project.name}.dll"/>
</references>
Modified: ibatis/trunk/cs/mapper/iBATIS.build
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/iBATIS.build?rev=224473&r1=224472&r2=224473&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/iBATIS.build (original)
+++ ibatis/trunk/cs/mapper/iBATIS.build Sat Jul 23 09:14:42 2005
@@ -39,13 +39,15 @@
<target name="debug" description="Perform a 'debug' build">
<property name="project.config" value="debug" />
<property name="build.debug" value="true" />
- <property name="build.dir"
value="${nant.project.basedir}/build/${nant.settings.currentframework}.${nant.platform.name}/${project.name}-${project.version}-${project.config}"
/>
+ <property name="build.dir"
value="${nant.project.basedir}/build/${nant.settings.currentframework}.${nant.platform.name}/${project.name}-${project.version}"
/>
+ <property name="lib.dir" value="${nant.project.basedir}/External-Bin"
/>
</target>
<target name="release" description="Perform a 'release' build">
<property name="project.config" value="release" />
<property name="build.debug" value="false" />
- <property name="build.dir"
value="${nant.project.basedir}/build/${project.name}-${project.version}" />
+ <property name="build.dir"
value="${nant.project.basedir}/build/${nant.settings.currentframework}.${nant.platform.name}/${project.name}-${project.version}"
/>
+ <property name="lib.dir" value="${nant.project.basedir}/External-Bin"
/>
</target>
<!-- build tasks -->
@@ -53,8 +55,8 @@
<!-- import system environment variables -->
<sysinfo />
- <loadtasks assembly="G:\Program
Files\nant\nantcontrib-0.85-rc1-bin\nantcontrib-0.85-rc1\bin/NAnt.Contrib.Tasks.dll"/>
- <loadtasks
assembly="E:\Projet\NUnit2Report\bin/NAnt.NUnit2ReportTasks.dll"/>
+ <loadtasks
assembly="C:\apps\nantcontrib\bin\NAnt.Contrib.Tasks.dll"/>
+ <loadtasks
assembly="C:\apps\nunit2report\bin\NAnt.NUnit2ReportTasks.dll"/>
<call target="${project.config}" />
<call target="set-runtime-configuration" />
@@ -75,10 +77,10 @@
<echo message="Build Directory is ${build.dir}" />
<!-- prepare build directory -->
- <mkdir dir="${build.dir}/bin" />
+ <mkdir dir="${build.dir}/${project.config}/bin" />
<!-- copy framework-specific libraries -->
- <copy todir="${build.dir}/bin">
+ <copy todir="${build.dir}/${project.config}/bin">
<fileset basedir="${lib.dir}">
<include name="*.dll" />
<include name="*.xml" />
@@ -96,26 +98,36 @@
<nant buildfile="IBatisNet.DataAccess/IBatisNet.DataAccess.build"
target="build" />
<!-- build IBatisNet.DataAccess.Extensions -->
+ <!--
<nant
buildfile="IBatisNet.DataAccess.Extensions/IBatisNet.DataAccess.Extensions.build"
target="build" />
+ -->
</target>
-
+
<!-- test the newly built IBatisNet librairies -->
<target name="test" depends="build">
- <!-- test IBatisNet.Test assembly -->
- <nant buildfile="IBatisNet.Test/IBatisNet.Test.build" target="test" />
-
+ <!-- test IBatisNet.Common assembly -->
+ <!--
+ <nant buildfile="IBatisNet.Common.Test/IBatisNet.Common.Test.build"
target="test" />
+ -->
+
+ <!-- test IBatisNet.DataMapper assembly -->
+ <nant
buildfile="IBatisNet.DataMapper.Test/IBatisNet.DataMapper.Test.build"
target="test" />
+
+ <!-- test IBatisNet.DataAccess assembly -->
+ <!--<nant
buildfile="IBatisNet.DataAccess.Test/IBatisNet.DataAccess.Test.build"
target="test" />-->
+
</target>
<target name="ndoc" depends="init">
<!-- use ndoc to build sdk doc if they are not uptodate-->
<ifnot uptodatefile="${build.dir}/doc/sdk-help/*.chm">
- <comparefiles basedir="${build.dir}/bin">
+ <comparefiles basedir="${build.dir}/${project.config}/bin">
<includes name="IBatisNet.*.dll" />
</comparefiles>
<ndoc>
- <assemblies basedir="${build.dir}/bin">
+ <assemblies basedir="${build.dir}/${project.config}/bin">
<includes name="IBatisNet.*.dll" />
<excludes name="*Test*.dll" />
</assemblies>
@@ -199,7 +211,7 @@
<target name="package-common" depends="clean test ndoc"
description="Creates a package zip file.">
<!-- remove non-release files -->
<delete>
- <fileset basedir="${build.dir}/bin">
+ <fileset basedir="${build.dir}/${project.config}/bin">
<!-- remove test files -->
<include name="*.Test.*" />
<include name="*.config" />
