Thread: [pgsqlclient-checkins] pgsqlclient_10 Build.bat,NONE,1.1 PgSqlClient.build,1.3,1.4

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/pgsqlclient/pgsqlclient_10
In directory sc8-pr-cvs1:/tmp/cvs-serv14057

Modified Files:
	PgSqlClient.build 
Added Files:
	Build.bat 
Log Message:
Reworked build system for Windows

--- NEW FILE: Build.bat ---
nant -buildfile:PgSqlClient.build -verbose %1 %2 %3 %4

Index: PgSqlClient.build
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PgSqlClient.build,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PgSqlClient.build	12 Sep 2003 20:47:43 -0000	1.3
--- PgSqlClient.build	30 Sep 2003 19:54:35 -0000	1.4
***************
*** 1,26 ****
! <?xml version="1.0" ?>
! <project name="PgSqlClient" default="build-all" basedir="." xmlnds="http://tempuri.org/nant-vs.xsd">
  	<!-- Project properties -->
  	<property name="project.name" value="PgSqlClient" />
  	<property name="project.FormalName" value="PostgreSql.Data.PgSqlClient" />
  	<property name="project.version" value="1.0" />
! 
  	<!-- Build properties -->
  	<property name="build.debug" value="true" />
  	<property name="build.define" value="_DEBUG" />
! 
  	<!-- Paths properties -->
  	<property name="base.dir" value="." />
! 	<property name="build.dir" value="build" />
! 	<property name="src.dir" value="${project.FormalName}\source" />
  	<property name="tls.src.dir" value="PgSqlClient.Security.Tls\source" />	
! 	<property name="nunit.test.dir" value="PostgreSql.Data.PgSqlClient.UnitTests"/>
  	<property name="resources.dir" value="${src.dir}\Resources" />
! 	<property name="distribution.dir" value="${build.dir}\distribution" />
  
  	<!-- 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" />
--- 1,28 ----
! <?xml version="1.0" encoding="utf-8" ?> 
! <project name="PgSqlClient" default="release" basedir="." xmlnds="http://tempuri.org/nant-vs.xsd">
  	<!-- Project properties -->
  	<property name="project.name" value="PgSqlClient" />
  	<property name="project.FormalName" value="PostgreSql.Data.PgSqlClient" />
  	<property name="project.version" value="1.0" />
! 	
  	<!-- Build properties -->
  	<property name="build.debug" value="true" />
  	<property name="build.define" value="_DEBUG" />
! 	
  	<!-- Paths properties -->
  	<property name="base.dir" value="." />
! 	<property name="base.build.dir" value="build" />
! 	<property name="build.dir" value="${base.build.dir}" />
! 	
  	<property name="tls.src.dir" value="PgSqlClient.Security.Tls\source" />	
! 	<property name="src.dir" value="${project.FormalName}\source" />
  	<property name="resources.dir" value="${src.dir}\Resources" />
! 	<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" />
***************
*** 29,33 ****
  		<ifnot propertyexists="htmlhelp.compiler">
  			<sysinfo />
! 			<property name="htmlhelp.compiler" value="${sys.os.folder.programfiles}\HTML Help Workshop\hhc.exe" readonly="false" />
  		</ifnot>
  	</target>
--- 31,36 ----
  		<ifnot propertyexists="htmlhelp.compiler">
  			<sysinfo />
! 			<property name="htmlhelp.compiler" value="${sys.os.folder.programfiles}\HTML Help Workshop\hhc.exe"
! 				readonly="false" />
  		</ifnot>
  	</target>
***************
*** 41,47 ****
  		</ifnot>
  	</target>
  	
! 	<!-- Displays configuration info, usefull for working out why PgSqlClient doesn't build -->
! 	<target name="display-setup" depends="check-nunit-framework">
  		<!-- .NET Framework 1.0 -->
  		<available type="Framework" resource="net-1.0" property="temp.framework.available" />
--- 44,74 ----
  		</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>
  	
! 	<!-- Target for clean destination directory -->
! 	<target name="clean" description="cleans build directory">
! 		<delete dir="${build.dir}" failonerror="false" verbose="true" />
! 	</target>
! 	
! 	<!-- Target for build in DEBUG mode -->
! 	<target name="debug" depends="clean">
! 		<property name="build.debug" value="true" />
! 		<call target="build-all" />
! 	</target>
! 	
! 	<!-- Target for build in RELEASE mode -->
! 	<target name="release" depends="clean">
! 		<property name="build.debug" value="false" />
! 		<property name="build.define" value="_RELEASE" />
! 		<call target="build-all" />
! 	</target>
! 	
! 	<!-- Build target for all existing platforms -->
! 	<target name="build-all" depends="check-build-config">	
  		<!-- .NET Framework 1.0 -->
  		<available type="Framework" resource="net-1.0" property="temp.framework.available" />
***************
*** 51,56 ****
  		<if propertytrue="temp.framework.available">
  			<property name="nant.settings.currentframework" value="net-1.0" />
! 			<call target="display-current-runtime" force="true" />
  		</if>
  		<!-- .NET Framework 1.1 -->
  		<available type="Framework" resource="net-1.1" property="temp.framework.available" />
--- 78,92 ----
  		<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" />
! 			<if propertyexists="htmlhelp.compiler">
!         		<!-- call target="build-sdk" / -->
! 			</if>
! 			<if propertyexists="nunit.framework.dll">
!         		<call target="build-nunit-tests" />
! 			</if>
! 			<call target="distribution" />
  		</if>
+ 		
  		<!-- .NET Framework 1.1 -->
  		<available type="Framework" resource="net-1.1" property="temp.framework.available" />
***************
*** 60,65 ****
  		<if propertytrue="temp.framework.available">
  			<property name="nant.settings.currentframework" value="net-1.1" />
! 			<call target="display-current-runtime" force="true" />
  		</if>
  		<!-- Mono 1.0 -->
  		<available type="Framework" resource="mono-1.0" property="temp.framework.available" />
--- 96,110 ----
  		<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" />
! 			<if propertyexists="htmlhelp.compiler">
!         		<!-- call target="build-sdk" / -->
! 			</if>
! 			<if propertyexists="nunit.framework.dll">
!         		<call target="build-nunit-tests" />
! 			</if>
! 			<call target="distribution" />
  		</if>
+ 		
  		<!-- Mono 1.0 -->
  		<available type="Framework" resource="mono-1.0" property="temp.framework.available" />
***************
*** 69,137 ****
  		<if propertytrue="temp.framework.available">
  			<property name="nant.settings.currentframework" value="mono-1.0" />
! 			<call target="display-current-runtime" force="true" />
! 		</if>
! 		<!-- SSCLI 1.0 -->
! 		<available type="Framework" resource="sscli-1.0" property="temp.framework.available" />
! 		<ifnot propertytrue="temp.framework.available">
! 			<echo message="SSCLI 1.0 runtime is not available." />
! 		</ifnot>
! 		<if propertytrue="temp.framework.available">
! 			<property name="nant.settings.currentframework" value="sscli-1.0" />
! 			<call target="display-current-runtime" force="true" />
! 		</if>
! 		<!-- HTML Help Compiler -->
! 		<echo message="" />
! 		<echo message="----------------------------------------------------------" />
! 		<echo message="" />
! 		<echo message="htmlhelp.compiler: ${htmlhelp.compiler}" />
! 		<echo message="" />
! 	</target>
! 	
! 	<target name="display-current-runtime">
! 		<echo message="" />
! 		<echo message="----------------------------------------------------------" />
! 		<echo message=" ${nant.settings.currentframework.description}" />
! 		<echo message="----------------------------------------------------------" />
! 		<echo message="" />
! 		<echo message="framework : ${nant.settings.currentframework}" />
! 		<echo message="description : ${nant.settings.currentframework.description}" />
! 		<if propertyexists="nant.settings.currentframework.sdkdirectory">
! 			<echo message="sdk directory : ${nant.settings.currentframework.sdkdirectory}" />
! 		</if>
! 		<ifnot propertyexists="nant.settings.currentframework.sdkdirectory">
! 			<echo message="sdk directory : &lt;not configured/available&gt;" />
! 		</ifnot>
! 		<echo message="framework directory : ${nant.settings.currentframework.frameworkdirectory}" />
! 		<echo message="assembly directory : ${nant.settings.currentframework.frameworkassemblydirectory}" />
! 		<if propertyexists="nant.settings.currentframework.runtimeengine">
! 			<echo message="runtime engine : ${nant.settings.currentframework.runtimeengine}" />
  		</if>
! 		<echo message="" />
! 	</target>
! 	
! 	<!-- Target for check build configuration -->
! 	<target name="check-build-config" depends="clean">
! 		<call target="display-setup" />
! 		<!-- ${nant.settings.currentframework} -->
  	</target>
  	
- 	<!-- Target for clean destination directory -->
- 	<target name="clean" description="cleans build directory">
- 		<delete dir="${build.dir}" failonerror="false" verbose="true" />
- 		<delete dir="${distribution.dir}" failonerror="false" verbose="true" />
- 	</target>
- 
- 	<!-- Target for check build configuration -->
- 	<target name="build-all" depends="check-build-config">	
- 		<call target="build-tls" />
-         <call target="build-pgsqlclient" />
- 		<if propertyexists="nunit.framework.dll">
-         	<call target="build-nunit-tests" />
-         </if>
-         <call target="distribution" />
- 	</target>
- 
  	<!-- Taget for build TLS Assembly -->
  	<target name="build-tls">
  		<mkdir dir="${build.dir}" failonerror="false" />
  
--- 114,130 ----
  		<if propertytrue="temp.framework.available">
  			<property name="nant.settings.currentframework" value="mono-1.0" />
! 			<echo message="Building using Mono 1.0." />
! 			<call target="build-provider" />
! 			<if propertyexists="nunit.framework.dll">
!         		<call target="build-nunit-tests" />
! 			</if>
  		</if>
! 		<call target="distribution" />
  	</target>
  	
  	<!-- Taget for build TLS Assembly -->
  	<target name="build-tls">
+ 		<property name="build.dir" value="${base.build.dir}\${nant.settings.currentframework}" />
+ 		
  		<mkdir dir="${build.dir}" failonerror="false" />
  
***************
*** 152,158 ****
  
  	<!-- Taget for build PgSqlClient .NET Data Provider Assembly -->
! 	<target name="build-pgsqlclient">
! 		<mkdir dir="${build.dir}" failonerror="false" />
! 
  		<!-- compile PostgreSql.Data.PgSqlClient -->
  		<csc output="${build.dir}\${project.FormalName}.dll" target="library" define="${build.define}">
--- 145,151 ----
  
  	<!-- Taget for build PgSqlClient .NET Data Provider Assembly -->
! 	<target name="build-provider" depends="build-tls">
! 		<property name="build.dir" value="${base.build.dir}\${nant.settings.currentframework}" />
! 	
  		<!-- compile PostgreSql.Data.PgSqlClient -->
  		<csc output="${build.dir}\${project.FormalName}.dll" target="library" define="${build.define}">
***************
*** 173,179 ****
  		</csc>
  	</target>
! 
  	<!-- Target for build csUnit Tests -->
  	<target name="build-nunit-tests">
  		<copy todir="${build.dir}">
  			<fileset basedir="${nunit.test.dir}">
--- 166,174 ----
  		</csc>
  	</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}">
***************
*** 199,202 ****
--- 194,200 ----
  	<!-- Target for distribution -->
  	<target name="distribution">
+ 		<property name="build.dir" value="${base.build.dir}\${nant.settings.currentframework}" />
+ 		<property name="distribution.dir" value="${build.dir}\distribution" />
+ 		
  		<mkdir dir="${distribution.dir}" failonerror="false" />
  		<!-- Copy needed files to distribution directory -->
***************
*** 214,216 ****
  		</copy>
  	</target>
! </project>
\ No newline at end of file
--- 212,214 ----
  		</copy>
  	</target>
! </project>