mirror of
https://github.com/FirebirdSQL/firebird.git
synced 2025-01-22 17:23:03 +01:00
Merge INTL branch into HEAD
This commit is contained in:
asfernandes
parent
49dcfcdfae
commit
59213efe7e
@ -2,7 +2,7 @@
|
||||
#
|
||||
# Run this to generate all the initial makefiles, etc.
|
||||
#
|
||||
# $Id: autogen.sh,v 1.11 2004-09-28 05:56:07 stryqx Exp $
|
||||
# $Id: autogen.sh,v 1.12 2005-05-27 22:14:40 asfernandes Exp $
|
||||
|
||||
PKG_NAME=Firebird2
|
||||
SRCDIR=`dirname $0`
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# $Id: install.sh.in,v 1.8 2005-03-05 01:43:39 robocop Exp $
|
||||
# $Id: install.sh.in,v 1.9 2005-05-27 22:14:45 asfernandes Exp $
|
||||
#
|
||||
|
||||
# Install script for FirebirdSQL database engine
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# $Id: Makefile.in,v 1.5 2004-10-24 09:07:45 skidder Exp $
|
||||
# $Id: Makefile.in,v 1.6 2005-05-27 22:15:05 asfernandes Exp $
|
||||
#
|
||||
ROOT=..
|
||||
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# $Id: makeInstallImage.sh.in,v 1.12 2005-04-29 18:22:15 alexpeshkoff Exp $
|
||||
# $Id: makeInstallImage.sh.in,v 1.13 2005-05-27 22:15:10 asfernandes Exp $
|
||||
#
|
||||
|
||||
# Script to copy install files from the build/transport area
|
||||
@ -189,6 +189,9 @@ copyFiles() {
|
||||
# cp -f $BuiltFBDir/lib/gds.a @libdir@/libgds.a
|
||||
cp -f $BuiltFBDir/lib/libib_util.so $DestDir/lib/libib_util.so
|
||||
|
||||
cp -f $BuiltFBDir/lib/libicuuc.so.30 $DestDir/lib/libicuuc.so.30
|
||||
cp -f $BuiltFBDir/lib/libicui18n.so.30 $DestDir/lib/libicui18n.so.30
|
||||
cp -f $BuiltFBDir/lib/libicudata.so.30 $DestDir/lib/libicudata.so.30
|
||||
|
||||
cp $BuiltFBDir/intl/libfbintl.so $DestDir/intl/fbintl
|
||||
cp $BuiltFBDir/UDF/ib_udf.so $DestDir/UDF/
|
||||
@ -209,6 +212,7 @@ copyFiles() {
|
||||
cp $BuildRootDir/gen/install/misc/firebird.xinetd $DestDir/misc/
|
||||
cp $BuildRootDir/gen/install/misc/firebird.conf $DestDir/
|
||||
cp $BuildRootDir/gen/install/misc/aliases.conf $DestDir/
|
||||
cp $BuildRootDir/gen/install/misc/fbintl.conf $DestDir/intl/
|
||||
|
||||
|
||||
# Create links from @libdir@ to install area.
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# $Id: postinstall.sh.in,v 1.11 2005-03-20 12:48:04 alexpeshkoff Exp $
|
||||
# $Id: postinstall.sh.in,v 1.12 2005-05-27 22:15:10 asfernandes Exp $
|
||||
#
|
||||
|
||||
# The post install script for Firebird Classic
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# $Id: postuninstall.sh.in,v 1.2 2005-03-13 16:04:33 alexpeshkoff Exp $
|
||||
# $Id: postuninstall.sh.in,v 1.3 2005-05-27 22:15:10 asfernandes Exp $
|
||||
#
|
||||
|
||||
# The post uninstall routine for Firebird Classic.
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# $Id: preinstall.sh.in,v 1.5 2005-03-13 16:04:33 alexpeshkoff Exp $
|
||||
# $Id: preinstall.sh.in,v 1.6 2005-05-27 22:15:10 asfernandes Exp $
|
||||
#
|
||||
|
||||
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# $Id: preuninstall.sh.in,v 1.3 2005-03-13 16:04:33 alexpeshkoff Exp $
|
||||
# $Id: preuninstall.sh.in,v 1.4 2005-05-27 22:15:10 asfernandes Exp $
|
||||
#
|
||||
|
||||
# The pre uninstall routines for Firebird Classic
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# $Id: makeInstallImage.sh.in,v 1.10 2005-04-29 18:22:25 alexpeshkoff Exp $
|
||||
# $Id: makeInstallImage.sh.in,v 1.11 2005-05-27 22:15:13 asfernandes Exp $
|
||||
#
|
||||
|
||||
# Script to copy install files from the build/transport area
|
||||
@ -177,6 +177,11 @@ copyFiles() {
|
||||
cp $BuiltFBDir/include/*.h $DestDir/include
|
||||
cp -df $BuiltFBDir/lib/libfbclient.so* $DestDir/lib
|
||||
cp -f $BuiltFBDir/lib/libib_util.so $DestDir/lib/libib_util.so
|
||||
|
||||
cp -f $BuiltFBDir/lib/libicuuc.so.30 $DestDir/lib/libicuuc.so.30
|
||||
cp -f $BuiltFBDir/lib/libicui18n.so.30 $DestDir/lib/libicui18n.so.30
|
||||
cp -f $BuiltFBDir/lib/libicudata.so.30 $DestDir/lib/libicudata.so.30
|
||||
|
||||
cp $BuiltFBDir/intl/libfbintl.so $DestDir/intl/fbintl
|
||||
cp $BuiltFBDir/UDF/ib_udf.so $DestDir/UDF/
|
||||
cp $BuiltFBDir/UDF/fbudf.so $DestDir/UDF/
|
||||
@ -194,6 +199,7 @@ copyFiles() {
|
||||
|
||||
# Miscellaneous config and startup files
|
||||
cp $BuildRootDir/gen/install/misc/firebird.conf $DestDir/firebird.conf
|
||||
cp $BuildRootDir/gen/install/misc/fbintl.conf $DestDir/intl/fbintl.conf
|
||||
cp $BuildRootDir/gen/install/misc/firebird.init.d.generic $DestDir/misc
|
||||
cp $BuildRootDir/gen/install/misc/firebird.init.d.mandrake $DestDir/misc
|
||||
cp $BuildRootDir/gen/install/misc/firebird.init.d.suse $DestDir/misc
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# $Id: tarMainInstall.sh.in,v 1.2 2005-04-29 18:22:25 alexpeshkoff Exp $
|
||||
# $Id: tarMainInstall.sh.in,v 1.3 2005-05-27 22:15:13 asfernandes Exp $
|
||||
#
|
||||
|
||||
# Install script for FirebirdSQL database engine
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# $Id: tarMainUninstall.sh.in,v 1.2 2005-04-29 18:22:25 alexpeshkoff Exp $
|
||||
# $Id: tarMainUninstall.sh.in,v 1.3 2005-05-27 22:15:13 asfernandes Exp $
|
||||
#
|
||||
|
||||
# Install script for FirebirdSQL database engine
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# $Id: tarinstall.sh.in,v 1.3 2005-04-29 18:22:25 alexpeshkoff Exp $
|
||||
# $Id: tarinstall.sh.in,v 1.4 2005-05-27 22:15:13 asfernandes Exp $
|
||||
#
|
||||
|
||||
# THe way this works is that the buildroot file is stored relative to the root
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# $Id: taruninstall.sh.in,v 1.2 2005-04-29 18:22:25 alexpeshkoff Exp $
|
||||
# $Id: taruninstall.sh.in,v 1.3 2005-05-27 22:15:13 asfernandes Exp $
|
||||
#
|
||||
|
||||
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
# Contributor(s):
|
||||
# James K. Lowden <jklowden@schemamania.org>
|
||||
#
|
||||
# $Id: install.sh.in,v 1.2 2005-03-05 01:43:50 robocop Exp $
|
||||
# $Id: install.sh.in,v 1.3 2005-05-27 22:15:16 asfernandes Exp $
|
||||
#
|
||||
|
||||
# Install script for FirebirdSQL database engine
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $Id: prototype.in,v 1.6 2005-03-05 01:43:55 robocop Exp $
|
||||
# $Id: prototype.in,v 1.7 2005-05-27 22:15:19 asfernandes Exp $
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
!SRCDIR=@NEW_FIREBIRD_DIR@
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# $Header: /home/job/firebird/cvs-backup/firebird2/builds/install/arch-specific/solaris/CS/postinstall.in,v 1.1 2005-04-18 16:05:13 kkuznetsov Exp $
|
||||
# $Header: /home/job/firebird/cvs-backup/firebird2/builds/install/arch-specific/solaris/CS/postinstall.in,v 1.2 2005-05-27 22:15:24 asfernandes Exp $
|
||||
#------------------------------------------------------------------------------
|
||||
# $Copyright:
|
||||
# Copyright (C) Siemens Nixdorf Informationssysteme AG 1994 - 1998
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# $Header: /home/job/firebird/cvs-backup/firebird2/builds/install/arch-specific/solaris/CS/postremove.in,v 1.1 2005-04-18 16:05:13 kkuznetsov Exp $
|
||||
# $Header: /home/job/firebird/cvs-backup/firebird2/builds/install/arch-specific/solaris/CS/postremove.in,v 1.2 2005-05-27 22:15:24 asfernandes Exp $
|
||||
#------------------------------------------------------------------------------
|
||||
# $Copyright:
|
||||
# Copyright (C) Siemens Nixdorf Informationssysteme AG 1994 - 1998
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#!/bin/sh
|
||||
|
||||
# $Header: /home/job/firebird/cvs-backup/firebird2/builds/install/arch-specific/solaris/CS/preinstall.in,v 1.1 2005-04-18 16:05:13 kkuznetsov Exp $
|
||||
# $Header: /home/job/firebird/cvs-backup/firebird2/builds/install/arch-specific/solaris/CS/preinstall.in,v 1.2 2005-05-27 22:15:24 asfernandes Exp $
|
||||
#------------------------------------------------------------------------------
|
||||
# $Copyright:
|
||||
# Copyright (C) Siemens Nixdorf Informationssysteme AG 1994 - 1998
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# $Id: Makefile.in,v 1.2 2005-04-18 16:05:08 kkuznetsov Exp $
|
||||
# $Id: Makefile.in,v 1.3 2005-05-27 22:15:21 asfernandes Exp $
|
||||
#
|
||||
|
||||
ROOT=..
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# $Header: /home/job/firebird/cvs-backup/firebird2/builds/install/arch-specific/solx86gcc/CS/postinstall.in,v 1.1 2005-03-11 15:19:37 kkuznetsov Exp $
|
||||
# $Header: /home/job/firebird/cvs-backup/firebird2/builds/install/arch-specific/solx86gcc/CS/postinstall.in,v 1.2 2005-05-27 22:15:33 asfernandes Exp $
|
||||
#------------------------------------------------------------------------------
|
||||
# $Copyright:
|
||||
# Copyright (C) Siemens Nixdorf Informationssysteme AG 1994 - 1998
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# $Header: /home/job/firebird/cvs-backup/firebird2/builds/install/arch-specific/solx86gcc/CS/postremove.in,v 1.1 2005-03-11 15:19:37 kkuznetsov Exp $
|
||||
# $Header: /home/job/firebird/cvs-backup/firebird2/builds/install/arch-specific/solx86gcc/CS/postremove.in,v 1.2 2005-05-27 22:15:33 asfernandes Exp $
|
||||
#------------------------------------------------------------------------------
|
||||
# $Copyright:
|
||||
# Copyright (C) Siemens Nixdorf Informationssysteme AG 1994 - 1998
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#!/bin/sh
|
||||
|
||||
# $Header: /home/job/firebird/cvs-backup/firebird2/builds/install/arch-specific/solx86gcc/CS/preinstall.in,v 1.1 2005-03-11 15:19:38 kkuznetsov Exp $
|
||||
# $Header: /home/job/firebird/cvs-backup/firebird2/builds/install/arch-specific/solx86gcc/CS/preinstall.in,v 1.2 2005-05-27 22:15:33 asfernandes Exp $
|
||||
#------------------------------------------------------------------------------
|
||||
# $Copyright:
|
||||
# Copyright (C) Siemens Nixdorf Informationssysteme AG 1994 - 1998
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# $Id: Makefile.in,v 1.3 2005-04-20 14:30:19 kkuznetsov Exp $
|
||||
# $Id: Makefile.in,v 1.4 2005-05-27 22:15:29 asfernandes Exp $
|
||||
#
|
||||
|
||||
ROOT=..
|
||||
|
||||
@ -304,6 +304,9 @@ Source: output\bin\isql.exe; DestDir: {app}\bin; Components: DevAdminComponent;
|
||||
Source: output\bin\nbackup.exe; DestDir: {app}\bin; Components: DevAdminComponent; Flags: ignoreversion
|
||||
Source: output\bin\qli.exe; DestDir: {app}\bin; Components: DevAdminComponent; Flags: ignoreversion
|
||||
Source: output\bin\fbclient.dll; DestDir: {app}\bin; Components: ClientComponent; Flags: overwritereadonly sharedfile promptifolder
|
||||
Source: output\bin\icuuc30.dll; DestDir: {app}\bin; Components: ServerComponent; Flags: sharedfile ignoreversion
|
||||
Source: output\bin\icuin30.dll; DestDir: {app}\bin; Components: ServerComponent; Flags: sharedfile ignoreversion
|
||||
Source: output\bin\icudt30.dll; DestDir: {app}\bin; Components: ServerComponent; Flags: sharedfile ignoreversion
|
||||
|
||||
; Install MS libs locally if Win2K or later, else place in <sys> if NT4 or Win95/98/ME.
|
||||
; NOTE: These dll's MUST never be sourced from the local system32 directory.
|
||||
@ -327,6 +330,7 @@ Source: output\doc\sql.extensions\*.*; DestDir: {app}\doc\sql.extensions; Compon
|
||||
Source: output\help\*.*; DestDir: {app}\help; Components: DevAdminComponent; Flags: ignoreversion;
|
||||
Source: output\include\*.*; DestDir: {app}\include; Components: DevAdminComponent; Flags: ignoreversion;
|
||||
Source: output\intl\fbintl.dll; DestDir: {app}\intl; Components: ServerComponent; Flags: sharedfile ignoreversion;
|
||||
Source: output\intl\fbintl.conf; DestDir: {app}\intl; Components: ServerComponent; Flags: onlyifdoesntexist
|
||||
Source: output\lib\*.*; DestDir: {app}\lib; Components: DevAdminComponent; Flags: ignoreversion;
|
||||
Source: output\UDF\ib_udf.dll; DestDir: {app}\UDF; Components: ServerComponent; Flags: sharedfile ignoreversion;
|
||||
Source: output\UDF\fbudf.dll; DestDir: {app}\UDF; Components: ServerComponent; Flags: sharedfile ignoreversion;
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# $Id: changeGdsLibraryCompatibleLink.sh.in,v 1.1 2005-04-29 18:16:46 alexpeshkoff Exp $
|
||||
# $Id: changeGdsLibraryCompatibleLink.sh.in,v 1.2 2005-05-27 22:15:57 asfernandes Exp $
|
||||
#
|
||||
|
||||
|
||||
|
||||
@ -28,7 +28,7 @@
|
||||
#
|
||||
# Contributor(s):
|
||||
#
|
||||
# $Id: fb_config.in,v 1.1 2005-03-13 16:02:12 alexpeshkoff Exp $
|
||||
# $Id: fb_config.in,v 1.2 2005-05-27 22:15:57 asfernandes Exp $
|
||||
#
|
||||
|
||||
# stored configuration values
|
||||
|
||||
280
builds/install/misc/fbintl.conf
Normal file
280
builds/install/misc/fbintl.conf
Normal file
@ -0,0 +1,280 @@
|
||||
<intl_module fbintl>
|
||||
filename $(this)/fbintl
|
||||
</intl_module>
|
||||
|
||||
<charset SJIS_0208>
|
||||
intl_module fbintl
|
||||
collation SJIS_0208
|
||||
</charset>
|
||||
|
||||
<charset EUCJ_0208>
|
||||
intl_module fbintl
|
||||
collation EUCJ_0208
|
||||
</charset>
|
||||
|
||||
<charset DOS437>
|
||||
intl_module fbintl
|
||||
collation DOS437
|
||||
collation DB_DEU437
|
||||
collation DB_ESP437
|
||||
collation DB_FIN437
|
||||
collation DB_FRA437
|
||||
collation DB_ITA437
|
||||
collation DB_NLD437
|
||||
collation DB_SVE437
|
||||
collation DB_UK437
|
||||
collation DB_US437
|
||||
collation PDOX_ASCII
|
||||
collation PDOX_INTL
|
||||
collation PDOX_SWEDFIN
|
||||
</charset>
|
||||
|
||||
<charset DOS850>
|
||||
intl_module fbintl
|
||||
collation DOS850
|
||||
collation DB_DEU850
|
||||
collation DB_ESP850
|
||||
collation DB_FRA850
|
||||
collation DB_FRC850
|
||||
collation DB_ITA850
|
||||
collation DB_NLD850
|
||||
collation DB_PTB850
|
||||
collation DB_SVE850
|
||||
collation DB_UK850
|
||||
collation DB_US850
|
||||
</charset>
|
||||
|
||||
<charset DOS865>
|
||||
intl_module fbintl
|
||||
collation DOS865
|
||||
collation DB_DAN865
|
||||
collation DB_NOR865
|
||||
collation PDOX_NORDAN4
|
||||
</charset>
|
||||
|
||||
<charset ISO8859_1>
|
||||
intl_module fbintl
|
||||
collation ISO8859_1
|
||||
collation DA_DA
|
||||
collation DE_DE
|
||||
collation DU_NL
|
||||
collation EN_UK
|
||||
collation EN_US
|
||||
collation ES_ES
|
||||
collation FI_FI
|
||||
collation FR_CA
|
||||
collation FR_FR
|
||||
collation IS_IS
|
||||
collation IT_IT
|
||||
collation NO_NO
|
||||
collation SV_SV
|
||||
collation PT_BR
|
||||
collation PT_PT
|
||||
</charset>
|
||||
|
||||
<charset ISO8859_2>
|
||||
intl_module fbintl
|
||||
collation ISO8859_2
|
||||
collation CS_CZ
|
||||
collation ISO_HUN
|
||||
</charset>
|
||||
|
||||
<charset ISO8859_3>
|
||||
intl_module fbintl
|
||||
collation ISO8859_3
|
||||
</charset>
|
||||
|
||||
<charset ISO8859_4>
|
||||
intl_module fbintl
|
||||
collation ISO8859_4
|
||||
</charset>
|
||||
|
||||
<charset ISO8859_5>
|
||||
intl_module fbintl
|
||||
collation ISO8859_5
|
||||
</charset>
|
||||
|
||||
<charset ISO8859_6>
|
||||
intl_module fbintl
|
||||
collation ISO8859_6
|
||||
</charset>
|
||||
|
||||
<charset ISO8859_7>
|
||||
intl_module fbintl
|
||||
collation ISO8859_7
|
||||
</charset>
|
||||
|
||||
<charset ISO8859_8>
|
||||
intl_module fbintl
|
||||
collation ISO8859_8
|
||||
</charset>
|
||||
|
||||
<charset ISO8859_9>
|
||||
intl_module fbintl
|
||||
collation ISO8859_9
|
||||
</charset>
|
||||
|
||||
<charset ISO8859_13>
|
||||
intl_module fbintl
|
||||
collation ISO8859_13
|
||||
</charset>
|
||||
|
||||
<charset DOS852>
|
||||
intl_module fbintl
|
||||
collation DOS852
|
||||
collation DB_CSY
|
||||
collation DB_PLK
|
||||
collation DB_SLO
|
||||
collation PDOX_CSY
|
||||
collation PDOX_HUN
|
||||
collation PDOX_PLK
|
||||
collation PDOX_SLO
|
||||
</charset>
|
||||
|
||||
<charset DOS857>
|
||||
intl_module fbintl
|
||||
collation DOS857
|
||||
collation DB_TRK
|
||||
</charset>
|
||||
|
||||
<charset DOS860>
|
||||
intl_module fbintl
|
||||
collation DOS860
|
||||
collation DB_PTG860
|
||||
</charset>
|
||||
|
||||
<charset DOS861>
|
||||
intl_module fbintl
|
||||
collation DOS861
|
||||
collation PDOX_ISL
|
||||
</charset>
|
||||
|
||||
<charset DOS863>
|
||||
intl_module fbintl
|
||||
collation DOS863
|
||||
collation DB_FRC863
|
||||
</charset>
|
||||
|
||||
<charset CYRL>
|
||||
intl_module fbintl
|
||||
collation CYRL
|
||||
collation DB_RUS
|
||||
collation PDOX_CYRL
|
||||
</charset>
|
||||
|
||||
<charset DOS737>
|
||||
intl_module fbintl
|
||||
collation DOS737
|
||||
</charset>
|
||||
|
||||
<charset DOS775>
|
||||
intl_module fbintl
|
||||
collation DOS775
|
||||
</charset>
|
||||
|
||||
<charset DOS858>
|
||||
intl_module fbintl
|
||||
collation DOS858
|
||||
</charset>
|
||||
|
||||
<charset DOS862>
|
||||
intl_module fbintl
|
||||
collation DOS862
|
||||
</charset>
|
||||
|
||||
<charset DOS864>
|
||||
intl_module fbintl
|
||||
collation DOS864
|
||||
</charset>
|
||||
|
||||
<charset DOS866>
|
||||
intl_module fbintl
|
||||
collation DOS866
|
||||
</charset>
|
||||
|
||||
<charset DOS869>
|
||||
intl_module fbintl
|
||||
collation DOS869
|
||||
</charset>
|
||||
|
||||
<charset WIN1250>
|
||||
intl_module fbintl
|
||||
collation WIN1250
|
||||
collation PXW_CSY
|
||||
collation PXW_HUN
|
||||
collation PXW_HUNDC
|
||||
collation PXW_PLK
|
||||
collation PXW_SLOV
|
||||
</charset>
|
||||
|
||||
<charset WIN1251>
|
||||
intl_module fbintl
|
||||
collation WIN1251
|
||||
collation PXW_CYRL
|
||||
collation WIN1251_UA
|
||||
</charset>
|
||||
|
||||
<charset WIN1252>
|
||||
intl_module fbintl
|
||||
collation WIN1252
|
||||
collation PT_BR
|
||||
collation PXW_INTL
|
||||
collation PXW_INTL850
|
||||
collation PXW_NORDAN4
|
||||
collation WIN_PTBR
|
||||
collation PXW_SPAN
|
||||
collation PXW_SWEDFIN
|
||||
</charset>
|
||||
|
||||
<charset WIN1253>
|
||||
intl_module fbintl
|
||||
collation WIN1253
|
||||
collation PXW_GREEK
|
||||
</charset>
|
||||
|
||||
<charset WIN1254>
|
||||
intl_module fbintl
|
||||
collation WIN1254
|
||||
collation PXW_TURK
|
||||
</charset>
|
||||
|
||||
<charset NEXT>
|
||||
intl_module fbintl
|
||||
collation NEXT
|
||||
collation NXT_DEU
|
||||
collation NXT_ESP
|
||||
collation NXT_FRA
|
||||
collation NXT_ITA
|
||||
collation NXT_US
|
||||
</charset>
|
||||
|
||||
<charset WIN1255>
|
||||
intl_module fbintl
|
||||
collation WIN1255
|
||||
</charset>
|
||||
|
||||
<charset WIN1256>
|
||||
intl_module fbintl
|
||||
collation WIN1256
|
||||
</charset>
|
||||
|
||||
<charset WIN1257>
|
||||
intl_module fbintl
|
||||
collation WIN1257
|
||||
</charset>
|
||||
|
||||
<charset KSC_5601>
|
||||
intl_module fbintl
|
||||
collation KSC_5601
|
||||
collation KSC_DICTIONARY
|
||||
</charset>
|
||||
|
||||
<charset BIG_5>
|
||||
intl_module fbintl
|
||||
collation BIG_5
|
||||
</charset>
|
||||
|
||||
<charset GB_2312>
|
||||
intl_module fbintl
|
||||
collation GB_2312
|
||||
</charset>
|
||||
@ -27,7 +27,7 @@
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# $Id: Makefile.in.boot.gpre,v 1.22 2005-05-19 05:09:06 aafemt Exp $
|
||||
# $Id: Makefile.in.boot.gpre,v 1.23 2005-05-27 22:16:01 asfernandes Exp $
|
||||
#
|
||||
ROOT=..
|
||||
ObjModuleType=boot
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# $Id: Makefile.in.client.fbudf,v 1.4 2004-12-28 21:12:46 skidder Exp $
|
||||
# $Id: Makefile.in.client.fbudf,v 1.5 2005-05-27 22:16:01 asfernandes Exp $
|
||||
#
|
||||
ROOT=..
|
||||
ObjModuleType=std
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# $Id: Makefile.in.client.gbak,v 1.10 2005-05-12 18:28:46 alexpeshkoff Exp $
|
||||
# $Id: Makefile.in.client.gbak,v 1.11 2005-05-27 22:16:01 asfernandes Exp $
|
||||
#
|
||||
|
||||
ROOT=..
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# $Id: Makefile.in.client.gdef,v 1.10 2005-02-05 10:30:48 fsg Exp $
|
||||
# $Id: Makefile.in.client.gdef,v 1.11 2005-05-27 22:16:01 asfernandes Exp $
|
||||
#
|
||||
ROOT=..
|
||||
ObjModuleType=std
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# $Id: Makefile.in.client.gfix,v 1.12 2005-03-01 15:49:09 kkuznetsov Exp $
|
||||
# $Id: Makefile.in.client.gfix,v 1.13 2005-05-27 22:16:01 asfernandes Exp $
|
||||
#
|
||||
ROOT=..
|
||||
ObjModuleType=std
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# $Id: Makefile.in.client.gpre,v 1.17 2005-02-05 10:30:48 fsg Exp $
|
||||
# $Id: Makefile.in.client.gpre,v 1.18 2005-05-27 22:16:01 asfernandes Exp $
|
||||
#
|
||||
ROOT=..
|
||||
ObjModuleType=std
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
# All Rights Reserved.
|
||||
# Contributor(s): ______________________________________.
|
||||
#
|
||||
# $Id: Makefile.in.client.gsec,v 1.3 2004-12-28 21:12:47 skidder Exp $
|
||||
# $Id: Makefile.in.client.gsec,v 1.4 2005-05-27 22:16:01 asfernandes Exp $
|
||||
#
|
||||
ROOT=..
|
||||
ObjModuleType=superclient
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# $Id: Makefile.in.client.isql,v 1.9 2005-02-05 10:30:48 fsg Exp $
|
||||
# $Id: Makefile.in.client.isql,v 1.10 2005-05-27 22:16:01 asfernandes Exp $
|
||||
#
|
||||
ROOT=..
|
||||
ObjModuleType=std
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# $Id: Makefile.in.client.qli,v 1.5 2005-02-05 10:30:48 fsg Exp $
|
||||
# $Id: Makefile.in.client.qli,v 1.6 2005-05-27 22:16:01 asfernandes Exp $
|
||||
#
|
||||
ROOT=..
|
||||
ObjModuleType=std
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# $Id: Makefile.in.client.util,v 1.23 2005-03-01 15:10:40 kkuznetsov Exp $
|
||||
# $Id: Makefile.in.client.util,v 1.24 2005-05-27 22:16:01 asfernandes Exp $
|
||||
#
|
||||
ROOT=..
|
||||
ObjModuleType=std
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# $Id: Makefile.in.embed.lockmgr,v 1.8 2004-12-28 21:12:47 skidder Exp $
|
||||
# $Id: Makefile.in.embed.lockmgr,v 1.9 2005-05-27 22:16:01 asfernandes Exp $
|
||||
#
|
||||
ROOT=..
|
||||
ObjModuleType=boot
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# $Id: Makefile.in.examples,v 1.4 2005-03-24 11:16:27 aafemt Exp $
|
||||
# $Id: Makefile.in.examples,v 1.5 2005-05-27 22:16:01 asfernandes Exp $
|
||||
#
|
||||
ROOT=../..
|
||||
ObjModuleType=std
|
||||
@ -48,6 +48,8 @@ include $(ROOT)/gen/make.shared.variables
|
||||
PATH := ./:$(BIN):$(PATH)
|
||||
export PATH
|
||||
|
||||
LD_LIBRARY_PATH := $(GEN_ROOT)/firebird/lib
|
||||
export LD_LIBRARY_PATH
|
||||
|
||||
GPRE_FLAGS= -r -m -z -n
|
||||
|
||||
|
||||
47
builds/posix/Makefile.in.extern.icu
Normal file
47
builds/posix/Makefile.in.extern.icu
Normal file
@ -0,0 +1,47 @@
|
||||
# The contents of this file are subject to the Initial
|
||||
# Developer's Public License Version 1.0 (the "License");
|
||||
# you may not use this file except in compliance with the
|
||||
# License. You may obtain a copy of the License at
|
||||
# http://www.ibphoenix.com/main.nfs?a=ibphoenix&page=ibp_idpl.
|
||||
#
|
||||
# Software distributed under the License is distributed AS IS,
|
||||
# WITHOUT WARRANTY OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing rights
|
||||
# and limitations under the License.
|
||||
#
|
||||
# The Original Code was created by Adriano dos Santos Fernandes
|
||||
# for the Firebird Open Source RDBMS project.
|
||||
#
|
||||
# Copyright (c) 2005 Adriano dos Santos Fernandes <adrianosf@uol.com.br>
|
||||
# and all contributors signed below.
|
||||
#
|
||||
# All Rights Reserved.
|
||||
# Contributor(s): ______________________________________.
|
||||
#
|
||||
#
|
||||
ROOT=..
|
||||
|
||||
|
||||
include $(ROOT)/gen/make.defaults
|
||||
include $(ROOT)/gen/make.platform
|
||||
include $(ROOT)/gen/make.rules
|
||||
include $(ROOT)/gen/make.shared.variables
|
||||
|
||||
@SET_MAKE@
|
||||
|
||||
|
||||
.PHONY: libicu
|
||||
|
||||
|
||||
libicu: $(LIB)/libicuuc.so $(LIB)/libicudata.so $(LIB)/libicui18n.so
|
||||
|
||||
$(LIB)/libicuuc.so $(LIB)/libicudata.so $(LIB)/libicui18n.so:
|
||||
cd $(ROOT)/extern/icu/source; chmod +x runConfigureICU configure install-sh; ./runConfigureICU LinuxRedHat --prefix=`pwd`/..
|
||||
$(MAKE) -C $(ROOT)/extern/icu/source
|
||||
$(MAKE) -C $(ROOT)/extern/icu/source install
|
||||
cp $(ROOT)/extern/icu/lib/libicuuc* $(LIB)
|
||||
cp $(ROOT)/extern/icu/lib/libicudata* $(LIB)
|
||||
cp $(ROOT)/extern/icu/lib/libicui18n* $(LIB)
|
||||
|
||||
|
||||
include $(ROOT)/gen/make.shared.targets
|
||||
@ -27,7 +27,7 @@
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# $Id: Makefile.in.extlib,v 1.19 2004-12-28 21:12:47 skidder Exp $
|
||||
# $Id: Makefile.in.extlib,v 1.20 2005-05-27 22:16:02 asfernandes Exp $
|
||||
#
|
||||
ROOT=..
|
||||
ObjModuleType=std
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# $Id: Makefile.in.fbserver,v 1.17 2004-12-28 21:12:47 skidder Exp $
|
||||
# $Id: Makefile.in.fbserver,v 1.18 2005-05-27 22:16:02 asfernandes Exp $
|
||||
#
|
||||
ROOT=..
|
||||
ObjModuleType=superserver
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# $Id: Makefile.in.firebird,v 1.60 2005-03-05 01:44:02 robocop Exp $
|
||||
# $Id: Makefile.in.firebird,v 1.61 2005-05-27 22:16:02 asfernandes Exp $
|
||||
#
|
||||
|
||||
ROOT=..
|
||||
@ -45,13 +45,14 @@ ISC_PASSWORD= masterkey
|
||||
TEST_PATH = @FIREBIRD_BUILD_DIR@
|
||||
# Firebird libs path set at link time (-R) so do not override local requirements - nmcc 28/12/2002
|
||||
#LD_LIBRARY_PATH=$(RealFirebirdPath)/lib
|
||||
LD_LIBRARY_PATH=$(LIB)
|
||||
|
||||
#export ISC_USER
|
||||
#export ISC_PASSWORD
|
||||
#export INTERBASE
|
||||
export FIREBIRD
|
||||
export DYLD_FRAMEWORK_PATH
|
||||
#export LD_LIBRARY_PATH
|
||||
export LD_LIBRARY_PATH
|
||||
|
||||
######################################################################
|
||||
########### Build process overview #################################
|
||||
@ -180,16 +181,19 @@ $(GEN_ROOT)/Make.Version : $(SRC_ROOT)/misc/writeBuildNum.sh
|
||||
|
||||
#
|
||||
# Libraries that come from outside the project but are built
|
||||
# as part of the project are included here. Currently editline
|
||||
# is the only external library we have included.
|
||||
# as part of the project are included here. Currently IBM ICU and
|
||||
# editline is the only externals libraries we have included.
|
||||
#
|
||||
EXTERNAL_LIBRARIES=
|
||||
EXTERNAL_LIBRARIES= $(LIBICU_SO)
|
||||
ifeq ($(EDITLINE_FLG),Y)
|
||||
EXTERNAL_LIBRARIES:= $(EXTERNAL_LIBRARIES) $(LIBEDITLINE_A)
|
||||
endif
|
||||
|
||||
external_libraries: $(EXTERNAL_LIBRARIES)
|
||||
|
||||
$(LIBICU_SO):
|
||||
$(MAKE) -f $(GEN_ROOT)/Makefile.extern.icu
|
||||
|
||||
$(LIBEDITLINE_A):
|
||||
$(MAKE) -f $(GEN_ROOT)/Makefile.extern.editline
|
||||
|
||||
@ -485,7 +489,7 @@ rebuild_codes :
|
||||
#INSTALL_MiscFiles = $(addprefix $(FIREBIRD)/misc/, $(CLASSIC_MiscFiles))
|
||||
#endif
|
||||
|
||||
MiscFiles = firebird.conf
|
||||
MiscFiles = firebird.conf fbintl.conf
|
||||
INSTALL_MiscFiles = $(addprefix $(FIREBIRD)/misc/, $(MiscFiles))
|
||||
|
||||
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# $Id: Makefile.in.intl,v 1.20 2004-12-28 21:12:47 skidder Exp $
|
||||
# $Id: Makefile.in.intl,v 1.21 2005-05-27 22:16:08 asfernandes Exp $
|
||||
#
|
||||
ROOT=..
|
||||
ObjModuleType=superclient
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# $Id: Makefile.in.libfbclient,v 1.28 2005-03-05 01:44:03 robocop Exp $
|
||||
# $Id: Makefile.in.libfbclient,v 1.29 2005-05-27 22:16:08 asfernandes Exp $
|
||||
#
|
||||
ROOT=..
|
||||
ObjModuleType=superclient
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# $Id: Makefile.in.libfbcommon,v 1.8 2005-05-19 05:09:06 aafemt Exp $
|
||||
# $Id: Makefile.in.libfbcommon,v 1.9 2005-05-27 22:16:09 asfernandes Exp $
|
||||
#
|
||||
ROOT=..
|
||||
ObjModuleType=std
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# $Id: Makefile.in.libfbembed,v 1.14 2005-03-05 01:44:03 robocop Exp $
|
||||
# $Id: Makefile.in.libfbembed,v 1.15 2005-05-27 22:16:09 asfernandes Exp $
|
||||
#
|
||||
ROOT=..
|
||||
ObjModuleType=std
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# $Id: Makefile.in.libfbstatic,v 1.7 2004-12-28 21:12:47 skidder Exp $
|
||||
# $Id: Makefile.in.libfbstatic,v 1.8 2005-05-27 22:16:09 asfernandes Exp $
|
||||
#
|
||||
ROOT=..
|
||||
ObjModuleType=boot
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# $Id: Makefile.in.refDatabases,v 1.26 2005-03-05 01:44:03 robocop Exp $
|
||||
# $Id: Makefile.in.refDatabases,v 1.27 2005-05-27 22:16:09 asfernandes Exp $
|
||||
#
|
||||
ROOT=..
|
||||
ObjModuleType=std
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# $Id: Makefile.in.static.gbak,v 1.9 2004-12-28 21:12:47 skidder Exp $
|
||||
# $Id: Makefile.in.static.gbak,v 1.10 2005-05-27 22:16:09 asfernandes Exp $
|
||||
#
|
||||
ROOT=..
|
||||
ObjModuleType=boot
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# $Id: Makefile.in.static.gpre,v 1.16 2004-12-28 21:12:47 skidder Exp $
|
||||
# $Id: Makefile.in.static.gpre,v 1.17 2005-05-27 22:16:09 asfernandes Exp $
|
||||
#
|
||||
ROOT=..
|
||||
ObjModuleType=boot
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# $Id: Makefile.in.static.isql,v 1.8 2004-12-28 21:12:47 skidder Exp $
|
||||
# $Id: Makefile.in.static.isql,v 1.9 2005-05-27 22:16:09 asfernandes Exp $
|
||||
#
|
||||
ROOT=..
|
||||
ObjModuleType=boot
|
||||
|
||||
@ -23,13 +23,14 @@
|
||||
# Contributor(s): ______________________________________.
|
||||
#
|
||||
#
|
||||
# $Id: fbintl.vers,v 1.2 2004-06-30 01:26:40 skidder Exp $
|
||||
# $Id: fbintl.vers,v 1.3 2005-05-27 22:16:09 asfernandes Exp $
|
||||
#
|
||||
|
||||
|
||||
{
|
||||
global:
|
||||
LD_lookup;
|
||||
LD_lookup_charset;
|
||||
LD_lookup_texttype;
|
||||
|
||||
local:
|
||||
*;
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# $Id: make.defaults,v 1.38 2005-02-24 12:23:14 alexpeshkoff Exp $
|
||||
# $Id: make.defaults,v 1.39 2005-05-27 22:16:09 asfernandes Exp $
|
||||
#
|
||||
|
||||
|
||||
@ -174,6 +174,7 @@ LIBFBINTL_SO = $(FIREBIRD)/intl/libfbintl.$(SHRLIB_EXT)
|
||||
LIBFBCOMMON_A = $(LIB)/libfbcommon.a
|
||||
LIBFBSTATIC_A = $(LIB)/libfbstatic.a
|
||||
LIBEDITLINE_A = $(LIB)/libeditline.a
|
||||
LIBICU_SO = $(LIB)/libicuuc.so $(LIB)/libicudata.so $(LIB)/libicui18n.so
|
||||
|
||||
# Shared library name for usage inside of the UDF
|
||||
IbUtilLibraryName = libib_util.$(SHRLIB_EXT)
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# $Id: make.rules,v 1.24 2004-10-04 05:23:56 skidder Exp $
|
||||
# $Id: make.rules,v 1.25 2005-05-27 22:16:09 asfernandes Exp $
|
||||
#
|
||||
|
||||
#____________________________________________________________________________
|
||||
@ -40,7 +40,7 @@ IsProdTypeBuild = @PROD_BUILD_FLG@
|
||||
|
||||
|
||||
# Please don't use compiler/platform specific flags here - nmcc 02-Nov-2002
|
||||
CFLAGS:= $(CFLAGS) -I$(SRC_ROOT)/include/gen -I$(SRC_ROOT)/include
|
||||
CFLAGS:= $(CFLAGS) -I$(SRC_ROOT)/include/gen -I$(SRC_ROOT)/include -I$(SRC_ROOT)/vulcan -I$(SRC_ROOT)/../extern/icu/include
|
||||
|
||||
ifeq ($(IsProdTypeBuild),Y)
|
||||
CFLAGS:= $(CFLAGS) $(PROD_FLAGS) -DPROD_BUILD
|
||||
@ -81,7 +81,7 @@ STATICLIB_LINK= ar cruvs
|
||||
EXE_LINK = @CXX@
|
||||
STATICEXE_LINK = @CXX@
|
||||
|
||||
LINK_LIBS = @LIBS@ @EDITLINE_A@
|
||||
LINK_LIBS = @LIBS@ @EDITLINE_A@ -licuuc -licudata -licui18n
|
||||
STATICLINK_LIBS = @LIBS@ @EDITLINE_A@
|
||||
SO_LINK_LIBS = @LIBS@
|
||||
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# $Id: make.shared.targets,v 1.18 2005-02-24 12:23:14 alexpeshkoff Exp $
|
||||
# $Id: make.shared.targets,v 1.19 2005-05-27 22:16:09 asfernandes Exp $
|
||||
#
|
||||
|
||||
|
||||
|
||||
@ -35,14 +35,15 @@ JRD_ServerFiles= blob_filter.cpp dpm.epp dyn.epp dyn_def.epp \
|
||||
err.cpp iberr.cpp \
|
||||
event.cpp evl.cpp exe.cpp ext.cpp \
|
||||
execute_statement.cpp filters.cpp flu.cpp functions.cpp \
|
||||
idx.cpp inf.cpp intl.cpp intl_builtin.cpp inuse.cpp \
|
||||
idx.cpp inf.cpp intl.cpp intl_builtin.cpp IntlManager.cpp inuse.cpp \
|
||||
jrd.cpp lck.cpp log.cpp \
|
||||
mov.cpp nav.cpp opt.cpp Optimizer.cpp pag.cpp par.cpp \
|
||||
plugin_manager.cpp pwd.cpp rlck.cpp \
|
||||
rng.cpp rpb_chain.cpp rse.cpp \
|
||||
sdw.cpp shut.cpp sort.cpp sort_mem.cpp sqz.cpp \
|
||||
svc.cpp sym.cpp tpc.cpp tra.cpp validation.cpp vio.cpp \
|
||||
nodebug.cpp nbak.cpp sha.cpp $(Physical_IO_Module) ThreadData.cpp thd.cpp
|
||||
nodebug.cpp nbak.cpp sha.cpp $(Physical_IO_Module) ThreadData.cpp thd.cpp \
|
||||
unicode_util.cpp
|
||||
|
||||
|
||||
JRD_Files = $(JRD_ClientFiles) $(JRD_ServerFiles)
|
||||
@ -216,6 +217,33 @@ FBCONFIG_Files= $(FBCONFIG_ClientFiles) $(FBCONFIG_ServerFiles)
|
||||
FBCONFIG_Sources = $(addprefix common/config/, $(FBCONFIG_Files))
|
||||
FBCONFIG_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(FBCONFIG_Sources))))
|
||||
|
||||
#________________________________________________________________________
|
||||
#
|
||||
# config
|
||||
|
||||
CONFIG_ClientFiles=AdminException.cpp Args.cpp ArgsException.cpp \
|
||||
ConfObj.cpp ConfObject.cpp ConfigFile.cpp Configuration.cpp \
|
||||
DirectoryList.cpp Element.cpp FileName.cpp InputFile.cpp \
|
||||
InputStream.cpp Lex.cpp ScanDir.cpp Stream.cpp StreamSegment.cpp
|
||||
CONFIG_ServerFiles=
|
||||
|
||||
CONFIG_Files= $(CONFIG_ClientFiles) $(CONFIG_ServerFiles)
|
||||
|
||||
CONFIG_Sources = $(addprefix config/, $(CONFIG_Files))
|
||||
CONFIG_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(CONFIG_Sources))))
|
||||
|
||||
#________________________________________________________________________
|
||||
#
|
||||
# vulcan
|
||||
|
||||
VULCAN_ClientFiles=JString.cpp PathName.cpp RefObject.cpp
|
||||
VULCAN_ServerFiles=
|
||||
|
||||
VULCAN_Files= $(VULCAN_ClientFiles) $(VULCAN_ServerFiles)
|
||||
|
||||
VULCAN_Sources = $(addprefix vulcan/, $(VULCAN_Files))
|
||||
VULCAN_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(VULCAN_Sources))))
|
||||
|
||||
#________________________________________________________________________
|
||||
#
|
||||
# common
|
||||
@ -272,7 +300,9 @@ LIBFBEMBED_Objects =$(OS_SPECIFIC_Objects) \
|
||||
$(CLUMPLETS_Objects) \
|
||||
$(FBCONFIG_Objects) \
|
||||
$(BURP_Objects) \
|
||||
$(ALICE_Objects)
|
||||
$(ALICE_Objects) \
|
||||
$(CONFIG_Objects) \
|
||||
$(VULCAN_Objects)
|
||||
|
||||
# Objects differences for server (super) and embedded (classic) libraries
|
||||
# have been worked out above in this file, based on macros, so here they
|
||||
@ -297,7 +327,9 @@ LIBFBSTATIC_Objects = $(OS_SPECIFIC_Objects) \
|
||||
$(INTERFACE_Objects) \
|
||||
$(GPRELIB_Objects) \
|
||||
$(FBCONFIG_Objects) \
|
||||
$(CLUMPLETS_Objects)
|
||||
$(CLUMPLETS_Objects) \
|
||||
$(CONFIG_Objects) \
|
||||
$(VULCAN_Objects)
|
||||
|
||||
|
||||
# Not needed since loaded into libfbmemory.a already
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
# All Rights Reserved.
|
||||
# Contributor(s): ______________________________________.
|
||||
# Start of file prefix.linux: $(VERSION) $(PLATFORM)
|
||||
#$Id: prefix.linux_generic,v 1.1 2004-12-28 21:00:57 skidder Exp $
|
||||
#$Id: prefix.linux_generic,v 1.2 2005-05-27 22:16:09 asfernandes Exp $
|
||||
# 2 Oct 2002, Nickolay Samofatov - Major cleanup
|
||||
|
||||
PROD_FLAGS=-O3 -DNDEBUG -DLINUX -pipe -MMD -fPIC
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
# All Rights Reserved.
|
||||
# Contributor(s): ______________________________________.
|
||||
# Start of file prefix.linux: $(VERSION) $(PLATFORM)
|
||||
#$Id: prefix.linux_sparc32,v 1.5 2004-12-28 20:57:46 skidder Exp $
|
||||
#$Id: prefix.linux_sparc32,v 1.6 2005-05-27 22:16:09 asfernandes Exp $
|
||||
# 2 Oct 2002, Nickolay Samofatov - Major cleanup
|
||||
|
||||
PROD_FLAGS=-m32 -mcpu=ultrasparc -mtune=ultrasparc -O3 -DNDEBUG -DLINUX -pipe -MMD -fPIC -Dsparc
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
# All Rights Reserved.
|
||||
# Contributor(s): ______________________________________.
|
||||
# Start of file prefix.netbsd: $(VERSION) @PLATFORM@
|
||||
#$Id: prefix.netbsd,v 1.2 2005-01-24 02:15:48 stryqx Exp $
|
||||
#$Id: prefix.netbsd,v 1.3 2005-05-27 22:16:09 asfernandes Exp $
|
||||
# 2 Oct 2002, Nickolay Samofatov - Major Cleanup
|
||||
|
||||
OS_ServerFiles=inet_server.cpp
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
#
|
||||
# Use SOLX86 to identify x86 version of Solaris. Neil McCalden
|
||||
#
|
||||
# $Id: prefix.solx86,v 1.25 2005-03-01 15:49:10 kkuznetsov Exp $
|
||||
# $Id: prefix.solx86,v 1.26 2005-05-27 22:16:09 asfernandes Exp $
|
||||
#
|
||||
# Start of file prefix.solaris X 86 : $(VERSION) $(PLATFORM)
|
||||
# 2 Oct 2002, Nickolay Samofatov - Major Cleanup
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
#
|
||||
# Use SOLX86 to identify x86 version of Solaris. Neil McCalden
|
||||
#
|
||||
# $Id: prefix.solx86gcc,v 1.15 2005-03-01 15:49:10 kkuznetsov Exp $
|
||||
# $Id: prefix.solx86gcc,v 1.16 2005-05-27 22:16:09 asfernandes Exp $
|
||||
#
|
||||
# Start of file prefix.solaris X 86 : $(VERSION) $(PLATFORM)
|
||||
# 2 Oct 2002, Nickolay Samofatov - Major Cleanup
|
||||
|
||||
@ -75,6 +75,9 @@ if errorlevel 1 call :ERROR Debug build failed
|
||||
@mkdir %ROOT_PATH%\output\lib
|
||||
@mkdir %ROOT_PATH%\output\system32 > nul
|
||||
|
||||
@copy %ROOT_PATH%\extern\icu\bin\icuuc30.dll %ROOT_PATH%\output\bin >nul
|
||||
@copy %ROOT_PATH%\extern\icu\bin\icudt30.dll %ROOT_PATH%\output\bin >nul
|
||||
@copy %ROOT_PATH%\extern\icu\bin\icuin30.dll %ROOT_PATH%\output\bin >nul
|
||||
@copy %ROOT_PATH%\temp\%DBG_DIR%\firebird\bin\* %ROOT_PATH%\output\bin >nul
|
||||
@copy %ROOT_PATH%\temp\%DBG_DIR%\firebird\intl\* %ROOT_PATH%\output\intl >nul
|
||||
@copy %ROOT_PATH%\temp\%DBG_DIR%\firebird\udf\* %ROOT_PATH%\output\udf >nul
|
||||
@ -83,6 +86,7 @@ if errorlevel 1 call :ERROR Debug build failed
|
||||
:: Firebird.conf, etc
|
||||
@copy %ROOT_PATH%\gen\firebird.msg %ROOT_PATH%\output > nul
|
||||
@copy %ROOT_PATH%\builds\install\misc\firebird.conf %ROOT_PATH%\output >nul
|
||||
@copy %ROOT_PATH%\builds\install\misc\fbintl.conf %ROOT_PATH%\output\intl >nul
|
||||
:: DATABASES
|
||||
@copy %ROOT_PATH%\gen\dbs\SECURITY2.FDB %ROOT_PATH%\output\security2.fdb >nul
|
||||
@copy %ROOT_PATH%\gen\dbs\HELP.fdb %ROOT_PATH%\output\help\help.fdb >nul
|
||||
|
||||
10
builds/win32/make_icu.bat
Normal file
10
builds/win32/make_icu.bat
Normal file
@ -0,0 +1,10 @@
|
||||
@echo off
|
||||
|
||||
set CLEAN=/build
|
||||
if "%1"=="CLEAN" (set CLEAN=/rebuild)
|
||||
|
||||
if "%VS_VER%"=="msvc6" (
|
||||
@msdev %ROOT_PATH%\extern\icu\source\allinone\allinone.dsw /MAKE "all - Win32 Release" %CLEAN% /OUT icu.log
|
||||
) else (
|
||||
@devenv %ROOT_PATH%\extern\icu\source\allinone\allinone.sln %CLEAN% release /OUT icu.log
|
||||
)
|
||||
@ -75,6 +75,18 @@ Package=<4>
|
||||
|
||||
###############################################################################
|
||||
|
||||
Project: "config"=.\config.dsp - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
Package=<4>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
||||
Project: "dsql_server"=.\dsql_server.dsp - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
@ -194,6 +206,9 @@ Package=<4>
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name common_classic
|
||||
End Project Dependency
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name config
|
||||
End Project Dependency
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
@ -257,6 +272,9 @@ Package=<4>
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name engine_embed
|
||||
End Project Dependency
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name config
|
||||
End Project Dependency
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
@ -311,6 +329,9 @@ Package=<4>
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name engine
|
||||
End Project Dependency
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name config
|
||||
End Project Dependency
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
@ -539,9 +560,6 @@ Package=<5>
|
||||
|
||||
Package=<4>
|
||||
{{{
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name common
|
||||
End Project Dependency
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
||||
252
builds/win32/msvc6/config.dsp
Normal file
252
builds/win32/msvc6/config.dsp
Normal file
@ -0,0 +1,252 @@
|
||||
# Microsoft Developer Studio Project File - Name="config" - Package Owner=<4>
|
||||
# Microsoft Developer Studio Generated Build File, Format Version 6.00
|
||||
# ** DO NOT EDIT **
|
||||
|
||||
# TARGTYPE "Win32 (x86) Static Library" 0x0104
|
||||
|
||||
CFG=config - Win32 Release
|
||||
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
|
||||
!MESSAGE use the Export Makefile command and run
|
||||
!MESSAGE
|
||||
!MESSAGE NMAKE /f "config.mak".
|
||||
!MESSAGE
|
||||
!MESSAGE You can specify a configuration when running NMAKE
|
||||
!MESSAGE by defining the macro CFG on the command line. For example:
|
||||
!MESSAGE
|
||||
!MESSAGE NMAKE /f "config.mak" CFG="config - Win32 Release"
|
||||
!MESSAGE
|
||||
!MESSAGE Possible choices for configuration are:
|
||||
!MESSAGE
|
||||
!MESSAGE "config - Win32 Debug" (based on "Win32 (x86) Static Library")
|
||||
!MESSAGE "config - Win32 Release" (based on "Win32 (x86) Static Library")
|
||||
!MESSAGE
|
||||
|
||||
# Begin Project
|
||||
# PROP AllowPerConfigDependencies 0
|
||||
# PROP Scc_ProjName ""
|
||||
# PROP Scc_LocalPath ""
|
||||
CPP=cl.exe
|
||||
RSC=rc.exe
|
||||
|
||||
!IF "$(CFG)" == "config - Win32 Debug"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 1
|
||||
# PROP BASE Output_Dir ""
|
||||
# PROP BASE Intermediate_Dir ""
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 1
|
||||
# PROP Output_Dir "..\..\..\temp\debug\config"
|
||||
# PROP Intermediate_Dir "..\..\..\temp\debug\config"
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /Gm /GR /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
|
||||
# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "../../../src/include" /I "../../../src/include/gen" /I "../../../src/vulcan" /I "../../../src/jrd" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "DEV_BUILD" /D NAMESPACE=Vulcan /YX /FD /GZ /c
|
||||
# ADD BASE RSC /l 0x41d /d "_DEBUG"
|
||||
# ADD RSC /l 0x41d /d "_DEBUG"
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LIB32=link.exe -lib
|
||||
# ADD BASE LIB32 /nologo
|
||||
# ADD LIB32 /nologo
|
||||
|
||||
!ELSEIF "$(CFG)" == "config - Win32 Release"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 1
|
||||
# PROP BASE Output_Dir ""
|
||||
# PROP BASE Intermediate_Dir ""
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 1
|
||||
# PROP Output_Dir "..\..\..\temp\release\config"
|
||||
# PROP Intermediate_Dir "..\..\..\temp\release\config"
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /MDd /W3 /GR /GX /Ot /Oi /Op /Oy /Ob2 /I "../../../src/include" /I "../../../src/include/gen" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
|
||||
# ADD CPP /nologo /MD /W3 /GR /GX /Ot /Og /Oi /Op /Oy /Ob1 /I "../../../src/include" /I "../../../src/include/gen" /I "../../../src/vulcan" /I "../../../src/jrd" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D NAMESPACE=Vulcan /FD /EHc- /c
|
||||
# ADD BASE RSC /l 0x41d /d "_DEBUG"
|
||||
# ADD RSC /l 0x41d /d "_DEBUG"
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LIB32=link.exe -lib
|
||||
# ADD BASE LIB32 /nologo
|
||||
# ADD LIB32 /nologo
|
||||
|
||||
!ENDIF
|
||||
|
||||
# Begin Target
|
||||
|
||||
# Name "config - Win32 Debug"
|
||||
# Name "config - Win32 Release"
|
||||
# Begin Group "CONFIG files"
|
||||
|
||||
# PROP Default_Filter ""
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\config\AdminException.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\config\Args.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\config\ArgsException.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\config\ConfigFile.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\config\Configuration.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\config\ConfObj.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\config\ConfObject.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\config\DirectoryList.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\config\Element.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\config\FileName.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\config\InputFile.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\config\InputStream.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\config\Lex.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\config\ScanDir.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\config\Stream.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\config\StreamSegment.cpp
|
||||
# End Source File
|
||||
# End Group
|
||||
# Begin Group "VULCAN files"
|
||||
|
||||
# PROP Default_Filter ""
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\vulcan\JString.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\vulcan\PathName.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\vulcan\RefObject.cpp
|
||||
# End Source File
|
||||
# End Group
|
||||
# Begin Group "Header files"
|
||||
|
||||
# PROP Default_Filter "h"
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\config\AdminException.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\config\Args.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\config\ArgsException.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\config\ConfigFile.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\config\Configuration.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\config\ConfObj.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\config\ConfObject.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\config\DirectoryList.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\config\Element.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\config\FileName.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\config\InputFile.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\config\InputStream.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\vulcan\JString.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\config\Lex.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\config\Parameters.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\vulcan\PathName.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\vulcan\RefObject.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\config\ScanDir.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\config\Stream.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\config\StreamSegment.h
|
||||
# End Source File
|
||||
# End Group
|
||||
# End Target
|
||||
# End Project
|
||||
@ -41,7 +41,7 @@ RSC=rc.exe
|
||||
# PROP Intermediate_Dir "..\..\..\temp\release\engine_ss"
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /GR /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
|
||||
# ADD CPP /nologo /MD /W3 /GR /GX /Ot /Og /Oi /Op /Oy /Ob1 /I "../../../src/include" /I "../../../src/include/gen" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_LIB" /D "_X86_" /D "SUPERSERVER" /YX /FD /EHc- /c
|
||||
# ADD CPP /nologo /MD /W3 /GR /GX /Ot /Og /Oi /Op /Oy /Ob1 /I "../../../src/include" /I "../../../src/include/gen" /I "../../../extern/icu/include" /I "../../../src/vulcan" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_LIB" /D "_X86_" /D "SUPERSERVER" /D NAMESPACE=Vulcan /YX /FD /I /EHc- /c
|
||||
# ADD BASE RSC /l 0x419 /d "NDEBUG"
|
||||
# ADD RSC /l 0x419 /d "NDEBUG"
|
||||
BSC32=bscmake.exe
|
||||
@ -64,8 +64,7 @@ LIB32=link.exe -lib
|
||||
# PROP Intermediate_Dir "..\..\..\temp\debug\engine_ss"
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /Gm /GR /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
|
||||
# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../../src/include" /I "../../../src/include/gen" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_LIB" /D "_X86_" /D "SUPERSERVER" /D "DEV_BUILD" /FD /GZ /c
|
||||
# SUBTRACT CPP /YX
|
||||
# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../../src/include" /I "../../../src/include/gen" /I "../../../extern/icu/include" /I "../../../src/vulcan" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_LIB" /D "_X86_" /D "SUPERSERVER" /D "DEV_BUILD" /D NAMESPACE=Vulcan /FD /GZ /c
|
||||
# ADD BASE RSC /l 0x419 /d "_DEBUG"
|
||||
# ADD RSC /l 0x419 /d "_DEBUG"
|
||||
BSC32=bscmake.exe
|
||||
@ -302,6 +301,10 @@ SOURCE=..\..\..\src\jrd\intl_builtin.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\jrd\IntlManager.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\jrd\inuse.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
@ -499,6 +502,10 @@ SOURCE=..\..\..\src\jrd\tra.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\jrd\unicode_util.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\jrd\utl.cpp
|
||||
|
||||
!IF "$(CFG)" == "engine - Win32 Release"
|
||||
@ -889,11 +896,15 @@ SOURCE=..\..\..\src\jrd\intl_proto.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\jrd\IntlManager.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\jrd\intlnames.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\jrd\intlobj.h
|
||||
SOURCE=..\..\..\src\jrd\intlobj_new.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
@ -1285,6 +1296,10 @@ SOURCE=..\..\..\src\jrd\types.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\jrd\unicode_util.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\jrd\utl_proto.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
@ -41,7 +41,7 @@ RSC=rc.exe
|
||||
# PROP Intermediate_Dir "..\..\..\temp\release\engine_cs"
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /GR /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
|
||||
# ADD CPP /nologo /MD /W3 /GR /GX /Ot /Og /Oi /Op /Oy /Ob1 /I "../../../src/include" /I "../../../src/include/gen" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_LIB" /D "_X86_" /YX /FD /EHc- /c
|
||||
# ADD CPP /nologo /MD /W3 /GR /GX /Ot /Og /Oi /Op /Oy /Ob1 /I "../../../src/include" /I "../../../src/include/gen" /I "../../../extern/icu/include" /I "../../../src/vulcan" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_LIB" /D "_X86_" /D NAMESPACE=Vulcan /YX /FD /EHc- /c
|
||||
# ADD BASE RSC /l 0x419 /d "NDEBUG"
|
||||
# ADD RSC /l 0x419 /d "NDEBUG"
|
||||
BSC32=bscmake.exe
|
||||
@ -64,8 +64,7 @@ LIB32=link.exe -lib
|
||||
# PROP Intermediate_Dir "..\..\..\temp\debug\engine_cs"
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /Gm /GR /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
|
||||
# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../../src/include" /I "../../../src/include/gen" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_LIB" /D "_X86_" /D "DEV_BUILD" /FD /GZ /c
|
||||
# SUBTRACT CPP /YX
|
||||
# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../../src/include" /I "../../../src/include/gen" /I "../../../extern/icu/include" /I "../../../src/vulcan" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_LIB" /D "_X86_" /D "DEV_BUILD" /D NAMESPACE=Vulcan /FD /GZ /c
|
||||
# ADD BASE RSC /l 0x419 /d "_DEBUG"
|
||||
# ADD RSC /l 0x419 /d "_DEBUG"
|
||||
BSC32=bscmake.exe
|
||||
@ -293,6 +292,10 @@ SOURCE=..\..\..\src\jrd\intl_builtin.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\jrd\IntlManager.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\jrd\inuse.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
@ -481,6 +484,10 @@ SOURCE=..\..\..\src\jrd\tra.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\jrd\unicode_util.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\jrd\utl.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
@ -858,11 +865,15 @@ SOURCE=..\..\..\src\jrd\intl_proto.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\jrd\IntlManager.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\jrd\intlnames.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\jrd\intlobj.h
|
||||
SOURCE=..\..\..\src\jrd\intlobj_new.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
@ -1250,6 +1261,10 @@ SOURCE=..\..\..\src\jrd\types.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\jrd\unicode_util.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\jrd\utl_proto.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
@ -41,7 +41,7 @@ RSC=rc.exe
|
||||
# PROP Intermediate_Dir "..\..\..\temp\release\engine_es"
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /GR /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
|
||||
# ADD CPP /nologo /MD /W3 /GR /GX /Ot /Og /Oi /Op /Oy /Ob1 /I "../../../src/include" /I "../../../src/include/gen" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_LIB" /D "_X86_" /D "SUPERSERVER" /D "EMBEDDED" /YX /FD /EHc- /c
|
||||
# ADD CPP /nologo /MD /W3 /GR /GX /Ot /Og /Oi /Op /Oy /Ob1 /I "../../../src/include" /I "../../../src/include/gen" /I "../../../extern/icu/include" /I "../../../src/vulcan" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_LIB" /D "_X86_" /D "SUPERSERVER" /D "EMBEDDED" /D NAMESPACE=Vulcan /YX /FD /EHc- /c
|
||||
# ADD BASE RSC /l 0x419 /d "NDEBUG"
|
||||
# ADD RSC /l 0x419 /d "NDEBUG"
|
||||
BSC32=bscmake.exe
|
||||
@ -64,8 +64,7 @@ LIB32=link.exe -lib
|
||||
# PROP Intermediate_Dir "..\..\..\temp\debug\engine_es"
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /Gm /GR /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
|
||||
# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../../src/include" /I "../../../src/include/gen" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_LIB" /D "_X86_" /D "SUPERSERVER" /D "DEV_BUILD" /D "EMBEDDED" /FD /GZ /c
|
||||
# SUBTRACT CPP /YX
|
||||
# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../../src/include" /I "../../../src/include/gen" /I "../../../extern/icu/include" /I "../../../src/vulcan" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_LIB" /D "_X86_" /D "SUPERSERVER" /D "DEV_BUILD" /D "EMBEDDED" /D NAMESPACE=Vulcan /FD /GZ /c
|
||||
# ADD BASE RSC /l 0x419 /d "_DEBUG"
|
||||
# ADD RSC /l 0x419 /d "_DEBUG"
|
||||
BSC32=bscmake.exe
|
||||
@ -281,6 +280,10 @@ SOURCE=..\..\..\src\jrd\intl_builtin.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\jrd\IntlManager.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\jrd\inuse.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
@ -481,6 +484,10 @@ SOURCE=..\..\..\src\jrd\tra.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\jrd\unicode_util.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\jrd\utl.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
@ -862,11 +869,15 @@ SOURCE=..\..\..\src\jrd\intl_proto.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\jrd\IntlManager.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\jrd\intlnames.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\jrd\intlobj.h
|
||||
SOURCE=..\..\..\src\jrd\intlobj_new.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
@ -1258,6 +1269,10 @@ SOURCE=..\..\..\src\jrd\types.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\jrd\unicode_util.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\jrd\utl_proto.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
@ -42,8 +42,8 @@ RSC=rc.exe
|
||||
# PROP Intermediate_Dir "..\..\..\temp\debug\fb_inet_server"
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /Gm /GX /GR /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
|
||||
# ADD CPP /nologo /MDd /W3 /Gi /GX /GR /Zi /Od /I "../../../src/include" /I "../../../src/include/gen" /D "_DEBUG" /D "_WINDOWS" /D "WIN32" /D "_MBCS" /D "_X86_" /D "DEV_BUILD" /FR /FD /GZ /c
|
||||
# ADD BASE CPP /nologo /W3 /Gm /GR /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
|
||||
# ADD CPP /nologo /MDd /W3 /Gi /GR /GX /Zi /Od /I "../../../src/include" /I "../../../src/include/gen" /D "_DEBUG" /D "_WINDOWS" /D "WIN32" /D "_MBCS" /D "_X86_" /D "DEV_BUILD" /FR /FD /GZ /c
|
||||
# SUBTRACT CPP /WX
|
||||
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
|
||||
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
|
||||
@ -54,8 +54,8 @@ BSC32=bscmake.exe
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib shell32.lib comctl32.lib advapi32.lib ws2_32.lib mpr.lib version.lib ole32.lib /nologo /stack:0x200000 /subsystem:windows /incremental:no /debug /machine:I386 /out:"..\..\..\temp\debug\firebird/bin/fb_inet_server.exe" /pdbtype:sept
|
||||
# SUBTRACT LINK32 /verbose /profile /pdb:none /map
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib shell32.lib comctl32.lib advapi32.lib ws2_32.lib mpr.lib version.lib ole32.lib icuuc.lib icuin.lib /nologo /stack:0x200000 /subsystem:windows /incremental:no /debug /machine:I386 /out:"..\..\..\temp\debug\firebird/bin/fb_inet_server.exe" /pdbtype:sept /libpath:../../../extern/icu/lib
|
||||
# SUBTRACT LINK32 /pdb:none
|
||||
|
||||
!ELSEIF "$(CFG)" == "fb_inet_server - Win32 Release"
|
||||
|
||||
@ -71,8 +71,8 @@ LINK32=link.exe
|
||||
# PROP Intermediate_Dir "..\..\..\temp\release\fb_inet_server"
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /MDd /W3 /Gi /GX /GR /Ot /Oi /Op /Oy /Ob2 /I "../../../src/include" /I "../../../src/include/gen" /D "NDEBUG" /D "_WINDOWS" /D "NOMSG" /D "WIN32" /D "_MBCS" /D "_X86_" /FR /FD /GZ /c
|
||||
# ADD CPP /nologo /G4 /MD /W3 /Gi /GX /GR /Ot /Og /Oi /Op /Oy /Ob1 /I "../../../src/include" /I "../../../src/include/gen" /D "NDEBUG" /D "_WINDOWS" /D "WIN32" /D "_MBCS" /D "_X86_" /FR /FD /EHc- /c
|
||||
# ADD BASE CPP /nologo /MDd /W3 /Gi /GR /GX /Ot /Oi /Op /Oy /Ob2 /I "../../../src/include" /I "../../../src/include/gen" /D "NDEBUG" /D "_WINDOWS" /D "NOMSG" /D "WIN32" /D "_MBCS" /D "_X86_" /FR /FD /GZ /c
|
||||
# ADD CPP /nologo /G4 /MD /W3 /Gi /GR /GX /Ot /Og /Oi /Op /Oy /Ob1 /I "../../../src/include" /I "../../../src/include/gen" /D "NDEBUG" /D "_WINDOWS" /D "WIN32" /D "_MBCS" /D "_X86_" /FR /FD /EHc- /c
|
||||
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
|
||||
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
|
||||
# ADD BASE RSC /l 0x41d /d "_DEBUG"
|
||||
@ -83,8 +83,8 @@ BSC32=bscmake.exe
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib comctl32.lib wsock32.lib mpr.lib shell32.lib /nologo /subsystem:windows /incremental:no /machine:I386 /pdbtype:sept
|
||||
# SUBTRACT BASE LINK32 /verbose /profile /pdb:none /map /debug
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib shell32.lib comctl32.lib advapi32.lib ws2_32.lib mpr.lib version.lib ole32.lib /nologo /stack:0x200000 /subsystem:windows /incremental:no /machine:I386 /out:"..\..\..\temp\release\firebird/bin/fb_inet_server.exe" /pdbtype:sept
|
||||
# SUBTRACT LINK32 /verbose /profile /pdb:none /map /debug
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib shell32.lib comctl32.lib advapi32.lib ws2_32.lib mpr.lib version.lib ole32.lib icuuc.lib icuin.lib /nologo /stack:0x200000 /subsystem:windows /incremental:no /machine:I386 /out:"..\..\..\temp\release\firebird/bin/fb_inet_server.exe" /pdbtype:sept /libpath:../../../extern/icu/lib
|
||||
# SUBTRACT LINK32 /pdb:none
|
||||
|
||||
!ENDIF
|
||||
|
||||
|
||||
@ -53,7 +53,8 @@ BSC32=bscmake.exe
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
|
||||
# ADD LINK32 kernel32.lib user32.lib advapi32.lib mpr.lib ws2_32.lib version.lib ole32.lib /nologo /dll /machine:I386 /out:"..\..\..\temp\release\firebird/bin/fbembed.dll"
|
||||
# ADD LINK32 kernel32.lib user32.lib advapi32.lib mpr.lib ws2_32.lib version.lib ole32.lib icuuc.lib icuin.lib /nologo /dll /machine:I386 /out:"..\..\..\temp\release\firebird/bin/fbembed.dll" /libpath:../../../extern/icu/lib
|
||||
# SUBTRACT LINK32 /pdb:none
|
||||
|
||||
!ELSEIF "$(CFG)" == "fbembed - Win32 Debug"
|
||||
|
||||
@ -80,7 +81,8 @@ BSC32=bscmake.exe
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib shell32.lib comctl32.lib advapi32.lib ws2_32.lib mpr.lib version.lib ole32.lib /nologo /dll /incremental:no /debug /machine:I386 /out:"..\..\..\temp\debug\firebird/bin/fbembed.dll" /pdbtype:sept
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib shell32.lib comctl32.lib advapi32.lib ws2_32.lib mpr.lib version.lib ole32.lib icuuc.lib icuin.lib /nologo /dll /incremental:no /debug /machine:I386 /out:"..\..\..\temp\debug\firebird/bin/fbembed.dll" /pdbtype:sept /libpath:../../../extern/icu/lib
|
||||
# SUBTRACT LINK32 /pdb:none
|
||||
|
||||
!ENDIF
|
||||
|
||||
@ -299,13 +301,6 @@ SOURCE=..\..\..\src\jrd\version.rc
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\defs\fbclient.def
|
||||
|
||||
!IF "$(CFG)" == "fbembed - Win32 Release"
|
||||
|
||||
!ELSEIF "$(CFG)" == "fbembed - Win32 Debug"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# End Target
|
||||
# End Project
|
||||
|
||||
@ -54,8 +54,8 @@ BSC32=bscmake.exe
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib shell32.lib comctl32.lib advapi32.lib ws2_32.lib mpr.lib version.lib ole32.lib /nologo /stack:0x200000 /subsystem:windows /incremental:no /debug /machine:I386 /out:"..\..\..\temp\debug\firebird/bin/fbserver.exe" /pdbtype:sept
|
||||
# SUBTRACT LINK32 /verbose /profile /pdb:none /map
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib shell32.lib comctl32.lib advapi32.lib ws2_32.lib mpr.lib version.lib ole32.lib icuuc.lib icuin.lib /nologo /stack:0x200000 /subsystem:windows /incremental:no /debug /machine:I386 /out:"..\..\..\temp\debug\firebird/bin/fbserver.exe" /pdbtype:sept /libpath:../../../extern/icu/lib
|
||||
# SUBTRACT LINK32 /pdb:none
|
||||
|
||||
!ELSEIF "$(CFG)" == "fbserver - Win32 Release"
|
||||
|
||||
@ -83,8 +83,8 @@ BSC32=bscmake.exe
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib comctl32.lib wsock32.lib mpr.lib shell32.lib /nologo /subsystem:windows /incremental:no /machine:I386 /pdbtype:sept
|
||||
# SUBTRACT BASE LINK32 /verbose /profile /pdb:none /map /debug
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib shell32.lib comctl32.lib advapi32.lib ws2_32.lib mpr.lib version.lib ole32.lib /nologo /stack:0x200000 /subsystem:windows /incremental:no /machine:I386 /out:"..\..\..\temp\release\firebird/bin/fbserver.exe" /pdbtype:sept
|
||||
# SUBTRACT LINK32 /verbose /profile /pdb:none /map /debug
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib shell32.lib comctl32.lib advapi32.lib ws2_32.lib mpr.lib version.lib ole32.lib icuuc.lib icuin.lib /nologo /stack:0x200000 /subsystem:windows /incremental:no /machine:I386 /out:"..\..\..\temp\release\firebird/bin/fbserver.exe" /pdbtype:sept /libpath:../../../extern/icu/lib
|
||||
# SUBTRACT LINK32 /pdb:none
|
||||
|
||||
!ENDIF
|
||||
|
||||
|
||||
@ -50,6 +50,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fb_inet_server", "fb_inet_s
|
||||
{D6D9D03A-D3F8-475D-BB18-3F3F125FF358} = {D6D9D03A-D3F8-475D-BB18-3F3F125FF358}
|
||||
{F5746066-8613-4811-B27C-0ED70FF9F0FF} = {F5746066-8613-4811-B27C-0ED70FF9F0FF}
|
||||
{C31DD0B9-ACEE-4F66-9CDE-DD92B0EB78E4} = {C31DD0B9-ACEE-4F66-9CDE-DD92B0EB78E4}
|
||||
{E83187C1-AAC2-445D-B8B2-883EFC10C39A} = {E83187C1-AAC2-445D-B8B2-883EFC10C39A}
|
||||
{488199DD-D9F3-41C8-AED6-8AFFFB294CFF} = {488199DD-D9F3-41C8-AED6-8AFFFB294CFF}
|
||||
{E029E4E2-0C3F-4F7D-BC4C-D9C20F40EB4E} = {E029E4E2-0C3F-4F7D-BC4C-D9C20F40EB4E}
|
||||
{3C4993E4-946C-4029-97B8-1A111F32F4FC} = {3C4993E4-946C-4029-97B8-1A111F32F4FC}
|
||||
@ -74,6 +75,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fbembed", "fbembed.vcproj",
|
||||
{F55ACA54-70DF-4343-8E16-FA97C757CCF6} = {F55ACA54-70DF-4343-8E16-FA97C757CCF6}
|
||||
{D1507562-A363-4685-96AF-B036F5E5E47F} = {D1507562-A363-4685-96AF-B036F5E5E47F}
|
||||
{0D616380-1A5A-4230-A80B-021360E4E669} = {0D616380-1A5A-4230-A80B-021360E4E669}
|
||||
{E83187C1-AAC2-445D-B8B2-883EFC10C39A} = {E83187C1-AAC2-445D-B8B2-883EFC10C39A}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fbguard", "fbguard.vcproj", "{BBD83ED3-8A48-4FE8-B4B7-CB27730986B2}"
|
||||
@ -92,6 +94,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fbserver", "fbserver.vcproj
|
||||
{F8798A49-9D20-451E-A7BD-FEB5237103B5} = {F8798A49-9D20-451E-A7BD-FEB5237103B5}
|
||||
{D1507562-A363-4685-96AF-B036F5E5E47F} = {D1507562-A363-4685-96AF-B036F5E5E47F}
|
||||
{0D616380-1A5A-4230-A80B-021360E4E669} = {0D616380-1A5A-4230-A80B-021360E4E669}
|
||||
{E83187C1-AAC2-445D-B8B2-883EFC10C39A} = {E83187C1-AAC2-445D-B8B2-883EFC10C39A}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fbudf", "fbudf.vcproj", "{9DC67B05-AC3E-49A3-B0CC-83B25D757445}"
|
||||
@ -169,7 +172,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "instsvc", "instsvc.vcproj",
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "intl", "intl.vcproj", "{DFFA2117-E6A8-4806-BB69-94DAC8F8F42A}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{15605F44-BFFD-444F-AD4C-55DC9D704465} = {15605F44-BFFD-444F-AD4C-55DC9D704465}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "isql", "isql.vcproj", "{DEE75AD5-F165-40E1-80B2-400E27725D5C}"
|
||||
@ -214,6 +216,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nbackup", "nbackup.vcproj",
|
||||
{492E7BDA-8948-408D-A43E-4C0A5B86AFB8} = {492E7BDA-8948-408D-A43E-4C0A5B86AFB8}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "config", "config.vcproj", "{E83187C1-AAC2-445D-B8B2-883EFC10C39A}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "instclient", "instclient.vcproj", "{C6A31374-178C-4680-A404-76BE24D0229B}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
EndProjectSection
|
||||
@ -392,6 +398,10 @@ Global
|
||||
{01A41DFA-8908-4576-A1F1-C8BC7EAE39A1}.Debug.Build.0 = Debug|Win32
|
||||
{01A41DFA-8908-4576-A1F1-C8BC7EAE39A1}.Release.ActiveCfg = Release|Win32
|
||||
{01A41DFA-8908-4576-A1F1-C8BC7EAE39A1}.Release.Build.0 = Release|Win32
|
||||
{E83187C1-AAC2-445D-B8B2-883EFC10C39A}.Debug.ActiveCfg = Debug|Win32
|
||||
{E83187C1-AAC2-445D-B8B2-883EFC10C39A}.Debug.Build.0 = Debug|Win32
|
||||
{E83187C1-AAC2-445D-B8B2-883EFC10C39A}.Release.ActiveCfg = Release|Win32
|
||||
{E83187C1-AAC2-445D-B8B2-883EFC10C39A}.Release.Build.0 = Release|Win32
|
||||
{C6A31374-178C-4680-A404-76BE24D0229B}.Debug.ActiveCfg = Debug|Win32
|
||||
{C6A31374-178C-4680-A404-76BE24D0229B}.Debug.Build.0 = Debug|Win32
|
||||
{C6A31374-178C-4680-A404-76BE24D0229B}.Release.ActiveCfg = Release|Win32
|
||||
|
||||
214
builds/win32/msvc7/config.vcproj
Normal file
214
builds/win32/msvc7/config.vcproj
Normal file
@ -0,0 +1,214 @@
|
||||
<?xml version="1.0" encoding="Windows-1252"?>
|
||||
<VisualStudioProject
|
||||
ProjectType="Visual C++"
|
||||
Version="7.10"
|
||||
Name="config"
|
||||
ProjectGUID="{E83187C1-AAC2-445D-B8B2-883EFC10C39A}"
|
||||
SccProjectName=""
|
||||
SccLocalPath="">
|
||||
<Platforms>
|
||||
<Platform
|
||||
Name="Win32"/>
|
||||
</Platforms>
|
||||
<Configurations>
|
||||
<Configuration
|
||||
Name="Release|Win32"
|
||||
OutputDirectory="..\..\..\temp\release\config"
|
||||
IntermediateDirectory="..\..\..\temp\release\config"
|
||||
ConfigurationType="4"
|
||||
UseOfMFC="0"
|
||||
ATLMinimizesCRunTimeLibraryUsage="FALSE"
|
||||
CharacterSet="2">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalOptions="/EHsc-"
|
||||
Optimization="4"
|
||||
GlobalOptimizations="TRUE"
|
||||
InlineFunctionExpansion="1"
|
||||
EnableIntrinsicFunctions="TRUE"
|
||||
ImproveFloatingPointConsistency="TRUE"
|
||||
FavorSizeOrSpeed="1"
|
||||
OmitFramePointers="TRUE"
|
||||
AdditionalIncludeDirectories="../../../src/include;../../../src/include/gen;../../../src/jrd;../../../src/vulcan"
|
||||
PreprocessorDefinitions="WIN32,NDEBUG,_LIB;NAMESPACE=Vulcan"
|
||||
ExceptionHandling="FALSE"
|
||||
RuntimeLibrary="2"
|
||||
RuntimeTypeInfo="TRUE"
|
||||
PrecompiledHeaderFile="..\..\..\temp\release\config/common.pch"
|
||||
AssemblerListingLocation="..\..\..\temp\release\config/"
|
||||
ObjectFile="..\..\..\temp\release\config/"
|
||||
ProgramDataBaseFileName="..\..\..\temp\release\config/"
|
||||
WarningLevel="3"
|
||||
SuppressStartupBanner="TRUE"
|
||||
DebugInformationFormat="3"
|
||||
CompileAs="0"/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
<Tool
|
||||
Name="VCLibrarianTool"
|
||||
OutputFile="..\..\..\temp\release\config\common.lib"
|
||||
SuppressStartupBanner="TRUE"/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
PreprocessorDefinitions="_DEBUG"
|
||||
Culture="1053"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCManagedWrapperGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Debug|Win32"
|
||||
OutputDirectory="..\..\..\temp\debug\config"
|
||||
IntermediateDirectory="..\..\..\temp\debug\config"
|
||||
ConfigurationType="4"
|
||||
UseOfMFC="0"
|
||||
ATLMinimizesCRunTimeLibraryUsage="FALSE"
|
||||
CharacterSet="2">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalOptions="/EHsc-"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="../../../src/include;../../../src/include/gen;../../../src/jrd;../../../src/vulcan"
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;DEV_BUILD;NAMESPACE=Vulcan"
|
||||
ExceptionHandling="FALSE"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="3"
|
||||
RuntimeTypeInfo="TRUE"
|
||||
UsePrecompiledHeader="2"
|
||||
PrecompiledHeaderFile="..\..\..\temp\debug\config/config.pch"
|
||||
AssemblerListingLocation="..\..\..\temp\debug\config/"
|
||||
ObjectFile="..\..\..\temp\debug\config/"
|
||||
ProgramDataBaseFileName="..\..\..\temp\debug\config/"
|
||||
WarningLevel="3"
|
||||
SuppressStartupBanner="TRUE"
|
||||
DebugInformationFormat="3"
|
||||
CompileAs="0"/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
<Tool
|
||||
Name="VCLibrarianTool"
|
||||
OutputFile="..\..\..\temp\debug\config\config.lib"
|
||||
SuppressStartupBanner="TRUE"/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
PreprocessorDefinitions="_DEBUG"
|
||||
Culture="1053"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCManagedWrapperGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
|
||||
</Configuration>
|
||||
</Configurations>
|
||||
<References>
|
||||
</References>
|
||||
<Files>
|
||||
<Filter
|
||||
Name="Config files"
|
||||
Filter="">
|
||||
<File
|
||||
RelativePath="..\..\..\src\config\AdminException.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\config\Args.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\config\ArgsException.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\config\ConfigFile.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\config\Configuration.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\config\ConfObj.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\config\ConfObject.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\config\DirectoryList.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\config\Element.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\config\FileName.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\config\InputFile.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\config\InputStream.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\config\Lex.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\config\ScanDir.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\config\Stream.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\config\StreamSegment.cpp">
|
||||
</File>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="Vulcan files"
|
||||
Filter="">
|
||||
<File
|
||||
RelativePath="..\..\..\src\vulcan\JString.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\vulcan\PathName.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\vulcan\RefObject.cpp">
|
||||
</File>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="Header files"
|
||||
Filter="h">
|
||||
<File
|
||||
RelativePath="..\..\..\src\vulcan\JString.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\vulcan\PathName.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\vulcan\RefObject.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\config\ScanDir.h">
|
||||
</File>
|
||||
</Filter>
|
||||
</Files>
|
||||
<Globals>
|
||||
</Globals>
|
||||
</VisualStudioProject>
|
||||
@ -22,8 +22,8 @@
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalOptions="/EHsc-"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="../../../src/include,../../../src/include/gen"
|
||||
PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,_LIB,_X86_,SUPERSERVER,DEV_BUILD"
|
||||
AdditionalIncludeDirectories="../../../src/include;../../../src/include/gen;../../../extern/icu/include;../../../src/vulcan"
|
||||
PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,_LIB,_X86_,SUPERSERVER,DEV_BUILD,NAMESPACE=Vulcan"
|
||||
ExceptionHandling="FALSE"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="3"
|
||||
@ -81,8 +81,8 @@
|
||||
ImproveFloatingPointConsistency="TRUE"
|
||||
FavorSizeOrSpeed="1"
|
||||
OmitFramePointers="TRUE"
|
||||
AdditionalIncludeDirectories="../../../src/include,../../../src/include/gen"
|
||||
PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,_LIB,_X86_,SUPERSERVER"
|
||||
AdditionalIncludeDirectories="../../../src/include;../../../src/include/gen;../../../extern/icu/include;../../../src/vulcan"
|
||||
PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,_LIB,_X86_,SUPERSERVER,NAMESPACE=Vulcan"
|
||||
ExceptionHandling="FALSE"
|
||||
RuntimeLibrary="2"
|
||||
RuntimeTypeInfo="TRUE"
|
||||
@ -252,6 +252,9 @@
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\intl_builtin.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\IntlManager.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\inuse.cpp">
|
||||
</File>
|
||||
@ -375,6 +378,9 @@
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\tra.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\unicode_util.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\utl.cpp">
|
||||
</File>
|
||||
@ -655,11 +661,14 @@
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\intl_proto.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\IntlManager.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\intlnames.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\intlobj.h">
|
||||
RelativePath="..\..\..\src\jrd\intlobj_new.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\inuse_proto.h">
|
||||
@ -982,6 +991,9 @@
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\types.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\unicode_util.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\utl_proto.h">
|
||||
</File>
|
||||
|
||||
@ -28,8 +28,8 @@
|
||||
ImproveFloatingPointConsistency="TRUE"
|
||||
FavorSizeOrSpeed="1"
|
||||
OmitFramePointers="TRUE"
|
||||
AdditionalIncludeDirectories="../../../src/include,../../../src/include/gen"
|
||||
PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,_LIB,_X86_"
|
||||
AdditionalIncludeDirectories="../../../src/include;../../../src/include/gen;../../../extern/icu/include;../../../src/vulcan"
|
||||
PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,_LIB,_X86_,NAMESPACE=Vulcan"
|
||||
ExceptionHandling="FALSE"
|
||||
RuntimeLibrary="2"
|
||||
RuntimeTypeInfo="TRUE"
|
||||
@ -81,8 +81,8 @@
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalOptions="/EHsc-"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="../../../src/include,../../../src/include/gen"
|
||||
PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,_LIB,_X86_,DEV_BUILD"
|
||||
AdditionalIncludeDirectories="../../../src/include;../../../src/include/gen;../../../extern/icu/include;../../../src/vulcan"
|
||||
PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,_LIB,_X86_,DEV_BUILD,NAMESPACE=Vulcan"
|
||||
ExceptionHandling="FALSE"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="3"
|
||||
@ -252,6 +252,9 @@
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\intl_builtin.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\IntlManager.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\inuse.cpp">
|
||||
</File>
|
||||
@ -375,6 +378,9 @@
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\tra.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\unicode_util.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\utl.cpp">
|
||||
</File>
|
||||
@ -655,11 +661,14 @@
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\intl_proto.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\IntlManager.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\intlnames.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\intlobj.h">
|
||||
RelativePath="..\..\..\src\jrd\intlobj_new.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\inuse_proto.h">
|
||||
@ -979,6 +988,9 @@
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\types.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\unicode_util.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\utl_proto.h">
|
||||
</File>
|
||||
|
||||
@ -28,8 +28,8 @@
|
||||
ImproveFloatingPointConsistency="TRUE"
|
||||
FavorSizeOrSpeed="1"
|
||||
OmitFramePointers="TRUE"
|
||||
AdditionalIncludeDirectories="../../../src/include,../../../src/include/gen"
|
||||
PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,_LIB,_X86_,SUPERSERVER,EMBEDDED"
|
||||
AdditionalIncludeDirectories="../../../src/include;../../../src/include/gen;../../../extern/icu/include;../../../src/vulcan"
|
||||
PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,_LIB,_X86_,SUPERSERVER,EMBEDDED,NAMESPACE=Vulcan"
|
||||
ExceptionHandling="FALSE"
|
||||
RuntimeLibrary="2"
|
||||
RuntimeTypeInfo="TRUE"
|
||||
@ -81,8 +81,8 @@
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalOptions="/EHsc-"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="../../../src/include,../../../src/include/gen"
|
||||
PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,_LIB,_X86_,SUPERSERVER,DEV_BUILD,EMBEDDED"
|
||||
AdditionalIncludeDirectories="../../../src/include;../../../src/include/gen;../../../extern/icu/include;../../../src/vulcan"
|
||||
PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,_LIB,_X86_,SUPERSERVER,DEV_BUILD,EMBEDDED,NAMESPACE=Vulcan"
|
||||
ExceptionHandling="FALSE"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="3"
|
||||
@ -255,6 +255,9 @@
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\intl_builtin.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\IntlManager.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\inuse.cpp">
|
||||
</File>
|
||||
@ -378,6 +381,9 @@
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\tra.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\unicode_util.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\utl.cpp">
|
||||
</File>
|
||||
@ -655,11 +661,14 @@
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\intl_proto.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\IntlManager.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\intlnames.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\intlobj.h">
|
||||
RelativePath="..\..\..\src\jrd\intlobj_new.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\inuse_proto.h">
|
||||
@ -979,6 +988,9 @@
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\types.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\unicode_util.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\utl_proto.h">
|
||||
</File>
|
||||
|
||||
@ -47,10 +47,11 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions="/MACHINE:I386"
|
||||
AdditionalDependencies="comctl32.lib ws2_32.lib mpr.lib version.lib"
|
||||
AdditionalDependencies="comctl32.lib ws2_32.lib mpr.lib version.lib icuuc.lib icuin.lib"
|
||||
OutputFile="..\..\..\temp\release\firebird\bin\fb_inet_server.exe"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="TRUE"
|
||||
AdditionalLibraryDirectories="../../../extern/icu/lib"
|
||||
GenerateDebugInformation="TRUE"
|
||||
SubSystem="2"
|
||||
StackReserveSize="2097152"/>
|
||||
@ -114,10 +115,11 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions="/MACHINE:I386"
|
||||
AdditionalDependencies="comctl32.lib ws2_32.lib mpr.lib version.lib"
|
||||
AdditionalDependencies="comctl32.lib ws2_32.lib mpr.lib version.lib icuuc.lib icuin.lib"
|
||||
OutputFile="..\..\..\temp\debug\firebird\bin\fb_inet_server.exe"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="TRUE"
|
||||
AdditionalLibraryDirectories="../../../extern/icu/lib"
|
||||
GenerateDebugInformation="TRUE"
|
||||
ProgramDatabaseFile="..\..\..\temp\debug\fb_inet_server\fb_inet_server.pdb"
|
||||
SubSystem="2"
|
||||
|
||||
@ -41,10 +41,11 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions="/MACHINE:I386"
|
||||
AdditionalDependencies="comctl32.lib ws2_32.lib mpr.lib version.lib"
|
||||
AdditionalDependencies="comctl32.lib ws2_32.lib mpr.lib version.lib icuuc.lib icuin.lib"
|
||||
OutputFile="..\..\..\temp\debug\firebird\bin\fbembed.dll"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="TRUE"
|
||||
AdditionalLibraryDirectories="../../../extern/icu/lib"
|
||||
ModuleDefinitionFile="..\defs\fbclient.def"
|
||||
GenerateDebugInformation="TRUE"
|
||||
ProgramDatabaseFile="..\..\..\temp\debug\fbembed\fbembed.pdb"
|
||||
@ -114,10 +115,11 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions="/MACHINE:I386"
|
||||
AdditionalDependencies="mpr.lib ws2_32.lib version.lib"
|
||||
AdditionalDependencies="mpr.lib ws2_32.lib version.lib icuuc.lib icuin.lib"
|
||||
OutputFile="..\..\..\temp\release\firebird/bin/fbembed.dll"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="TRUE"
|
||||
AdditionalLibraryDirectories="../../../extern/icu/lib"
|
||||
ModuleDefinitionFile="..\defs\fbclient.def"
|
||||
GenerateDebugInformation="TRUE"
|
||||
ImportLibrary="..\..\..\temp\release\fbembed\fbembed.lib"/>
|
||||
|
||||
@ -47,10 +47,11 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions="/MACHINE:I386"
|
||||
AdditionalDependencies="comctl32.lib ws2_32.lib mpr.lib version.lib"
|
||||
AdditionalDependencies="comctl32.lib ws2_32.lib mpr.lib version.lib icuuc.lib icuin.lib"
|
||||
OutputFile="..\..\..\temp\release\firebird\bin\fbserver.exe"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="TRUE"
|
||||
AdditionalLibraryDirectories="../../../extern/icu/lib"
|
||||
GenerateDebugInformation="TRUE"
|
||||
SubSystem="2"
|
||||
StackReserveSize="2097152"/>
|
||||
@ -114,10 +115,11 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions="/MACHINE:I386"
|
||||
AdditionalDependencies="comctl32.lib ws2_32.lib mpr.lib version.lib"
|
||||
AdditionalDependencies="comctl32.lib ws2_32.lib mpr.lib version.lib icuuc.lib icuin.lib"
|
||||
OutputFile="..\..\..\temp\debug\firebird\bin\fbserver.exe"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="TRUE"
|
||||
AdditionalLibraryDirectories="../../../extern/icu/lib"
|
||||
GenerateDebugInformation="TRUE"
|
||||
ProgramDatabaseFile="..\..\..\temp\debug\fbserver\fbserver.pdb"
|
||||
SubSystem="2"
|
||||
|
||||
@ -531,6 +531,9 @@
|
||||
<File
|
||||
RelativePath="..\..\..\src\intl\collations\pw1252nor4.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\intl\collations\pw1252ptbr.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\intl\collations\pw1252span.h">
|
||||
</File>
|
||||
|
||||
@ -76,6 +76,7 @@
|
||||
|
||||
@echo.
|
||||
@echo Completed Preparations for build
|
||||
@echo You may now run make_icu.bat [CLEAN]
|
||||
@echo You may now run make_boot.bat [DEBUG] [CLEAN]
|
||||
@echo.
|
||||
|
||||
|
||||
10
configure.in
10
configure.in
@ -715,6 +715,7 @@ mkdir -p temp/boot/alice
|
||||
mkdir -p temp/boot/burp
|
||||
mkdir -p temp/boot/common/classes
|
||||
mkdir -p temp/boot/common/config
|
||||
mkdir -p temp/boot/config
|
||||
mkdir -p temp/boot/dsql
|
||||
mkdir -p temp/boot/dudley
|
||||
mkdir -p temp/boot/extlib
|
||||
@ -741,11 +742,13 @@ mkdir -p temp/boot/utilities/guard
|
||||
mkdir -p temp/boot/utilities/ibmgr
|
||||
mkdir -p temp/boot/utilities/install
|
||||
mkdir -p temp/boot/utilities/rebuild
|
||||
mkdir -p temp/boot/vulcan
|
||||
|
||||
mkdir -p temp/std/alice
|
||||
mkdir -p temp/std/burp
|
||||
mkdir -p temp/std/common/classes
|
||||
mkdir -p temp/std/common/config
|
||||
mkdir -p temp/std/config
|
||||
mkdir -p temp/std/dsql
|
||||
mkdir -p temp/std/dudley
|
||||
mkdir -p temp/std/extlib
|
||||
@ -772,12 +775,14 @@ mkdir -p temp/std/utilities/guard
|
||||
mkdir -p temp/std/utilities/ibmgr
|
||||
mkdir -p temp/std/utilities/install
|
||||
mkdir -p temp/std/utilities/rebuild
|
||||
mkdir -p temp/std/vulcan
|
||||
mkdir -p temp/std/extern/editline
|
||||
|
||||
mkdir -p temp/superclient/alice
|
||||
mkdir -p temp/superclient/burp
|
||||
mkdir -p temp/superclient/common/classes
|
||||
mkdir -p temp/superclient/common/config
|
||||
mkdir -p temp/superclient/config
|
||||
mkdir -p temp/superclient/dsql
|
||||
mkdir -p temp/superclient/dudley
|
||||
mkdir -p temp/superclient/extlib
|
||||
@ -804,11 +809,13 @@ mkdir -p temp/superclient/utilities/guard
|
||||
mkdir -p temp/superclient/utilities/ibmgr
|
||||
mkdir -p temp/superclient/utilities/install
|
||||
mkdir -p temp/superclient/utilities/rebuild
|
||||
mkdir -p temp/superclient/vulcan
|
||||
|
||||
mkdir -p temp/superserver/alice
|
||||
mkdir -p temp/superserver/burp
|
||||
mkdir -p temp/superserver/common/classes
|
||||
mkdir -p temp/superserver/common/config
|
||||
mkdir -p temp/superserver/config
|
||||
mkdir -p temp/superserver/dsql
|
||||
mkdir -p temp/superserver/dudley
|
||||
mkdir -p temp/superserver/extlib
|
||||
@ -835,6 +842,7 @@ mkdir -p temp/superserver/utilities/guard
|
||||
mkdir -p temp/superserver/utilities/ibmgr
|
||||
mkdir -p temp/superserver/utilities/install
|
||||
mkdir -p temp/superserver/utilities/rebuild
|
||||
mkdir -p temp/superserver/vulcan
|
||||
|
||||
])
|
||||
|
||||
@ -866,6 +874,7 @@ case "$PLATFORM" in
|
||||
gen/install/scripts/rpmfiles.txt:${INSTALL_SRC_DIR}/rpmfiles.txt.in
|
||||
gen/install/misc/firebird.conf:builds/install/misc/firebird.conf
|
||||
gen/install/misc/aliases.conf:builds/install/misc/aliases.conf.in
|
||||
gen/install/misc/fbintl.conf:builds/install/misc/fbintl.conf
|
||||
gen/install/misc/firebird.xinetd:builds/install/arch-specific/linux/misc/firebird.xinetd.in
|
||||
gen/install/misc/firebird.init.d.generic:builds/install/arch-specific/linux/misc/firebird.init.d.generic.in
|
||||
gen/install/misc/firebird.init.d.mandrake:builds/install/arch-specific/linux/misc/firebird.init.d.mandrake.in
|
||||
@ -967,6 +976,7 @@ gen/Makefile.embed.gpre:${MAKE_SRC_DIR}/Makefile.in.embed.gpre
|
||||
gen/Makefile.install:builds/install/arch-specific/${INSTALL_PREFIX}/Makefile.in
|
||||
Makefile:Makefile.in
|
||||
gen/Makefile.extern.editline:${MAKE_SRC_DIR}/Makefile.in.extern.editline
|
||||
gen/Makefile.extern.icu:${MAKE_SRC_DIR}/Makefile.in.extern.icu
|
||||
)
|
||||
AC_OUTPUT
|
||||
|
||||
|
||||
104
doc/WhatsNew
104
doc/WhatsNew
@ -1,3 +1,107 @@
|
||||
**************
|
||||
* v2.0 (new INTL) Alpha 2
|
||||
**************
|
||||
|
||||
* New INTL interface
|
||||
A new interface allowing the following enhancements and features
|
||||
Contributor(s):
|
||||
Nickolay Samofatov <nickolay at broadviewsoftware.com>
|
||||
|
||||
* INTL enhancements
|
||||
1) Well-formedness checks of string constants and parameters
|
||||
2) Uppercase and lowercase all possible (and not only ASCII) characters in default collation orders
|
||||
3) Check length of characters (and not bytes) for new MBCS (including UTF8)
|
||||
4) Inform original character set in sqlsubtype of XSQLVAR when connecting with NONE
|
||||
Contributor(s):
|
||||
Adriano dos Santos Fernandes <adrianosf at uol.com.br>
|
||||
|
||||
* BLOB enhancements
|
||||
1) Allow usage of collations
|
||||
2) Performe comparision using entire content
|
||||
3) Convert between character sets when assigning from string or BLOB
|
||||
Contributor(s):
|
||||
Adriano dos Santos Fernandes <adrianosf at uol.com.br>
|
||||
|
||||
* Unicode 4.0 support
|
||||
UTF8 character set with collations UCS_BASIC and UNICODE
|
||||
Contributor(s):
|
||||
Adriano dos Santos Fernandes <adrianosf at uol.com.br>
|
||||
|
||||
* Brazilian collations
|
||||
1) Collation PT_BR for ISO8859_1 and WIN1252 character sets
|
||||
2) Collation WIN_PTBR for WIN1252 character set
|
||||
Contributor(s):
|
||||
Adriano dos Santos Fernandes <adrianosf at uol.com.br>
|
||||
Paulo Henrique Albanez <lista at pha.com.br>
|
||||
|
||||
* New string functions
|
||||
LOWER, BIT_LENGTH, CHAR_LENGTH/CHARACTER_LENGTH, OCTET_LENGTH, TRIM.
|
||||
See also:
|
||||
/doc/sql.extentions/README.length
|
||||
/doc/sql.extentions/README.trim
|
||||
Contributor(s):
|
||||
Adriano dos Santos Fernandes <adrianosf at uol.com.br>
|
||||
|
||||
* INTL plugins
|
||||
Character sets and collations are installed using a manifest file. Server write to the log when conflicts exist.
|
||||
Contributor(s):
|
||||
Adriano dos Santos Fernandes <adrianosf at uol.com.br>
|
||||
|
||||
* Fixed SF #1073212
|
||||
Order by big columns (collate) terminates server
|
||||
Contributor(s):
|
||||
Adriano dos Santos Fernandes <adrianosf at uol.com.br>
|
||||
|
||||
* Fixed SF #939844
|
||||
Queries > 263 chars with UNICODE DB throws GDS Exception
|
||||
Contributor(s):
|
||||
Adriano dos Santos Fernandes <adrianosf at uol.com.br>
|
||||
|
||||
* Fixed SF #977785
|
||||
Wrong character lengths MBCS (UTF-8, East-Asian charsets)
|
||||
Contributor(s):
|
||||
Adriano dos Santos Fernandes <adrianosf at uol.com.br>
|
||||
|
||||
* Fixed SF #536243
|
||||
UNICODE_FSS charset and UPPER function
|
||||
Contributor(s):
|
||||
Adriano dos Santos Fernandes <adrianosf at uol.com.br>
|
||||
|
||||
* Fixed SF #942726
|
||||
UPPER does not convert aacute to Aacute for ISO8859_1
|
||||
Contributor(s):
|
||||
Adriano dos Santos Fernandes <adrianosf at uol.com.br>
|
||||
|
||||
* Fixed SF #544630
|
||||
Problems when connecting using UNICODE
|
||||
Contributor(s):
|
||||
Adriano dos Santos Fernandes <adrianosf at uol.com.br>
|
||||
|
||||
* Fixed SF #540547
|
||||
Concatenation, numeric fields & charset
|
||||
Contributor(s):
|
||||
Adriano dos Santos Fernandes <adrianosf at uol.com.br>
|
||||
|
||||
* Fixed unregistered bug
|
||||
Query produce different result depending on index presence when the last character of the string is the first character of a compression pair
|
||||
Contributor(s):
|
||||
Adriano dos Santos Fernandes <adrianosf at uol.com.br>
|
||||
|
||||
* Fixed unregistered bug
|
||||
SUBSTRING and multi-byte BLOB don't work correctly
|
||||
Contributor(s):
|
||||
Adriano dos Santos Fernandes <adrianosf at uol.com.br>
|
||||
|
||||
* Fixed unregistered bug
|
||||
Pattern matching with multi-byte BLOB is performed in binary mode
|
||||
Contributor(s):
|
||||
Adriano dos Santos Fernandes <adrianosf at uol.com.br>
|
||||
|
||||
* Fixed unregistered bug
|
||||
It's not safe to connect with MBCS if database has columns using different character set
|
||||
Contributor(s):
|
||||
Adriano dos Santos Fernandes <adrianosf at uol.com.br>
|
||||
|
||||
**************
|
||||
* v2.0 Alpha 2
|
||||
**************
|
||||
|
||||
@ -56,11 +56,20 @@ Firebird 2.0:
|
||||
|
||||
Added as reserved words:
|
||||
|
||||
BIT_LENGTH
|
||||
BOTH
|
||||
CHAR_LENGTH
|
||||
CHARACTER_LENGTH
|
||||
CLOSE
|
||||
CROSS
|
||||
FETCH
|
||||
LEADING
|
||||
LOWER
|
||||
OCTET_LENGTH
|
||||
OPEN
|
||||
ROWS
|
||||
TRAILING
|
||||
TRIM
|
||||
|
||||
Moved from non-reserved words to reserved:
|
||||
|
||||
|
||||
16
doc/sql.extensions/README.length
Normal file
16
doc/sql.extensions/README.length
Normal file
@ -0,0 +1,16 @@
|
||||
SQL Language Extension: BIT_LENGTH, CHAR_LENGTH/CHARACTER_LENGTH and OCTET_LENGTH
|
||||
|
||||
Function:
|
||||
Return number of bits, characters and bytes of a string.
|
||||
|
||||
Author:
|
||||
Adriano dos Santos Fernandes <adrianosf@uol.com.br>
|
||||
|
||||
Format:
|
||||
<length function> ::=
|
||||
{ BIT_LENGTH | CHAR_LENGTH | CHARACTER_LENGTH | OCTET_LENGTH } <left paren> <value expression> <right paren>
|
||||
|
||||
Example:
|
||||
select
|
||||
rdb$relation_name, char_length(rdb$relation_name), char_length(trim(rdb$relation_name))
|
||||
from rdb$relations;
|
||||
38
doc/sql.extensions/README.trim
Normal file
38
doc/sql.extensions/README.trim
Normal file
@ -0,0 +1,38 @@
|
||||
SQL Language Extension: TRIM
|
||||
|
||||
Function:
|
||||
Remove leading, trailing or both substring from a string.
|
||||
|
||||
Author:
|
||||
Adriano dos Santos Fernandes <adrianosf@uol.com.br>
|
||||
|
||||
Format:
|
||||
<trim function> ::=
|
||||
TRIM <left paren> [ [ <trim specification> ] [ <trim character> ] FROM ] <value expression> <right paren>
|
||||
|
||||
<trim specification> ::=
|
||||
LEADING
|
||||
| TRAILING
|
||||
| BOTH
|
||||
|
||||
<trim character> ::=
|
||||
<value expression>
|
||||
|
||||
Syntax Rules:
|
||||
1) If <trim specification> is not specified, BOTH is assumed.
|
||||
2) If <trim character> is not specified, ' ' is assumed.
|
||||
3) If <trim specification> and/or <trim character> is specified, FROM should be specified.
|
||||
4) If <trim specification> and <trim character> is not specified, FROM should not be specified.
|
||||
|
||||
Examples:
|
||||
A)
|
||||
select
|
||||
rdb$relation_name, trim(leading 'RDB$' from rdb$relation_name)
|
||||
from rdb$relations
|
||||
where rdb$relation_name starting with 'RDB$';
|
||||
|
||||
B)
|
||||
select
|
||||
trim(rdb$relation_name) || ' is a system table'
|
||||
from rdb$relations
|
||||
where rdb$system_flag = 1;
|
||||
0
src/extern/editline/config.guess → extern/editline/config.guess
vendored
Executable file → Normal file
0
src/extern/editline/config.guess → extern/editline/config.guess
vendored
Executable file → Normal file
0
src/extern/editline/config.sub → extern/editline/config.sub
vendored
Executable file → Normal file
0
src/extern/editline/config.sub → extern/editline/config.sub
vendored
Executable file → Normal file
2
src/extern/editline/configure → extern/editline/configure
vendored
Executable file → Normal file
2
src/extern/editline/configure → extern/editline/configure
vendored
Executable file → Normal file
@ -753,7 +753,7 @@ if test "x$CFLAGS" = "x" ; then
|
||||
no_CFLAGS="yes"
|
||||
fi
|
||||
if test "x$no_CFLAGS" = "xyes" -a "x$GCC" = "xyes" ; then
|
||||
CFLAGS="-Wall -g3"
|
||||
CFLAGS="-Wall -pipe -g3"
|
||||
fi
|
||||
A_CFLAGS=""
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user