Skip to content

Commit

Permalink
This commit was manufactured by cvs2git to create branch 'B2_0_0'.
Browse files Browse the repository at this point in the history 
Sprout from unlabeled-1.1.2 2007-09-04 14:52:47 UTC Vladimir Tsvigun <praktik@users.sourceforge.net> '- fixed bug, URL: http://tracker.firebirdsql.org/browse/ODBC-30,'
Cherrypick from master 2004-10-18 17:27:25 UTC Vladimir Tsvigun <praktik@users.sourceforge.net> '- added Ukrainian HtmlHelp':
    Builds/Gcc.freeBSD/readme.freeBSD
    Builds/MinGW_Dev-Cpp.win/IscDbc.layout
    Builds/MinGW_Dev-Cpp.win/OdbcJdbc.layout
    Builds/MinGW_Dev-Cpp.win/OdbcJdbcSetup.layout
    Builds/MsVc60.win/BuildAll.bat
    ChangeLog
    Install/HtmlHelp.es/OdbcJdbc.hhc
    Install/HtmlHelp.es/OdbcJdbc.hhk
    Install/HtmlHelp.es/OdbcJdbc.hhp
    Install/HtmlHelp.es/html/About.htm
    Install/HtmlHelp.es/html/Array.htm
    Install/HtmlHelp.es/html/ConfigurationParameters.htm
    Install/HtmlHelp.es/html/ConnectionAttributes.htm
    Install/HtmlHelp.es/html/ConnectionExamples.htm
    Install/HtmlHelp.es/html/Copyright.htm
    Install/HtmlHelp.es/html/Cursors.htm
    Install/HtmlHelp.es/html/Environment.htm
    Install/HtmlHelp.es/html/FirebirdODBC.htm
    Install/HtmlHelp.es/html/Multithread.htm
    Install/HtmlHelp.es/html/Procedures.htm
    Install/HtmlHelp.es/html/SecurityPassword.htm
    Install/HtmlHelp.es/html/Transactions.htm
    Install/HtmlHelp.es/html/Usage.htm
    Install/HtmlHelp.es/images/odbcjdbc-logo.gif
    Install/HtmlHelp.pt/OdbcJdbc.hhc
    Install/HtmlHelp.pt/OdbcJdbc.hhk
    Install/HtmlHelp.pt/OdbcJdbc.hhp
    Install/HtmlHelp.pt/html/About.htm
    Install/HtmlHelp.pt/html/Array.htm
    Install/HtmlHelp.pt/html/ConfigurationParameters.htm
    Install/HtmlHelp.pt/html/ConnectionAttributes.htm
    Install/HtmlHelp.pt/html/ConnectionExamples.htm
    Install/HtmlHelp.pt/html/Copyright.htm
    Install/HtmlHelp.pt/html/Cursors.htm
    Install/HtmlHelp.pt/html/Environment.htm
    Install/HtmlHelp.pt/html/FirebirdODBC.htm
    Install/HtmlHelp.pt/html/Multithread.htm
    Install/HtmlHelp.pt/html/Procedures.htm
    Install/HtmlHelp.pt/html/SecurityPassword.htm
    Install/HtmlHelp.pt/html/Transactions.htm
    Install/HtmlHelp.pt/html/Usage.htm
    Install/HtmlHelp.pt/images/odbcjdbc-logo.gif
    Install/HtmlHelp.ru/html/Clarion.htm
    Install/HtmlHelp.ru/html/FirebirdODBC.htm
    Install/HtmlHelp.ru/images/modArrayField.jpg
    Install/HtmlHelp.ru/images/odbcjdbc-logo.gif
    Install/HtmlHelp.ru/images/ruleModArrayField.jpg
    Install/HtmlHelp.uk/html/Clarion.htm
    Install/HtmlHelp.uk/html/FirebirdODBC.htm
    Install/HtmlHelp.uk/images/modArrayField.jpg
    Install/HtmlHelp.uk/images/odbcjdbc-logo.gif
    Install/HtmlHelp.uk/images/ruleModArrayField.jpg
    Install/HtmlHelp/OdbcJdbc.hhc
    Install/HtmlHelp/OdbcJdbc.hhk
    Install/HtmlHelp/html/About.htm
    Install/HtmlHelp/html/Array.htm
    Install/HtmlHelp/html/Clarion.htm
    Install/HtmlHelp/html/ConfigurationParameters.htm
    Install/HtmlHelp/html/ConnectionAttributes.htm
    Install/HtmlHelp/html/ConnectionExamples.htm
    Install/HtmlHelp/html/Copyright.htm
    Install/HtmlHelp/html/Cursors.htm
    Install/HtmlHelp/html/Environment.htm
    Install/HtmlHelp/html/FirebirdODBC.htm
    Install/HtmlHelp/html/Multithread.htm
    Install/HtmlHelp/html/Procedures.htm
    Install/HtmlHelp/html/SecurityPassword.htm
    Install/HtmlHelp/html/Transactions.htm
    Install/HtmlHelp/html/Usage.htm
    Install/HtmlHelp/images/odbcjdbc-logo.gif
    Install/IDPLicense.txt
    Install/Linux/DriverTemplate.ini
    Install/Linux/FirebirdDSNTemplate.ini
    Install/Linux/InterBaseDSNTemplate.ini
    Install/Linux/install.sh
    Install/Linux/readme.txt
    Install/ReleaseNotes_v1.2.html
    Install/Win32/Installation_Readme.txt
    Install/Win32/MakePackage.bat
    Install/Win32/Readme.txt
    Install/Win32/firebird-logo1.bmp
    Install/Win32/firebird-logo2.bmp
    IscDbc/BinToHexStr.h
    IscDbc/Blob.cpp
    IscDbc/DateTime.h
    IscDbc/Engine.h
    IscDbc/Error.cpp
    IscDbc/Error.h
    IscDbc/IscArray.h
    IscDbc/IscBlob.h
    IscDbc/JString.h
    IscDbc/LinkedList.h
    IscDbc/Lock.cpp
    IscDbc/Lock.h
    IscDbc/Parameter.cpp
    IscDbc/Parameter.h
    IscDbc/Parameters.h
    IscDbc/Properties.h
    IscDbc/SqlTime.h
    IscDbc/TimeStamp.h
    IscDbc/Values.cpp
    IscDbc/Values.h
    IscDbc/makefile.in
    IscDbc/resource.h
    JdbcTest/JdbcTest.dsp
    JdbcTest/Test.cpp
    OdbcDateTime.h
    Res/resource.en
    Res/resource.es
    Res/resource.it
    Res/resource.ru
    Res/resource.uk
    Test/Hash.cpp
    Test/Odbc.cpp
    Test/Odbc.h
    Test/SimpleTest.cpp
    Test/Table.cpp
    Test/Test.cpp
    Test/Test.dsp
    TestInstall/TestInstall.dsp
    change.log
    makefile.in
    resource.h
Cherrypick from IBPhoenix 2001-05-10 21:51:40 UTC Ann W. Harrison <awharrison@users.sourceforge.net> 'Finally the source of the Starkey ODBC/JDBC driver is released':
    .cvsignore
    Headers/SQL.H
    Headers/SQLEXT.H
    Test/Constraint.cpp
    Test/Constraint.h
    Test/Database.cpp
    Test/Database.h
    Test/Field.cpp
    Test/Field.h
    Test/Gen.cpp
    Test/Gen.h
    Test/Hash.h
    Test/Index.cpp
    Test/Index.h
    Test/JString.cpp
    Test/JString.h
    Test/LinkedList.cpp
    Test/LinkedList.h
    Test/NetfraDatabase.cpp
    Test/NetfraDatabase.h
    Test/NetfraRemote.lib
    Test/Print.cpp
    Test/Print.h
    Test/RString.cpp
    Test/RString.h
    Test/StdAfx.h
    Test/Table.h
    Test/Test.001
    Test/Test.dsw
    Test/Test.ncb
    Test/Test.opt
    Test/Type.cpp
    Test/Type.h
    Test/scrambledTest.cpp
    Test/statistics.cpp
    TestInstall/TestInstall.cpp
Cherrypick from unlabeled-1.6.2 2008-06-08 20:49:56 UTC Nikolay Samofatov <skidder@users.sourceforge.net> 'Fix ODBC driver to work correctly with Microsoft Project 2003. This involves the following changes:':
    Install/Win32/OdbcJdbcSetup.iss
    IscDbc/BinaryBlob.cpp
    IscDbc/IscBlob.cpp
    IscDbc/IscColumnPrivilegesResultSet.cpp
    IscDbc/IscColumnPrivilegesResultSet.h
    IscDbc/IscCrossReferenceResultSet.h
    IscDbc/IscIndexInfoResultSet.h
    IscDbc/IscProcedureColumnsResultSet.h
    IscDbc/IscProceduresResultSet.h
    IscDbc/IscSpecialColumnsResultSet.h
    IscDbc/IscStatementMetaData.h
    IscDbc/IscTablePrivilegesResultSet.cpp
    IscDbc/IscTablePrivilegesResultSet.h
    IscDbc/IscTablesResultSet.h
    IscDbc/LoadFbClientDll.cpp
    IscDbc/Stream.h
    OdbcConvert.h
    OdbcError.h
    OdbcJdbc.h
    OdbcJdbcSetup/Setup.h
    OdbcJdbcSetup/resource.h
    OdbcObject.h
Cherrypick from unlabeled-1.4.2 2007-03-23 14:14:43 UTC Vladimir Tsvigun <praktik@users.sourceforge.net> '- is executed replacement of functions for the greater safety':
    Builds/Gcc.lin/readme.linux
    Builds/MinGW_Dev-Cpp.win/IscDbc.dev
    Builds/MsVc60.win/OdbcJdbcSetup.dsp
    Builds/MsVc70.win/IscDbc.vcproj
    Builds/MsVc70.win/makefile.msvc7
    Builds/makefile.sources
    ConnectDialog.h
    Install/HtmlHelp/OdbcJdbc.hhp
    IscDbc/JavaType.h
    IscDbc/SQLError.cpp
    IscDbc/SQLError.h
    IscDbc/SQLException.h
    IscDbc/SqlTime.cpp
    OdbcInstGetProp.cpp
    OdbcJdbcSetup/OdbcJdbcSetup.cpp
    OdbcJdbcSetup/OdbcJdbcSetup.def
    OdbcJdbcSetup/OdbcJdbcSetup.h
    SafeEnvThread.cpp
Cherrypick from unlabeled-1.3.2 2007-04-25 13:25:18 UTC Paul Reeves <paul_reeves@users.sourceforge.net> 'Use FIREBIRD env var if available otherwise default to hard-coded value.':
    Builds/MinGW_Dev-Cpp.win/OdbcJdbc.dev
    Builds/MinGW_Dev-Cpp.win/OdbcJdbcSetup.dev
    Builds/MsVc60.win/OdbcJdbc.dsp
    Builds/MsVc60.win/makefile.msvc6
    Builds/MsVc70.win/OdbcJdbc.vcproj
    Builds/MsVc70.win/OdbcJdbcSetup.vcproj
    Builds/makefile.environ
    IscDbc/EnvShare.cpp
    IscDbc/EnvShare.h
    IscDbc/IscHeadSqlVar.h
    IscDbc/IscOdbcStatement.cpp
    IscDbc/IscOdbcStatement.h
    IscDbc/Mlist.h
    IscDbc/Mutex.cpp
    IscDbc/SupportFunctions.cpp
    IscDbc/SupportFunctions.h
    SecurityPassword.h
Cherrypick from unlabeled-1.7.2 2007-03-22 18:13:30 UTC Vladimir Tsvigun <praktik@users.sourceforge.net> '- improvement, Firebird do not supports catalogs and query':
    DescRecord.h
    InfoItems.h
    IscDbc/BinaryBlob.h
    IscDbc/IscArray.cpp
    IscDbc/IscColumnsResultSet.h
    IscDbc/IscCrossReferenceResultSet.cpp
    IscDbc/IscMetaDataResultSet.h
    IscDbc/IscProceduresResultSet.cpp
    IscDbc/IscSqlType.h
    IscDbc/IscTablesResultSet.cpp
    IscDbc/JString.cpp
    IscDbc/TimeStamp.cpp
    IscDbc/Types.h
    IscDbc/TypesResultSet.h
    OdbcError.cpp
Cherrypick from unlabeled-1.5.2 2007-03-23 14:14:41 UTC Vladimir Tsvigun <praktik@users.sourceforge.net> '- is executed replacement of functions for the greater safety':
    Builds/MinGW_Dev-Cpp.win/makefile.mingw
    Builds/MsVc60.win/IscDbc.dsp
    IscDbc/Blob.h
    IscDbc/IscPrimaryKeysResultSet.h
    IscDbc/IscResultSetMetaData.cpp
    IscDbc/IscResultSetMetaData.h
    IscDbc/IscStatementMetaData.cpp
    IscDbc/LinkedList.cpp
    IscDbc/LoadFbClientDll.h
    IscDbc/Mutex.h
    IscDbc/Parameters.cpp
    IscDbc/Stream.cpp
    IscDbc/extodbc.cpp
    SafeEnvThread.h
Cherrypick from unlabeled-1.2.4 2007-03-23 14:01:45 UTC Vladimir Tsvigun <praktik@users.sourceforge.net> '- the schema of build of a package is briefly described,':
    Builds/Bcc55.win/build.bat
    Builds/Bcc55.win/makefile.bcc55
    Builds/Gcc.freeBSD/makefile.freeBSD
    Builds/MinGW_Dev-Cpp.win/build.bat
    Builds/MsVc60.win/OdbcJdbc.dsw
    Builds/MsVc60.win/build.bat
    Builds/MsVc70.win/OdbcJdbc.sln
    Builds/MsVc70.win/build.bat
    IscDbc/IscDbc.def
    OdbcJdbc.def
    OdbcJdbcMinGw.def
Cherrypick from unlabeled-1.8.2 2007-03-22 18:13:27 UTC Vladimir Tsvigun <praktik@users.sourceforge.net> '- improvement, Firebird do not supports catalogs and query':
    DescRecord.cpp
    IscDbc/Attachment.cpp
    IscDbc/Attachment.h
    IscDbc/IscDatabaseMetaData.h
    IscDbc/IscDbc.rc
    IscDbc/IscPrimaryKeysResultSet.cpp
    IscDbc/Sqlda.h
    OdbcEnv.h
    OdbcJdbc.rc
Cherrypick from unlabeled-1.9.2 2007-03-23 14:14:38 UTC Vladimir Tsvigun <praktik@users.sourceforge.net> '- is executed replacement of functions for the greater safety':
    ConnectDialog.cpp
    IscDbc/DateTime.cpp
    IscDbc/IscIndexInfoResultSet.cpp
    IscDbc/IscMetaDataResultSet.cpp
    IscDbc/IscSpecialColumnsResultSet.cpp
    IscDbc/TypesResultSet.cpp
    OdbcDesc.h
    OdbcJdbcSetup/DsnDialog.h
    OdbcObject.cpp
Cherrypick from unlabeled-1.10.2 2008-06-08 20:49:55 UTC Nikolay Samofatov <skidder@users.sourceforge.net> 'Fix ODBC driver to work correctly with Microsoft Project 2003. This involves the following changes:':
    IscDbc/IscConnection.h
    IscDbc/IscSqlType.cpp
    IscDbc/Value.h
    OdbcConnection.h
    OdbcConvert.cpp
    OdbcEnv.cpp
Cherrypick from unlabeled-1.13.2 2007-09-05 17:31:54 UTC Vladimir Tsvigun <praktik@users.sourceforge.net> '- current BUILDNUM_VERSION set 144 ( 5 Sep 2007 )':
    IscDbc/IscCallableStatement.cpp
    IscDbc/IscCallableStatement.h
    OdbcDesc.cpp
    OdbcJdbcSetup/OdbcJdbcSetup.rc
    SetupAttributes.h
    WriteBuildNo.h
Cherrypick from unlabeled-1.14.2 2007-03-23 14:14:42 UTC Vladimir Tsvigun <praktik@users.sourceforge.net> '- is executed replacement of functions for the greater safety':
    IscDbc/IscDatabaseMetaData.cpp
    IscDbc/IscPreparedStatement.cpp
    IscDbc/IscPreparedStatement.h
    IscDbc/Value.cpp
    OdbcJdbcSetup/DsnDialog.cpp
    OdbcStatement.h
Cherrypick from unlabeled-1.11.2 2007-03-22 17:44:28 UTC Vladimir Tsvigun <praktik@users.sourceforge.net> '- fix bug, after performance SQLPrepare the status of the operator should be':
    IscDbc/IscProcedureColumnsResultSet.cpp
    IscDbc/IscResultSet.cpp
    IscDbc/IscResultSet.h
    IscDbc/IscStatement.h
Cherrypick from unlabeled-1.1.4 2006-07-25 07:23:28 UTC Vladimir Tsvigun <praktik@users.sourceforge.net> '- fix collision name, replace FbOdbc(use Easysoft) to OdbcFb32.dll,':
    Builds/CC.solaris/makefile.solaris
    OdbcJdbcSetup/OdbcJdbcSetupMinGw.def
Cherrypick from unlabeled-1.12.2 2006-07-25 07:23:29 UTC Vladimir Tsvigun <praktik@users.sourceforge.net> '- fix collision name, replace FbOdbc(use Easysoft) to OdbcFb32.dll,':
    Builds/Gcc.lin/makefile.linux
    OdbcDateTime.cpp
Cherrypick from unlabeled-1.15.2 2007-03-23 14:14:39 UTC Vladimir Tsvigun <praktik@users.sourceforge.net> '- is executed replacement of functions for the greater safety':
    IscDbc/IscDbc.h
    IscDbc/Sqlda.cpp
Cherrypick from unlabeled-1.16.2 2007-03-23 14:14:37 UTC Vladimir Tsvigun <praktik@users.sourceforge.net> '- is executed replacement of functions for the greater safety':
    IscDbc/Connection.h
    Main.cpp
Cherrypick from unlabeled-1.18.2 2007-08-26 17:21:05 UTC Vladimir Tsvigun <praktik@users.sourceforge.net> '- fixed bug, URL: http://tracker.firebirdsql.org/browse/ODBC-29,':
    IscDbc/IscColumnsResultSet.cpp
    IscDbc/IscStatement.cpp
Cherrypick from unlabeled-1.17.2 2007-03-23 14:14:44 UTC Vladimir Tsvigun <praktik@users.sourceforge.net> '- is executed replacement of functions for the greater safety':
    OdbcJdbcSetup/Setup.cpp
Cherrypick from unlabeled-1.19.2 2007-03-22 18:13:28 UTC Vladimir Tsvigun <praktik@users.sourceforge.net> '- improvement, Firebird do not supports catalogs and query':
    IscDbc/IscConnection.cpp
Cherrypick from unlabeled-1.27.2 2007-03-22 18:13:31 UTC Vladimir Tsvigun <praktik@users.sourceforge.net> '- improvement, Firebird do not supports catalogs and query':
    OdbcConnection.cpp
Cherrypick from unlabeled-1.38.2 2008-06-08 20:49:57 UTC Nikolay Samofatov <skidder@users.sourceforge.net> 'Fix ODBC driver to work correctly with Microsoft Project 2003. This involves the following changes:':
    OdbcStatement.cpp
  • Loading branch information
cvs2git committed Jun 8, 2008
1 parent 0955c4a commit f06d8f2
Show file tree
Hide file tree
Showing 310 changed files with 77,356 additions and 0 deletions.
1 change: 1 addition & 0 deletions .cvsignore
View file
@@ -0,0 +1 @@
*.d
15 changes: 15 additions & 0 deletions Builds/Bcc55.win/build.bat
View file
@@ -0,0 +1,15 @@
@echo off

rem
rem Examples Win98/Me
rem build C:\Borland\BCC55 WIN98
rem
rem
rem Examples Win XP/2000/2003/...
rem build C:\Borland\BCC55
rem


%1\bin\make -f makefile.bcc55 COMPDIR=%1 VER_NT=%2

@echo on
102 changes: 102 additions & 0 deletions Builds/Bcc55.win/makefile.bcc55
View file
@@ -0,0 +1,102 @@
#
.PHONY: all createdirs IscDbc OdbcJdbc OdbcJdbcSetup clean
#
#DEBUG = 1
#
!if(VER_NT == "WIN98")
# Win98/Me
VER_WINNT = "_WIN32_WINNT=0x0400"
!else
# Windows 2000/NT
VER_WINNT = "_WIN32_WINNT=0x0500"
!endif
#
!include ../makefile.environ
!include ../makefile.sources
#
!ifdef DEBUG
TARGETDIR = Debug
!else
TARGETDIR = Release
!endif
#
BUILDDIR = $(TARGETDIR)\obj
#
COMPFLAGS = -n$(BUILDDIR) \
-w- -a8 -jb -j1 -Hc -H=$(BUILDDIR)\bcc.csm \
-DWIN32 -D_WIN32 -D_WINDOWS -D$(VER_WINNT) -DISOLATION_AWARE_ENABLED \
-I.\ -I$(FBINCDIR) -I$(COMPDIR)\Include -I$(ISCDBCDIR) -I$(ODBCJDBCDIR)
# -w- -a8 -VM -VF -jb -j1 -Hc -H=$(BUILDDIR)\bcc.csm \
#
RCINCLUDE = -i$(COMPDIR)\Include
BRCC = $(COMPDIR)\bin\brcc32 -dWIN32 -d_WIN32
LD = $(COMPDIR)\bin\ilink32
BCC = $(COMPDIR)\bin\bcc32
LINKFLAGS = -q -Gn -Gi -Tpd -ad -L$(COMPDIR)\lib -L$(COMPDIR)\lib\PSDK -x
STARTUP = c0d32.obj
LIBRARIES = import32.lib cw32mt.lib wsock32.lib
ISCDBCDLL = $(TARGETDIR)\IscDbc.dll
ODBCJDBCDLL = $(TARGETDIR)\OdbcFb32.dll
ODBCJDBCSDLL = $(TARGETDIR)\OdbcJdbcSetup.dll
#
!ifdef DEBUG
COMPFLAGS = $(COMPFLAGS) -v -N -x -xp -D_DEBUG -DDEBUG
!else
COMPFLAGS = $(COMPFLAGS) -DNDEBUG
!endif
#
COMPFLAGS = $(COMPFLAGS) -tWCR -lGn -tWM -q
#
.rc.res:
@$(BRCC) $(RCINCLUDE) -fo$@ $*.rc
#
.cpp.obj :
@$(BCC) $(COMPFLAGS) $(COMPEXTFLAGS) -c $*.cpp
#
ISCDBCLIB = $(ISCDBCDLL:.dll=.lib)
ISCDBCDIRBCC = $(ISCDBCDIR:/=\)
ODBCJDBCDIRBCC = $(ODBCJDBCDIR:/=\)
ODBCJDBCSDIRBCC = $(ODBCJDBCSETUPDIR:/=\)
LIST_ISCDBCOBJ = $(ISCDBCSRC:.cpp=.obj)
LIST_ODBCJDBCOBJ = $(ODBCJDBCSRC:.cpp=.obj)
LIST_ODBCJDBCSOBJ = $(ODBCJDBCSETUPSRC:.cpp=.obj)
#
.PATH.cpp = $(ISCDBCDIRBCC);$(ODBCJDBCDIRBCC);$(ODBCJDBCSDIRBCC)
.PATH.obj = $(BUILDDIR)
.PATH.rc = $(ISCDBCDIRBCC);$(ODBCJDBCDIRBCC);$(ODBCJDBCSDIRBCC)
.PATH.res = $(BUILDDIR)
#
ISCDBCDEFFILE =
#ISCDBCDEFFILE = $(ISCDBCDIRBCC)\IscDbc.def
ODBCJDBCDEFFILE = $(ODBCJDBCDIRBCC)\OdbcJdbc.def
ODBCJDBCSDEFFILE=
#ODBCJDBCSDEFFILE= $(ODBCJDBCSDIRBCC)\OdbcJdbcSetup.def
#
all : createdirs IscDbc OdbcJdbc OdbcJdbcSetup
#
# Silently creates the target and build directories
createdirs :
@-if not exist $(TARGETDIR)\*.* mkdir $(TARGETDIR) > nul
@-if not exist $(BUILDDIR)\*.* mkdir $(BUILDDIR) > nul
#
# Silently cleanup and deletes the target and build directories
clean :
@if exist $(BUILDDIR) rm -fr $(TARGETDIR)
#
IscDbc : $(BUILDDIR)\IscDbc.res $(ISCDBCDLL)
OdbcJdbc : $(BUILDDIR)\OdbcJdbc.res $(ODBCJDBCDLL)
OdbcJdbcSetup : $(BUILDDIR)\OdbcJdbcSetup.res $(ODBCJDBCSDLL)
#
# Build the library from the object modules
#
$(ISCDBCDLL) : $(LIST_ISCDBCOBJ)
# @$(LD) $(LINKFLAGS) $(STARTUP) $(**:$(ISCDBCDIRBCC)=$(BUILDDIR)) ,$(ISCDBCDLL),,$(LIBRARIES),$(ISCDBCDEFFILE), $(BUILDDIR)\IscDbc.res
#
$(ODBCJDBCDLL) : $(LIST_ISCDBCOBJ) $(LIST_ODBCJDBCOBJ) $(LIST_ODBCJDBCSOBJ)
@$(LD) $(LINKFLAGS) $(STARTUP) $(**:$(ODBCJDBCDIRBCC)=$(BUILDDIR)),$(ODBCJDBCDLL),,$(LIBRARIES) odbccp32.lib ,$(ODBCJDBCDEFFILE), $(BUILDDIR)\OdbcJdbc.res
#
$(ODBCJDBCSDLL) : $(LIST_ODBCJDBCSOBJ)
# @$(LD) $(LINKFLAGS) $(STARTUP) $(BUILDDIR)\JString.obj $(**:$(ODBCJDBCSDIRBCC)=$(BUILDDIR)) ,$(ODBCJDBCSDLL),,$(LIBRARIES) gdi32.lib shell32.lib advapi32.lib user32.lib comdlg32.lib comctl32.lib odbccp32.lib,$(ODBCJDBCSDEFFILE),$(BUILDDIR)\OdbcJdbcSetup.res
#
# End
#
101 changes: 101 additions & 0 deletions Builds/CC.solaris/makefile.solaris
View file
@@ -0,0 +1,101 @@
#
#DEBUG=1
#
.PHONY: all createdirs IscDbc OdbcJdbc OdbcJdbcSetup clean postbuild
#
CC = CC
#
# Start build
#
include ../makefile.sources
include ../makefile.environ
#
INCLUDEDIR = -I/mnt/third_party/odbc/unixODBC/sun5-2.2.7/include \
-I/mnt/third_party/interbase/sun5-2003-03-10/include
EXTLIBDIR = -L/mnt/third_party/interbase/sun5-2003-03-10/lib \
-L/mnt/third_party/odbc/unixODBC/sun5-2.2.7/lib#
ifdef DEBUG
TARGETDIR = Debug
else
TARGETDIR = Release
endif
#
BUILDDIR = $(TARGETDIR)/obj
#
LIST_ISCDBCSRC = $(addprefix $(ISCDBCDIR)/, $(ISCDBCSRC))
LIST_ISCDBCOBJ = $(addprefix $(BUILDDIR)/, $(ISCDBCSRC:.cpp=.o))
LIST_ODBCJDBCSRC = $(addprefix $(ODBCJDBCDIR)/, $(ODBCJDBCSRC))
LIST_ODBCJDBCOBJ = $(addprefix $(BUILDDIR)/, $(ODBCJDBCSRC:.cpp=.o))
LIST_ODBCJDBCSETUPSRC = $(addprefix $(ODBCJDBCDIR)/, $(ODBCJDBCSETUPSRC_LINUX))
LIST_ODBCJDBCSETUPOBJ = $(addprefix $(BUILDDIR)/, $(ODBCJDBCSETUPSRC_LINUX:.cpp=.o))
#
COMPFLAGS = -pic -g -w -D_REENTRANT -D_PTHREADS -DEXTERNAL $(INCLUDEDIR)
#
LINKFLAGS = -G
EXTLIBS = $(EXTLIBDIR) -lcrypt -ldl -lgds
#
ISCDBCDLL = $(TARGETDIR)/IscDbc.so
ODBCJDBCDLL = $(TARGETDIR)/OdbcFb32.so
ODBCJDBCSETUPDLL= $(TARGETDIR)/OdbcJdbcS.so
ISCDBCDEFFILE = $(ISCDBCDIR)/IscDbc.def
ODBCJDBCDEFFILE = $(ODBCJDBCDIR)/OdbcJdbc.def
ODBCJDBCSDEFFILE= $(ODBCJDBCSETUPDIR)/OdbcJdbcSetup.def
#
ifdef DEBUG
DEBUGFLAGS = -D_DEBUG -DDEBUG -DLOGGING -fexceptions
else
DEBUGFLAGS = -DNDEBUG
endif
#
$(BUILDDIR)/%.o: $(ISCDBCDIR)/%.cpp
$(CC) $(COMPFLAGS) $(DEBUGFLAGS) -c $(firstword $<) -o $@
#
$(BUILDDIR)/%.o: $(ODBCJDBCDIR)/%.cpp
$(CC) $(COMPFLAGS) $(DEBUGFLAGS) -c $(firstword $<) -o $@
#
ISCDBCLIB = $(ISCDBCDLL:.so=.a)
ODBCJDBCLIB = $(ODBCJDBCDLL:.so=.a)
ODBCJDBCSETUPLIB= $(ODBCJDBCSETUPDLL:.so=.a)
#
all : createdirs $(ISCDBCDLL) $(ODBCJDBCDLL) $(ODBCJDBCSETUPDLL)
#
# Silently creates the target and build directories
createdirs :
@-mkdir $(TARGETDIR)
@-mkdir $(BUILDDIR)
#
# Silently cleanup and deletes the target and build directories
clean :
@-rm -fr $(TARGETDIR)
#
IscDbc : $(ISCDBCDLL)
OdbcJdbc : $(ODBCJDBCDLL)
OdbcJdbcSetup : $(ODBCJDBCSETUPDLL)
#
# Build the library from the object modules
#
$(ISCDBCDLL) : $(LIST_ISCDBCOBJ)
# ar crs $(ISCDBCLIB) $(LIST_ISCDBCOBJ)
# $(CC) $(LINKFLAGS) $(LIST_ISCDBCOBJ) $(EXTLIBS) -o $(ISCDBCDLL)
#
#$(ODBCJDBCDLL) : $(LIST_ODBCJDBCOBJ)
# ar crs $(ODBCJDBCLIB) $(LIST_ODBCJDBCOBJ)
# $(CC) $(LINKFLAGS) $(BUILDDIR)/JString.o $(BUILDDIR)/Mutex.o $(LIST_ODBCJDBCOBJ) $(EXTLIBS) -lodbcinst -o $(ODBCJDBCDLL)
#
$(ODBCJDBCSETUPDLL) : $(LIST_ODBCJDBCSETUPOBJ)
# ar crs $(ODBCJDBCSETUPLIB) $(LIST_ODBCJDBCSETUPOBJ)
# $(CC) $(LINKFLAGS) $(LIST_ODBCJDBCSETUPOBJ) $(EXTLIBS) -o $(ODBCJDBCSETUPDLL)
#
$(ODBCJDBCDLL) : $(LIST_ODBCJDBCOBJ) $(LIST_ODBCJDBCOBJ) $(LIST_ODBCJDBCSETUPOBJ)
ar crs $(ODBCJDBCLIB) $(LIST_ISCDBCOBJ)
ar crs $(ODBCJDBCLIB) $(LIST_ODBCJDBCOBJ)
ar crs $(ODBCJDBCLIB) $(LIST_ODBCJDBCSETUPOBJ)
$(CC) $(LINKFLAGS) $(LIST_ODBCJDBCOBJ) $(LIST_ODBCJDBCOBJ) $(LIST_ODBCJDBCSETUPOBJ) $(EXTLIBS) -lodbcinst -o $(ODBCJDBCDLL)
#
postbuild : $(ISCDBCDLL) $(ODBCJDBCDLL) $(ODBCJDBCSETUPDLL)
@-strip -s $(ISCDBCDLL) $(ODBCJDBCDLL) $(ODBCJDBCSETUPDLL)
@-tar -cf OdbcJdbc_Snapshot.tar $(ISCDBCDLL) $(ODBCJDBCDLL) $(ODBCJDBCSETUPDLL)
@-gzip -9 -S .gz OdbcJdbc_Snapshot.tar
#
# End
#
89 changes: 89 additions & 0 deletions Builds/Gcc.freeBSD/makefile.freeBSD
View file
@@ -0,0 +1,89 @@
#
#DEBUG=1
#
.PHONY: all createdirs IscDbc OdbcJdbc OdbcJdbcSetup clean
#
GCC = g++
#
# Start build
#
include ../makefile.sources
include ../makefile.environ
#
ifdef DEBUG
TARGETDIR = Debug
else
TARGETDIR = Release
endif
#
BUILDDIR = $(TARGETDIR)/obj
#
LIST_ISCDBCSRC = $(addprefix $(ISCDBCDIR)/, $(ISCDBCSRC))
LIST_ISCDBCOBJ = $(addprefix $(BUILDDIR)/, $(ISCDBCSRC:.cpp=.o))
LIST_ODBCJDBCSRC = $(addprefix $(ODBCJDBCDIR)/, $(ODBCJDBCSRC))
LIST_ODBCJDBCOBJ = $(addprefix $(BUILDDIR)/, $(ODBCJDBCSRC:.cpp=.o))
LIST_ODBCJDBCSETUPSRC = $(addprefix $(ODBCJDBCDIR)/, $(ODBCJDBCSETUPSRC_LINUX))
LIST_ODBCJDBCSETUPOBJ = $(addprefix $(BUILDDIR)/, $(ODBCJDBCSETUPSRC_LINUX:.cpp=.o))
#
COMPFLAGS = -g -w -D_REENTRANT -D_PTHREADS -DEXTERNAL -pthread
#
LINKFLAGS = -rdynamic -export-dynamic -shared
EXTLIBS = -lcrypt -lgds -lcompat
#
ISCDBCDLL = $(TARGETDIR)/IscDbc.so
ODBCJDBCDLL = $(TARGETDIR)/OdbcFb32.so
ODBCJDBCSETUPDLL= $(TARGETDIR)/OdbcJdbcS.so
#
ifdef DEBUG
DEBUGFLAGS = -D_DEBUG -DDEBUG -DLOGGING -fexceptions
else
DEBUGFLAGS = -DNDEBUG
endif
#
$(BUILDDIR)/%.o: $(ISCDBCDIR)/%.cpp
$(GCC) $(COMPFLAGS) $(DEBUGFLAGS) -c $(firstword $<) -o $@
#
$(BUILDDIR)/%.o: $(ODBCJDBCDIR)/%.cpp
$(GCC) $(COMPFLAGS) $(DEBUGFLAGS) -c $(firstword $<) -o $@
#
ISCDBCLIB = $(ISCDBCDLL:.so=.a)
ODBCJDBCLIB = $(ODBCJDBCDLL:.so=.a)
ODBCJDBCSETUPLIB= $(ODBCJDBCSETUPDLL:.so=.a)
#
all : createdirs $(ISCDBCDLL) $(ODBCJDBCDLL) $(ODBCJDBCSETUPDLL)
#
# Silently creates the target and build directories
createdirs :
@-mkdir $(TARGETDIR)
@-mkdir $(BUILDDIR)
#
# Silently cleanup and deletes the target and build directories
clean :
@-rm -fr $(TARGETDIR)
#
IscDbc : $(ISCDBCDLL)
OdbcJdbc : $(ODBCJDBCDLL)
OdbcJdbcSetup : $(ODBCJDBCSETUPDLL)
#
# Build the library from the object modules
#
$(ISCDBCDLL) : $(LIST_ISCDBCOBJ)
# ar crs $(ISCDBCLIB) $(LIST_ISCDBCOBJ)
# $(GCC) $(LINKFLAGS) $(LIST_ISCDBCOBJ) $(EXTLIBS) -o $(ISCDBCDLL)
#
#$(ODBCJDBCDLL) : $(LIST_ODBCJDBCOBJ)
# ar crs $(ODBCJDBCLIB) $(LIST_ODBCJDBCOBJ)
# $(GCC) $(LINKFLAGS) $(BUILDDIR)/JString.o $(BUILDDIR)/Mutex.o $(LIST_ODBCJDBCOBJ) $(EXTLIBS) -o $(ODBCJDBCDLL)
#
$(ODBCJDBCSETUPDLL) : $(LIST_ODBCJDBCSETUPOBJ)
# ar crs $(ODBCJDBCSETUPLIB) $(LIST_ODBCJDBCSETUPOBJ)
# $(GCC) $(LINKFLAGS) $(LIST_ODBCJDBCSETUPOBJ) $(EXTLIBS) -o $(ODBCJDBCSETUPDLL)
#
$(ODBCJDBCDLL) : $(LIST_ISCDBCOBJ) $(LIST_ODBCJDBCOBJ) $(LIST_ODBCJDBCSETUPOBJ)
ar crs $(ODBCJDBCLIB) $(LIST_ISCDBCOBJ)
ar crs $(ODBCJDBCLIB) $(LIST_ODBCJDBCOBJ)
ar crs $(ODBCJDBCLIB) $(LIST_ODBCJDBCSETUPOBJ)
$(GCC) $(LINKFLAGS) $(LIST_ISCDBCOBJ) $(LIST_ODBCJDBCOBJ) $(LIST_ODBCJDBCSETUPOBJ) $(EXTLIBS) -o $(ODBCJDBCDLL)
#
# End
#
12 changes: 12 additions & 0 deletions Builds/Gcc.freeBSD/readme.freeBSD
View file
@@ -0,0 +1,12 @@

1) Uses -pthread flag

Problem:
But my simple client working over OTL-wrapper (otl.sf.net) sigfaults on exit,
and on linux works fine.

Writen by Dmitriy Nikitinskiy
All clients *must be* complied with -pthread flag:
g++ -pthread -o client client.cpp

2)

0 comments on commit f06d8f2

Please sign in to comment.