[pgsqlclient-checkins] pgsqlclient_10 makefile,1.1.1.1,1.2 PgSqlClient.build,1.1.1.1,1.2 PgSqlClient
Status: Inactive
Brought to you by:
carlosga_fb
Menu
▾
▴
[pgsqlclient-checkins] pgsqlclient_10 makefile,1.1.1.1,1.2 PgSqlClient.build,1.1.1.1,1.2 PgSqlClient_Mono.build,1.1.1.1,1.2
|
From: <car...@us...> - 2003-08-31 12:55:27
|
Update of /cvsroot/pgsqlclient/pgsqlclient_10
In directory sc8-pr-cvs1:/tmp/cvs-serv3035
Modified Files:
makefile PgSqlClient.build PgSqlClient_Mono.build
Log Message:
Updated build files for windows ( .net & mono ) and linux ( mono )
Index: makefile
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** makefile 2 Aug 2003 19:42:38 -0000 1.1.1.1
--- makefile 31 Aug 2003 12:55:21 -0000 1.2
***************
*** 1,5 ****
LIBRARY = PostgreSql.Data.PgSqlClient.dll
! all: $(LIBRARY) install clean
CSC = mcs
--- 1,7 ----
+ PGTEST = pgtest.exe
+ TLS = PgSqlClient.Security.Tls.dll
LIBRARY = PostgreSql.Data.PgSqlClient.dll
! all: ${TLS} $(LIBRARY) $(PGTEST) install clean
CSC = mcs
***************
*** 10,25 ****
TOOL_RESOURCES = -resource:PostgreSql.Data.PgSqlClient/source/Resources/ToolBox/PgConnection.bmp,PostgreSql.Data.PgSqlClient.Resources.ToolBox.PgConnection.bmp -resource:PostgreSql.Data.PgSqlClient/source/Resources/ToolBox/PgCommand.bmp,PostgreSql.Data.PgSqlClient.Resources.ToolBox.FbCommand.bmp -resource:PostgreSql.Data.PgSqlClient/source/Resources/ToolBox/PgDataAdapter.bmp,PostgreSql.Data.PgSqlClient.Resources.ToolBox.FbDataAdapter.bmp
# Source files
RECURSE_SOURCE = -recurse:./PostgreSql.Data.PgSqlClient/source/*.cs
# Defines
DEFINE = -define:_DEBUG
PostgreSql.Data.PgSqlClient.dll:
! $(CSC) -target:library -out:$(LIBRARY) $(LD_FLAGS) $(DEFINE) $(TOOL_RESOURCES) $(RECURSE_SOURCE)
install:
rm -rf build
mkdir -p build
$(COPY) $(LIBRARY) ./build
clean:
! rm $(LIBRARY)
\ No newline at end of file
--- 12,39 ----
TOOL_RESOURCES = -resource:PostgreSql.Data.PgSqlClient/source/Resources/ToolBox/PgConnection.bmp,PostgreSql.Data.PgSqlClient.Resources.ToolBox.PgConnection.bmp -resource:PostgreSql.Data.PgSqlClient/source/Resources/ToolBox/PgCommand.bmp,PostgreSql.Data.PgSqlClient.Resources.ToolBox.FbCommand.bmp -resource:PostgreSql.Data.PgSqlClient/source/Resources/ToolBox/PgDataAdapter.bmp,PostgreSql.Data.PgSqlClient.Resources.ToolBox.FbDataAdapter.bmp
# Source files
+ RECURSE_PGTEST = -recurse:./PgTest/*.cs
+ RECURSE_TLS = -recurse:./PgSqlClient.Security.Tls/source/*.cs
RECURSE_SOURCE = -recurse:./PostgreSql.Data.PgSqlClient/source/*.cs
# Defines
DEFINE = -define:_DEBUG
+ PgSqlClient.Security.Tls.dll:
+ $(CSC) -target:library -out:$(TLS) $(LD_FLAGS) $(DEFINE) $(RECURSE_TLS)
+
PostgreSql.Data.PgSqlClient.dll:
! $(CSC) -target:library -out:$(LIBRARY) $(LD_FLAGS) -reference:PgSqlClient.Security.Tls.dll $(DEFINE) $(TOOL_RESOURCES) $(RECURSE_SOURCE)
!
! pgtest.exe:
! $(CSC) -target:exe -out:$(PGTEST) $(LD_FLAGS) $(DEFINE) $(RECURSE_PGTEST) -reference:PgSqlClient.Security.Tls.dll -reference:PostgreSql.Data.PgSqlClient.dll
install:
rm -rf build
mkdir -p build
+ $(COPY) $(TLS) ./build
$(COPY) $(LIBRARY) ./build
+ $(COPY) $(PGTEST) ./build
clean:
! rm $(TLS)
! rm $(LIBRARY)
! rm $(PGTEST)
\ No newline at end of file
Index: PgSqlClient.build
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PgSqlClient.build,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** PgSqlClient.build 2 Aug 2003 19:42:38 -0000 1.1.1.1
--- PgSqlClient.build 31 Aug 2003 12:55:21 -0000 1.2
***************
*** 14,17 ****
--- 14,18 ----
<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" />
***************
*** 36,40 ****
<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>
--- 37,41 ----
<ifnot propertyexists="nunit.framework.dll">
<sysinfo />
! <property name="nunit.framework.dll" value="${sys.os.folder.programfiles}\NUnit V2.0\bin\nunit.framework.dll"
readonly="false" />
</ifnot>
***************
*** 123,126 ****
--- 124,128 ----
<!-- 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">
***************
*** 130,133 ****
--- 132,154 ----
</target>
+ <!-- Taget for build TLS Assembly -->
+ <target name="build-tls">
+ <mkdir dir="${build.dir}" failonerror="false" />
+
+ <!-- compile PgSqlClient.Security.TLS -->
+ <csc output="${build.dir}\PgSqlClient.Security.Tls.dll" target="library" define="${build.define}">
+ <sources>
+ <includes name="${tls.src.dir}/**/*.cs" />
+ </sources>
+ <references>
+ <absolute file="System.dll" />
+ <absolute file="System.Data.dll" />
+ <absolute file="System.Drawing.dll" />
+ <absolute file="System.XML.dll" />
+ </references>
+ <arg value="/optimize+" />
+ </csc>
+ </target>
+
<!-- Taget for build PgSqlClient .NET Data Provider Assembly -->
<target name="build-pgsqlclient">
***************
*** 144,147 ****
--- 165,169 ----
<absolute file="System.Drawing.dll" />
<absolute file="System.XML.dll" />
+ <includes name="${build.dir}/PgSqlClient.Security.Tls.dll" />
</references>
<arg value="/resource:${resources.dir}\Toolbox\PgConnection.bmp,PostgreSql.Data.PgSqlClient.Resources.ToolBox.PgConnection.bmp" />
Index: PgSqlClient_Mono.build
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PgSqlClient_Mono.build,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** PgSqlClient_Mono.build 2 Aug 2003 19:42:38 -0000 1.1.1.1
--- PgSqlClient_Mono.build 31 Aug 2003 12:55:21 -0000 1.2
***************
*** 13,16 ****
--- 13,17 ----
<property name="base.dir" value="." />
<property name="build.dir" value="build" />
+ <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" />
***************
*** 37,40 ****
--- 38,42 ----
<!-- Target for check build configuration -->
<target name="build-all">
+ <call target="build-tls" />
<call target="build-pgsqlclient" />
<if propertyexists="htmlhelp.compiler">
***************
*** 43,46 ****
--- 45,67 ----
</target>
+ <!-- Taget for build TLS Assembly -->
+ <target name="build-tls">
+ <mkdir dir="${build.dir}" failonerror="false" />
+
+ <!-- compile PgSqlClient.Security.TLS -->
+ <csc output="${build.dir}\PgSqlClient.Security.Tls.dll" target="library" define="${build.define}">
+ <sources>
+ <includes name="${tls.src.dir}/**/*.cs" />
+ </sources>
+ <references>
+ <absolute file="System.dll" />
+ <absolute file="System.Data.dll" />
+ <absolute file="System.Drawing.dll" />
+ <absolute file="System.XML.dll" />
+ </references>
+ <arg value="/optimize+" />
+ </csc>
+ </target>
+
<!-- Taget for build PgSqlClient .NET Data Provider Assembly -->
<target name="build-pgsqlclient">
***************
*** 57,60 ****
--- 78,82 ----
<includes name="${nant.settings.currentframework.frameworkassemblydirectory}/System.Drawing.dll" />
<includes name="${nant.settings.currentframework.frameworkassemblydirectory}/System.XML.dll" />
+ <includes name="${build.dir}/PgSqlClient.Security.Tls.dll" />
</references>
<arg value="/resource:${resources.dir}\Toolbox\PgConnection.bmp,PostgreSql.Data.PgSqlClient.Resources.ToolboxBitmaps.PgConnection.bmp" />
|
