From: <fab...@us...> - 2009-07-13 22:32:40
|
Revision: 4607 http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4607&view=rev Author: fabiomaulo Date: 2009-07-13 22:32:35 +0000 (Mon, 13 Jul 2009) Log Message: ----------- Adjust compilation and reference manual images Modified Paths: -------------- branches/2.1.x/nhibernate/default.build branches/2.1.x/nhibernate/doc/reference/master.xml branches/2.1.x/nhibernate/doc/reference/modules/architecture.xml branches/2.1.x/nhibernate/doc/reference/modules/example_mappings.xml branches/2.1.x/nhibernate/doc/reference/styles/fopdf.xsl branches/2.1.x/nhibernate/src/NHibernate/ISession.cs Added Paths: ----------- branches/2.1.x/nhibernate/doc/reference/images/EmployerEmployee.png branches/2.1.x/nhibernate/doc/reference/images/fullcream.png branches/2.1.x/nhibernate/doc/reference/images/lite.png branches/2.1.x/nhibernate/doc/reference/images/overview.png Removed Paths: ------------- branches/2.1.x/nhibernate/doc/reference/images/EmployerEmployee.gif branches/2.1.x/nhibernate/doc/reference/images/EmployerEmployee.zargo branches/2.1.x/nhibernate/doc/reference/images/full_cream.gif branches/2.1.x/nhibernate/doc/reference/images/full_cream.svg branches/2.1.x/nhibernate/doc/reference/images/hibernate_logo_a.png branches/2.1.x/nhibernate/doc/reference/images/lite.gif branches/2.1.x/nhibernate/doc/reference/images/lite.svg branches/2.1.x/nhibernate/doc/reference/images/overview.gif branches/2.1.x/nhibernate/doc/reference/images/overview.svg Modified: branches/2.1.x/nhibernate/default.build =================================================================== --- branches/2.1.x/nhibernate/default.build 2009-07-13 18:32:18 UTC (rev 4606) +++ branches/2.1.x/nhibernate/default.build 2009-07-13 22:32:35 UTC (rev 4607) @@ -149,6 +149,11 @@ description="Builds the Help Documentation and the API documentation"> <nant buildfile="doc/documentation.build" target="api manual" /> </target> + + <target name="manual" depends="init binaries" + description="Builds the Help Documentation"> + <nant buildfile="doc/documentation.build" target="manual" /> + </target> <target name="build-all-frameworks" depends="init"> <!-- Save the current framework --> @@ -291,8 +296,8 @@ <target name="installer" depends="init binaries doc prepare-installer-files"> <nant buildfile="src/NHibernate.Setup/NHibernate.Setup.build" target="msi" /> </target> - - <target name="package" depends="init test-all-frameworks binaries doc sources-zip binaries-zip installer" + + <target name="package" depends="init set-release-project-configuration test binaries manual sources-zip binaries-zip" description="Creates files for the File Release System on SourceForge"> <property name="dist.output.dir" value="${project::get-base-directory()}/build/" /> Deleted: branches/2.1.x/nhibernate/doc/reference/images/EmployerEmployee.gif =================================================================== (Binary files differ) Added: branches/2.1.x/nhibernate/doc/reference/images/EmployerEmployee.png =================================================================== (Binary files differ) Property changes on: branches/2.1.x/nhibernate/doc/reference/images/EmployerEmployee.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: branches/2.1.x/nhibernate/doc/reference/images/EmployerEmployee.zargo =================================================================== (Binary files differ) Deleted: branches/2.1.x/nhibernate/doc/reference/images/full_cream.gif =================================================================== (Binary files differ) Deleted: branches/2.1.x/nhibernate/doc/reference/images/full_cream.svg =================================================================== --- branches/2.1.x/nhibernate/doc/reference/images/full_cream.svg 2009-07-13 18:32:18 UTC (rev 4606) +++ branches/2.1.x/nhibernate/doc/reference/images/full_cream.svg 2009-07-13 22:32:35 UTC (rev 4607) @@ -1,429 +0,0 @@ -<?xml version="1.0" standalone="no"?> -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" -"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd" -[ - <!ATTLIST svg - xmlns:xlink CDATA #FIXED "http://www.w3.org/1999/xlink"> -]> -<!-- Created with Sodipodi ("http://www.sodipodi.com/") --> -<svg - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - width="354.331" - height="336.614" - id="svg1"> - <defs - id="defs3"> - <linearGradient - x1="0" - y1="0" - x2="1" - y2="0" - id="linearGradient127" - gradientUnits="objectBoundingBox" - spreadMethod="pad"> - <stop - style="stop-color:#000000;stop-opacity:1;" - offset="0" - id="stop128" /> - <stop - style="stop-color:#ffffff;stop-opacity:1;" - offset="1" - id="stop129" /> - </linearGradient> - <linearGradient - x1="0" - y1="0" - x2="1" - y2="0" - id="linearGradient130" - xlink:href="#linearGradient127" - gradientUnits="objectBoundingBox" - spreadMethod="pad" /> - <radialGradient - cx="0.5" - cy="0.5" - fx="0.5" - fy="0.5" - r="0.5" - id="radialGradient131" - xlink:href="#linearGradient127" - gradientUnits="objectBoundingBox" - spreadMethod="pad" /> - </defs> - <g - transform="matrix(0.823795,0,0,0.823795,0.120302,5.25349)" - style="font-size:12;" - id="g659"> - <rect - width="212.257" - height="57.2441" - x="17.9576" - y="100.132" - style="fill:#757575;fill-rule:evenodd;stroke-width:1pt;" - id="rect137" /> - <rect - width="285.502" - height="118.523" - x="13.4238" - y="95.9309" - transform="matrix(0.743454,0,0,0.482981,6.46949,52.2178)" - style="fill:#d2d2d2;fill-rule:evenodd;stroke-width:1pt;" - id="rect132" /> - </g> - <rect - width="325.86" - height="63.6537" - x="17.4083" - y="15.194" - style="font-size:12;fill:#757575;fill-rule:evenodd;stroke-width:1pt;" - id="rect136" /> - <rect - width="325.86" - height="63.6537" - x="13.6713" - y="12.4966" - style="font-size:12;fill:#d2d2d2;fill-rule:evenodd;stroke-width:1pt;" - id="rect126" /> - <g - transform="matrix(1.14345,0,0,0.729078,-1.67818,105.325)" - style="font-size:12;" - id="g164"> - <rect - width="285.502" - height="77.2688" - x="16.6979" - y="222.966" - style="fill:#757575;fill-rule:evenodd;stroke-width:1pt;" - id="rect138" /> - <rect - width="285.502" - height="77.2688" - x="14.7335" - y="221.002" - transform="translate(-1.30962,-1.30992)" - style="fill:#d2d2d2;fill-rule:evenodd;stroke-width:1pt;" - id="rect133" /> - </g> - <text - x="170.824753" - y="58.402939" - transform="scale(0.823795,0.823795)" - style="font-size:18;font-weight:normal;stroke-width:1pt;font-family:Helvetica;" - id="text183"> - <tspan - x="170.824997" - y="58.402901" - id="tspan360"> -Application</tspan> - </text> - <text - x="178.076340" - y="364.281433" - transform="scale(0.823795,0.823795)" - style="font-size:18;font-weight:normal;stroke-width:1pt;font-family:Helvetica;" - id="text197"> - <tspan - x="178.076004" - y="364.281006" - id="tspan421"> -Database</tspan> - </text> - <text - x="68.605331" - y="138.524582" - transform="scale(0.823795,0.823795)" - style="font-size:16;font-weight:normal;stroke-width:1pt;font-family:Helvetica;" - id="text216"> - <tspan - x="68.605301" - y="138.524994" - id="tspan384"> -SessionFactory</tspan> - </text> - <rect - width="67.0014" - height="101.35" - x="196.927" - y="89.2389" - style="font-size:12;fill:#757575;fill-rule:evenodd;stroke-width:1pt;" - id="rect387" /> - <rect - width="67.0014" - height="101.35" - x="194.633" - y="86.4389" - style="font-size:12;fill:#d2d2d2;fill-rule:evenodd;stroke-width:1pt;" - id="rect388" /> - <text - x="249.108841" - y="173.885559" - transform="scale(0.823795,0.823795)" - style="font-size:16;font-weight:normal;stroke-width:1pt;font-family:Helvetica;" - id="text389"> - <tspan - x="249.108994" - y="173.886002" - id="tspan392"> -Session</tspan> - </text> - <rect - width="73.0355" - height="101.35" - x="270.995" - y="90.0018" - style="font-size:12;fill:#757575;fill-rule:evenodd;stroke-width:1pt;" - id="rect395" /> - <rect - width="73.0355" - height="101.35" - x="267.869" - y="87.2018" - style="font-size:12;fill:#d2d2d2;fill-rule:evenodd;stroke-width:1pt;" - id="rect396" /> - <text - x="328.593658" - y="174.715622" - transform="scale(0.823795,0.823795)" - style="font-size:16;font-weight:normal;stroke-width:1pt;font-family:Helvetica;" - id="text397"> - <tspan - x="328.593994" - y="174.716003" - id="tspan563"> -Transaction</tspan> - </text> - <g - transform="matrix(0.29544,0,0,0.397877,9.70533,103.96)" - style="font-size:12;" - id="g565"> - <rect - width="285.502" - height="118.523" - x="16.6979" - y="99.2053" - style="fill:#757575;fill-rule:evenodd;stroke-width:1pt;" - id="rect566" /> - <rect - width="285.502" - height="118.523" - x="13.4238" - y="95.9309" - style="fill:#d2d2d2;fill-rule:evenodd;stroke-width:1pt;" - id="rect567" /> - </g> - <text - x="25.592752" - y="204.497803" - transform="scale(0.823795,0.823795)" - style="font-size:10;font-weight:normal;stroke-width:1pt;font-family:Helvetica;" - id="text568"> - <tspan - x="25.592800" - y="204.498001" - id="tspan662"> -TransactionFactory</tspan> - </text> - <g - transform="matrix(0.298082,0,0,0.397877,99.6898,103.96)" - style="font-size:12;" - id="g573"> - <rect - width="285.502" - height="118.523" - x="16.6979" - y="99.2053" - style="fill:#757575;fill-rule:evenodd;stroke-width:1pt;" - id="rect574" /> - <rect - width="285.502" - height="118.523" - x="13.4238" - y="95.9309" - style="fill:#d2d2d2;fill-rule:evenodd;stroke-width:1pt;" - id="rect575" /> - </g> - <text - x="134.030670" - y="205.532791" - transform="scale(0.823795,0.823795)" - style="font-size:10;font-weight:normal;stroke-width:1pt;font-family:Helvetica;" - id="text576"> - <tspan - x="134.031006" - y="205.533005" - id="tspan664"> -ConnectionProvider</tspan> - </text> - <g - transform="matrix(1.14345,0,0,0.729078,-1.67818,38.9539)" - style="font-size:12;" - id="g587"> - <rect - width="285.502" - height="77.2688" - x="16.6979" - y="222.966" - style="fill:#757575;fill-rule:evenodd;stroke-width:1pt;" - id="rect588" /> - <rect - width="285.502" - height="77.2688" - x="14.7335" - y="221.002" - transform="translate(-1.30962,-1.30992)" - style="fill:#d2d2d2;fill-rule:evenodd;stroke-width:1pt;" - id="rect589" /> - </g> - <rect - width="90.951" - height="44.4829" - x="25.6196" - y="206.028" - style="font-size:12;fill:#757575;fill-rule:evenodd;stroke-width:1pt;" - id="rect594" /> - <rect - width="90.951" - height="44.4829" - x="24.4229" - y="204.135" - style="font-size:12;fill:#b3b3b3;fill-rule:evenodd;stroke-width:1pt;" - id="rect595" /> - <text - x="85.575645" - y="282.300354" - transform="scale(0.823795,0.823795)" - style="font-size:18;font-weight:normal;stroke-width:1pt;font-family:Helvetica;text-anchor:middle;" - id="text596"> - <tspan - x="85.575600" - y="282.299988" - id="tspan607"> -JNDI</tspan> - </text> - <rect - width="90.951" - height="44.4829" - x="236.937" - y="206.791" - style="font-size:12;fill:#757575;fill-rule:evenodd;stroke-width:1pt;" - id="rect610" /> - <rect - width="90.951" - height="44.4829" - x="235.741" - y="204.898" - style="font-size:12;fill:#b3b3b3;fill-rule:evenodd;stroke-width:1pt;" - id="rect611" /> - <text - x="342.093201" - y="283.226410" - transform="scale(0.823795,0.823795)" - style="font-size:18;font-weight:normal;stroke-width:1pt;font-family:Helvetica;text-anchor:middle;" - id="text612"> - <tspan - x="342.092987" - y="283.226013" - id="tspan621"> -JTA</tspan> - </text> - <rect - width="90.951" - height="44.4829" - x="130.134" - y="206.791" - style="font-size:12;fill:#757575;fill-rule:evenodd;stroke-width:1pt;" - id="rect616" /> - <rect - width="90.951" - height="44.4829" - x="128.937" - y="204.898" - style="font-size:12;fill:#b3b3b3;fill-rule:evenodd;stroke-width:1pt;" - id="rect617" /> - <text - x="212.445343" - y="283.226410" - transform="scale(0.823795,0.823795)" - style="font-size:18;font-weight:normal;stroke-width:1pt;font-family:Helvetica;text-anchor:middle;" - id="text618"> - <tspan - x="212.445007" - y="283.226013" - id="tspan623"> -JDBC</tspan> - </text> - <g - transform="matrix(0.823795,0,0,0.823795,0.120302,6.19341)" - style="font-size:12;" - id="g637"> - <g - transform="matrix(0.499515,0,0,0.415467,-0.237339,5.61339)" - id="g167"> - <rect - width="199.065" - height="61.5532" - x="61.8805" - y="68.4288" - style="fill:#757575;fill-rule:evenodd;stroke-width:1pt;" - id="rect134" /> - <rect - width="199.065" - height="61.5532" - x="59.2613" - y="65.8095" - style="fill:#e0e0e0;fill-rule:evenodd;stroke-width:1pt;" - id="rect135" /> - </g> - <text - x="33.749969" - y="50.589706" - style="font-size:11;font-weight:normal;stroke-width:1pt;font-family:Helvetica;" - id="text188"> - <tspan - x="33.750000" - y="50.589699" - id="tspan635"> -Transient Objects</tspan> - </text> - </g> - <g - transform="matrix(0.823795,0,0,0.823795,0.120302,5.25349)" - style="font-size:12;" - id="g644"> - <g - transform="matrix(0.297486,0,0,0.516482,230.251,36.9178)" - id="g364"> - <rect - width="199.065" - height="61.5532" - x="61.8805" - y="68.4288" - style="fill:#757575;fill-rule:evenodd;stroke-width:1pt;" - id="rect365" /> - <rect - width="199.065" - height="61.5532" - x="59.2613" - y="65.8095" - style="fill:#e0e0e0;fill-rule:evenodd;stroke-width:1pt;" - id="rect366" /> - </g> - <text - x="277.123230" - y="85.155571" - style="font-size:11;font-weight:normal;stroke-width:1pt;font-family:Helvetica;text-anchor:middle;" - id="text367"> - <tspan - x="277.122986" - y="85.155602" - id="tspan631"> -Persistent</tspan> - <tspan - x="277.122986" - y="96.155602" - id="tspan633"> -Objects</tspan> - </text> - </g> -</svg> Added: branches/2.1.x/nhibernate/doc/reference/images/fullcream.png =================================================================== (Binary files differ) Property changes on: branches/2.1.x/nhibernate/doc/reference/images/fullcream.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: branches/2.1.x/nhibernate/doc/reference/images/hibernate_logo_a.png =================================================================== (Binary files differ) Deleted: branches/2.1.x/nhibernate/doc/reference/images/lite.gif =================================================================== (Binary files differ) Added: branches/2.1.x/nhibernate/doc/reference/images/lite.png =================================================================== (Binary files differ) Property changes on: branches/2.1.x/nhibernate/doc/reference/images/lite.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: branches/2.1.x/nhibernate/doc/reference/images/lite.svg =================================================================== --- branches/2.1.x/nhibernate/doc/reference/images/lite.svg 2009-07-13 18:32:18 UTC (rev 4606) +++ branches/2.1.x/nhibernate/doc/reference/images/lite.svg 2009-07-13 22:32:35 UTC (rev 4607) @@ -1,334 +0,0 @@ -<?xml version="1.0" standalone="no"?> -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" -"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd" -[ - <!ATTLIST svg - xmlns:xlink CDATA #FIXED "http://www.w3.org/1999/xlink"> -]> -<!-- Created with Sodipodi ("http://www.sodipodi.com/") --> -<svg - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - width="318.898" - height="248.031" - id="svg1"> - <defs - id="defs3"> - <linearGradient - x1="0" - y1="0" - x2="1" - y2="0" - id="linearGradient127" - gradientUnits="objectBoundingBox" - spreadMethod="pad"> - <stop - style="stop-color:#000000;stop-opacity:1;" - offset="0" - id="stop128" /> - <stop - style="stop-color:#ffffff;stop-opacity:1;" - offset="1" - id="stop129" /> - </linearGradient> - <linearGradient - x1="0" - y1="0" - x2="1" - y2="0" - id="linearGradient130" - xlink:href="#linearGradient127" - gradientUnits="objectBoundingBox" - spreadMethod="pad" /> - <radialGradient - cx="0.5" - cy="0.5" - fx="0.5" - fy="0.5" - r="0.5" - id="radialGradient131" - xlink:href="#linearGradient127" - gradientUnits="objectBoundingBox" - spreadMethod="pad" /> - </defs> - <rect - width="291.837" - height="57.0074" - x="17.3169" - y="18.646" - style="font-size:12;fill:#757575;fill-rule:evenodd;stroke-width:1pt;" - id="rect136" /> - <rect - width="291.837" - height="57.0074" - x="13.9703" - y="16.2302" - style="font-size:12;fill:#d2d2d2;fill-rule:evenodd;stroke-width:1pt;" - id="rect126" /> - <g - transform="matrix(0.326107,0,0,0.765831,9.59261,8.98517)" - style="font-size:12;" - id="g161"> - <rect - width="285.502" - height="118.523" - x="16.6979" - y="99.2053" - style="fill:#757575;fill-rule:evenodd;stroke-width:1pt;" - id="rect137" /> - <rect - width="285.502" - height="118.523" - x="13.4238" - y="95.9309" - style="fill:#d2d2d2;fill-rule:evenodd;stroke-width:1pt;" - id="rect132" /> - </g> - <g - transform="matrix(1.02406,0,0,0.652953,0.223384,39.9254)" - style="font-size:12;" - id="g164"> - <rect - width="285.502" - height="77.2688" - x="16.6979" - y="222.966" - style="fill:#757575;fill-rule:evenodd;stroke-width:1pt;" - id="rect138" /> - <rect - width="285.502" - height="77.2688" - x="14.7335" - y="221.002" - transform="translate(-1.30962,-1.30992)" - style="fill:#d2d2d2;fill-rule:evenodd;stroke-width:1pt;" - id="rect133" /> - </g> - <g - transform="matrix(0.449834,0,0,0.338463,-3.15909,9.73319)" - style="font-size:12;" - id="g167"> - <rect - width="199.065" - height="61.5532" - x="61.8805" - y="68.4288" - style="fill:#757575;fill-rule:evenodd;stroke-width:1pt;" - id="rect134" /> - <rect - width="199.065" - height="61.5532" - x="59.2613" - y="65.8095" - style="fill:#e0e0e0;fill-rule:evenodd;stroke-width:1pt;" - id="rect135" /> - </g> - <text - x="302.277679" - y="65.943230" - transform="scale(0.73778,0.73778)" - style="font-size:18;font-weight:normal;stroke-width:1pt;font-family:Helvetica;" - id="text183"> - <tspan - x="302.277954" - y="65.943184" - id="tspan360"> -Application</tspan> - </text> - <text - x="36.235924" - y="63.796055" - transform="scale(0.73778,0.73778)" - style="font-size:14;font-weight:normal;stroke-width:1pt;font-family:Helvetica;" - id="text188"> - <tspan - x="36.235950" - y="63.796051" - id="tspan427"> -Transient Objects</tspan> - </text> - <text - x="180.416245" - y="290.543701" - transform="scale(0.73778,0.73778)" - style="font-size:18;font-weight:normal;stroke-width:1pt;font-family:Helvetica;" - id="text197"> - <tspan - x="180.415939" - y="290.543549" - id="tspan421"> -Database</tspan> - </text> - <text - x="25.037701" - y="179.154755" - transform="scale(0.73778,0.73778)" - style="font-size:16;font-weight:normal;stroke-width:1pt;font-family:Helvetica;" - id="text216"> - <tspan - x="25.037655" - y="179.154648" - id="tspan384"> -SessionFactory</tspan> - </text> - <g - transform="matrix(0.252763,0,0,0.765831,109.104,8.98517)" - style="font-size:12;" - id="g386"> - <rect - width="285.502" - height="118.523" - x="16.6979" - y="99.2053" - style="fill:#757575;fill-rule:evenodd;stroke-width:1pt;" - id="rect387" /> - <rect - width="285.502" - height="118.523" - x="13.4238" - y="95.9309" - style="fill:#d2d2d2;fill-rule:evenodd;stroke-width:1pt;" - id="rect388" /> - </g> - <g - transform="matrix(0.297394,0,0,0.572692,101.502,21.6359)" - style="font-size:12;" - id="g364"> - <rect - width="199.065" - height="61.5532" - x="61.8805" - y="68.4288" - style="fill:#757575;fill-rule:evenodd;stroke-width:1pt;" - id="rect365" /> - <rect - width="199.065" - height="61.5532" - x="59.2613" - y="65.8095" - style="fill:#e0e0e0;fill-rule:evenodd;stroke-width:1pt;" - id="rect366" /> - </g> - <text - x="202.746506" - y="102.992203" - transform="scale(0.73778,0.73778)" - style="font-size:14;font-weight:normal;stroke-width:1pt;font-family:Helvetica;text-anchor:middle;" - id="text367"> - <tspan - x="202.746948" - y="102.992249" - id="tspan423"> -Persistent</tspan> - <tspan - x="202.746948" - y="116.992355" - id="tspan425"> -Objects</tspan> - </text> - <text - x="174.458496" - y="180.080795" - transform="scale(0.73778,0.73778)" - style="font-size:16;font-weight:normal;stroke-width:1pt;font-family:Helvetica;" - id="text389"> - <tspan - x="174.458618" - y="180.080338" - id="tspan392"> -Session</tspan> - </text> - <g - transform="matrix(0.127369,0,0,0.765831,188.675,8.98517)" - style="font-size:12;" - id="g394"> - <rect - width="285.502" - height="118.523" - x="16.6979" - y="99.2053" - style="fill:#757575;fill-rule:evenodd;stroke-width:1pt;" - id="rect395" /> - <rect - width="285.502" - height="118.523" - x="13.4238" - y="95.9309" - style="fill:#d2d2d2;fill-rule:evenodd;stroke-width:1pt;" - id="rect396" /> - </g> - <text - x="260.413269" - y="179.154739" - transform="scale(0.73778,0.73778)" - style="font-size:16;font-weight:normal;stroke-width:1pt;font-family:Helvetica;" - id="text397"> - <tspan - x="260.412964" - y="179.154343" - id="tspan400"> -JDBC</tspan> - </text> - <g - transform="matrix(0.127369,0,0,0.765831,229.156,8.98517)" - style="font-size:12;" - id="g405"> - <rect - width="285.502" - height="118.523" - x="16.6979" - y="99.2053" - style="fill:#757575;fill-rule:evenodd;stroke-width:1pt;" - id="rect406" /> - <rect - width="285.502" - height="118.523" - x="13.4238" - y="95.9309" - style="fill:#d2d2d2;fill-rule:evenodd;stroke-width:1pt;" - id="rect407" /> - </g> - <text - x="320.606903" - y="179.154739" - transform="scale(0.73778,0.73778)" - style="font-size:16;font-weight:normal;stroke-width:1pt;font-family:Helvetica;" - id="text408"> - <tspan - x="320.606964" - y="179.154343" - id="tspan417"> -JNDI</tspan> - </text> - <g - transform="matrix(0.127369,0,0,0.765831,269.281,8.98517)" - style="font-size:12;" - id="g411"> - <rect - width="285.502" - height="118.523" - x="16.6979" - y="99.2053" - style="fill:#757575;fill-rule:evenodd;stroke-width:1pt;" - id="rect412" /> - <rect - width="285.502" - height="118.523" - x="13.4238" - y="95.9309" - style="fill:#d2d2d2;fill-rule:evenodd;stroke-width:1pt;" - id="rect413" /> - </g> - <text - x="377.096313" - y="179.154739" - transform="scale(0.73778,0.73778)" - style="font-size:16;font-weight:normal;stroke-width:1pt;font-family:Helvetica;" - id="text414"> - <tspan - x="377.096008" - y="179.154999" - id="tspan145"> -JTA</tspan> - </text> -</svg> Deleted: branches/2.1.x/nhibernate/doc/reference/images/overview.gif =================================================================== (Binary files differ) Added: branches/2.1.x/nhibernate/doc/reference/images/overview.png =================================================================== (Binary files differ) Property changes on: branches/2.1.x/nhibernate/doc/reference/images/overview.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: branches/2.1.x/nhibernate/doc/reference/images/overview.svg =================================================================== --- branches/2.1.x/nhibernate/doc/reference/images/overview.svg 2009-07-13 18:32:18 UTC (rev 4606) +++ branches/2.1.x/nhibernate/doc/reference/images/overview.svg 2009-07-13 22:32:35 UTC (rev 4607) @@ -1,250 +0,0 @@ -<?xml version="1.0" standalone="no"?> -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" -"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd" -[ - <!ATTLIST svg - xmlns:xlink CDATA #FIXED "http://www.w3.org/1999/xlink"> -]> -<!-- Created with Sodipodi ("http://www.sodipodi.com/") --> -<svg - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - width="248.031" - height="248.031" - id="svg1"> - <defs - id="defs3"> - <linearGradient - x1="0" - y1="0" - x2="1" - y2="0" - id="linearGradient127" - gradientUnits="objectBoundingBox" - spreadMethod="pad"> - <stop - style="stop-color:#000000;stop-opacity:1;" - offset="0" - id="stop128" /> - <stop - style="stop-color:#ffffff;stop-opacity:1;" - offset="1" - id="stop129" /> - </linearGradient> - <linearGradient - x1="0" - y1="0" - x2="1" - y2="0" - id="linearGradient130" - xlink:href="#linearGradient127" - gradientUnits="objectBoundingBox" - spreadMethod="pad" /> - <radialGradient - cx="0.5" - cy="0.5" - fx="0.5" - fy="0.5" - r="0.5" - id="radialGradient131" - xlink:href="#linearGradient127" - gradientUnits="objectBoundingBox" - spreadMethod="pad" /> - </defs> - <g - transform="matrix(0.771934,0,0,0.771934,4.36019,-3.02123)" - style="font-size:12;" - id="g158"> - <rect - width="285.502" - height="77.2688" - x="16.6979" - y="17.3527" - style="fill:#757575;fill-rule:evenodd;stroke-width:1pt;" - id="rect136" /> - <rect - width="285.502" - height="77.2688" - x="14.7335" - y="15.3883" - transform="translate(-1.30962,-1.30992)" - style="fill:#d2d2d2;fill-rule:evenodd;stroke-width:1pt;" - id="rect126" /> - </g> - <g - transform="matrix(0.771934,0,0,0.771934,4.36019,3.04452)" - style="font-size:12;" - id="g161"> - <rect - width="285.502" - height="118.523" - x="16.6979" - y="99.2053" - style="fill:#757575;fill-rule:evenodd;stroke-width:1pt;" - id="rect137" /> - <rect - width="285.502" - height="118.523" - x="13.4238" - y="95.9309" - style="fill:#d2d2d2;fill-rule:evenodd;stroke-width:1pt;" - id="rect132" /> - </g> - <g - transform="matrix(0.771934,0,0,0.771934,4.36019,8.0993)" - style="font-size:12;" - id="g164"> - <rect - width="285.502" - height="77.2688" - x="16.6979" - y="222.966" - style="fill:#757575;fill-rule:evenodd;stroke-width:1pt;" - id="rect138" /> - <rect - width="285.502" - height="77.2688" - x="14.7335" - y="221.002" - transform="translate(-1.30962,-1.30992)" - style="fill:#d2d2d2;fill-rule:evenodd;stroke-width:1pt;" - id="rect133" /> - </g> - <g - transform="matrix(0.771934,0,0,0.543505,2.59104,21.1103)" - style="font-size:12;" - id="g167"> - <rect - width="199.065" - height="61.5532" - x="61.8805" - y="68.4288" - style="fill:#757575;fill-rule:evenodd;stroke-width:1pt;" - id="rect134" /> - <rect - width="199.065" - height="61.5532" - x="59.2613" - y="65.8095" - style="fill:#e0e0e0;fill-rule:evenodd;stroke-width:1pt;" - id="rect135" /> - </g> - <text - x="105.392174" - y="56.568123" - transform="scale(0.771934,0.771934)" - style="font-size:24;font-weight:normal;stroke-width:1pt;font-family:Helvetica;" - id="text183"> - <tspan - x="105.392273" - y="56.568146" - id="tspan186"> -Application</tspan> - </text> - <text - x="81.820183" - y="103.149330" - transform="scale(0.771934,0.771934)" - style="font-size:20;font-weight:normal;stroke-width:1pt;font-family:Helvetica;" - id="text188"> - <tspan - x="81.820213" - y="103.149727" - id="tspan206"> -Persistent Objects</tspan> - </text> - <text - x="111.548180" - y="278.927887" - transform="scale(0.771934,0.771934)" - style="font-size:24;font-weight:normal;stroke-width:1pt;font-family:Helvetica;" - id="text197"> - <tspan - x="111.547874" - y="278.927551" - id="tspan200"> -Database</tspan> - </text> - <text - x="94.436180" - y="153.805740" - transform="scale(0.771934,0.771934)" - style="font-size:24;font-weight:normal;stroke-width:1pt;font-family:Helvetica;" - id="text216"> - <tspan - x="94.436180" - y="153.805740" - id="tspan221"> -HIBERNATE</tspan> - </text> - <g - transform="matrix(0.771934,0,0,0.771934,2.59083,1.02261)" - style="font-size:12;" - id="g254"> - <g - transform="translate(4.58374,2.61928)" - id="g176"> - <g - transform="matrix(0.571429,0,0,0.67347,-10.6174,117.093)" - id="g170"> - <rect - width="199.065" - height="61.5532" - x="61.8805" - y="68.4288" - style="fill:#757575;fill-rule:evenodd;stroke-width:1pt;" - id="rect171" /> - <rect - width="199.065" - height="61.5532" - x="59.2613" - y="65.8095" - style="fill:#e0e0e0;fill-rule:evenodd;stroke-width:1pt;" - id="rect172" /> - </g> - <g - transform="matrix(0.571429,0,0,0.67347,138.682,117.093)" - id="g173"> - <rect - width="199.065" - height="61.5532" - x="61.8805" - y="68.4288" - style="fill:#757575;fill-rule:evenodd;stroke-width:1pt;" - id="rect174" /> - <rect - width="199.065" - height="61.5532" - x="59.2613" - y="65.8095" - style="fill:#e0e0e0;fill-rule:evenodd;stroke-width:1pt;" - id="rect175" /> - </g> - </g> - <text - x="47.259438" - y="182.367538" - style="font-weight:bold;stroke-width:1pt;font-family:Courier;" - id="text191"> - <tspan - x="47.259399" - y="182.367996" - id="tspan212"> -hibernate.</tspan> - <tspan - x="47.259399" - y="194.367996" - id="tspan214"> -properties</tspan> - </text> - <text - x="198.523010" - y="188.260941" - style="font-weight:normal;stroke-width:1pt;font-family:helvetica;" - id="text194"> - <tspan - id="tspan195"> -XML Mapping</tspan> - </text> - </g> -</svg> Modified: branches/2.1.x/nhibernate/doc/reference/master.xml =================================================================== --- branches/2.1.x/nhibernate/doc/reference/master.xml 2009-07-13 18:32:18 UTC (rev 4606) +++ branches/2.1.x/nhibernate/doc/reference/master.xml 2009-07-13 22:32:35 UTC (rev 4607) @@ -36,7 +36,7 @@ <bookinfo> <title>NHibernate - Relational Persistence for Idiomatic .NET</title> <subtitle>NHibernate Reference Documentation</subtitle> - <releaseinfo>2.0.0</releaseinfo> + <releaseinfo>2.1.0</releaseinfo> </bookinfo> <toc /> Modified: branches/2.1.x/nhibernate/doc/reference/modules/architecture.xml =================================================================== --- branches/2.1.x/nhibernate/doc/reference/modules/architecture.xml 2009-07-13 18:32:18 UTC (rev 4606) +++ branches/2.1.x/nhibernate/doc/reference/modules/architecture.xml 2009-07-13 22:32:35 UTC (rev 4607) @@ -11,13 +11,13 @@ <mediaobject> <imageobject role="fo"> - <imagedata fileref="images/overview.svg" format="SVG" align="center"/> + <imagedata fileref="images/overview.png" format="PNG" align="center"/> </imageobject> <imageobject role="html"> - <imagedata fileref="../shared/images/overview.gif" format="GIF" align="center"/> + <imagedata fileref="../shared/images/overview.png" format="PNG" align="center"/> </imageobject> <imageobject role="chm"> - <imagedata fileref="shared/images/overview.gif" format="GIF" align="center"/> + <imagedata fileref="shared/images/overview.png" format="PNG" align="center"/> </imageobject> </mediaobject> @@ -36,13 +36,13 @@ <mediaobject> <imageobject role="fo"> - <imagedata fileref="images/lite.svg" format="SVG" align="center"/> + <imagedata fileref="images/lite.png" format="PNG" align="center"/> </imageobject> <imageobject role="html"> - <imagedata fileref="../shared/images/lite.gif" format="GIF" align="center"/> + <imagedata fileref="../shared/images/lite.png" format="PNG" align="center"/> </imageobject> <imageobject role="chm"> - <imagedata fileref="shared/images/lite.gif" format="GIF" align="center"/> + <imagedata fileref="shared/images/lite.png" format="PNG" align="center"/> </imageobject> </mediaobject> @@ -53,13 +53,13 @@ <mediaobject> <imageobject role="fo"> - <imagedata fileref="images/full_cream.svg" format="SVG" align="center"/> + <imagedata fileref="images/fullcream.png" format="PNG" align="center"/> </imageobject> <imageobject role="html"> - <imagedata fileref="../shared/images/full_cream.gif" format="GIF" align="center"/> + <imagedata fileref="../shared/images/fullcream.png" format="PNG" align="center"/> </imageobject> <imageobject role="chm"> - <imagedata fileref="shared/images/full_cream.gif" format="GIF" align="center"/> + <imagedata fileref="shared/images/fullcream.png" format="PNG" align="center"/> </imageobject> </mediaobject> Modified: branches/2.1.x/nhibernate/doc/reference/modules/example_mappings.xml =================================================================== --- branches/2.1.x/nhibernate/doc/reference/modules/example_mappings.xml 2009-07-13 18:32:18 UTC (rev 4606) +++ branches/2.1.x/nhibernate/doc/reference/modules/example_mappings.xml 2009-07-13 22:32:35 UTC (rev 4607) @@ -18,13 +18,13 @@ <mediaobject> <imageobject role="fo"> - <imagedata fileref="images/EmployerEmployee.gif" format="GIF" align="center"/> + <imagedata fileref="images/EmployerEmployee.png" format="PNG" align="center"/> </imageobject> <imageobject role="html"> - <imagedata fileref="../shared/images/EmployerEmployee.gif" format="GIF" align="center"/> + <imagedata fileref="../shared/images/EmployerEmployee.png" format="PNG" align="center"/> </imageobject> <imageobject role="chm"> - <imagedata fileref="shared/images/EmployerEmployee.gif" format="GIF" align="center"/> + <imagedata fileref="shared/images/EmployerEmployee.png" format="PNG" align="center"/> </imageobject> </mediaobject> Modified: branches/2.1.x/nhibernate/doc/reference/styles/fopdf.xsl =================================================================== --- branches/2.1.x/nhibernate/doc/reference/styles/fopdf.xsl 2009-07-13 18:32:18 UTC (rev 4606) +++ branches/2.1.x/nhibernate/doc/reference/styles/fopdf.xsl 2009-07-13 22:32:35 UTC (rev 4607) @@ -41,7 +41,7 @@ <fo:table-row> <fo:table-cell text-align="center"> <fo:block> - <fo:external-graphic src="file:images/hibernate_logo_a.png"/> + <fo:external-graphic src="file:images/nhibernate_logo_a.png"/> </fo:block> <fo:block font-family="Helvetica" font-size="22pt" padding-before="10mm"> <xsl:value-of select="bookinfo/subtitle"/> Modified: branches/2.1.x/nhibernate/src/NHibernate/ISession.cs =================================================================== --- branches/2.1.x/nhibernate/src/NHibernate/ISession.cs 2009-07-13 18:32:18 UTC (rev 4606) +++ branches/2.1.x/nhibernate/src/NHibernate/ISession.cs 2009-07-13 22:32:35 UTC (rev 4607) @@ -8,7 +8,7 @@ namespace NHibernate { /// <summary> - /// The main runtime interface between a Java application and Hibernate. This is the central + /// The main runtime interface between a .NET application and NHibernate. This is the central /// API class abstracting the notion of a persistence service. /// </summary> /// <remarks> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fab...@us...> - 2009-07-14 22:46:03
|
Revision: 4631 http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4631&view=rev Author: fabiomaulo Date: 2009-07-14 22:46:00 +0000 (Tue, 14 Jul 2009) Log Message: ----------- - Actualization of some build tasks for documentation - changed task about NDoc to use SandCastle Modified Paths: -------------- branches/2.1.x/nhibernate/default.build branches/2.1.x/nhibernate/doc/documentation.build branches/2.1.x/nhibernate/doc/reference/reference.build Added Paths: ----------- branches/2.1.x/nhibernate/doc/NHibernate.shfbproj.template Property Changed: ---------------- branches/2.1.x/nhibernate/doc/ Modified: branches/2.1.x/nhibernate/default.build =================================================================== --- branches/2.1.x/nhibernate/default.build 2009-07-14 19:00:35 UTC (rev 4630) +++ branches/2.1.x/nhibernate/default.build 2009-07-14 22:46:00 UTC (rev 4631) @@ -154,6 +154,11 @@ description="Builds the Help Documentation"> <nant buildfile="doc/documentation.build" target="manual" /> </target> + + <target name="api" depends="init binaries" + description="Builds the API Documentation"> + <nant buildfile="doc/documentation.build" target="api" /> + </target> <target name="build-all-frameworks" depends="init"> <!-- Save the current framework --> @@ -297,7 +302,7 @@ <nant buildfile="src/NHibernate.Setup/NHibernate.Setup.build" target="msi" /> </target> - <target name="package" depends="init set-release-project-configuration test binaries manual sources-zip binaries-zip" + <target name="package" depends="init binaries manual sources-zip binaries-zip" description="Creates files for the File Release System on SourceForge"> <property name="dist.output.dir" value="${project::get-base-directory()}/build/" /> Property changes on: branches/2.1.x/nhibernate/doc ___________________________________________________________________ Modified: svn:ignore - build NHibernate.ndoc + NHibernate.ndoc NHibernate.shfbproj build Added: branches/2.1.x/nhibernate/doc/NHibernate.shfbproj.template =================================================================== --- branches/2.1.x/nhibernate/doc/NHibernate.shfbproj.template (rev 0) +++ branches/2.1.x/nhibernate/doc/NHibernate.shfbproj.template 2009-07-14 22:46:00 UTC (rev 4631) @@ -0,0 +1,42 @@ +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5"> + <PropertyGroup> + <!-- The configuration and platform will be used to determine which + assemblies to include from solution and project documentation + sources --> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <SchemaVersion>2.0</SchemaVersion> + <ProjectGuid>{91f431cd-23fb-4ed4-a690-0344073c65f0}</ProjectGuid> + <SHFBSchemaVersion>1.8.0.0</SHFBSchemaVersion> + <!-- AssemblyName, Name, and RootNamespace are not used by SHFB but Visual + Studio adds them anyway --> + <AssemblyName>Documentation</AssemblyName> + <RootNamespace>Documentation</RootNamespace> + <Name>Documentation</Name> + <!-- SHFB properties --> + <OutputPath>${doc.out.dir}</OutputPath> + <HtmlHelpName>NHibernateAPI</HtmlHelpName> + <HelpFileFormat>HtmlHelp1x</HelpFileFormat> + <CopyrightText>NHibernate</CopyrightText> + <CopyrightHref>www.nhforge.org</CopyrightHref> + <FeedbackEMailAddress>http://groups.google.com/group/nhibernate-development</FeedbackEMailAddress> + <FeedbackEMailLinkText>nhibernate team</FeedbackEMailLinkText> + <HelpTitle>NHibernate API Reference</HelpTitle> + <IndentHtml>False</IndentHtml> + <HelpFileVersion>${project.version.numeric}</HelpFileVersion> + <DocumentationSources> + <DocumentationSource sourceFile="${bin.dir}/Iesi.Collections.dll" /> + <DocumentationSource sourceFile="${bin.dir}/Iesi.Collections.xml" /> + <DocumentationSource sourceFile="${bin.dir}/NHibernate.dll" /> + <DocumentationSource sourceFile="${bin.dir}/Nhibernate.xml" /> + </DocumentationSources> + </PropertyGroup> + <!-- There are no properties for these two groups but they need to appear in + order for Visual Studio to perform the build. --> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + </PropertyGroup> + <!-- Import the SHFB build targets --> + <Import Project="$(SHFBROOT)\SandcastleHelpFileBuilder.targets" /> +</Project> \ No newline at end of file Modified: branches/2.1.x/nhibernate/doc/documentation.build =================================================================== --- branches/2.1.x/nhibernate/doc/documentation.build 2009-07-14 19:00:35 UTC (rev 4630) +++ branches/2.1.x/nhibernate/doc/documentation.build 2009-07-14 22:46:00 UTC (rev 4631) @@ -21,7 +21,7 @@ <target name="clean" depends="init"> <nant target="clean" buildfile="reference/reference.build" /> <delete dir="${doc.out.dir}" /> - <delete file="NHibernate.ndoc" /> + <delete file="NHibernate.shfbproj" /> </target> <target name="manual" depends="init"> @@ -33,15 +33,15 @@ </nant> </target> - <target name="ndoc-project" depends="init"> - <copy file="NHibernate.ndoc.in" tofile="NHibernate.ndoc" overwrite="true"> + <target name="apidocbuilder-project" depends="init"> + <copy file="NHibernate.shfbproj.template" tofile="NHibernate.shfbproj" overwrite="true"> <filterchain> <expandproperties /> </filterchain> </copy> </target> - <target name="api" depends="init ndoc-project" description="Generates the API documentation (in MSDN style and VS.NET 2003 if available)"> + <target name="api" depends="init apidocbuilder-project" description="Generates the API documentation (in MSDN style and VS.NET 2005 if available)"> <uptodate property="api.uptodate"> <sourcefiles> <include name="${bin.dir}/*.dll" /> @@ -56,15 +56,10 @@ <echo if="${api.uptodate}">API documentation is up to date, skipping generation step.</echo> <if test="${not api.uptodate}"> - <property name="ndocconsole.exe" value="C:\net\NDoc2Alpha\NDocConsole.exe" /> - <exec program="${ndocconsole.exe}"> - <arg line="-documenter=MSDN-Help2" /> - <arg line="-project=NHibernate.ndoc" /> + <property name="apidocbuilder.exe" value="${directory::get-parent-directory(environment::get-folder-path('System'))}\Microsoft.NET\Framework\v3.5\MSBuild.exe" /> + <exec program="${apidocbuilder.exe}"> + <arg line="NHibernate.shfbproj" /> </exec> - <exec program="${ndocconsole.exe}"> - <arg line="-documenter=MSDN-CHM" /> - <arg line="-project=NHibernate.ndoc" /> - </exec> </if> </target> Modified: branches/2.1.x/nhibernate/doc/reference/reference.build =================================================================== --- branches/2.1.x/nhibernate/doc/reference/reference.build 2009-07-14 19:00:35 UTC (rev 4630) +++ branches/2.1.x/nhibernate/doc/reference/reference.build 2009-07-14 22:46:00 UTC (rev 4631) @@ -12,7 +12,7 @@ <property name="lang" value="en" /> <property name="output.dir" value="${build.dir}/doc" /> - <property name="output.html.basename" value="NHibernate.Documentation" /> + <property name="output.html.basename" value="NHibernate.Reference" /> <property name="output.help2.dir" value="${output.dir}/help2" /> <property name="build.html.dir" value="${output.dir}" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fab...@us...> - 2009-07-15 18:48:04
|
Revision: 4638 http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4638&view=rev Author: fabiomaulo Date: 2009-07-15 18:47:57 +0000 (Wed, 15 Jul 2009) Log Message: ----------- Adjusted tasks for release and GA release (now all automated) Modified Paths: -------------- branches/2.1.x/nhibernate/default.build branches/2.1.x/nhibernate/doc/documentation.build Added Paths: ----------- branches/2.1.x/nhibernate/Choose_Only_One.txt branches/2.1.x/nhibernate/GaRelease.bat branches/2.1.x/nhibernate/HowInstall.txt Added: branches/2.1.x/nhibernate/Choose_Only_One.txt =================================================================== --- branches/2.1.x/nhibernate/Choose_Only_One.txt (rev 0) +++ branches/2.1.x/nhibernate/Choose_Only_One.txt 2009-07-15 18:47:57 UTC (rev 4638) @@ -0,0 +1,2 @@ +You don't need all assemblies contained in this folder. +Choose only one system between available. \ No newline at end of file Added: branches/2.1.x/nhibernate/GaRelease.bat =================================================================== --- branches/2.1.x/nhibernate/GaRelease.bat (rev 0) +++ branches/2.1.x/nhibernate/GaRelease.bat 2009-07-15 18:47:57 UTC (rev 4638) @@ -0,0 +1 @@ +NAnt -D:project.config=release clean package \ No newline at end of file Added: branches/2.1.x/nhibernate/HowInstall.txt =================================================================== --- branches/2.1.x/nhibernate/HowInstall.txt (rev 0) +++ branches/2.1.x/nhibernate/HowInstall.txt 2009-07-15 18:47:57 UTC (rev 4638) @@ -0,0 +1,7 @@ +Required Bins : Minimal required assemblies to work with NHibernate + + +Required for LazyLoading : +NHibernate 2.1 has a new important feature regarding dynamic-proxy systems for lazy-loading +Details are available in releasenotes.txt and in this post +http://nhforge.org/blogs/nhibernate/archive/2008/11/09/nh2-1-0-bytecode-providers.aspx Modified: branches/2.1.x/nhibernate/default.build =================================================================== --- branches/2.1.x/nhibernate/default.build 2009-07-15 17:34:19 UTC (rev 4637) +++ branches/2.1.x/nhibernate/default.build 2009-07-15 18:47:57 UTC (rev 4638) @@ -150,11 +150,16 @@ <nant buildfile="doc/documentation.build" target="api manual" /> </target> - <target name="manual" depends="init binaries" - description="Builds the Help Documentation"> + <target name="reference" depends="init binaries" + description="Builds Reference Manual"> <nant buildfile="doc/documentation.build" target="manual" /> </target> + <target name="reference-zip" depends="init binaries" + description="Builds Reference Manual zip"> + <nant buildfile="doc/documentation.build" target="manual-zip" /> + </target> + <target name="api" depends="init binaries" description="Builds the API Documentation"> <nant buildfile="doc/documentation.build" target="api" /> @@ -245,91 +250,101 @@ </target> <target name="sources-zip" depends="init sources"> - <mkdir dir="${build.dir}/src" /> - <zip zipfile="${build.dir}/src/NHibernate-${project.version}-src.zip"> + <zip zipfile="${build.dir}/NHibernate-${project.version}-src.zip"> <fileset basedir="${source.tmpdir}"> <include name="**/*" /> </fileset> </zip> </target> - <target name="copy-release-notes" depends="init"> - <copy file="releasenotes.txt" todir="${build.dir}" /> - </target> - - <target name="copy-xml-schemas" depends="init"> - <!-- - TODO: Probably need to think of a better place for the XML schemas since - they are used by NHibernate and this build file. - --> - <copy todir="${build.dir}"> - <fileset basedir="src/NHibernate"> - <include name="nhibernate-mapping.xsd" /> - <include name="nhibernate-configuration.xsd" /> + <target name="binaries-zip" depends="init bin-pack"> + <zip zipfile="${build.dir}/NHibernate-${project.version}-bin.zip"> + <fileset basedir="${bin-pack.tmpdir}"> + <include name="**/*" /> </fileset> - </copy> + </zip> </target> - <target name="copy-config-templates" depends="init"> - <!-- - TODO: I don't like where these are put now. Should think of a better - place for these. - --> - <copy todir="${build.dir}/config.templates"> + <target name="bin-pack" depends="init binaries"> + <property name="bin-pack.tmpdir" value="${build.dir}/tmp-bin" /> + <property name="bin-pack.conf-template" value="${bin-pack.tmpdir}/Configuration_Templates" /> + <property name="bin-pack.required" value="${bin-pack.tmpdir}/Required_Bins" /> + <property name="bin-pack.requiredlazy" value="${bin-pack.tmpdir}/Required_For_LazyLoading" /> + <property name="bin-pack.tests" value="${bin-pack.tmpdir}/Tests" /> + + <copy file="releasenotes.txt" todir="${bin-pack.tmpdir}"/> + <copy file="readme.html" todir="${bin-pack.tmpdir}"/> + <copy file="lgpl.txt" todir="${bin-pack.tmpdir}"/> + <copy file="gfdl.txt" todir="${bin-pack.tmpdir}"/> + <copy file="HowInstall.txt" todir="${bin-pack.tmpdir}"/> + + <!--Configuration templates--> + <copy todir="${bin-pack.conf-template}"> <fileset basedir="src/NHibernate.Config.Templates"> <include name="*"/> </fileset> </copy> - </target> - - <target name="binaries-zip" depends="init binaries copy-release-notes copy-xml-schemas copy-config-templates"> - <zip zipfile="${build.dir}/bin/NHibernate-${project.version}-bin.zip"> - <fileset basedir="${build.dir}"> - <include name="releasenotes.txt" /> + + <!--Minimal Required Bins--> + <copy todir="${bin-pack.required}"> + <fileset basedir="src/NHibernate"> <include name="*.xsd" /> - <include name="bin/**" /> - - <exclude name="**/*.hbm.xml" /> - <exclude name="**/*.commandlog" /> - <exclude name="**/MyTest*" /> </fileset> - </zip> + </copy> + <copy todir="${bin-pack.required}"> + <fileset basedir="${bin.dir}"> + <include name="Antlr3.Runtime.dll" /> + <include name="Iesi.Collections.???" /> + <include name="log4net*" /> + <include name="NHibernate.???" /> + </fileset> + </copy> + <!--Required Bins for lazy loading NHibernate.ByteCode.Castle.dll--> + <copy file="Choose_Only_One.txt" todir="${bin-pack.requiredlazy}"/> + <copy todir="${bin-pack.requiredlazy}/Castle"> + <fileset basedir="${bin.dir}"> + <include name="Castle.*" /> + <include name="NHibernate.ByteCode.Castle.???" /> + </fileset> + </copy> + <copy todir="${bin-pack.requiredlazy}/LinFu"> + <fileset basedir="${bin.dir}"> + <include name="LinFu.*" /> + <include name="NHibernate.ByteCode.LinFu.???" /> + </fileset> + </copy> + <copy todir="${bin-pack.requiredlazy}/Spring"> + <fileset basedir="${bin.dir}"> + <include name="antlr.runtime.dll" /> + <include name="Common.Logging.dll" /> + <include name="Spring.*" /> + <include name="NHibernate.ByteCode.Spring.???" /> + </fileset> + </copy> + <!-- Tests --> + <copy file="${bin.dir}/TestEnbeddedConfig.cfg.xml" todir="${bin-pack.tests}"/> + <copy file="${bin.dir}/ABC.hbm.xml" todir="${bin-pack.tests}"/> + <copy todir="${bin-pack.tests}"> + <fileset basedir="${bin.dir}"> + <include name="nunit*" /> + <include name="NHibernate.Domain*" /> + <include name="NHibernate.Test*" /> + </fileset> + </copy> </target> + + <target name="package" depends="init binaries reference-zip sources-zip binaries-zip" + description="Creates files for the General Available Release on SourceForge"> - <target name="prepare-installer-files" depends="init sources-zip copy-release-notes" /> - - <target name="installer" depends="init binaries doc prepare-installer-files"> - <nant buildfile="src/NHibernate.Setup/NHibernate.Setup.build" target="msi" /> + <echo message="Created a '${project.config}' package in ${build.dir}" /> </target> - <target name="package" depends="init binaries manual sources-zip binaries-zip" - description="Creates files for the File Release System on SourceForge"> + <target name="release" depends="init binaries binaries-zip sources-zip" + description="Creates files for the partial (Alpha-Beta-Candidate) Release on SourceForge"> - <property name="dist.output.dir" value="${project::get-base-directory()}/build/" /> - <move todir="${dist.output.dir}" flatten="true" overwrite="true"> - <fileset basedir="${build.dir}"> - <include name="*.msi" /> - <include name="src/NHibernate-${project.version}-src.zip" /> - <include name="bin/NHibernate-${project.version}-bin.zip" /> - </fileset> - </move> - - <echo message="Created a '${project.config}' package in ${dist.output.dir}" /> - + <echo message="Created a '${project.config}' package in ${build.dir}" /> </target> - <target name="fxcop" depends="init" > - <exec program="${fxcop.exe}" - commandline="/f:${build.dir}\bin\nhibernate.dll /o:${build.dir}\bin\fxcop-results.xml" - failonerror="false"/> - </target> - - <target name="simian" depends="init" > - <exec program="${simian.exe}" verbose="true" - commandline="-recurse=src/*.cs -formatter=xml:${build.dir}\bin\simian-results.xml -failOnDuplication-" - failonerror="false"/> - </target> - <target name="visual-studio" depends="init" description="Modifies AssemblyInfo.cs files to work with Visual Studio"> <property name="visual-studio" value="true" /> <nant target="generate-assemblyinfo"> Modified: branches/2.1.x/nhibernate/doc/documentation.build =================================================================== --- branches/2.1.x/nhibernate/doc/documentation.build 2009-07-15 17:34:19 UTC (rev 4637) +++ branches/2.1.x/nhibernate/doc/documentation.build 2009-07-15 18:47:57 UTC (rev 4638) @@ -32,6 +32,14 @@ </properties> </nant> </target> + + <target name="manual-zip" depends="manual"> + <zip zipfile="${build.dir}/NHibernate-${project.version}-reference.zip"> + <fileset basedir="${doc.out.dir}"> + <include name="**/*" /> + </fileset> + </zip> + </target> <target name="apidocbuilder-project" depends="init"> <copy file="NHibernate.shfbproj.template" tofile="NHibernate.shfbproj" overwrite="true"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fab...@us...> - 2009-07-17 12:56:13
|
Revision: 4645 http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4645&view=rev Author: fabiomaulo Date: 2009-07-17 12:56:10 +0000 (Fri, 17 Jul 2009) Log Message: ----------- Revert r3849 because NH-1890 (ugly but needed). Modified Paths: -------------- branches/2.1.x/nhibernate/lib/net/2.0/Iesi.Collections.dll branches/2.1.x/nhibernate/lib/net/3.5/Iesi.Collections.dll branches/2.1.x/nhibernate/src/Iesi.Collections/Iesi.Collections.build branches/2.1.x/nhibernate/src/Iesi.Collections.Test/Iesi.Collections.Test.build Modified: branches/2.1.x/nhibernate/lib/net/2.0/Iesi.Collections.dll =================================================================== (Binary files differ) Modified: branches/2.1.x/nhibernate/lib/net/3.5/Iesi.Collections.dll =================================================================== (Binary files differ) Modified: branches/2.1.x/nhibernate/src/Iesi.Collections/Iesi.Collections.build =================================================================== --- branches/2.1.x/nhibernate/src/Iesi.Collections/Iesi.Collections.build 2009-07-16 17:03:34 UTC (rev 4644) +++ branches/2.1.x/nhibernate/src/Iesi.Collections/Iesi.Collections.build 2009-07-17 12:56:10 UTC (rev 4645) @@ -18,7 +18,7 @@ value="Declaration of code in public domain can be found in comment by Jason Smith at http://www.codeproject.com/csharp/sets.asp#xx703510xx. Copyright © 2002-2004 by Aidant Systems, Inc., and by Jason Smith." /> <property name="assembly.version" value="1.0.1.0" /> <property name="assembly.version.informational" value="1.0" /> - <property name="assembly.version.file" value="1.0.1.0" /> + <!-- NOTE : Don't add file version see NH-1890 issue --> <property name="assembly.allow-partially-trusted-callers" value="true" /> <property name="clover.instrument" value="true" /> Modified: branches/2.1.x/nhibernate/src/Iesi.Collections.Test/Iesi.Collections.Test.build =================================================================== --- branches/2.1.x/nhibernate/src/Iesi.Collections.Test/Iesi.Collections.Test.build 2009-07-16 17:03:34 UTC (rev 4644) +++ branches/2.1.x/nhibernate/src/Iesi.Collections.Test/Iesi.Collections.Test.build 2009-07-17 12:56:10 UTC (rev 4645) @@ -16,7 +16,6 @@ <property name="assembly.description" value="The Unit Tests for Iesi.Collections." /> <property name="assembly.version" value="1.0.1.0" /> <property name="assembly.version.informational" value="1.0" /> - <property name="assembly.version.file" value="1.0.1.0" /> <property name="clover.instrument" value="false" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aye...@us...> - 2009-10-18 01:14:44
|
Revision: 4771 http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4771&view=rev Author: ayenderahien Date: 2009-10-18 01:14:34 +0000 (Sun, 18 Oct 2009) Log Message: ----------- Just recording the previous merge Property Changed: ---------------- branches/2.1.x/nhibernate/ branches/2.1.x/nhibernate/src/NHibernate/ branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1850/Customer.cs branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1850/Fixture.cs branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1850/Mappings.hbm.xml branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1927/ branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1928/ branches/2.1.x/nhibernate/src/NHibernate.Test/Tools/hbm2ddl/SchemaExportTests/ branches/2.1.x/nhibernate/src/NHibernate.Test/Tools/hbm2ddl/SchemaExportTests/WithColumnTag.hbm.xml Property changes on: branches/2.1.x/nhibernate ___________________________________________________________________ Added: svn:mergeinfo + /trunk:4770 /trunk/nhibernate:4768 Property changes on: branches/2.1.x/nhibernate/src/NHibernate ___________________________________________________________________ Added: svn:mergeinfo + /trunk/nhibernate/src:4770 Property changes on: branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1850/Customer.cs ___________________________________________________________________ Modified: svn:mergeinfo - + /trunk/src/NHibernate.Test/NHSpecificTest/NH1850/Customer.cs:4770 Property changes on: branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1850/Fixture.cs ___________________________________________________________________ Modified: svn:mergeinfo - + /trunk/src/NHibernate.Test/NHSpecificTest/NH1850/Fixture.cs:4770 Property changes on: branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1850/Mappings.hbm.xml ___________________________________________________________________ Modified: svn:mergeinfo - + /trunk/src/NHibernate.Test/NHSpecificTest/NH1850/Mappings.hbm.xml:4770 Property changes on: branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1927 ___________________________________________________________________ Modified: svn:mergeinfo - + /trunk/src/NHibernate.Test/NHSpecificTest/NH1927:4770 Property changes on: branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1928 ___________________________________________________________________ Modified: svn:mergeinfo - + /trunk/src/NHibernate.Test/NHSpecificTest/NH1928:4770 Property changes on: branches/2.1.x/nhibernate/src/NHibernate.Test/Tools/hbm2ddl/SchemaExportTests ___________________________________________________________________ Modified: svn:mergeinfo - + /trunk/src/NHibernate.Test/Tools/hbm2ddl/SchemaExportTests:4770 Property changes on: branches/2.1.x/nhibernate/src/NHibernate.Test/Tools/hbm2ddl/SchemaExportTests/WithColumnTag.hbm.xml ___________________________________________________________________ Deleted: svn:mergeinfo - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |