diff options
-rw-r--r-- | .gitignore | 37 | ||||
-rw-r--r-- | INSTALL | 155 | ||||
-rw-r--r-- | INSTALL-GIT | 78 | ||||
-rw-r--r-- | Makefile.am | 10 | ||||
-rw-r--r-- | NEWS | 1 | ||||
-rw-r--r-- | README-GIT | 5 | ||||
-rwxr-xr-x | bootstrap | 16 | ||||
-rw-r--r-- | build/bootstrap.make | 70 | ||||
-rw-r--r-- | build/export/libodb-oracle/stub.make | 8 | ||||
-rw-r--r-- | build/import/cli/cli-cxx.make | 47 | ||||
-rw-r--r-- | build/import/cli/configuration-rules.make | 13 | ||||
-rwxr-xr-x | build/import/cli/configure | 53 | ||||
-rw-r--r-- | build/import/cli/stub.make | 28 | ||||
-rw-r--r-- | build/import/liboci/configuration-rules.make | 13 | ||||
-rwxr-xr-x | build/import/liboci/configure | 70 | ||||
-rw-r--r-- | build/import/liboci/rules.make | 24 | ||||
-rw-r--r-- | build/import/liboci/stub.make | 22 | ||||
-rw-r--r-- | build/import/liboci/version | 1 | ||||
-rw-r--r-- | build/import/libodb-oracle/configuration-rules.make | 13 | ||||
-rwxr-xr-x | build/import/libodb-oracle/configure | 53 | ||||
-rw-r--r-- | build/import/libodb-oracle/stub.make | 28 | ||||
-rw-r--r-- | build/import/libodb/configuration-rules.make | 13 | ||||
-rwxr-xr-x | build/import/libodb/configure | 53 | ||||
-rw-r--r-- | build/import/libodb/stub.make | 28 | ||||
-rw-r--r-- | configure.ac | 57 | ||||
-rw-r--r-- | libodb-oracle-vc10.sln | 26 | ||||
-rw-r--r-- | libodb-oracle-vc11.sln | 26 | ||||
-rw-r--r-- | libodb-oracle-vc12.sln | 28 | ||||
-rw-r--r-- | libodb-oracle-vc8.sln | 26 | ||||
-rw-r--r-- | libodb-oracle-vc9.sln | 26 | ||||
-rw-r--r-- | libodb-oracle.pc.in | 14 | ||||
-rw-r--r-- | libodb-oracle/.gitignore | 25 | ||||
-rw-r--r-- | libodb-oracle/INSTALL | 6 | ||||
-rw-r--r-- | libodb-oracle/LICENSE (renamed from LICENSE) | 0 | ||||
-rw-r--r-- | libodb-oracle/NCUEL (renamed from NCUEL) | 0 | ||||
-rw-r--r-- | libodb-oracle/README (renamed from README) | 0 | ||||
-rw-r--r-- | libodb-oracle/build/.gitignore (renamed from build/.gitignore) | 0 | ||||
-rw-r--r-- | libodb-oracle/build/bootstrap.build (renamed from build/bootstrap.build) | 0 | ||||
-rw-r--r-- | libodb-oracle/build/export.build (renamed from build/export.build) | 0 | ||||
-rw-r--r-- | libodb-oracle/build/root.build (renamed from build/root.build) | 0 | ||||
-rw-r--r-- | libodb-oracle/buildfile (renamed from buildfile) | 2 | ||||
-rw-r--r-- | libodb-oracle/manifest (renamed from manifest) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/auto-descriptor.cxx (renamed from odb/oracle/auto-descriptor.cxx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/auto-descriptor.hxx (renamed from odb/oracle/auto-descriptor.hxx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/auto-handle.cxx (renamed from odb/oracle/auto-handle.cxx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/auto-handle.hxx (renamed from odb/oracle/auto-handle.hxx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/binding.hxx (renamed from odb/oracle/binding.hxx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/buildfile (renamed from odb/oracle/buildfile) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/connection-factory.cxx (renamed from odb/oracle/connection-factory.cxx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/connection-factory.hxx (renamed from odb/oracle/connection-factory.hxx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/connection.cxx (renamed from odb/oracle/connection.cxx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/connection.hxx (renamed from odb/oracle/connection.hxx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/connection.ixx (renamed from odb/oracle/connection.ixx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/container-statements.hxx (renamed from odb/oracle/container-statements.hxx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/container-statements.txx (renamed from odb/oracle/container-statements.txx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/database.cxx (renamed from odb/oracle/database.cxx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/database.hxx (renamed from odb/oracle/database.hxx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/database.ixx (renamed from odb/oracle/database.ixx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/details/.gitignore (renamed from odb/oracle/details/.gitignore) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/details/build2/config-stub.h (renamed from odb/oracle/details/build2/config-stub.h) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/details/build2/config-vc-stub.h (renamed from odb/oracle/details/build2/config-vc-stub.h) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/details/build2/config-vc.h (renamed from odb/oracle/details/build2/config-vc.h) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/details/build2/config.h (renamed from odb/oracle/details/build2/config.h) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/details/config-vc.h (renamed from odb/oracle/details/config-vc.h) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/details/config.h.in (renamed from odb/oracle/details/config.h.in) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/details/config.hxx (renamed from odb/oracle/details/config.hxx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/details/conversion.hxx (renamed from odb/oracle/details/conversion.hxx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/details/date.hxx (renamed from odb/oracle/details/date.hxx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/details/export.hxx (renamed from odb/oracle/details/export.hxx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/details/number.cxx (renamed from odb/oracle/details/number.cxx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/details/number.hxx (renamed from odb/oracle/details/number.hxx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/details/options.cli (renamed from odb/oracle/details/options.cli) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/details/pregenerated/odb/oracle/details/options.cxx (renamed from odb/oracle/details/pregenerated/odb/oracle/details/options.cxx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/details/pregenerated/odb/oracle/details/options.hxx (renamed from odb/oracle/details/pregenerated/odb/oracle/details/options.hxx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/details/pregenerated/odb/oracle/details/options.ixx (renamed from odb/oracle/details/pregenerated/odb/oracle/details/options.ixx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/error.cxx (renamed from odb/oracle/error.cxx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/error.hxx (renamed from odb/oracle/error.hxx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/exceptions.cxx (renamed from odb/oracle/exceptions.cxx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/exceptions.hxx (renamed from odb/oracle/exceptions.hxx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/forward.hxx (renamed from odb/oracle/forward.hxx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/no-id-object-result.hxx (renamed from odb/oracle/no-id-object-result.hxx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/no-id-object-result.txx (renamed from odb/oracle/no-id-object-result.txx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/no-id-object-statements.hxx (renamed from odb/oracle/no-id-object-statements.hxx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/no-id-object-statements.txx (renamed from odb/oracle/no-id-object-statements.txx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/oracle-fwd.hxx (renamed from odb/oracle/oracle-fwd.hxx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/oracle-types.cxx (renamed from odb/oracle/oracle-types.cxx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/oracle-types.hxx (renamed from odb/oracle/oracle-types.hxx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/polymorphic-object-result.hxx (renamed from odb/oracle/polymorphic-object-result.hxx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/polymorphic-object-result.txx (renamed from odb/oracle/polymorphic-object-result.txx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/polymorphic-object-statements.hxx (renamed from odb/oracle/polymorphic-object-statements.hxx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/polymorphic-object-statements.txx (renamed from odb/oracle/polymorphic-object-statements.txx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/prepared-query.cxx (renamed from odb/oracle/prepared-query.cxx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/prepared-query.hxx (renamed from odb/oracle/prepared-query.hxx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/query-const-expr.cxx (renamed from odb/oracle/query-const-expr.cxx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/query-dynamic.cxx (renamed from odb/oracle/query-dynamic.cxx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/query-dynamic.hxx (renamed from odb/oracle/query-dynamic.hxx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/query-dynamic.ixx (renamed from odb/oracle/query-dynamic.ixx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/query-dynamic.txx (renamed from odb/oracle/query-dynamic.txx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/query.cxx (renamed from odb/oracle/query.cxx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/query.hxx (renamed from odb/oracle/query.hxx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/query.ixx (renamed from odb/oracle/query.ixx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/query.txx (renamed from odb/oracle/query.txx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/section-statements.hxx (renamed from odb/oracle/section-statements.hxx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/section-statements.txx (renamed from odb/oracle/section-statements.txx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/simple-object-result.hxx (renamed from odb/oracle/simple-object-result.hxx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/simple-object-result.txx (renamed from odb/oracle/simple-object-result.txx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/simple-object-statements.cxx (renamed from odb/oracle/simple-object-statements.cxx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/simple-object-statements.hxx (renamed from odb/oracle/simple-object-statements.hxx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/simple-object-statements.ixx (renamed from odb/oracle/simple-object-statements.ixx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/simple-object-statements.txx (renamed from odb/oracle/simple-object-statements.txx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/statement-cache.hxx (renamed from odb/oracle/statement-cache.hxx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/statement-cache.txx (renamed from odb/oracle/statement-cache.txx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/statement.cxx (renamed from odb/oracle/statement.cxx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/statement.hxx (renamed from odb/oracle/statement.hxx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/statement.ixx (renamed from odb/oracle/statement.ixx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/statements-base.cxx (renamed from odb/oracle/statements-base.cxx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/statements-base.hxx (renamed from odb/oracle/statements-base.hxx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/tracer.cxx (renamed from odb/oracle/tracer.cxx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/tracer.hxx (renamed from odb/oracle/tracer.hxx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/traits-calls.hxx (renamed from odb/oracle/traits-calls.hxx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/traits.cxx (renamed from odb/oracle/traits.cxx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/traits.hxx (renamed from odb/oracle/traits.hxx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/traits.txx (renamed from odb/oracle/traits.txx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/transaction-impl.cxx (renamed from odb/oracle/transaction-impl.cxx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/transaction-impl.hxx (renamed from odb/oracle/transaction-impl.hxx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/transaction.cxx (renamed from odb/oracle/transaction.cxx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/transaction.hxx (renamed from odb/oracle/transaction.hxx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/transaction.ixx (renamed from odb/oracle/transaction.ixx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/version-build2-stub.hxx (renamed from odb/oracle/version-build2-stub.hxx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/version-build2.hxx (renamed from odb/oracle/version-build2.hxx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/version-build2.hxx.in (renamed from odb/oracle/version-build2.hxx.in) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/version.hxx (renamed from odb/oracle/version.hxx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/view-result.hxx (renamed from odb/oracle/view-result.hxx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/view-result.txx (renamed from odb/oracle/view-result.txx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/view-statements.hxx (renamed from odb/oracle/view-statements.hxx) | 0 | ||||
-rw-r--r-- | libodb-oracle/odb/oracle/view-statements.txx (renamed from odb/oracle/view-statements.txx) | 0 | ||||
-rw-r--r-- | libodb-oracle/tests/.gitignore (renamed from tests/.gitignore) | 0 | ||||
-rw-r--r-- | libodb-oracle/tests/basics/buildfile (renamed from tests/basics/buildfile) | 0 | ||||
-rw-r--r-- | libodb-oracle/tests/basics/driver.cxx (renamed from tests/basics/driver.cxx) | 0 | ||||
-rw-r--r-- | libodb-oracle/tests/build/.gitignore (renamed from tests/build/.gitignore) | 0 | ||||
-rw-r--r-- | libodb-oracle/tests/build/bootstrap.build (renamed from tests/build/bootstrap.build) | 0 | ||||
-rw-r--r-- | libodb-oracle/tests/build/root.build (renamed from tests/build/root.build) | 0 | ||||
-rw-r--r-- | libodb-oracle/tests/buildfile (renamed from tests/buildfile) | 0 | ||||
-rw-r--r-- | m4/acx-pthread.m4 | 259 | ||||
-rw-r--r-- | m4/disable-rpath.m4 | 24 | ||||
-rw-r--r-- | m4/liboci.m4 | 155 | ||||
-rw-r--r-- | m4/libodb.m4 | 81 | ||||
-rw-r--r-- | m4/libtool-link.m4 | 45 | ||||
-rw-r--r-- | m4/pkgconfig.m4 | 11 | ||||
-rw-r--r-- | m4/static-lib.m4 | 17 | ||||
-rw-r--r-- | m4/threads.m4 | 68 | ||||
-rw-r--r-- | makefile | 35 | ||||
-rw-r--r-- | odb/oracle/Makefile.am | 14 | ||||
-rw-r--r-- | odb/oracle/libodb-oracle-vc10.vcxproj | 174 | ||||
-rw-r--r-- | odb/oracle/libodb-oracle-vc10.vcxproj.filters | 19 | ||||
-rw-r--r-- | odb/oracle/libodb-oracle-vc11.vcxproj | 178 | ||||
-rw-r--r-- | odb/oracle/libodb-oracle-vc11.vcxproj.filters | 19 | ||||
-rw-r--r-- | odb/oracle/libodb-oracle-vc12.vcxproj | 182 | ||||
-rw-r--r-- | odb/oracle/libodb-oracle-vc12.vcxproj.filters | 19 | ||||
-rw-r--r-- | odb/oracle/libodb-oracle-vc8.vcproj | 352 | ||||
-rw-r--r-- | odb/oracle/libodb-oracle-vc9.vcproj | 359 | ||||
-rw-r--r-- | odb/oracle/makefile | 158 | ||||
-rw-r--r-- | repositories.manifest | 10 | ||||
-rw-r--r-- | version.txt | 1 |
164 files changed, 32 insertions, 3223 deletions
diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 3004ad1..0000000 --- a/.gitignore +++ /dev/null @@ -1,37 +0,0 @@ -.bdep/ - -# Compiler/linker output. -# -*.d -*.t -*.i -*.ii -*.o -*.obj -*.so -*.dll -*.a -*.lib -*.exp -*.pdb -*.ilk -*.exe -*.exe.dlls/ -*.exe.manifest -*.pc - -*.l -*.l.cpp-options - -# Generated documentation. -# -*.pdf -*.ps - -# Generated build system files. -# -*-dynamic.make - -# Generated .gitignore files. -# -.gitignore diff --git a/INSTALL b/INSTALL deleted file mode 100644 index 5d667f3..0000000 --- a/INSTALL +++ /dev/null @@ -1,155 +0,0 @@ -Prerequisites -============= - - - libodb http://www.codesynthesis.com/products/odb/ - - oci http://www.oracle.com/technetwork/database/database-technologies/instant-client/overview/index.html - -The OCI library can be obtained in two ways: as part of the Oracle database -installation or as a separate distribution called Instant Client. - -If you have the Oracle database installed, then the OCI headers and -libraries can be found in the following locations relative to ORACLE_HOME -(root directory of the Oracle database installation): - -UNIX - headers ORACLE_HOME/rdbms/public - libraries ORACLE_HOME/lib - -Windows - headers ORACLE_HOME\oci\include - import libraries (.lib) ORACLE_HOME\oci\lib\msvc - dynamic libraries (.dll) ORACLE_HOME\bin - -If you would like to use Instant Client, then in order to build the -Oracle ODB runtime you will need the 'basic' and 'sdk' packages of the -Instant Client distribution. If you are planning to run the ODB tests -or examples, then you will also need the 'sqlplus' package. - -Once the Instant Client packages are unpacked, the OCI headers and -libraries can be found in the following locations relative to the -Instant Client root directory (referred to as instantclient_X_Y below): - -UNIX - headers instantclient_X_Y/sdk/include - libraries instantclient_X_Y - -Windows - headers instantclient_X_Y\sdk\include - import libraries (.lib) instantclient_X_Y\sdk\lib\msvc - dynamic libraries (.dll) instantclient_X_Y - -In order for applications that are using OCI to be able to find the -OCI libraries, when using either the Oracle database installation or -Instant Client, make sure that: - -- on UNIX the 'libraries' directory is added to the LD_LIBRARY_PATH - environment variable or the ld.so.conf file (or equivalent - mechanisms for your platform); - -- on Windows the 'dynamic libraries' directory is added to the PATH - environment variable. - -Building on UNIX -================ - -The following build instructions are for the Linux/UNIX/Mac OS X -operating systems as well as for Cygwin and MinGW on Windows. - -The standard autotools-based build system is used on these platforms. -After unpacking the source code archive, change to the libodb-oracle -package directory (referred to as libodb-oracle/ from now on) and run -the configure script: - -./configure - -To see the available configuration options run configure with --help: - -./configure --help - -The configure script expects the libodb headers and library to be -installed in a directory where the C++ compiler and linker will search -for them by default (normally /usr and /usr/local). If this library is -installed in another directory, you can use the CPPFLAGS and LDFLAGS -configure variables to specify its location, for example: - -./configure CPPFLAGS=-I/opt/libodb/include LDFLAGS=-L/opt/libodb/lib - -If libodb is not installed and you would like to use its build directory -instead, you can use the --with-libodb configure option to specify its -location, for example: - -./configure --with-libodb=/tmp/libodb - -While you can use the CPPFLAGS and LDFLAGS configure variables to specify -the location of the OCI headers and libraries, the configure script provides -the --with-oci option which can be used to specify the root directory either -of the Oracle database installation (ORACLE_HOME) or of Instant Client -(instantclient_X_Y). If the --with-oci option is not specified and OCI -cannot be found using CPPFLAGS/LDFLAGS, then the configure script also -checks if the ORACLE_HOME environment variable is set and if so, uses its -value as the root of the Oracle database installation. - -As another example, the following configure command only builds shared -libraries, uses the specified C++ compiler, and compiles with optimization -and without debug information: - -./configure --disable-static CXX=g++-4.5 CXXFLAGS=-O3 - -Once configuration is complete, run make to build libodb-oracle: - -make - -Once the build is completed successfully, you can install the libodb-oracle -headers and libraries using the install target (you may need to do this -step as root depending on the installation directory): - -make install - - -Building on Windows -=================== - -The following build instructions are for Windows using Microsoft Visual -Studio. If you would like to build libodb-oracle with GCC either using -Cygwin or MinGW, refer to the "Building on UNIX" section above. - -The standard Visual Studio project and solution files are used on this -platform. The provided project files expect the libodb and OCI header -and import library directories to be in the VC++ Directories Include -and Library search lists. For libodb, see the INSTALL file in the -package directory for more information on how to setup the VC++ -Directories. - -For OCI, add the 'headers' directory mentioned in the Prerequisites -section to the Include search list and the 'import libraries' directory -to the Library search list. - -To build libodb-oracle, unpack the source code archive and open the -libodb-oracle-vc<N>.sln file located in the libodb-oracle package -directory (referred to as libodb-oracle\ from now on). Here <N> is the -version of Visual Studio that you are using. Once the solution is open, -select the desired build configuration (Debug or Release) and platform -(Win32 or x64) and build the solution. - -The resulting 32-bit DLLs and import libraries are placed into the -libodb-oracle\bin\ and libodb-oracle\lib\ directories, respectively. -Similarly, the 64-bit DLLs and import libraries are placed into -libodb-oracle\bin64\ and libodb-oracle\lib64\. The Release versions of -the import libraries are named odb-oracle.lib and the Debug versions -are named odb-oracle-d.lib. - -To configure Visual Studio to automatically locate the libodb-oracle -headers, DLLs, and import libraries, add the following paths to your -VC++ Directories: - -Win32: - - Include: ...\libodb-oracle - Library: ...\libodb-oracle\lib - Executable: ...\libodb-oracle\bin - -x64: - - Include: ...\libodb-oracle - Library: ...\libodb-oracle\lib64 - Executable: ...\libodb-oracle\bin64 diff --git a/INSTALL-GIT b/INSTALL-GIT deleted file mode 100644 index f917af5..0000000 --- a/INSTALL-GIT +++ /dev/null @@ -1,78 +0,0 @@ -The following instructions describe how to work with the source code that was -checked out from the git repository. - -The major difference between using a released source code package and source -code from the repository is that the former does not contain autotools-based -makefiles or Visual Studio project files. Instead, it contains templates for -these files as well as its own, custom build system. This build system is -used for development as well as to automatically generate the autotools and -Visual Studio files. - -This file describes how to use this build system to build the package as well -as to create a release-ready source distribution which contains the autotools -build system and Visual Studio project files. - - -Prerequisites -============= - -Besides the prerequisites listed in the INSTALL file, you will need the -following additional packages: - - - GNU bash >= 2.0.0 http://www.gnu.org/software/bash/ - - GNU make >= 3.81 http://www.gnu.org/software/make/ - - build >= latest http://www.codesynthesis.com/projects/build/ - -If you are planning to create the source code distributions, then you will -also need the following packages: - - - GNU m4 >= 1.4.0 http://www.gnu.org/software/m4/ - - GNU sed >= 4.0.0 http://www.gnu.org/software/sed/ - - tofrodos >= 1.7.0 http://www.thefreecountry.com/tofrodos/ - -As we as the GNU autotools: - - - GNU libtool >= 2.2.6b http://www.gnu.org/software/libtool/ - - GNU autoconf >= 2.67 http://www.gnu.org/software/autoconf/ - - GNU automake >= 1.11.1 http://www.gnu.org/software/automake/ - -Any reasonably up to date GNU/Linux installation would normally have all of -the above packages already present, except for build and maybe tofrodos. - - -Configuring and Building -======================== - -To build the source code simply run make in the root directory of the package. -The first time you run make, the build process will also configure the -package by asking you several questions. On the subsequent runs, make will -only rebuild what has changed. - -To run the automated test suite (if any), run 'make test'. To clean the object -files, executables, etc., run 'make clean'. To de-configure the package (that -is, to remove configuration files in addition to objects, executables, etc.), -run 'make disfigure'. - - -Creating Distribution -===================== - -To create the source code distribution, use the dist make target as well as -the dist_prefix variable to specify the directory where the distribution files -should be placed. For example: - -make dist dist_prefix=/tmp/package-1.1.0 - -Once the distribution files are ready, change to the distribution directory -and run the bootstrap script to bootstrap the autotools build system, for -example: - -cd /tmp/package-1.1.0 -./bootsrap - -To create the source code archives, use the autotools build system. First -configuring the package (see the INSTALL file for more information on this -step) and then use the dist target to make the archives, for example: - -./configure -make dist diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index 7876cc7..0000000 --- a/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -# file : Makefile.am -# license : ODB NCUEL; see accompanying LICENSE file - -SUBDIRS = __path__(dirs) -dist_doc_DATA = __file__(docs) -EXTRA_DIST = __file__(extra_dist) -ACLOCAL_AMFLAGS = -I m4 - -pkgconfigdir = @pkgconfigdir@ -pkgconfig_DATA= libodb-oracle.pc @@ -1 +0,0 @@ -See the common NEWS file in the ODB compiler package. diff --git a/README-GIT b/README-GIT deleted file mode 100644 index 5506448..0000000 --- a/README-GIT +++ /dev/null @@ -1,5 +0,0 @@ -The checked out odb/oracle/version-build2.hxx will be overwritten during the -build process but these changes should be ignored. To do this automatically, -run: - -git update-index --assume-unchanged odb/oracle/version-build2.hxx diff --git a/bootstrap b/bootstrap deleted file mode 100755 index ff29551..0000000 --- a/bootstrap +++ /dev/null @@ -1,16 +0,0 @@ -#! /bin/sh - -# file : bootstrap -# license : ODB NCUEL; see accompanying LICENSE file - -# -# Bootstrap the automake build system. -# - -rm -f config.cache - -if test ! -d m4; then - mkdir m4 -fi - -autoreconf --install diff --git a/build/bootstrap.make b/build/bootstrap.make deleted file mode 100644 index 1b8004f..0000000 --- a/build/bootstrap.make +++ /dev/null @@ -1,70 +0,0 @@ -# file : build/bootstrap.make -# license : ODB NCUEL; see accompanying LICENSE file - -project_name := libodb-oracle - -# First try to include the bundled bootstrap.make if it exist. If that -# fails, let make search for the external bootstrap.make. -# -build := build-0.3 - --include $(dir $(lastword $(MAKEFILE_LIST)))../../$(build)/bootstrap.make - -ifeq ($(patsubst %build/bootstrap.make,,$(lastword $(MAKEFILE_LIST))),) -include $(build)/bootstrap.make -endif - - -# Aliases -# -.PHONY: $(out_base)/ \ - $(out_base)/.test \ - $(out_base)/.dist \ - $(out_base)/.clean - -ifdef %interactive% - -.PHONY: test dist clean - -test: $(out_base)/.test -dist: $(out_base)/.dist -clean: $(out_base)/.clean - -ifneq ($(filter $(.DEFAULT_GOAL),test dist clean),) -.DEFAULT_GOAL := -endif - -endif - -# Make sure the distribution prefix is set if the goal is dist. -# -ifneq ($(filter $(MAKECMDGOALS),dist),) -ifeq ($(dist_prefix),) -$(error dist_prefix is not set) -endif -endif - -# If we don't have dependency auto-generation then we need to manually -# make sure that generated files are generated before C++ file are -# compiler. To do this we make the object files ($2) depend in order- -# only on generated files ($3). -# -ifeq ($(cxx_id),generic) - -define include-dep -$(if $2,$(eval $2: | $3)) -endef - -else - -define include-dep -$(call -include,$1) -endef - -endif - -# Don't include dependency info for certain targets. -# -ifneq ($(filter $(MAKECMDGOALS),clean disfigure dist),) -include-dep = -endif diff --git a/build/export/libodb-oracle/stub.make b/build/export/libodb-oracle/stub.make deleted file mode 100644 index 499f11b..0000000 --- a/build/export/libodb-oracle/stub.make +++ /dev/null @@ -1,8 +0,0 @@ -# file : build/export/libodb-oracle/stub.make -# license : ODB NCUEL; see accompanying LICENSE file - -$(call include-once,$(src_root)/odb/oracle/makefile,$(out_root)) - -$(call export,\ - l: $(out_root)/odb/oracle/odb-oracle.l,\ - cpp-options: $(out_root)/odb/oracle/odb-oracle.l.cpp-options) diff --git a/build/import/cli/cli-cxx.make b/build/import/cli/cli-cxx.make deleted file mode 100644 index 9bdf238..0000000 --- a/build/import/cli/cli-cxx.make +++ /dev/null @@ -1,47 +0,0 @@ -# file : build/import/cli/cli-cxx.make -# license : MIT; see accompanying LICENSE file - -# Here we are operating in the importing project's space, not in -# cli's. -# - -# Get the C++ file extensions. -# -$(call include,$(bld_root)/cxx/configuration-static.make) - -cli_pattern := \ -$(out_base)/%.$(cxx_s_suffix) \ -$(out_base)/%.$(cxx_h_suffix) \ -$(out_base)/%.$(cxx_i_suffix) - -$(cli_pattern): cli_options := \ ---hxx-suffix .$(cxx_h_suffix) \ ---ixx-suffix .$(cxx_i_suffix) \ ---cxx-suffix .$(cxx_s_suffix) - -.PRECIOUS: $(cli_pattern) - -ifeq ($(out_base),$(src_base)) - -$(cli_pattern): $(src_base)/%.cli - $(call message,cli $<,$(cli) $(cli_options) --output-dir $(dir $@) $<) - -else - -$(cli_pattern): $(src_base)/%.cli | $$(dir $$@). - $(call message,cli $<,$(cli) $(cli_options) --output-dir $(dir $@) $<) - -$(cli_pattern): $(out_base)/%.cli | $$(dir $$@). - $(call message,cli $<,$(cli) $(cli_options) --output-dir $(dir $@) $<) -endif - -.PHONY: $(out_base)/%.cxx.cli.clean - -$(out_base)/%.cxx.cli.clean: cxx_s_suffix := $(cxx_s_suffix) -$(out_base)/%.cxx.cli.clean: cxx_h_suffix := $(cxx_h_suffix) -$(out_base)/%.cxx.cli.clean: cxx_i_suffix := $(cxx_i_suffix) - -$(out_base)/%.cxx.cli.clean: - $(call message,rm $$1,rm -f $$1,$(@:.cxx.cli.clean=.$(cxx_s_suffix))) - $(call message,rm $$1,rm -f $$1,$(@:.cxx.cli.clean=.$(cxx_h_suffix))) - $(call message,rm $$1,rm -f $$1,$(@:.cxx.cli.clean=.$(cxx_i_suffix))) diff --git a/build/import/cli/configuration-rules.make b/build/import/cli/configuration-rules.make deleted file mode 100644 index 6355000..0000000 --- a/build/import/cli/configuration-rules.make +++ /dev/null @@ -1,13 +0,0 @@ -# file : build/import/cli/configuration-rules.make -# license : MIT; see accompanying LICENSE file - -$(dcf_root)/import/cli/configuration-dynamic.make: | $(dcf_root)/import/cli/. - $(call message,,$(scf_root)/import/cli/configure $@) - -ifndef %foreign% - -$(dcf_root)/.disfigure:: - $(call message,rm $(dcf_root)/import/cli/configuration-dynamic.make,\ -rm -f $(dcf_root)/import/cli/configuration-dynamic.make) - -endif diff --git a/build/import/cli/configure b/build/import/cli/configure deleted file mode 100755 index 2a1fde4..0000000 --- a/build/import/cli/configure +++ /dev/null @@ -1,53 +0,0 @@ -#! /usr/bin/env bash - -# file : build/import/cli/configure -# license : MIT; see accompanying LICENSE file - - -# $1 - out file -# -# bld_root - build root -# project_name - project name -# - -source $bld_root/dialog.bash - - -$echo -$echo "Configuring external dependency on 'cli' for '$project_name'." -$echo - -$echo -$echo "Would you like to configure dependency on the installed " -$echo "version of 'cli' as opposed to the development build?" -$echo - -installed=`read_y_n y` - -path= - -if [ "$installed" = "n" ]; then - -$echo -$echo "Please enter the src_root for 'cli'." -$echo - -src_root=`read_path --directory --exist` - -$echo -$echo "Please enter the out_root for 'cli'." -$eche - -out_root=`read_path --directory $src_root` - -fi - -echo cli_installed := $installed >$1 - -if [ "$installed" = "n" ]; then - -echo src_root := $src_root >>$1 -echo scf_root := \$\(src_root\)/build >>$1 -echo out_root := $out_root >>$1 - -fi diff --git a/build/import/cli/stub.make b/build/import/cli/stub.make deleted file mode 100644 index 741b371..0000000 --- a/build/import/cli/stub.make +++ /dev/null @@ -1,28 +0,0 @@ -# file : build/import/cli/stub.make -# license : MIT; see accompanying LICENSE file - -$(call include-once,$(scf_root)/import/cli/configuration-rules.make,$(dcf_root)) - -cli_installed := - -$(call -include,$(dcf_root)/import/cli/configuration-dynamic.make) - -ifdef cli_installed - -ifeq ($(cli_installed),y) - -$(call export,cli: cli,cli-rules: $(scf_root)/import/cli/cli-cxx.make) - -else - -# Include export stub. -# -$(call include,$(scf_root)/export/cli/stub.make) - -endif - -else - -.NOTPARALLEL: - -endif diff --git a/build/import/liboci/configuration-rules.make b/build/import/liboci/configuration-rules.make deleted file mode 100644 index dac07e8..0000000 --- a/build/import/liboci/configuration-rules.make +++ /dev/null @@ -1,13 +0,0 @@ -# file : build/import/liboci/configuration-rules.make -# license : GNU GPL v2; see accompanying LICENSE file - -$(dcf_root)/import/liboci/configuration-dynamic.make: | $(dcf_root)/import/liboci/. - $(call message,,$(scf_root)/import/liboci/configure $@) - -ifndef %foreign% - -disfigure:: - $(call message,rm $(dcf_root)/import/liboci/configuration-dynamic.make,\ -rm -f $(dcf_root)/import/liboci/configuration-dynamic.make) - -endif diff --git a/build/import/liboci/configure b/build/import/liboci/configure deleted file mode 100755 index 5fcefa5..0000000 --- a/build/import/liboci/configure +++ /dev/null @@ -1,70 +0,0 @@ -#! /usr/bin/env bash - -# file : build/import/liboci/configure -# license : GNU GPL v2; see accompanying LICENSE file - - -# $1 - out config file -# -# bld_root - build root -# project_name - project name -# - -source $bld_root/dialog.bash - -$echo -$echo "Configuring external dependency on 'OCI library' for '$project_name'." -$echo - -$echo -$echo "Please enter the 'Oracle' home or 'Instant Client' directory." -$echo - -liboci_root=$ORACLE_HOME -liboci_include= -liboci_lib= - -while [ -z "$liboci_include" ]; do - liboci_root=`read_path --directory --exist $liboci_root` - - if [ -d "$liboci_root/sdk/include" ]; then - liboci_include="$liboci_root/sdk/include" - - liboci_lib=`ls $liboci_root/libclntsh.so 2>/dev/null` - if [ -z "$liboci_lib" ]; then - liboci_lib=`ls $liboci_root/libclntsh.so.* 2>/dev/null` - fi - - elif [ -d "$liboci_root/rdbms/public" ]; then - liboci_include="$liboci_root/rdbms/public" - liboci_lib=`ls $liboci_root/lib/libclntsh.so 2>/dev/null` - elif [ -d "$liboci_root/include" ]; then - liboci_include="$liboci_root/include" - - liboci_lib=`ls $liboci_root/lib/libclntsh.so 2>/dev/null` - if [ -z "$liboci_lib" ]; then - liboci_lib=`ls $liboci_root/lib/libclntsh.so.* 2>/dev/null` - fi - fi - - if [ -z "$liboci_include" ]; then - liboci_root= - - $echo - $echo "The specified directory looks like neither an Instant Client nor" - $echo "an Oracle home directory." - $echo - elif [ -z "$liboci_lib" ]; then - liboci_root= - liboci_include= - - $echo - $echo "The libclntsh.so shared library not found." - $echo - fi - -done - -echo liboci_root := $liboci_root > $1 -echo liboci_include := $liboci_include >>$1 -echo liboci_lib := $liboci_lib >>$1 diff --git a/build/import/liboci/rules.make b/build/import/liboci/rules.make deleted file mode 100644 index 2d0664e..0000000 --- a/build/import/liboci/rules.make +++ /dev/null @@ -1,24 +0,0 @@ -# file : build/import/liboci/rules.make -# license : GNU GPL v2; see accompanying LICENSE file - -$(dcf_root)/import/liboci/%: root := $(liboci_root) -$(dcf_root)/import/liboci/%: include := $(liboci_include) -$(dcf_root)/import/liboci/%: lib := $(liboci_lib) -$(dcf_root)/import/liboci/oci.l: | $(dcf_root)/import/liboci/. - -$(dcf_root)/import/liboci/oci.l: $(liboci_lib) - @echo $(lib) >$@ - @echo rpath:$(dir $(lib)) >>$@ - -$(dcf_root)/import/liboci/oci.l.cpp-options: | $(dcf_root)/import/liboci/. - @echo include: -I$(include) >$@ - -ifndef %foreign% - -disfigure:: - $(call message,rm $(dcf_root)/import/liboci/oci.l,\ -rm -f $(dcf_root)/import/liboci/oci.l) - $(call message,rm $(dcf_root)/import/liboci/oci.l.cpp-options,\ -rm -f $(dcf_root)/import/liboci/oci.l.cpp-options) - -endif diff --git a/build/import/liboci/stub.make b/build/import/liboci/stub.make deleted file mode 100644 index f419ada..0000000 --- a/build/import/liboci/stub.make +++ /dev/null @@ -1,22 +0,0 @@ -# file : build/import/liboci/stub.make -# license : GNU GPL v2; see accompanying LICENSE file - -$(call include-once,$(scf_root)/import/liboci/configuration-rules.make,$(dcf_root)) - -liboci_root := - -$(call -include,$(dcf_root)/import/liboci/configuration-dynamic.make) - -ifdef liboci_root - -$(call include-once,$(scf_root)/import/liboci/rules.make,$(dcf_root)) - -$(call export,\ - l: $(dcf_root)/import/liboci/oci.l,\ - cpp-options: $(dcf_root)/import/liboci/oci.l.cpp-options) - -else - -.NOTPARALLEL: - -endif diff --git a/build/import/liboci/version b/build/import/liboci/version deleted file mode 100644 index 6e8bf73..0000000 --- a/build/import/liboci/version +++ /dev/null @@ -1 +0,0 @@ -0.1.0 diff --git a/build/import/libodb-oracle/configuration-rules.make b/build/import/libodb-oracle/configuration-rules.make deleted file mode 100644 index cef4150..0000000 --- a/build/import/libodb-oracle/configuration-rules.make +++ /dev/null @@ -1,13 +0,0 @@ -# file : build/import/libodb-oracle/configuration-rules.make -# license : ODB NCUEL; see accompanying LICENSE file - -$(dcf_root)/import/libodb-oracle/configuration-dynamic.make: | $(dcf_root)/import/libodb-oracle/. - $(call message,,$(scf_root)/import/libodb-oracle/configure $@) - -ifndef %foreign% - -$(dcf_root)/.disfigure:: - $(call message,rm $(dcf_root)/import/libodb-oracle/configuration-dynamic.make,\ -rm -f $(dcf_root)/import/libodb-oracle/configuration-dynamic.make) - -endif diff --git a/build/import/libodb-oracle/configure b/build/import/libodb-oracle/configure deleted file mode 100755 index 81cd5e4..0000000 --- a/build/import/libodb-oracle/configure +++ /dev/null @@ -1,53 +0,0 @@ -#! /usr/bin/env bash - -# file : build/import/libodb-oracle/configure -# license : ODB NCUEL; see accompanying LICENSE file - - -# $1 - out file -# -# bld_root - build root -# project_name - project name -# - -source $bld_root/dialog.bash - - -$echo -$echo "Configuring external dependency on 'libodb-oracle' for '$project_name'." -$echo - -$echo -$echo "Would you like to configure dependency on the installed version" -$echo "of 'libodb-oracle' as opposed to the development build?" -$echo - -installed=`read_y_n y` - -path= - -if [ "$installed" = "n" ]; then - -$echo -$echo "Please enter the src_root for 'libodb-oracle'." -$echo - -src_root=`read_path --directory --exist` - -$echo -$echo "Please enter the out_root for 'libodb-oracle'." -$echo - -out_root=`read_path --directory $src_root` - -fi - -echo libodb_oracle_installed := $installed >$1 - -if [ "$installed" = "n" ]; then - -echo src_root := $src_root >>$1 -echo scf_root := \$\(src_root\)/build >>$1 -echo out_root := $out_root >>$1 - -fi diff --git a/build/import/libodb-oracle/stub.make b/build/import/libodb-oracle/stub.make deleted file mode 100644 index 6861dc7..0000000 --- a/build/import/libodb-oracle/stub.make +++ /dev/null @@ -1,28 +0,0 @@ -# file : build/import/libodb-oracle/stub.make -# license : ODB NCUEL; see accompanying LICENSE file - -$(call include-once,$(scf_root)/import/libodb-oracle/configuration-rules.make,$(dcf_root)) - -libodb_oracle_installed := - -$(call -include,$(dcf_root)/import/libodb-oracle/configuration-dynamic.make) - -ifdef libodb_oracle_installed - -ifeq ($(libodb_oracle_installed),y) - -$(call export,l: -lodb-oracle -lodb -lclntsh,cpp-options: ) - -else - -# Include export stub. -# -$(call include,$(scf_root)/export/libodb-oracle/stub.make) - -endif - -else - -.NOTPARALLEL: - -endif diff --git a/build/import/libodb/configuration-rules.make b/build/import/libodb/configuration-rules.make deleted file mode 100644 index 340c418..0000000 --- a/build/import/libodb/configuration-rules.make +++ /dev/null @@ -1,13 +0,0 @@ -# file : build/import/libodb/configuration-rules.make -# license : GNU GPL v2; see accompanying LICENSE file - -$(dcf_root)/import/libodb/configuration-dynamic.make: | $(dcf_root)/import/libodb/. - $(call message,,$(scf_root)/import/libodb/configure $@) - -ifndef %foreign% - -$(dcf_root)/.disfigure:: - $(call message,rm $(dcf_root)/import/libodb/configuration-dynamic.make,\ -rm -f $(dcf_root)/import/libodb/configuration-dynamic.make) - -endif diff --git a/build/import/libodb/configure b/build/import/libodb/configure deleted file mode 100755 index 261a202..0000000 --- a/build/import/libodb/configure +++ /dev/null @@ -1,53 +0,0 @@ -#! /usr/bin/env bash - -# file : build/import/libodb/configure -# license : GNU GPL v2; see accompanying LICENSE file - - -# $1 - out file -# -# bld_root - build root -# project_name - project name -# - -source $bld_root/dialog.bash - - -$echo -$echo "Configuring external dependency on 'libodb' for '$project_name'." -$echo - -$echo -$echo "Would you like to configure dependency on the installed " -$echo "version of 'libodb' as opposed to the development build?" -$echo - -installed=`read_y_n y` - -path= - -if [ "$installed" = "n" ]; then - -$echo -$echo "Please enter the src_root for 'libodb'." -$echo - -src_root=`read_path --directory --exist` - -$echo -$echo "Please enter the out_root for 'libodb'." -$echo - -out_root=`read_path --directory $src_root` - -fi - -echo libodb_installed := $installed >$1 - -if [ "$installed" = "n" ]; then - -echo src_root := $src_root >>$1 -echo scf_root := \$\(src_root\)/build >>$1 -echo out_root := $out_root >>$1 - -fi diff --git a/build/import/libodb/stub.make b/build/import/libodb/stub.make deleted file mode 100644 index 04dc786..0000000 --- a/build/import/libodb/stub.make +++ /dev/null @@ -1,28 +0,0 @@ -# file : build/import/libodb/stub.make -# license : GNU GPL v2; see accompanying LICENSE file - -$(call include-once,$(scf_root)/import/libodb/configuration-rules.make,$(dcf_root)) - -libodb_installed := - -$(call -include,$(dcf_root)/import/libodb/configuration-dynamic.make) - -ifdef libodb_installed - -ifeq ($(libodb_installed),y) - -$(call export,l: -lodb,cpp-options: ) - -else - -# Include export stub. -# -$(call include,$(scf_root)/export/libodb/stub.make) - -endif - -else - -.NOTPARALLEL: - -endif diff --git a/configure.ac b/configure.ac deleted file mode 100644 index fd3a1f3..0000000 --- a/configure.ac +++ /dev/null @@ -1,57 +0,0 @@ -# file : configure.ac -# license : ODB NCUEL; see accompanying LICENSE file - -AC_PREREQ(2.60) -AC_INIT([libodb-oracle], [__value__(version)], [odb-users@codesynthesis.com]) -AC_CONFIG_AUX_DIR([config]) -AC_CONFIG_MACRO_DIR([m4]) -AC_CONFIG_SRCDIR([odb/oracle/version.hxx]) - -AM_INIT_AUTOMAKE([-Wall -Werror foreign nostdinc subdir-objects dist-bzip2 dist-zip tar-ustar]) -m4_equote()[m4_ifdef]m4_dquote()([AM_PROG_AR], [AM_PROG_AR]) # Required by automake 1.12. - -LT_INIT([win32-dll]) - -AC_CANONICAL_HOST - -# Check for C++ compiler and use it to compile the tests. -# -AC_PROG_CXX -AC_LANG(C++) - -# Create the libtool executable so that we can use it in further tests. -# -LT_OUTPUT - -# Check for threads. -# -THREADS - -# Check for OCI. -# -LIBOCI( - [], - [AC_MSG_ERROR([oci is not found; consider using --with-oci=DIR])]) - -# Check for libodb. -# -LIBODB([],[AC_MSG_ERROR([libodb is not found; consider using --with-libodb=DIR])]) - -# Define LIBODB_ORACLE_STATIC_LIB if we are build static library on certain -# platforms. -# -STATIC_LIB([LIBODB_ORACLE_STATIC_LIB], [Static library interface.]) - -# Allow the user to specify the pkgconfig directory. -# -PKGCONFIG - -# Check if we should disable rpath. -# -DISABLE_RPATH - -# Output. -# -AC_CONFIG_HEADERS([odb/oracle/config.h odb/oracle/details/config.h]) -AC_CONFIG_FILES([__path__(config_files)]) -AC_OUTPUT diff --git a/libodb-oracle-vc10.sln b/libodb-oracle-vc10.sln deleted file mode 100644 index ae1b09e..0000000 --- a/libodb-oracle-vc10.sln +++ /dev/null @@ -1,26 +0,0 @@ -
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{C1335C92-809F-41A7-877A-4A0193D974D3}") = "libodb-oracle", "odb\oracle\libodb-oracle-vc10.vcxproj", "{C47F2161-7F5A-4ADB-8CF3-FDFF1D0ACD5C}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Debug|x64 = Debug|x64
- Release|Win32 = Release|Win32
- Release|x64 = Release|x64
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {C47F2161-7F5A-4ADB-8CF3-FDFF1D0ACD5C}.Debug|Win32.ActiveCfg = Debug|Win32
- {C47F2161-7F5A-4ADB-8CF3-FDFF1D0ACD5C}.Debug|Win32.Build.0 = Debug|Win32
- {C47F2161-7F5A-4ADB-8CF3-FDFF1D0ACD5C}.Debug|x64.ActiveCfg = Debug|x64
- {C47F2161-7F5A-4ADB-8CF3-FDFF1D0ACD5C}.Debug|x64.Build.0 = Debug|x64
- {C47F2161-7F5A-4ADB-8CF3-FDFF1D0ACD5C}.Release|Win32.ActiveCfg = Release|Win32
- {C47F2161-7F5A-4ADB-8CF3-FDFF1D0ACD5C}.Release|Win32.Build.0 = Release|Win32
- {C47F2161-7F5A-4ADB-8CF3-FDFF1D0ACD5C}.Release|x64.ActiveCfg = Release|x64
- {C47F2161-7F5A-4ADB-8CF3-FDFF1D0ACD5C}.Release|x64.Build.0 = Release|x64
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
diff --git a/libodb-oracle-vc11.sln b/libodb-oracle-vc11.sln deleted file mode 100644 index 4b5099c..0000000 --- a/libodb-oracle-vc11.sln +++ /dev/null @@ -1,26 +0,0 @@ -
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
-Project("{C1335C92-809F-41A7-877A-4A0193D974D3}") = "libodb-oracle", "odb\oracle\libodb-oracle-vc11.vcxproj", "{C47F2161-7F5A-4ADB-8CF3-FDFF1D0ACD5C}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Debug|x64 = Debug|x64
- Release|Win32 = Release|Win32
- Release|x64 = Release|x64
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {C47F2161-7F5A-4ADB-8CF3-FDFF1D0ACD5C}.Debug|Win32.ActiveCfg = Debug|Win32
- {C47F2161-7F5A-4ADB-8CF3-FDFF1D0ACD5C}.Debug|Win32.Build.0 = Debug|Win32
- {C47F2161-7F5A-4ADB-8CF3-FDFF1D0ACD5C}.Debug|x64.ActiveCfg = Debug|x64
- {C47F2161-7F5A-4ADB-8CF3-FDFF1D0ACD5C}.Debug|x64.Build.0 = Debug|x64
- {C47F2161-7F5A-4ADB-8CF3-FDFF1D0ACD5C}.Release|Win32.ActiveCfg = Release|Win32
- {C47F2161-7F5A-4ADB-8CF3-FDFF1D0ACD5C}.Release|Win32.Build.0 = Release|Win32
- {C47F2161-7F5A-4ADB-8CF3-FDFF1D0ACD5C}.Release|x64.ActiveCfg = Release|x64
- {C47F2161-7F5A-4ADB-8CF3-FDFF1D0ACD5C}.Release|x64.Build.0 = Release|x64
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
diff --git a/libodb-oracle-vc12.sln b/libodb-oracle-vc12.sln deleted file mode 100644 index 051c96f..0000000 --- a/libodb-oracle-vc12.sln +++ /dev/null @@ -1,28 +0,0 @@ -
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013 -VisualStudioVersion = 12.0.21005.1 -MinimumVisualStudioVersion = 10.0.40219.1
-Project("{C1335C92-809F-41A7-877A-4A0193D974D3}") = "libodb-oracle", "odb\oracle\libodb-oracle-vc12.vcxproj", "{C47F2161-7F5A-4ADB-8CF3-FDFF1D0ACD5C}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Debug|x64 = Debug|x64
- Release|Win32 = Release|Win32
- Release|x64 = Release|x64
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {C47F2161-7F5A-4ADB-8CF3-FDFF1D0ACD5C}.Debug|Win32.ActiveCfg = Debug|Win32
- {C47F2161-7F5A-4ADB-8CF3-FDFF1D0ACD5C}.Debug|Win32.Build.0 = Debug|Win32
- {C47F2161-7F5A-4ADB-8CF3-FDFF1D0ACD5C}.Debug|x64.ActiveCfg = Debug|x64
- {C47F2161-7F5A-4ADB-8CF3-FDFF1D0ACD5C}.Debug|x64.Build.0 = Debug|x64
- {C47F2161-7F5A-4ADB-8CF3-FDFF1D0ACD5C}.Release|Win32.ActiveCfg = Release|Win32
- {C47F2161-7F5A-4ADB-8CF3-FDFF1D0ACD5C}.Release|Win32.Build.0 = Release|Win32
- {C47F2161-7F5A-4ADB-8CF3-FDFF1D0ACD5C}.Release|x64.ActiveCfg = Release|x64
- {C47F2161-7F5A-4ADB-8CF3-FDFF1D0ACD5C}.Release|x64.Build.0 = Release|x64
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
diff --git a/libodb-oracle-vc8.sln b/libodb-oracle-vc8.sln deleted file mode 100644 index c986e9e..0000000 --- a/libodb-oracle-vc8.sln +++ /dev/null @@ -1,26 +0,0 @@ -
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{C3AD7165-4D15-4E93-BE2A-D2B237C7A33C}") = "libodb-oracle", "odb\oracle\libodb-oracle-vc8.vcproj", "{AAB7F95D-D83E-46CC-B0DC-D0E6F0A3B7C3}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Debug|x64 = Debug|x64
- Release|Win32 = Release|Win32
- Release|x64 = Release|x64
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {AAB7F95D-D83E-46CC-B0DC-D0E6F0A3B7C3}.Debug|Win32.ActiveCfg = Debug|Win32
- {AAB7F95D-D83E-46CC-B0DC-D0E6F0A3B7C3}.Debug|Win32.Build.0 = Debug|Win32
- {AAB7F95D-D83E-46CC-B0DC-D0E6F0A3B7C3}.Debug|x64.ActiveCfg = Debug|x64
- {AAB7F95D-D83E-46CC-B0DC-D0E6F0A3B7C3}.Debug|x64.Build.0 = Debug|x64
- {AAB7F95D-D83E-46CC-B0DC-D0E6F0A3B7C3}.Release|Win32.ActiveCfg = Release|Win32
- {AAB7F95D-D83E-46CC-B0DC-D0E6F0A3B7C3}.Release|Win32.Build.0 = Release|Win32
- {AAB7F95D-D83E-46CC-B0DC-D0E6F0A3B7C3}.Release|x64.ActiveCfg = Release|x64
- {AAB7F95D-D83E-46CC-B0DC-D0E6F0A3B7C3}.Release|x64.Build.0 = Release|x64
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
diff --git a/libodb-oracle-vc9.sln b/libodb-oracle-vc9.sln deleted file mode 100644 index c6be2e0..0000000 --- a/libodb-oracle-vc9.sln +++ /dev/null @@ -1,26 +0,0 @@ -
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{C3AD7165-4D15-4E93-BE2A-D2B237C7A33C}") = "libodb-oracle", "odb\oracle\libodb-oracle-vc9.vcproj", "{AAB7F95D-D83E-46CC-B0DC-D0E6F0A3B7C3}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Debug|x64 = Debug|x64
- Release|Win32 = Release|Win32
- Release|x64 = Release|x64
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {AAB7F95D-D83E-46CC-B0DC-D0E6F0A3B7C3}.Debug|Win32.ActiveCfg = Debug|Win32
- {AAB7F95D-D83E-46CC-B0DC-D0E6F0A3B7C3}.Debug|Win32.Build.0 = Debug|Win32
- {AAB7F95D-D83E-46CC-B0DC-D0E6F0A3B7C3}.Debug|x64.ActiveCfg = Debug|x64
- {AAB7F95D-D83E-46CC-B0DC-D0E6F0A3B7C3}.Debug|x64.Build.0 = Debug|x64
- {AAB7F95D-D83E-46CC-B0DC-D0E6F0A3B7C3}.Release|Win32.ActiveCfg = Release|Win32
- {AAB7F95D-D83E-46CC-B0DC-D0E6F0A3B7C3}.Release|Win32.Build.0 = Release|Win32
- {AAB7F95D-D83E-46CC-B0DC-D0E6F0A3B7C3}.Release|x64.ActiveCfg = Release|x64
- {AAB7F95D-D83E-46CC-B0DC-D0E6F0A3B7C3}.Release|x64.Build.0 = Release|x64
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
diff --git a/libodb-oracle.pc.in b/libodb-oracle.pc.in deleted file mode 100644 index 074e300..0000000 --- a/libodb-oracle.pc.in +++ /dev/null @@ -1,14 +0,0 @@ -# file : libodb-oracle.pc.in -# license : ODB NCUEL; see accompanying LICENSE file - -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: libodb-oracle -Description: Object-relational mapping (ORM) system for C++, Oracle runtime library -URL: http://www.codesynthesis.com/products/odb/ -Version: @VERSION@ -Libs: -L${libdir} -lodb-oracle -Cflags: -I${includedir} diff --git a/libodb-oracle/.gitignore b/libodb-oracle/.gitignore new file mode 100644 index 0000000..1c363a0 --- /dev/null +++ b/libodb-oracle/.gitignore @@ -0,0 +1,25 @@ +# Compiler/linker output. +# +*.d +*.t +*.i +*.i.* +*.ii +*.ii.* +*.o +*.obj +*.gcm +*.pcm +*.ifc +*.so +*.dylib +*.dll +*.a +*.lib +*.exp +*.pdb +*.ilk +*.exe +*.exe.dlls/ +*.exe.manifest +*.pc diff --git a/libodb-oracle/INSTALL b/libodb-oracle/INSTALL new file mode 100644 index 0000000..51daf9e --- /dev/null +++ b/libodb-oracle/INSTALL @@ -0,0 +1,6 @@ +The easiest way to build this package is with the bpkg package manager: + +$ bpkg build libodb-oracle + +But if you don't want to use the package manager, then you can also build it +manually using the standard build2 build system. diff --git a/LICENSE b/libodb-oracle/LICENSE index c5effce..c5effce 100644 --- a/LICENSE +++ b/libodb-oracle/LICENSE diff --git a/NCUEL b/libodb-oracle/NCUEL index e8e179c..e8e179c 100644 --- a/NCUEL +++ b/libodb-oracle/NCUEL diff --git a/README b/libodb-oracle/README index 3e51928..3e51928 100644 --- a/README +++ b/libodb-oracle/README diff --git a/build/.gitignore b/libodb-oracle/build/.gitignore index 4a730a3..4a730a3 100644 --- a/build/.gitignore +++ b/libodb-oracle/build/.gitignore diff --git a/build/bootstrap.build b/libodb-oracle/build/bootstrap.build index 8bb932b..8bb932b 100644 --- a/build/bootstrap.build +++ b/libodb-oracle/build/bootstrap.build diff --git a/build/export.build b/libodb-oracle/build/export.build index 00ecc72..00ecc72 100644 --- a/build/export.build +++ b/libodb-oracle/build/export.build diff --git a/build/root.build b/libodb-oracle/build/root.build index 316c276..316c276 100644 --- a/build/root.build +++ b/libodb-oracle/build/root.build diff --git a/buildfile b/libodb-oracle/buildfile index d7329c2..db1aceb 100644 --- a/buildfile +++ b/libodb-oracle/buildfile @@ -1,7 +1,7 @@ # file : buildfile # license : ODB NCUEL; see accompanying LICENSE file -./: {*/ -build/ -m4/} doc{INSTALL NEWS README} legal{NCUEL LICENSE} manifest +./: {*/ -build/} doc{INSTALL NEWS README} legal{NCUEL LICENSE} manifest # Don't install tests or the INSTALL file. # diff --git a/manifest b/libodb-oracle/manifest index ab1502d..ab1502d 100644 --- a/manifest +++ b/libodb-oracle/manifest diff --git a/odb/oracle/auto-descriptor.cxx b/libodb-oracle/odb/oracle/auto-descriptor.cxx index fa83086..fa83086 100644 --- a/odb/oracle/auto-descriptor.cxx +++ b/libodb-oracle/odb/oracle/auto-descriptor.cxx diff --git a/odb/oracle/auto-descriptor.hxx b/libodb-oracle/odb/oracle/auto-descriptor.hxx index b856a2c..b856a2c 100644 --- a/odb/oracle/auto-descriptor.hxx +++ b/libodb-oracle/odb/oracle/auto-descriptor.hxx diff --git a/odb/oracle/auto-handle.cxx b/libodb-oracle/odb/oracle/auto-handle.cxx index 55614d4..55614d4 100644 --- a/odb/oracle/auto-handle.cxx +++ b/libodb-oracle/odb/oracle/auto-handle.cxx diff --git a/odb/oracle/auto-handle.hxx b/libodb-oracle/odb/oracle/auto-handle.hxx index 4da1cdd..4da1cdd 100644 --- a/odb/oracle/auto-handle.hxx +++ b/libodb-oracle/odb/oracle/auto-handle.hxx diff --git a/odb/oracle/binding.hxx b/libodb-oracle/odb/oracle/binding.hxx index 0b3c1d9..0b3c1d9 100644 --- a/odb/oracle/binding.hxx +++ b/libodb-oracle/odb/oracle/binding.hxx diff --git a/odb/oracle/buildfile b/libodb-oracle/odb/oracle/buildfile index c1cb778..c1cb778 100644 --- a/odb/oracle/buildfile +++ b/libodb-oracle/odb/oracle/buildfile diff --git a/odb/oracle/connection-factory.cxx b/libodb-oracle/odb/oracle/connection-factory.cxx index 9ad9474..9ad9474 100644 --- a/odb/oracle/connection-factory.cxx +++ b/libodb-oracle/odb/oracle/connection-factory.cxx diff --git a/odb/oracle/connection-factory.hxx b/libodb-oracle/odb/oracle/connection-factory.hxx index 835759e..835759e 100644 --- a/odb/oracle/connection-factory.hxx +++ b/libodb-oracle/odb/oracle/connection-factory.hxx diff --git a/odb/oracle/connection.cxx b/libodb-oracle/odb/oracle/connection.cxx index 5c2f7a7..5c2f7a7 100644 --- a/odb/oracle/connection.cxx +++ b/libodb-oracle/odb/oracle/connection.cxx diff --git a/odb/oracle/connection.hxx b/libodb-oracle/odb/oracle/connection.hxx index 4192728..4192728 100644 --- a/odb/oracle/connection.hxx +++ b/libodb-oracle/odb/oracle/connection.hxx diff --git a/odb/oracle/connection.ixx b/libodb-oracle/odb/oracle/connection.ixx index 5abaddc..5abaddc 100644 --- a/odb/oracle/connection.ixx +++ b/libodb-oracle/odb/oracle/connection.ixx diff --git a/odb/oracle/container-statements.hxx b/libodb-oracle/odb/oracle/container-statements.hxx index 23e1564..23e1564 100644 --- a/odb/oracle/container-statements.hxx +++ b/libodb-oracle/odb/oracle/container-statements.hxx diff --git a/odb/oracle/container-statements.txx b/libodb-oracle/odb/oracle/container-statements.txx index 6a6c53b..6a6c53b 100644 --- a/odb/oracle/container-statements.txx +++ b/libodb-oracle/odb/oracle/container-statements.txx diff --git a/odb/oracle/database.cxx b/libodb-oracle/odb/oracle/database.cxx index 3b720be..3b720be 100644 --- a/odb/oracle/database.cxx +++ b/libodb-oracle/odb/oracle/database.cxx diff --git a/odb/oracle/database.hxx b/libodb-oracle/odb/oracle/database.hxx index 0b66999..0b66999 100644 --- a/odb/oracle/database.hxx +++ b/libodb-oracle/odb/oracle/database.hxx diff --git a/odb/oracle/database.ixx b/libodb-oracle/odb/oracle/database.ixx index ea41aca..ea41aca 100644 --- a/odb/oracle/database.ixx +++ b/libodb-oracle/odb/oracle/database.ixx diff --git a/odb/oracle/details/.gitignore b/libodb-oracle/odb/oracle/details/.gitignore index b298f89..b298f89 100644 --- a/odb/oracle/details/.gitignore +++ b/libodb-oracle/odb/oracle/details/.gitignore diff --git a/odb/oracle/details/build2/config-stub.h b/libodb-oracle/odb/oracle/details/build2/config-stub.h index 2159951..2159951 100644 --- a/odb/oracle/details/build2/config-stub.h +++ b/libodb-oracle/odb/oracle/details/build2/config-stub.h diff --git a/odb/oracle/details/build2/config-vc-stub.h b/libodb-oracle/odb/oracle/details/build2/config-vc-stub.h index 697da2e..697da2e 100644 --- a/odb/oracle/details/build2/config-vc-stub.h +++ b/libodb-oracle/odb/oracle/details/build2/config-vc-stub.h diff --git a/odb/oracle/details/build2/config-vc.h b/libodb-oracle/odb/oracle/details/build2/config-vc.h index 8b9dbdd..8b9dbdd 100644 --- a/odb/oracle/details/build2/config-vc.h +++ b/libodb-oracle/odb/oracle/details/build2/config-vc.h diff --git a/odb/oracle/details/build2/config.h b/libodb-oracle/odb/oracle/details/build2/config.h index 017c1ba..017c1ba 100644 --- a/odb/oracle/details/build2/config.h +++ b/libodb-oracle/odb/oracle/details/build2/config.h diff --git a/odb/oracle/details/config-vc.h b/libodb-oracle/odb/oracle/details/config-vc.h index 8036f07..8036f07 100644 --- a/odb/oracle/details/config-vc.h +++ b/libodb-oracle/odb/oracle/details/config-vc.h diff --git a/odb/oracle/details/config.h.in b/libodb-oracle/odb/oracle/details/config.h.in index 3624466..3624466 100644 --- a/odb/oracle/details/config.h.in +++ b/libodb-oracle/odb/oracle/details/config.h.in diff --git a/odb/oracle/details/config.hxx b/libodb-oracle/odb/oracle/details/config.hxx index 89f715b..89f715b 100644 --- a/odb/oracle/details/config.hxx +++ b/libodb-oracle/odb/oracle/details/config.hxx diff --git a/odb/oracle/details/conversion.hxx b/libodb-oracle/odb/oracle/details/conversion.hxx index c3c86cf..c3c86cf 100644 --- a/odb/oracle/details/conversion.hxx +++ b/libodb-oracle/odb/oracle/details/conversion.hxx diff --git a/odb/oracle/details/date.hxx b/libodb-oracle/odb/oracle/details/date.hxx index d6c1acb..d6c1acb 100644 --- a/odb/oracle/details/date.hxx +++ b/libodb-oracle/odb/oracle/details/date.hxx diff --git a/odb/oracle/details/export.hxx b/libodb-oracle/odb/oracle/details/export.hxx index 7a7aea5..7a7aea5 100644 --- a/odb/oracle/details/export.hxx +++ b/libodb-oracle/odb/oracle/details/export.hxx diff --git a/odb/oracle/details/number.cxx b/libodb-oracle/odb/oracle/details/number.cxx index aeb2b96..aeb2b96 100644 --- a/odb/oracle/details/number.cxx +++ b/libodb-oracle/odb/oracle/details/number.cxx diff --git a/odb/oracle/details/number.hxx b/libodb-oracle/odb/oracle/details/number.hxx index 8ab6a90..8ab6a90 100644 --- a/odb/oracle/details/number.hxx +++ b/libodb-oracle/odb/oracle/details/number.hxx diff --git a/odb/oracle/details/options.cli b/libodb-oracle/odb/oracle/details/options.cli index 82be308..82be308 100644 --- a/odb/oracle/details/options.cli +++ b/libodb-oracle/odb/oracle/details/options.cli diff --git a/odb/oracle/details/pregenerated/odb/oracle/details/options.cxx b/libodb-oracle/odb/oracle/details/pregenerated/odb/oracle/details/options.cxx index 69ea3d7..69ea3d7 100644 --- a/odb/oracle/details/pregenerated/odb/oracle/details/options.cxx +++ b/libodb-oracle/odb/oracle/details/pregenerated/odb/oracle/details/options.cxx diff --git a/odb/oracle/details/pregenerated/odb/oracle/details/options.hxx b/libodb-oracle/odb/oracle/details/pregenerated/odb/oracle/details/options.hxx index 285c906..285c906 100644 --- a/odb/oracle/details/pregenerated/odb/oracle/details/options.hxx +++ b/libodb-oracle/odb/oracle/details/pregenerated/odb/oracle/details/options.hxx diff --git a/odb/oracle/details/pregenerated/odb/oracle/details/options.ixx b/libodb-oracle/odb/oracle/details/pregenerated/odb/oracle/details/options.ixx index a69d602..a69d602 100644 --- a/odb/oracle/details/pregenerated/odb/oracle/details/options.ixx +++ b/libodb-oracle/odb/oracle/details/pregenerated/odb/oracle/details/options.ixx diff --git a/odb/oracle/error.cxx b/libodb-oracle/odb/oracle/error.cxx index 3c9a7df..3c9a7df 100644 --- a/odb/oracle/error.cxx +++ b/libodb-oracle/odb/oracle/error.cxx diff --git a/odb/oracle/error.hxx b/libodb-oracle/odb/oracle/error.hxx index 50092c8..50092c8 100644 --- a/odb/oracle/error.hxx +++ b/libodb-oracle/odb/oracle/error.hxx diff --git a/odb/oracle/exceptions.cxx b/libodb-oracle/odb/oracle/exceptions.cxx index 532306e..532306e 100644 --- a/odb/oracle/exceptions.cxx +++ b/libodb-oracle/odb/oracle/exceptions.cxx diff --git a/odb/oracle/exceptions.hxx b/libodb-oracle/odb/oracle/exceptions.hxx index d21b742..d21b742 100644 --- a/odb/oracle/exceptions.hxx +++ b/libodb-oracle/odb/oracle/exceptions.hxx diff --git a/odb/oracle/forward.hxx b/libodb-oracle/odb/oracle/forward.hxx index ae4d3a0..ae4d3a0 100644 --- a/odb/oracle/forward.hxx +++ b/libodb-oracle/odb/oracle/forward.hxx diff --git a/odb/oracle/no-id-object-result.hxx b/libodb-oracle/odb/oracle/no-id-object-result.hxx index 93e7e54..93e7e54 100644 --- a/odb/oracle/no-id-object-result.hxx +++ b/libodb-oracle/odb/oracle/no-id-object-result.hxx diff --git a/odb/oracle/no-id-object-result.txx b/libodb-oracle/odb/oracle/no-id-object-result.txx index 7bac70b..7bac70b 100644 --- a/odb/oracle/no-id-object-result.txx +++ b/libodb-oracle/odb/oracle/no-id-object-result.txx diff --git a/odb/oracle/no-id-object-statements.hxx b/libodb-oracle/odb/oracle/no-id-object-statements.hxx index 2e5a033..2e5a033 100644 --- a/odb/oracle/no-id-object-statements.hxx +++ b/libodb-oracle/odb/oracle/no-id-object-statements.hxx diff --git a/odb/oracle/no-id-object-statements.txx b/libodb-oracle/odb/oracle/no-id-object-statements.txx index 23d330f..23d330f 100644 --- a/odb/oracle/no-id-object-statements.txx +++ b/libodb-oracle/odb/oracle/no-id-object-statements.txx diff --git a/odb/oracle/oracle-fwd.hxx b/libodb-oracle/odb/oracle/oracle-fwd.hxx index cbc107a..cbc107a 100644 --- a/odb/oracle/oracle-fwd.hxx +++ b/libodb-oracle/odb/oracle/oracle-fwd.hxx diff --git a/odb/oracle/oracle-types.cxx b/libodb-oracle/odb/oracle/oracle-types.cxx index 1ef531f..1ef531f 100644 --- a/odb/oracle/oracle-types.cxx +++ b/libodb-oracle/odb/oracle/oracle-types.cxx diff --git a/odb/oracle/oracle-types.hxx b/libodb-oracle/odb/oracle/oracle-types.hxx index a9553b2..a9553b2 100644 --- a/odb/oracle/oracle-types.hxx +++ b/libodb-oracle/odb/oracle/oracle-types.hxx diff --git a/odb/oracle/polymorphic-object-result.hxx b/libodb-oracle/odb/oracle/polymorphic-object-result.hxx index ddb3055..ddb3055 100644 --- a/odb/oracle/polymorphic-object-result.hxx +++ b/libodb-oracle/odb/oracle/polymorphic-object-result.hxx diff --git a/odb/oracle/polymorphic-object-result.txx b/libodb-oracle/odb/oracle/polymorphic-object-result.txx index b810b29..b810b29 100644 --- a/odb/oracle/polymorphic-object-result.txx +++ b/libodb-oracle/odb/oracle/polymorphic-object-result.txx diff --git a/odb/oracle/polymorphic-object-statements.hxx b/libodb-oracle/odb/oracle/polymorphic-object-statements.hxx index fbb8fcf..fbb8fcf 100644 --- a/odb/oracle/polymorphic-object-statements.hxx +++ b/libodb-oracle/odb/oracle/polymorphic-object-statements.hxx diff --git a/odb/oracle/polymorphic-object-statements.txx b/libodb-oracle/odb/oracle/polymorphic-object-statements.txx index 9d190e5..9d190e5 100644 --- a/odb/oracle/polymorphic-object-statements.txx +++ b/libodb-oracle/odb/oracle/polymorphic-object-statements.txx diff --git a/odb/oracle/prepared-query.cxx b/libodb-oracle/odb/oracle/prepared-query.cxx index 7fa11be..7fa11be 100644 --- a/odb/oracle/prepared-query.cxx +++ b/libodb-oracle/odb/oracle/prepared-query.cxx diff --git a/odb/oracle/prepared-query.hxx b/libodb-oracle/odb/oracle/prepared-query.hxx index c449a3a..c449a3a 100644 --- a/odb/oracle/prepared-query.hxx +++ b/libodb-oracle/odb/oracle/prepared-query.hxx diff --git a/odb/oracle/query-const-expr.cxx b/libodb-oracle/odb/oracle/query-const-expr.cxx index 5395f1f..5395f1f 100644 --- a/odb/oracle/query-const-expr.cxx +++ b/libodb-oracle/odb/oracle/query-const-expr.cxx diff --git a/odb/oracle/query-dynamic.cxx b/libodb-oracle/odb/oracle/query-dynamic.cxx index 8ee4964..8ee4964 100644 --- a/odb/oracle/query-dynamic.cxx +++ b/libodb-oracle/odb/oracle/query-dynamic.cxx diff --git a/odb/oracle/query-dynamic.hxx b/libodb-oracle/odb/oracle/query-dynamic.hxx index eceac44..eceac44 100644 --- a/odb/oracle/query-dynamic.hxx +++ b/libodb-oracle/odb/oracle/query-dynamic.hxx diff --git a/odb/oracle/query-dynamic.ixx b/libodb-oracle/odb/oracle/query-dynamic.ixx index 154f5cb..154f5cb 100644 --- a/odb/oracle/query-dynamic.ixx +++ b/libodb-oracle/odb/oracle/query-dynamic.ixx diff --git a/odb/oracle/query-dynamic.txx b/libodb-oracle/odb/oracle/query-dynamic.txx index a19b5c8..a19b5c8 100644 --- a/odb/oracle/query-dynamic.txx +++ b/libodb-oracle/odb/oracle/query-dynamic.txx diff --git a/odb/oracle/query.cxx b/libodb-oracle/odb/oracle/query.cxx index 890e1db..890e1db 100644 --- a/odb/oracle/query.cxx +++ b/libodb-oracle/odb/oracle/query.cxx diff --git a/odb/oracle/query.hxx b/libodb-oracle/odb/oracle/query.hxx index a1cbd80..a1cbd80 100644 --- a/odb/oracle/query.hxx +++ b/libodb-oracle/odb/oracle/query.hxx diff --git a/odb/oracle/query.ixx b/libodb-oracle/odb/oracle/query.ixx index 48caec3..48caec3 100644 --- a/odb/oracle/query.ixx +++ b/libodb-oracle/odb/oracle/query.ixx diff --git a/odb/oracle/query.txx b/libodb-oracle/odb/oracle/query.txx index 65f2858..65f2858 100644 --- a/odb/oracle/query.txx +++ b/libodb-oracle/odb/oracle/query.txx diff --git a/odb/oracle/section-statements.hxx b/libodb-oracle/odb/oracle/section-statements.hxx index 1819fb1..1819fb1 100644 --- a/odb/oracle/section-statements.hxx +++ b/libodb-oracle/odb/oracle/section-statements.hxx diff --git a/odb/oracle/section-statements.txx b/libodb-oracle/odb/oracle/section-statements.txx index 45606d5..45606d5 100644 --- a/odb/oracle/section-statements.txx +++ b/libodb-oracle/odb/oracle/section-statements.txx diff --git a/odb/oracle/simple-object-result.hxx b/libodb-oracle/odb/oracle/simple-object-result.hxx index df828d2..df828d2 100644 --- a/odb/oracle/simple-object-result.hxx +++ b/libodb-oracle/odb/oracle/simple-object-result.hxx diff --git a/odb/oracle/simple-object-result.txx b/libodb-oracle/odb/oracle/simple-object-result.txx index 436c5a9..436c5a9 100644 --- a/odb/oracle/simple-object-result.txx +++ b/libodb-oracle/odb/oracle/simple-object-result.txx diff --git a/odb/oracle/simple-object-statements.cxx b/libodb-oracle/odb/oracle/simple-object-statements.cxx index 330627a..330627a 100644 --- a/odb/oracle/simple-object-statements.cxx +++ b/libodb-oracle/odb/oracle/simple-object-statements.cxx diff --git a/odb/oracle/simple-object-statements.hxx b/libodb-oracle/odb/oracle/simple-object-statements.hxx index 98e60b2..98e60b2 100644 --- a/odb/oracle/simple-object-statements.hxx +++ b/libodb-oracle/odb/oracle/simple-object-statements.hxx diff --git a/odb/oracle/simple-object-statements.ixx b/libodb-oracle/odb/oracle/simple-object-statements.ixx index 4631d69..4631d69 100644 --- a/odb/oracle/simple-object-statements.ixx +++ b/libodb-oracle/odb/oracle/simple-object-statements.ixx diff --git a/odb/oracle/simple-object-statements.txx b/libodb-oracle/odb/oracle/simple-object-statements.txx index 99de084..99de084 100644 --- a/odb/oracle/simple-object-statements.txx +++ b/libodb-oracle/odb/oracle/simple-object-statements.txx diff --git a/odb/oracle/statement-cache.hxx b/libodb-oracle/odb/oracle/statement-cache.hxx index 2dba01f..2dba01f 100644 --- a/odb/oracle/statement-cache.hxx +++ b/libodb-oracle/odb/oracle/statement-cache.hxx diff --git a/odb/oracle/statement-cache.txx b/libodb-oracle/odb/oracle/statement-cache.txx index 23d9504..23d9504 100644 --- a/odb/oracle/statement-cache.txx +++ b/libodb-oracle/odb/oracle/statement-cache.txx diff --git a/odb/oracle/statement.cxx b/libodb-oracle/odb/oracle/statement.cxx index 93d8a4a..93d8a4a 100644 --- a/odb/oracle/statement.cxx +++ b/libodb-oracle/odb/oracle/statement.cxx diff --git a/odb/oracle/statement.hxx b/libodb-oracle/odb/oracle/statement.hxx index d435286..d435286 100644 --- a/odb/oracle/statement.hxx +++ b/libodb-oracle/odb/oracle/statement.hxx diff --git a/odb/oracle/statement.ixx b/libodb-oracle/odb/oracle/statement.ixx index ef0fa64..ef0fa64 100644 --- a/odb/oracle/statement.ixx +++ b/libodb-oracle/odb/oracle/statement.ixx diff --git a/odb/oracle/statements-base.cxx b/libodb-oracle/odb/oracle/statements-base.cxx index e25d851..e25d851 100644 --- a/odb/oracle/statements-base.cxx +++ b/libodb-oracle/odb/oracle/statements-base.cxx diff --git a/odb/oracle/statements-base.hxx b/libodb-oracle/odb/oracle/statements-base.hxx index 61b34ae..61b34ae 100644 --- a/odb/oracle/statements-base.hxx +++ b/libodb-oracle/odb/oracle/statements-base.hxx diff --git a/odb/oracle/tracer.cxx b/libodb-oracle/odb/oracle/tracer.cxx index ca56d05..ca56d05 100644 --- a/odb/oracle/tracer.cxx +++ b/libodb-oracle/odb/oracle/tracer.cxx diff --git a/odb/oracle/tracer.hxx b/libodb-oracle/odb/oracle/tracer.hxx index 0627926..0627926 100644 --- a/odb/oracle/tracer.hxx +++ b/libodb-oracle/odb/oracle/tracer.hxx diff --git a/odb/oracle/traits-calls.hxx b/libodb-oracle/odb/oracle/traits-calls.hxx index 7b9d6f3..7b9d6f3 100644 --- a/odb/oracle/traits-calls.hxx +++ b/libodb-oracle/odb/oracle/traits-calls.hxx diff --git a/odb/oracle/traits.cxx b/libodb-oracle/odb/oracle/traits.cxx index 6c7b46e..6c7b46e 100644 --- a/odb/oracle/traits.cxx +++ b/libodb-oracle/odb/oracle/traits.cxx diff --git a/odb/oracle/traits.hxx b/libodb-oracle/odb/oracle/traits.hxx index 8a1673c..8a1673c 100644 --- a/odb/oracle/traits.hxx +++ b/libodb-oracle/odb/oracle/traits.hxx diff --git a/odb/oracle/traits.txx b/libodb-oracle/odb/oracle/traits.txx index 22d8f9e..22d8f9e 100644 --- a/odb/oracle/traits.txx +++ b/libodb-oracle/odb/oracle/traits.txx diff --git a/odb/oracle/transaction-impl.cxx b/libodb-oracle/odb/oracle/transaction-impl.cxx index 377e409..377e409 100644 --- a/odb/oracle/transaction-impl.cxx +++ b/libodb-oracle/odb/oracle/transaction-impl.cxx diff --git a/odb/oracle/transaction-impl.hxx b/libodb-oracle/odb/oracle/transaction-impl.hxx index 0b7e9bf..0b7e9bf 100644 --- a/odb/oracle/transaction-impl.hxx +++ b/libodb-oracle/odb/oracle/transaction-impl.hxx diff --git a/odb/oracle/transaction.cxx b/libodb-oracle/odb/oracle/transaction.cxx index 6dff1a0..6dff1a0 100644 --- a/odb/oracle/transaction.cxx +++ b/libodb-oracle/odb/oracle/transaction.cxx diff --git a/odb/oracle/transaction.hxx b/libodb-oracle/odb/oracle/transaction.hxx index 8d06b2f..8d06b2f 100644 --- a/odb/oracle/transaction.hxx +++ b/libodb-oracle/odb/oracle/transaction.hxx diff --git a/odb/oracle/transaction.ixx b/libodb-oracle/odb/oracle/transaction.ixx index d75a399..d75a399 100644 --- a/odb/oracle/transaction.ixx +++ b/libodb-oracle/odb/oracle/transaction.ixx diff --git a/odb/oracle/version-build2-stub.hxx b/libodb-oracle/odb/oracle/version-build2-stub.hxx index d7da05c..d7da05c 100644 --- a/odb/oracle/version-build2-stub.hxx +++ b/libodb-oracle/odb/oracle/version-build2-stub.hxx diff --git a/odb/oracle/version-build2.hxx b/libodb-oracle/odb/oracle/version-build2.hxx index e69de29..e69de29 100644 --- a/odb/oracle/version-build2.hxx +++ b/libodb-oracle/odb/oracle/version-build2.hxx diff --git a/odb/oracle/version-build2.hxx.in b/libodb-oracle/odb/oracle/version-build2.hxx.in index 6006a0e..6006a0e 100644 --- a/odb/oracle/version-build2.hxx.in +++ b/libodb-oracle/odb/oracle/version-build2.hxx.in diff --git a/odb/oracle/version.hxx b/libodb-oracle/odb/oracle/version.hxx index 1523172..1523172 100644 --- a/odb/oracle/version.hxx +++ b/libodb-oracle/odb/oracle/version.hxx diff --git a/odb/oracle/view-result.hxx b/libodb-oracle/odb/oracle/view-result.hxx index 15d1cee..15d1cee 100644 --- a/odb/oracle/view-result.hxx +++ b/libodb-oracle/odb/oracle/view-result.hxx diff --git a/odb/oracle/view-result.txx b/libodb-oracle/odb/oracle/view-result.txx index 8ae25aa..8ae25aa 100644 --- a/odb/oracle/view-result.txx +++ b/libodb-oracle/odb/oracle/view-result.txx diff --git a/odb/oracle/view-statements.hxx b/libodb-oracle/odb/oracle/view-statements.hxx index 272352f..272352f 100644 --- a/odb/oracle/view-statements.hxx +++ b/libodb-oracle/odb/oracle/view-statements.hxx diff --git a/odb/oracle/view-statements.txx b/libodb-oracle/odb/oracle/view-statements.txx index 3a5d31e..3a5d31e 100644 --- a/odb/oracle/view-statements.txx +++ b/libodb-oracle/odb/oracle/view-statements.txx diff --git a/tests/.gitignore b/libodb-oracle/tests/.gitignore index e54525b..e54525b 100644 --- a/tests/.gitignore +++ b/libodb-oracle/tests/.gitignore diff --git a/tests/basics/buildfile b/libodb-oracle/tests/basics/buildfile index e963685..e963685 100644 --- a/tests/basics/buildfile +++ b/libodb-oracle/tests/basics/buildfile diff --git a/tests/basics/driver.cxx b/libodb-oracle/tests/basics/driver.cxx index 38ec6d2..38ec6d2 100644 --- a/tests/basics/driver.cxx +++ b/libodb-oracle/tests/basics/driver.cxx diff --git a/tests/build/.gitignore b/libodb-oracle/tests/build/.gitignore index 4a730a3..4a730a3 100644 --- a/tests/build/.gitignore +++ b/libodb-oracle/tests/build/.gitignore diff --git a/tests/build/bootstrap.build b/libodb-oracle/tests/build/bootstrap.build index 895126c..895126c 100644 --- a/tests/build/bootstrap.build +++ b/libodb-oracle/tests/build/bootstrap.build diff --git a/tests/build/root.build b/libodb-oracle/tests/build/root.build index bbd3781..bbd3781 100644 --- a/tests/build/root.build +++ b/libodb-oracle/tests/build/root.build diff --git a/tests/buildfile b/libodb-oracle/tests/buildfile index fd73adc..fd73adc 100644 --- a/tests/buildfile +++ b/libodb-oracle/tests/buildfile diff --git a/m4/acx-pthread.m4 b/m4/acx-pthread.m4 deleted file mode 100644 index 204b32d..0000000 --- a/m4/acx-pthread.m4 +++ /dev/null @@ -1,259 +0,0 @@ -dnl -dnl NOTE: This file was modified. See the comments starting with 'CS:' -dnl for more information. In particular, it was changed to use C++ -dnl instead of C. -dnl -dnl @synopsis ACX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) -dnl -dnl @summary figure out how to build C++ programs using POSIX threads -dnl -dnl This macro figures out how to build C++ programs using POSIX threads. -dnl It sets the PTHREAD_LIBS output variable to the threads library and -dnl linker flags, and the PTHREAD_CXXFLAGS output variable to any special -dnl C++ compiler flags that are needed. (The user can also force certain -dnl compiler flags/libs to be tested by setting these environment -dnl variables.) -dnl -dnl Also sets PTHREAD_CXX to any special C++ compiler that is needed for -dnl multi-threaded programs (defaults to the value of CXX otherwise). -dnl (This is necessary on AIX to use the special xlC_r compiler alias.) -dnl -dnl NOTE: You are assumed to not only compile your program with these -dnl flags, but also link it with them as well. e.g. you should link -dnl with $PTHREAD_CXX $CXXFLAGS $PTHREAD_CXXFLAGS $LDFLAGS ... $PTHREAD_LIBS -dnl $LIBS -dnl -dnl If you are only building threads programs, you may wish to use -dnl these variables in your default LIBS, CXXFLAGS, and CXX: -dnl -dnl LIBS="$PTHREAD_LIBS $LIBS" -dnl CXXFLAGS="$CXXFLAGS $PTHREAD_CXXFLAGS" -dnl CXX="$PTHREAD_CXX" -dnl -dnl In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute -dnl constant has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to -dnl that name (e.g. PTHREAD_CREATE_UNDETACHED on AIX). -dnl -dnl ACTION-IF-FOUND is a list of shell commands to run if a threads -dnl library is found, and ACTION-IF-NOT-FOUND is a list of commands to -dnl run it if it is not found. If ACTION-IF-FOUND is not specified, the -dnl default action will define HAVE_PTHREAD. -dnl -dnl Please let the authors know if this macro fails on any platform, or -dnl if you have any other suggestions or comments. This macro was based -dnl on work by SGJ on autoconf scripts for FFTW (www.fftw.org) (with -dnl help from M. Frigo), as well as ac_pthread and hb_pthread macros -dnl posted by Alejandro Forero Cuervo to the autoconf macro repository. -dnl We are also grateful for the helpful feedback of numerous users. -dnl -dnl @category InstalledPackages -dnl @author Steven G. Johnson <stevenj@alum.mit.edu> -dnl @version 2006-05-29 -dnl @license GPLWithACException - -AC_DEFUN([ACX_PTHREAD], [ -AC_REQUIRE([AC_CANONICAL_HOST]) -AC_LANG_SAVE -AC_LANG(C++) -acx_pthread_ok=no - -# We used to check for pthread.h first, but this fails if pthread.h -# requires special compiler flags (e.g. on True64 or Sequent). -# It gets checked for in the link test anyway. - -# First of all, check if the user has set any of the PTHREAD_LIBS, -# etcetera environment variables, and if threads linking works using -# them: -if test x"$PTHREAD_LIBS$PTHREAD_CXXFLAGS" != x; then - save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS $PTHREAD_CXXFLAGS" - save_LIBS="$LIBS" - LIBS="$PTHREAD_LIBS $LIBS" - AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CXXFLAGS=$PTHREAD_CXXFLAGS]) - AC_TRY_LINK_FUNC(pthread_join, acx_pthread_ok=yes) - AC_MSG_RESULT($acx_pthread_ok) - if test x"$acx_pthread_ok" = xno; then - PTHREAD_LIBS="" - PTHREAD_CXXFLAGS="" - fi - LIBS="$save_LIBS" - CXXFLAGS="$save_CXXFLAGS" -fi - -# We must check for the threads library under a number of different -# names; the ordering is very important because some systems -# (e.g. DEC) have both -lpthread and -lpthreads, where one of the -# libraries is broken (non-POSIX). - -# Create a list of thread flags to try. Items starting with a "-" are -# C compiler flags, and other items are library names, except for "none" -# which indicates that we try without any flags at all, and "pthread-config" -# which is a program returning the flags for the Pth emulation library. - -# CS: On GNU/Linux with gcc both -pthread and -lpthread are valid. -# However, libtool links libraries with -nostdlib which results in -# -pthread being stripped from the linker command line. To resolve -# this we move pthread from after -mthreads to after pthreads. -# -acx_pthread_flags="pthreads pthread none -Kthread -kthread lthread -pthread -pthreads -mthreads --thread-safe -mt pthread-config" - -# The ordering *is* (sometimes) important. Some notes on the -# individual items follow: - -# pthreads: AIX (must check this before -lpthread) -# none: in case threads are in libc; should be tried before -Kthread and -# other compiler flags to prevent continual compiler warnings -# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h) -# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able) -# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread) -# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads) -# -pthreads: Solaris/gcc -# -mthreads: Mingw32/gcc, Lynx/gcc -# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it -# doesn't hurt to check since this sometimes defines pthreads too; -# also defines -D_REENTRANT) -# ... -mt is also the pthreads flag for HP/aCC -# pthread: Linux, etcetera -# --thread-safe: KAI C++ -# pthread-config: use pthread-config program (for GNU Pth library) - -case "${host_cpu}-${host_os}" in - *solaris*) - - # On Solaris (at least, for some versions), libc contains stubbed - # (non-functional) versions of the pthreads routines, so link-based - # tests will erroneously succeed. (We need to link with -pthreads/-mt/ - # -lpthread.) (The stubs are missing pthread_cleanup_push, or rather - # a function called by this macro, so we could check for that, but - # who knows whether they'll stub that too in a future libc.) So, - # we'll just look for -pthreads and -lpthread first: - - # CS: Move -mt to the front of the list; Sun CC will use -mt, - # gcc will use -pthreads. - # - acx_pthread_flags="-mt -pthreads pthread -pthread $acx_pthread_flags" - ;; -esac - -if test x"$acx_pthread_ok" = xno; then -for flag in $acx_pthread_flags; do - - case $flag in - none) - AC_MSG_CHECKING([whether pthreads work without any flags]) - ;; - - -*) - AC_MSG_CHECKING([whether pthreads work with $flag]) - PTHREAD_CXXFLAGS="$flag" - ;; - - pthread-config) - AC_CHECK_PROG(acx_pthread_config, pthread-config, yes, no) - if test x"$acx_pthread_config" = xno; then continue; fi - PTHREAD_CXXFLAGS="`pthread-config --cflags`" - PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`" - ;; - - *) - AC_MSG_CHECKING([for the pthreads library -l$flag]) - PTHREAD_LIBS="-l$flag" - ;; - esac - - save_LIBS="$LIBS" - save_CXXFLAGS="$CXXFLAGS" - LIBS="$PTHREAD_LIBS $LIBS" - CXXFLAGS="$CXXFLAGS $PTHREAD_CXXFLAGS" - - # Check for various functions. We must include pthread.h, - # since some functions may be macros. (On the Sequent, we - # need a special flag -Kthread to make this header compile.) - # We check for pthread_join because it is in -lpthread on IRIX - # while pthread_create is in libc. We check for pthread_attr_init - # due to DEC craziness with -lpthreads. We check for - # pthread_cleanup_push because it is one of the few pthread - # functions on Solaris that doesn't have a non-functional libc stub. - # We try pthread_create on general principles. - # - AC_TRY_LINK([#include <pthread.h>], - [pthread_t th; pthread_join(th, 0); - pthread_attr_init(0); pthread_cleanup_push(0, 0); - pthread_create(0,0,0,0); pthread_cleanup_pop(0);], - [acx_pthread_ok=yes]) - - LIBS="$save_LIBS" - CXXFLAGS="$save_CXXFLAGS" - - AC_MSG_RESULT($acx_pthread_ok) - if test "x$acx_pthread_ok" = xyes; then - break; - fi - - PTHREAD_LIBS="" - PTHREAD_CXXFLAGS="" -done -fi - -# Various other checks: -if test "x$acx_pthread_ok" = xyes; then - save_LIBS="$LIBS" - LIBS="$PTHREAD_LIBS $LIBS" - save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS $PTHREAD_CXXFLAGS" - -dnl # Detect AIX lossage: JOINABLE attribute is called UNDETACHED. -dnl AC_MSG_CHECKING([for joinable pthread attribute]) -dnl attr_name=unknown -dnl for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do -dnl AC_TRY_LINK([#include <pthread.h>], [int attr=$attr; return attr;], -dnl [attr_name=$attr; break]) -dnl done -dnl AC_MSG_RESULT($attr_name) -dnl if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then -dnl AC_DEFINE_UNQUOTED(PTHREAD_CREATE_JOINABLE, $attr_name, -dnl [Define to necessary symbol if this constant -dnl uses a non-standard name on your system.]) -dnl fi - - AC_MSG_CHECKING([if more special flags are required for pthreads]) - flag=no - case "${host_cpu}-${host_os}" in - *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";; - # CS: Add _REENTRANT in Linux to emulate -pthread. - # - *-linux* | *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";; - esac - AC_MSG_RESULT(${flag}) - if test "x$flag" != xno; then - PTHREAD_CXXFLAGS="$flag $PTHREAD_CXXFLAGS" - fi - - LIBS="$save_LIBS" - CXXFLAGS="$save_CXXFLAGS" - -dnl # More AIX lossage: must compile with xlC_r -dnl if test x"$GXX" != xyes; then -dnl AC_CHECK_PROGS(PTHREAD_CXX, xlC_r, ${CXX}) -dnl else -dnl PTHREAD_CXX=$CXX -dnl fi - -else - PTHREAD_CXX="$CXX" -fi - -AC_SUBST(PTHREAD_LIBS) -AC_SUBST(PTHREAD_CXXFLAGS) -AC_SUBST(PTHREAD_CXX) - -# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: -if test x"$acx_pthread_ok" = xyes; then - ifelse([$1],,AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.]),[$1]) - : -else - acx_pthread_ok=no - $2 -fi -AC_LANG_RESTORE -])dnl ACX_PTHREAD diff --git a/m4/disable-rpath.m4 b/m4/disable-rpath.m4 deleted file mode 100644 index 0864209..0000000 --- a/m4/disable-rpath.m4 +++ /dev/null @@ -1,24 +0,0 @@ -dnl file : m4/disable-rpath.m4 -dnl license : GNU GPL v2; see accompanying LICENSE file -dnl -AC_DEFUN([DISABLE_RPATH],[ - -AC_MSG_CHECKING([whether to use rpath]) -AC_ARG_ENABLE( - [rpath], - [AC_HELP_STRING([--disable-rpath], [patch libtool to not use rpath])], - [libtool_rpath="$enable_rpath"], - [libtool_rpath="yes"]) -AC_MSG_RESULT($libtool_rpath) - -# Patch libtool to not use rpath if requested. -# -AC_CONFIG_COMMANDS( - [libtool-rpath-patch], - [if test "$libtool_use_rpath" = "no"; then - sed < libtool > libtool-2 's/^hardcode_libdir_flag_spec.*$'/'hardcode_libdir_flag_spec=" -D__LIBTOOL_NO_RPATH__ "/' - mv libtool-2 libtool - chmod 755 libtool - fi], - [libtool_use_rpath=$libtool_rpath]) -])dnl diff --git a/m4/liboci.m4 b/m4/liboci.m4 deleted file mode 100644 index 1e74fe6..0000000 --- a/m4/liboci.m4 +++ /dev/null @@ -1,155 +0,0 @@ -dnl file : m4/oci.m4 -dnl license : GNU GPL v2; see accompanying LICENSE file -dnl -dnl LIBOCI([ACTION-IF-FOUND[, -dnl ACTION-IF-NOT-FOUND]]) -dnl -dnl -AC_DEFUN([LIBOCI], [ -oci_found=no - -AC_ARG_WITH( - [oci], - [AC_HELP_STRING([--with-oci=DIR],[oracle home or instant client directory])], - [oci_dir=${withval}], - [oci_dir=]) - -AC_MSG_CHECKING([for oci]) - -save_CPPFLAGS="$CPPFLAGS" -save_LDFLAGS="$LDFLAGS" -save_LIBS="$LIBS" - -# If oci_dir was given, add the necessary preprocessor and linker flags. -# -if test x"$oci_dir" != x; then - # Check whether oci_dir refers to Oracle home or an Instant Client - # directory. - # - if test -d "$oci_dir/sdk/include"; then - CPPFLAGS="$CPPFLAGS -I$oci_dir/sdk/include" - LDFLAGS="$LDFLAGS -L$oci_dir" - LIBS="-lclntsh $LIBS" - - CXX_LIBTOOL_LINK_IFELSE([ -AC_LANG_SOURCE([ -#include <oci.h> - -int -main () -{ - OCIEnv* env (0); - OCIEnvNlsCreate (&env, OCI_THREADED, 0, 0, 0, 0, 0, 0, 0, 0); - OCIHandleFree (env, OCI_HTYPE_ENV); - return 0; -} -])], -[ -oci_found=yes -]) - - if test x"$oci_found" = xno; then - LIBS="-Wc,`ls $oci_dir/libclntsh.* 2>/dev/null` $save_LIBS" - fi - elif test -d "$oci_dir/rdbms/public"; then - CPPFLAGS="$CPPFLAGS -I$oci_dir/rdbms/public" - LDFLAGS="$LDFLAGS -L$oci_dir/lib" - LIBS="-lclntsh $LIBS" - fi -else - LIBS="-lclntsh $LIBS" -fi - -if test x"$oci_found" = xno; then - - CXX_LIBTOOL_LINK_IFELSE([ -AC_LANG_SOURCE([ -#include <oci.h> - -int -main () -{ - OCIEnv* env (0); - OCIEnvNlsCreate (&env, OCI_THREADED, 0, 0, 0, 0, 0, 0, 0, 0); - OCIHandleFree (env, OCI_HTYPE_ENV); - return 0; -} -])], -[ -oci_found=yes -]) - -fi - -if test x"$oci_found" = xno; then - - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" - - # Try using ORACLE_HOME if it exists. - # - if test x"$ORACLE_HOME" != x; then - CPPFLAGS="$CPPFLAGS -I$ORACLE_HOME/rdbms/public" - LDFLAGS="$LDFLAGS -L$ORACLE_HOME/lib" - LIBS="-lclntsh $LIBS" - - CXX_LIBTOOL_LINK_IFELSE([ -AC_LANG_SOURCE([ -#include <oci.h> - -int -main () -{ - OCIEnv* env (0); - OCIEnvNlsCreate (&env, OCI_THREADED, 0, 0, 0, 0, 0, 0, 0, 0); - OCIHandleFree (env, OCI_HTYPE_ENV); - return 0; -} -])], -[ -oci_found=yes -]) - - # Try the new Instant Client layout. - # - if test x"$oci_found" = xno; then - CPPFLAGS="$CPPFLAGS -I$ORACLE_HOME/include" - LDFLAGS="$LDFLAGS -L$ORACLE_HOME/lib" - LIBS="-lclntsh $LIBS" - - CXX_LIBTOOL_LINK_IFELSE([ -AC_LANG_SOURCE([ -#include <oci.h> - -int -main () -{ - OCIEnv* env (0); - OCIEnvNlsCreate (&env, OCI_THREADED, 0, 0, 0, 0, 0, 0, 0, 0); - OCIHandleFree (env, OCI_HTYPE_ENV); - return 0; -} -])], -[ -oci_found=yes -]) - fi - - if test x"$oci_found" = xno; then - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" - fi - fi -fi - -if test x"$oci_found" = xyes; then - AC_MSG_RESULT([yes]) - $1 -else - LIBS="$save_LIBS" - AC_MSG_RESULT([no]) - $2 -fi -])dnl diff --git a/m4/libodb.m4 b/m4/libodb.m4 deleted file mode 100644 index 0dba7c4..0000000 --- a/m4/libodb.m4 +++ /dev/null @@ -1,81 +0,0 @@ -dnl file : m4/libodb.m4 -dnl license : GNU GPL v2; see accompanying LICENSE file -dnl -dnl LIBODB([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) -dnl -dnl -AC_DEFUN([LIBODB], [ -libodb_found=no - -AC_ARG_WITH( - [libodb], - [AC_HELP_STRING([--with-libodb=DIR],[location of libodb build directory])], - [libodb_dir=${withval}], - [libodb_dir=]) - -AC_MSG_CHECKING([for libodb]) - -# If libodb_dir was given, add the necessary preprocessor and linker flags. -# -if test x"$libodb_dir" != x; then - save_CPPFLAGS="$CPPFLAGS" - save_LDFLAGS="$LDFLAGS" - - AS_SET_CATFILE([abs_libodb_dir], [$ac_pwd], [$libodb_dir]) - - CPPFLAGS="$CPPFLAGS -I$abs_libodb_dir" - LDFLAGS="$LDFLAGS -L$abs_libodb_dir/odb" -fi - -save_LIBS="$LIBS" -LIBS="-lodb $LIBS" - -CXX_LIBTOOL_LINK_IFELSE([ -AC_LANG_SOURCE([ -#include <odb/exception.hxx> - -void -f () -{ -} - -const char* -g () -{ - try - { - f (); - } - catch (const odb::exception& e) - { - return e.what (); - } - return 0; -} - -int -main () -{ - const char* m (g ()); - return m != 0; -} -])], -[libodb_found=yes]) - -if test x"$libodb_found" = xno; then - LIBS="$save_LIBS" - - if test x"$libodb_dir" != x; then - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - fi -fi - -if test x"$libodb_found" = xyes; then - AC_MSG_RESULT([yes]) - $1 -else - AC_MSG_RESULT([no]) - $2 -fi -])dnl diff --git a/m4/libtool-link.m4 b/m4/libtool-link.m4 deleted file mode 100644 index 302639f..0000000 --- a/m4/libtool-link.m4 +++ /dev/null @@ -1,45 +0,0 @@ -dnl file : m4/libtool-link.m4 -dnl license : GNU GPL v2; see accompanying LICENSE file -dnl -dnl -dnl CXX_LIBTOOL_LINK_IFELSE (input, [action-if-true], [action-if-false]) -dnl -dnl Similar to AC_LINK_IFELSE except it uses libtool to perform the -dnl linking and it does this using the C++ compiler. -dnl -AC_DEFUN([CXX_LIBTOOL_LINK_IFELSE],[ -AC_LANG_SAVE -AC_LANG(C++) - -if test -d .libs; then - delete_libs_dir=no -else - delete_libs_dir=yes -fi - -AC_COMPILE_IFELSE([$1], -[ - ac_try='./libtool --tag=CXX --mode=link $CXX -no-install $CXXFLAGS $LDFLAGS -o conftest conftest.$OBJEXT $LIBS >&AS_MESSAGE_LOG_FD' - if _AC_DO_VAR(ac_try); then - libtool_link_ok=yes - else - libtool_link_ok=no - fi -], -[ - libtool_link_ok=no -]) - -if test x"$delete_libs_dir" = xyes; then - rm -rf .libs -fi - -if test x"$libtool_link_ok" = xyes; then -[$2] -: -else -[$3] -: -fi - -AC_LANG_RESTORE])dnl diff --git a/m4/pkgconfig.m4 b/m4/pkgconfig.m4 deleted file mode 100644 index c48ea56..0000000 --- a/m4/pkgconfig.m4 +++ /dev/null @@ -1,11 +0,0 @@ -dnl file : m4/pkgconfig.m4 -dnl license : GNU GPL v2; see accompanying LICENSE file -dnl -AC_DEFUN([PKGCONFIG],[ -AC_ARG_WITH( - [pkgconfigdir], - [AC_HELP_STRING([--with-pkgconfigdir=DIR],[location of pkgconfig dir (default is libdir/pkgconfig)])], - [pkgconfigdir=${withval}], - [pkgconfigdir='${libdir}/pkgconfig']) -AC_SUBST([pkgconfigdir]) -])dnl diff --git a/m4/static-lib.m4 b/m4/static-lib.m4 deleted file mode 100644 index 5fb1c11..0000000 --- a/m4/static-lib.m4 +++ /dev/null @@ -1,17 +0,0 @@ -dnl file : m4/static-lib.m4 -dnl license : GNU GPL v2; see accompanying LICENSE file -dnl -dnl STATIC_LIB(MACRO, DESCRIPTION) -dnl -dnl Define MACRO if we are on MinGW and are only building static library. -dnl -AC_DEFUN([STATIC_LIB], -[ -if test x$enable_shared = xno; then - case $host_os in - mingw*) - AC_DEFINE([$1], [1], [$2]) - ;; - esac -fi -])dnl diff --git a/m4/threads.m4 b/m4/threads.m4 deleted file mode 100644 index 6f2e25f..0000000 --- a/m4/threads.m4 +++ /dev/null @@ -1,68 +0,0 @@ -dnl file : m4/threads.m4 -dnl license : GNU GPL v2; see accompanying LICENSE file -dnl -AC_DEFUN([THREADS],[ - -threads_thread_keyword=no - -AC_ARG_ENABLE( - [threads], - AS_HELP_STRING([--disable-threads], [disable threads (enabled by default)]), - [AS_IF([test x"$enableval" = xno], [threads=none], [threads=check])], - [threads=check]) - -# If thread support is not disabled by the user, figure out what we can use. -# -if test x$threads = xcheck; then - case $host_os in - windows* | mingw*) - case $host_os in - mingw*) - CXXFLAGS="$CXXFLAGS -mthreads" - ;; - esac - - # Newer versions of GCC can be configured to use either Win32 or POSIX - # threads. It appears that -mthreads should be used in both cases but - # if the model is POSIX then GCC will also link -lpthread by default. - # Use that fact to test which model we have. - # - AC_TRY_LINK([#include <pthread.h>], - [pthread_create(0,0,0,0);], - [threads=posix], - [threads=win32]) - ;; - *) - ACX_PTHREAD - - if test x$acx_pthread_ok = xyes; then - threads=posix - LIBS="$LIBS $PTHREAD_LIBS" - CXXFLAGS="$CXXFLAGS $PTHREAD_CXXFLAGS" - - # Check if we can use the __thread keyword. - # - AC_MSG_CHECKING([for __thread keyword]) - - CXX_LIBTOOL_LINK_IFELSE([ - AC_LANG_SOURCE([ - __thread int tls_var; - - int - main () - { - tls_var = 0; - } - ])], - [threads_thread_keyword=yes]) - - AC_MSG_RESULT([$threads_thread_keyword]) - fi - ;; - esac -fi - -if test x$threads = xcheck; then - AC_MSG_ERROR([thread support not available; use --disable-threads to force single-threaded mode]) -fi -])dnl diff --git a/makefile b/makefile deleted file mode 100644 index d771a39..0000000 --- a/makefile +++ /dev/null @@ -1,35 +0,0 @@ -# file : makefile -# license : ODB NCUEL; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))build/bootstrap.make - -dirs := odb/oracle - -default := $(out_base)/ -dist := $(out_base)/.dist -clean := $(out_base)/.clean - -$(default): $(addprefix $(out_base)/,$(addsuffix /,$(dirs))) - -$(dist): export dirs := $(dirs) -$(dist): export docs := LICENSE NCUEL README NEWS version.txt -$(dist): data_dist := INSTALL libodb-oracle-vc8.sln libodb-oracle-vc9.sln \ -libodb-oracle-vc10.sln libodb-oracle-vc11.sln libodb-oracle-vc12.sln -$(dist): exec_dist := bootstrap -$(dist): export extra_dist := $(data_dist) $(exec_dist) -$(dist): export version = $(shell cat $(src_root)/version.txt) - -$(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(dirs))) - $(call dist-data,$(docs) $(data_dist) libodb-oracle.pc.in) - $(call dist-exec,$(exec_dist)) - $(call dist-dir,m4) - $(call meta-automake) - $(call meta-autoconf) - -$(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(dirs))) - -$(call include,$(bld_root)/dist.make) -$(call include,$(bld_root)/meta/automake.make) -$(call include,$(bld_root)/meta/autoconf.make) - -$(foreach d,$(dirs),$(call import,$(src_base)/$d/makefile)) diff --git a/odb/oracle/Makefile.am b/odb/oracle/Makefile.am deleted file mode 100644 index d1dbca8..0000000 --- a/odb/oracle/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -# file : odb/oracle/Makefile.am -# license : ODB NCUEL; see accompanying LICENSE file - -lib_LTLIBRARIES = libodb-oracle.la -libodb_oracle_la_SOURCES = __path__(sources) - -odboracleincludedir = $(includedir)/odb/oracle/ -nobase_odboracleinclude_HEADERS = __path__(headers) -nobase_nodist_odboracleinclude_HEADERS = details/config.h - -EXTRA_DIST = __file__(extra_dist) - -AM_CPPFLAGS= -I'$(top_builddir)' -I'$(top_srcdir)' -DLIBODB_ORACLE_DYNAMIC_LIB -AM_LDFLAGS = -release __value__(interface_version) -no-undefined diff --git a/odb/oracle/libodb-oracle-vc10.vcxproj b/odb/oracle/libodb-oracle-vc10.vcxproj deleted file mode 100644 index 3f4982c..0000000 --- a/odb/oracle/libodb-oracle-vc10.vcxproj +++ /dev/null @@ -1,174 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|x64"> - <Configuration>Debug</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|x64"> - <Configuration>Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>{C47F2161-7F5A-4ADB-8CF3-FDFF1D0ACD5C}</ProjectGuid> - <Keyword>Win32Proj</Keyword> - <RootNamespace>libodb-oracle</RootNamespace> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <LinkIncremental>true</LinkIncremental> - <OutDir>..\..\bin\</OutDir> - <TargetName>odb-oracle-d-__value__(interface_version)-vc10</TargetName> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <LinkIncremental>true</LinkIncremental> - <OutDir>..\..\bin64\</OutDir> - <TargetName>odb-oracle-d-__value__(interface_version)-vc10</TargetName> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <LinkIncremental>false</LinkIncremental> - <OutDir>..\..\bin\</OutDir> - <TargetName>odb-oracle-__value__(interface_version)-vc10</TargetName> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <LinkIncremental>false</LinkIncremental> - <OutDir>..\..\bin64\</OutDir> - <TargetName>odb-oracle-__value__(interface_version)-vc10</TargetName> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBODB_ORACLE_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..</AdditionalIncludeDirectories> - <DisableSpecificWarnings>4355;4800;4290;4251;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings> - </ClCompile> - <Link> - <AdditionalDependencies>odb-d.lib;oci.lib;%(AdditionalDependencies)</AdditionalDependencies> - <SubSystem>Windows</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - <OutputFile>$(TargetPath)</OutputFile> - <ImportLibrary>..\..\lib\odb-oracle-d.lib</ImportLibrary> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <ClCompile> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBODB_ORACLE_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..</AdditionalIncludeDirectories> - <DisableSpecificWarnings>4355;4800;4290;4251;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings> - </ClCompile> - <Link> - <AdditionalDependencies>odb-d.lib;oci.lib;%(AdditionalDependencies)</AdditionalDependencies> - <SubSystem>Windows</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - <OutputFile>$(TargetPath)</OutputFile> - <ImportLibrary>..\..\lib64\odb-oracle-d.lib</ImportLibrary> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <PrecompiledHeader> - </PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBODB_ORACLE_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..</AdditionalIncludeDirectories> - <DisableSpecificWarnings>4355;4800;4290;4251;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings> - </ClCompile> - <Link> - <AdditionalDependencies>odb.lib;oci.lib;%(AdditionalDependencies)</AdditionalDependencies> - <SubSystem>Windows</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - <OutputFile>$(TargetPath)</OutputFile> - <ImportLibrary>..\..\lib\odb-oracle.lib</ImportLibrary> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <PrecompiledHeader> - </PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBODB_ORACLE_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..</AdditionalIncludeDirectories> - <DisableSpecificWarnings>4355;4800;4290;4251;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings> - </ClCompile> - <Link> - <AdditionalDependencies>odb.lib;oci.lib;%(AdditionalDependencies)</AdditionalDependencies> - <SubSystem>Windows</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - <OutputFile>$(TargetPath)</OutputFile> - <ImportLibrary>..\..\lib64\odb-oracle.lib</ImportLibrary> - </Link> - </ItemDefinitionGroup> - <ItemGroup> -__header_entries__(headers) - </ItemGroup> - <ItemGroup> -__source_entries__(sources) - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project> diff --git a/odb/oracle/libodb-oracle-vc10.vcxproj.filters b/odb/oracle/libodb-oracle-vc10.vcxproj.filters deleted file mode 100644 index 1891ddf..0000000 --- a/odb/oracle/libodb-oracle-vc10.vcxproj.filters +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <Filter Include="Source Files"> - <UniqueIdentifier>{0E6C6336-4797-46CD-9081-7B19FAD26843}</UniqueIdentifier> - <Extensions>cxx</Extensions> - </Filter> - <Filter Include="Header Files"> - <UniqueIdentifier>{87786249-9DCA-4FE7-8E98-88D44FC9C7E3}</UniqueIdentifier> - <Extensions>h;hxx;ixx;txx</Extensions> - </Filter> - </ItemGroup> - <ItemGroup> -__header_filter_entries__(headers) - </ItemGroup> - <ItemGroup> -__source_filter_entries__(sources) - </ItemGroup> -</Project> diff --git a/odb/oracle/libodb-oracle-vc11.vcxproj b/odb/oracle/libodb-oracle-vc11.vcxproj deleted file mode 100644 index b422c8c..0000000 --- a/odb/oracle/libodb-oracle-vc11.vcxproj +++ /dev/null @@ -1,178 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|x64"> - <Configuration>Debug</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|x64"> - <Configuration>Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>{C47F2161-7F5A-4ADB-8CF3-FDFF1D0ACD5C}</ProjectGuid> - <Keyword>Win32Proj</Keyword> - <RootNamespace>libodb-oracle</RootNamespace> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v110</PlatformToolset> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v110</PlatformToolset> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v110</PlatformToolset> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v110</PlatformToolset> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <LinkIncremental>true</LinkIncremental> - <OutDir>..\..\bin\</OutDir> - <TargetName>odb-oracle-d-__value__(interface_version)-vc11</TargetName> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <LinkIncremental>true</LinkIncremental> - <OutDir>..\..\bin64\</OutDir> - <TargetName>odb-oracle-d-__value__(interface_version)-vc11</TargetName> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <LinkIncremental>false</LinkIncremental> - <OutDir>..\..\bin\</OutDir> - <TargetName>odb-oracle-__value__(interface_version)-vc11</TargetName> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <LinkIncremental>false</LinkIncremental> - <OutDir>..\..\bin64\</OutDir> - <TargetName>odb-oracle-__value__(interface_version)-vc11</TargetName> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBODB_ORACLE_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..</AdditionalIncludeDirectories> - <DisableSpecificWarnings>4355;4800;4290;4251;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings> - </ClCompile> - <Link> - <AdditionalDependencies>odb-d.lib;oci.lib;%(AdditionalDependencies)</AdditionalDependencies> - <SubSystem>Windows</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - <OutputFile>$(TargetPath)</OutputFile> - <ImportLibrary>..\..\lib\odb-oracle-d.lib</ImportLibrary> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <ClCompile> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBODB_ORACLE_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..</AdditionalIncludeDirectories> - <DisableSpecificWarnings>4355;4800;4290;4251;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings> - </ClCompile> - <Link> - <AdditionalDependencies>odb-d.lib;oci.lib;%(AdditionalDependencies)</AdditionalDependencies> - <SubSystem>Windows</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - <OutputFile>$(TargetPath)</OutputFile> - <ImportLibrary>..\..\lib64\odb-oracle-d.lib</ImportLibrary> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <PrecompiledHeader> - </PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBODB_ORACLE_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..</AdditionalIncludeDirectories> - <DisableSpecificWarnings>4355;4800;4290;4251;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings> - </ClCompile> - <Link> - <AdditionalDependencies>odb.lib;oci.lib;%(AdditionalDependencies)</AdditionalDependencies> - <SubSystem>Windows</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - <OutputFile>$(TargetPath)</OutputFile> - <ImportLibrary>..\..\lib\odb-oracle.lib</ImportLibrary> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <PrecompiledHeader> - </PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBODB_ORACLE_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..</AdditionalIncludeDirectories> - <DisableSpecificWarnings>4355;4800;4290;4251;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings> - </ClCompile> - <Link> - <AdditionalDependencies>odb.lib;oci.lib;%(AdditionalDependencies)</AdditionalDependencies> - <SubSystem>Windows</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - <OutputFile>$(TargetPath)</OutputFile> - <ImportLibrary>..\..\lib64\odb-oracle.lib</ImportLibrary> - </Link> - </ItemDefinitionGroup> - <ItemGroup> -__header_entries__(headers) - </ItemGroup> - <ItemGroup> -__source_entries__(sources) - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project> diff --git a/odb/oracle/libodb-oracle-vc11.vcxproj.filters b/odb/oracle/libodb-oracle-vc11.vcxproj.filters deleted file mode 100644 index 1891ddf..0000000 --- a/odb/oracle/libodb-oracle-vc11.vcxproj.filters +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <Filter Include="Source Files"> - <UniqueIdentifier>{0E6C6336-4797-46CD-9081-7B19FAD26843}</UniqueIdentifier> - <Extensions>cxx</Extensions> - </Filter> - <Filter Include="Header Files"> - <UniqueIdentifier>{87786249-9DCA-4FE7-8E98-88D44FC9C7E3}</UniqueIdentifier> - <Extensions>h;hxx;ixx;txx</Extensions> - </Filter> - </ItemGroup> - <ItemGroup> -__header_filter_entries__(headers) - </ItemGroup> - <ItemGroup> -__source_filter_entries__(sources) - </ItemGroup> -</Project> diff --git a/odb/oracle/libodb-oracle-vc12.vcxproj b/odb/oracle/libodb-oracle-vc12.vcxproj deleted file mode 100644 index 68629d4..0000000 --- a/odb/oracle/libodb-oracle-vc12.vcxproj +++ /dev/null @@ -1,182 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|x64"> - <Configuration>Debug</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|x64"> - <Configuration>Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>{C47F2161-7F5A-4ADB-8CF3-FDFF1D0ACD5C}</ProjectGuid> - <Keyword>Win32Proj</Keyword> - <RootNamespace>libodb-oracle</RootNamespace> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v120</PlatformToolset> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v120</PlatformToolset> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v120</PlatformToolset> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v120</PlatformToolset> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <LinkIncremental>true</LinkIncremental> - <OutDir>..\..\bin\</OutDir> - <TargetName>odb-oracle-d-__value__(interface_version)-vc12</TargetName> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <LinkIncremental>true</LinkIncremental> - <OutDir>..\..\bin64\</OutDir> - <TargetName>odb-oracle-d-__value__(interface_version)-vc12</TargetName> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <LinkIncremental>false</LinkIncremental> - <OutDir>..\..\bin\</OutDir> - <TargetName>odb-oracle-__value__(interface_version)-vc12</TargetName> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <LinkIncremental>false</LinkIncremental> - <OutDir>..\..\bin64\</OutDir> - <TargetName>odb-oracle-__value__(interface_version)-vc12</TargetName> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBODB_ORACLE_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..</AdditionalIncludeDirectories> - <DisableSpecificWarnings>4355;4800;4290;4251;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings> - <SDLCheck>true</SDLCheck> - </ClCompile> - <Link> - <AdditionalDependencies>odb-d.lib;oci.lib;%(AdditionalDependencies)</AdditionalDependencies> - <SubSystem>Windows</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - <OutputFile>$(TargetPath)</OutputFile> - <ImportLibrary>..\..\lib\odb-oracle-d.lib</ImportLibrary> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <ClCompile> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBODB_ORACLE_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..</AdditionalIncludeDirectories> - <DisableSpecificWarnings>4355;4800;4290;4251;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings> - <SDLCheck>true</SDLCheck> - </ClCompile> - <Link> - <AdditionalDependencies>odb-d.lib;oci.lib;%(AdditionalDependencies)</AdditionalDependencies> - <SubSystem>Windows</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - <OutputFile>$(TargetPath)</OutputFile> - <ImportLibrary>..\..\lib64\odb-oracle-d.lib</ImportLibrary> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <PrecompiledHeader> - </PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBODB_ORACLE_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..</AdditionalIncludeDirectories> - <DisableSpecificWarnings>4355;4800;4290;4251;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings> - <SDLCheck>true</SDLCheck> - </ClCompile> - <Link> - <AdditionalDependencies>odb.lib;oci.lib;%(AdditionalDependencies)</AdditionalDependencies> - <SubSystem>Windows</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - <OutputFile>$(TargetPath)</OutputFile> - <ImportLibrary>..\..\lib\odb-oracle.lib</ImportLibrary> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <PrecompiledHeader> - </PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBODB_ORACLE_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..</AdditionalIncludeDirectories> - <DisableSpecificWarnings>4355;4800;4290;4251;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings> - <SDLCheck>true</SDLCheck> - </ClCompile> - <Link> - <AdditionalDependencies>odb.lib;oci.lib;%(AdditionalDependencies)</AdditionalDependencies> - <SubSystem>Windows</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - <OutputFile>$(TargetPath)</OutputFile> - <ImportLibrary>..\..\lib64\odb-oracle.lib</ImportLibrary> - </Link> - </ItemDefinitionGroup> - <ItemGroup> -__header_entries__(headers) - </ItemGroup> - <ItemGroup> -__source_entries__(sources) - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project> diff --git a/odb/oracle/libodb-oracle-vc12.vcxproj.filters b/odb/oracle/libodb-oracle-vc12.vcxproj.filters deleted file mode 100644 index 1891ddf..0000000 --- a/odb/oracle/libodb-oracle-vc12.vcxproj.filters +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <Filter Include="Source Files"> - <UniqueIdentifier>{0E6C6336-4797-46CD-9081-7B19FAD26843}</UniqueIdentifier> - <Extensions>cxx</Extensions> - </Filter> - <Filter Include="Header Files"> - <UniqueIdentifier>{87786249-9DCA-4FE7-8E98-88D44FC9C7E3}</UniqueIdentifier> - <Extensions>h;hxx;ixx;txx</Extensions> - </Filter> - </ItemGroup> - <ItemGroup> -__header_filter_entries__(headers) - </ItemGroup> - <ItemGroup> -__source_filter_entries__(sources) - </ItemGroup> -</Project> diff --git a/odb/oracle/libodb-oracle-vc8.vcproj b/odb/oracle/libodb-oracle-vc8.vcproj deleted file mode 100644 index 9c4876b..0000000 --- a/odb/oracle/libodb-oracle-vc8.vcproj +++ /dev/null @@ -1,352 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="8.00" - Name="libodb-oracle" - ProjectGUID="{AAB7F95D-D83E-46CC-B0DC-D0E6F0A3B7C3}" - RootNamespace="libodb-oracle" - Keyword="Win32Proj" - > - <Platforms> - <Platform - Name="Win32" - /> - <Platform - Name="x64" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\.." - IntermediateDirectory="$(ConfigurationName)" - ConfigurationType="2" - CharacterSet="1" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalOptions="/wd4355 /wd4800 /wd4290 /wd4267" - Optimization="0" - AdditionalIncludeDirectories="..\.." - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBODB_ORACLE_DYNAMIC_LIB" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - UsePrecompiledHeader="0" - WarningLevel="3" - DebugInformationFormat="4" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - CommandLine="if not exist ..\..\lib mkdir ..\..\lib" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="odb-d.lib oci.lib" - OutputFile="$(OutDir)\bin\odb-oracle-d-__value__(interface_version)-vc8.dll" - LinkIncremental="2" - GenerateDebugInformation="true" - SubSystem="2" - ImportLibrary="$(OutDir)\lib\odb-oracle-d.lib" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Debug|x64" - OutputDirectory="..\.." - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" - ConfigurationType="2" - CharacterSet="1" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TargetEnvironment="3" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalOptions="/wd4355 /wd4800 /wd4290 /wd4267" - Optimization="0" - AdditionalIncludeDirectories="..\.." - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBODB_ORACLE_DYNAMIC_LIB" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - UsePrecompiledHeader="0" - WarningLevel="3" - DebugInformationFormat="3" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - CommandLine="if not exist ..\..\lib64 mkdir ..\..\lib64" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="odb-d.lib oci.lib" - OutputFile="$(OutDir)\bin64\odb-oracle-d-__value__(interface_version)-vc8.dll" - LinkIncremental="2" - GenerateDebugInformation="true" - SubSystem="2" - ImportLibrary="$(OutDir)\lib64\odb-oracle-d.lib" - TargetMachine="17" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Release|Win32" - OutputDirectory="..\.." - IntermediateDirectory="$(ConfigurationName)" - ConfigurationType="2" - CharacterSet="1" - WholeProgramOptimization="1" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalOptions="/wd4355 /wd4800 /wd4290 /wd4267" - AdditionalIncludeDirectories="..\.." - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBODB_ORACLE_DYNAMIC_LIB" - RuntimeLibrary="2" - UsePrecompiledHeader="0" - WarningLevel="3" - DebugInformationFormat="3" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - CommandLine="if not exist ..\..\lib mkdir ..\..\lib" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="odb.lib oci.lib" - OutputFile="$(OutDir)\bin\odb-oracle-__value__(interface_version)-vc8.dll" - LinkIncremental="1" - GenerateDebugInformation="true" - SubSystem="2" - OptimizeReferences="2" - EnableCOMDATFolding="2" - ImportLibrary="$(OutDir)\lib\odb-oracle.lib" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Release|x64" - OutputDirectory="..\.." - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" - ConfigurationType="2" - CharacterSet="1" - WholeProgramOptimization="1" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TargetEnvironment="3" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalOptions="/wd4355 /wd4800 /wd4290 /wd4267" - AdditionalIncludeDirectories="..\.." - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBODB_ORACLE_DYNAMIC_LIB" - RuntimeLibrary="2" - UsePrecompiledHeader="0" - WarningLevel="3" - DebugInformationFormat="3" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - CommandLine="if not exist ..\..\lib64 mkdir ..\..\lib64" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="odb.lib oci.lib" - OutputFile="$(OutDir)\bin64\odb-oracle-__value__(interface_version)-vc8.dll" - LinkIncremental="1" - GenerateDebugInformation="true" - SubSystem="2" - OptimizeReferences="2" - EnableCOMDATFolding="2" - ImportLibrary="$(OutDir)\lib64\odb-oracle.lib" - TargetMachine="17" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="Source Files" - Filter="cxx" - UniqueIdentifier="{79E3D0D8-5397-4740-8F55-78430CC50B4A}" - > -__source_entries__(sources) - </Filter> - <Filter - Name="Header Files" - Filter="h;hxx;ixx;txx" - UniqueIdentifier="{BC4D49CA-8943-48B1-8AEB-3E709FF13635}" - > -__file_entries__(headers) - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/odb/oracle/libodb-oracle-vc9.vcproj b/odb/oracle/libodb-oracle-vc9.vcproj deleted file mode 100644 index 0249fb0..0000000 --- a/odb/oracle/libodb-oracle-vc9.vcproj +++ /dev/null @@ -1,359 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9.00" - Name="libodb-oracle" - ProjectGUID="{AAB7F95D-D83E-46CC-B0DC-D0E6F0A3B7C3}" - RootNamespace="libodb-oracle" - Keyword="Win32Proj" - TargetFrameworkVersion="196613" - > - <Platforms> - <Platform - Name="Win32" - /> - <Platform - Name="x64" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\.." - IntermediateDirectory="$(ConfigurationName)" - ConfigurationType="2" - CharacterSet="1" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalOptions="/wd4355 /wd4800 /wd4290 /wd4267" - Optimization="0" - AdditionalIncludeDirectories="..\.." - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBODB_ORACLE_DYNAMIC_LIB" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - UsePrecompiledHeader="0" - WarningLevel="3" - DebugInformationFormat="4" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - CommandLine="if not exist ..\..\lib mkdir ..\..\lib" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="odb-d.lib oci.lib" - OutputFile="$(OutDir)\bin\odb-oracle-d-__value__(interface_version)-vc9.dll" - LinkIncremental="2" - GenerateDebugInformation="true" - SubSystem="2" - ImportLibrary="$(OutDir)\lib\odb-oracle-d.lib" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Debug|x64" - OutputDirectory="..\.." - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" - ConfigurationType="2" - CharacterSet="1" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TargetEnvironment="3" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalOptions="/wd4355 /wd4800 /wd4290 /wd4267" - Optimization="0" - AdditionalIncludeDirectories="..\.." - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBODB_ORACLE_DYNAMIC_LIB" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - UsePrecompiledHeader="0" - WarningLevel="3" - DebugInformationFormat="3" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - CommandLine="if not exist ..\..\lib64 mkdir ..\..\lib64" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="odb-d.lib oci.lib" - OutputFile="$(OutDir)\bin64\odb-oracle-d-__value__(interface_version)-vc9.dll" - LinkIncremental="2" - GenerateDebugInformation="true" - SubSystem="2" - ImportLibrary="$(OutDir)\lib64\odb-oracle-d.lib" - TargetMachine="17" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Release|Win32" - OutputDirectory="..\.." - IntermediateDirectory="$(ConfigurationName)" - ConfigurationType="2" - CharacterSet="1" - WholeProgramOptimization="1" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalOptions="/wd4355 /wd4800 /wd4290 /wd4267" - Optimization="2" - EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\.." - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBODB_ORACLE_DYNAMIC_LIB" - RuntimeLibrary="2" - EnableFunctionLevelLinking="true" - UsePrecompiledHeader="0" - WarningLevel="3" - DebugInformationFormat="3" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - CommandLine="if not exist ..\..\lib mkdir ..\..\lib" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="odb.lib oci.lib" - OutputFile="$(OutDir)\bin\odb-oracle-__value__(interface_version)-vc9.dll" - LinkIncremental="1" - GenerateDebugInformation="true" - SubSystem="2" - OptimizeReferences="2" - EnableCOMDATFolding="2" - ImportLibrary="$(OutDir)\lib\odb-oracle.lib" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Release|x64" - OutputDirectory="..\.." - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" - ConfigurationType="2" - CharacterSet="1" - WholeProgramOptimization="1" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TargetEnvironment="3" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalOptions="/wd4355 /wd4800 /wd4290 /wd4267" - Optimization="2" - EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\.." - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBODB_ORACLE_DYNAMIC_LIB" - RuntimeLibrary="2" - EnableFunctionLevelLinking="true" - UsePrecompiledHeader="0" - WarningLevel="3" - DebugInformationFormat="3" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - CommandLine="if not exist ..\..\lib64 mkdir ..\..\lib64" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="odb.lib oci.lib" - OutputFile="$(OutDir)\bin64\odb-oracle-__value__(interface_version)-vc9.dll" - LinkIncremental="1" - GenerateDebugInformation="true" - SubSystem="2" - OptimizeReferences="2" - EnableCOMDATFolding="2" - ImportLibrary="$(OutDir)\lib64\odb-oracle.lib" - TargetMachine="17" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="Source Files" - Filter="cxx" - UniqueIdentifier="{79E3D0D8-5397-4740-8F55-78430CC50B4A}" - > -__source_entries__(sources) - </Filter> - <Filter - Name="Header Files" - Filter="h;hxx;ixx;txx" - UniqueIdentifier="{BC4D49CA-8943-48B1-8AEB-3E709FF13635}" - > -__file_entries__(headers) - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/odb/oracle/makefile b/odb/oracle/makefile deleted file mode 100644 index d4698b0..0000000 --- a/odb/oracle/makefile +++ /dev/null @@ -1,158 +0,0 @@ -# file : odb/oracle/makefile -# license : ODB NCUEL; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make - -cxx := \ -auto-descriptor.cxx \ -auto-handle.cxx \ -connection.cxx \ -connection-factory.cxx \ -database.cxx \ -error.cxx \ -exceptions.cxx \ -oracle-types.cxx \ -prepared-query.cxx \ -query.cxx \ -query-dynamic.cxx \ -query-const-expr.cxx \ -simple-object-statements.cxx \ -statement.cxx \ -statements-base.cxx \ -tracer.cxx \ -traits.cxx \ -transaction.cxx \ -transaction-impl.cxx \ -details/number.cxx - -cli_tun := details/options.cli -cxx_tun := $(cxx) -cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o) $(cli_tun:.cli=.o)) -cxx_od := $(cxx_obj:.o=.o.d) - -odb_oracle.l := $(out_base)/odb-oracle.l -odb_oracle.l.cpp-options := $(out_base)/odb-oracle.l.cpp-options - -default := $(out_base)/ -dist := $(out_base)/.dist -clean := $(out_base)/.clean - -# Import. -# -$(call import,\ - $(scf_root)/import/cli/stub.make,\ - cli: cli,cli-rules: cli_rules) - -$(call import,\ - $(scf_root)/import/libodb/stub.make,\ - l: odb.l,\ - cpp-options: odb.l.cpp-options) - -$(call import,\ - $(scf_root)/import/liboci/stub.make,\ - l: oci.l,\ - cpp-options: oci.l.cpp-options) - -# Build. -# -$(odb_oracle.l): $(cxx_obj) $(odb.l) $(oci.l) -$(odb_oracle.l.cpp-options): value := -I$(out_root) -I$(src_root) -$(odb_oracle.l.cpp-options): $(odb.l.cpp-options) $(oci.l.cpp-options) - -$(cxx_obj) $(cxx_od): $(odb_oracle.l.cpp-options) $(out_base)/details/config.h - -genf := $(cli_tun:.cli=.hxx) $(cli_tun:.cli=.ixx) $(cli_tun:.cli=.cxx) -gen := $(addprefix $(out_base)/,$(genf)) - -# Don't try to depend on the installed executable. -# -ifneq ($(cli),cli) -$(gen): $(cli) -endif - -$(gen): cli := $(cli) -$(gen): cli_options += \ ---long-usage \ ---generate-specifier \ ---generate-file-scanner \ ---cli-namespace odb::oracle::details::cli \ ---guard-prefix LIBODB_ORACLE_DETAILS - -$(out_base)/details/config.h: | $(out_base)/details/. - @echo '/* file : odb/oracle/details/config.h' >$@ - @echo ' * note : automatically generated' >>$@ - @echo ' */' >>$@ - @echo '' >>$@ - @echo '#ifndef ODB_ORACLE_DETAILS_CONFIG_H' >>$@ - @echo '#define ODB_ORACLE_DETAILS_CONFIG_H' >>$@ - @echo '' >>$@ - @echo '#endif /* ODB_ORACLE_DETAILS_CONFIG_H */' >>$@ - -$(call include-dep,$(cxx_od),$(cxx_obj),$(gen) $(out_base)/details/config.h) - -# Convenience alias for default target. -# -$(out_base)/: $(odb_oracle.l) - -# Dist. -# -$(dist): sources_dist := $(cxx) -$(dist): export sources := $(sources_dist) $(cli_tun:.cli=.cxx) -$(dist): headers_dist = $(subst $(src_base)/,,$(shell find $(src_base) \ --name '*.hxx' -o -name '*.ixx' -o -name '*.txx')) -$(dist): gen_headers := $(cli_tun:.cli=.hxx) $(cli_tun:.cli=.ixx) -$(dist): export headers = $(sort $(headers_dist) $(gen_headers)) -$(dist): gen_dist := $(gen) -$(dist): data_dist := $(cli_tun) details/config.h.in details/config-vc.h -$(dist): export extra_dist := $(data_dist) \ -libodb-oracle-vc8.vcproj libodb-oracle-vc9.vcproj \ -libodb-oracle-vc10.vcxproj libodb-oracle-vc10.vcxproj.filters \ -libodb-oracle-vc11.vcxproj libodb-oracle-vc11.vcxproj.filters \ -libodb-oracle-vc12.vcxproj libodb-oracle-vc12.vcxproj.filters -$(dist): export interface_version = $(shell sed -e \ -'s/^\([0-9]*\.[0-9]*\).*/\1/' $(src_root)/version.txt) - -$(dist): $(gen) - $(call dist-data,$(sources_dist) $(headers_dist) $(data_dist)) - $(call dist-data,$(gen_dist),$(dist_prefix)/odb/oracle/details) - $(call meta-vc8proj,$(src_base)/libodb-oracle-vc8.vcproj) - $(call meta-vc9proj,$(src_base)/libodb-oracle-vc9.vcproj) - $(call meta-vc10proj,$(src_base)/libodb-oracle-vc10.vcxproj) - $(call meta-vc11proj,$(src_base)/libodb-oracle-vc11.vcxproj) - $(call meta-vc12proj,$(src_base)/libodb-oracle-vc12.vcxproj) - $(call meta-automake) - -# Clean. -# -$(clean): $(odb_oracle.l).o.clean \ - $(odb_oracle.l.cpp-options).clean \ - $(addsuffix .cxx.clean,$(cxx_obj)) \ - $(addsuffix .cxx.clean,$(cxx_od)) \ - $(addprefix $(out_base)/,$(cli_tun:.cli=.cxx.cli.clean)) - $(call message,rm $$1,rm -f $$1,$(out_base)/details/config.h) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(odb_oracle.l): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := details/config.h $(genf) -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/dist.make) -$(call include,$(bld_root)/meta/vc8proj.make) -$(call include,$(bld_root)/meta/vc9proj.make) -$(call include,$(bld_root)/meta/vc10proj.make) -$(call include,$(bld_root)/meta/vc11proj.make) -$(call include,$(bld_root)/meta/vc12proj.make) -$(call include,$(bld_root)/meta/automake.make) - -$(call include,$(cli_rules)) -$(call include,$(bld_root)/cxx/o-l.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) diff --git a/repositories.manifest b/repositories.manifest deleted file mode 100644 index 785e0a5..0000000 --- a/repositories.manifest +++ /dev/null @@ -1,10 +0,0 @@ -: 1 -summary: Oracle ODB runtime library repository - -: -role: prerequisite -location: ../libodb.git##HEAD - -: -role: prerequisite -location: https://git.codesynthesis.com/cli/cli.git##HEAD diff --git a/version.txt b/version.txt deleted file mode 100644 index 6bc2f39..0000000 --- a/version.txt +++ /dev/null @@ -1 +0,0 @@ -2.5.0-b.26 |