firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-22 16:43:03 +01:00
Code Issues

Merge branch 'master' into read_consistency

Browse Source
This commit is contained in:
hvlad 2017-12-29 10:55:31 +02:00
parent 7e583e5849
commit ccbf5c724a
658 changed files with 85253 additions and 7848 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@ -9,12 +9,13 @@ dist: trusty
branches:
only:
- master
- B3_0_Release
install:
# wget --no-check-certificate https://www.cmake.org/files/v3.2/cmake-3.2.3-Linux-x86_64.sh
# sudo sh cmake-3.2.3-Linux-x86_64.sh --skip-license --prefix=/usr
- sudo apt-get update
- sudo apt-get install -y libtommath0 libtommath-dev
- sudo apt-get install -y libtommath0 libtommath-dev libtomcrypt0 libtomcrypt-dev
# sudo python -m pip install Mako fdb
# svn co http://svn.code.sf.net/p/firebird/code/qa/fbtest/trunk/ fbtest
# svn co http://svn.code.sf.net/p/firebird/code/qa/fbt-repository/trunk/ fbtest/fbt

3
CHANGELOG.md
View File

@ -62,6 +62,9 @@
Reference(s): [doc/sql.extensions/README.subroutines.txt](https://github.com/FirebirdSQL/firebird/raw/master/doc/sql.extensions/README.subroutines.txt)
Contributor(s): Adriano dos Santos Fernandes
* [CORE-5238](http://tracker.firebirdsql.org/browse/CORE-5238): Replace xinetd support with the native listener
Contributor(s): Alex Peshkoff
* [CORE-5119](http://tracker.firebirdsql.org/browse/CORE-5119): Support autocommit mode in SET TRANSACTION statement
Contributor(s): Dmitry Yemanov

31
CMakeLists.txt
View File

@ -212,7 +212,7 @@ if (UNIX)
set(OS_DIR posix)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -msse4 -std=c++11")
if (NOT CMAKE_CROSSCOMPILING)
set(LIB_readline readline)
@ -322,6 +322,8 @@ endif() # if (NOT CMAKE_CROSSCOMPILING)
crosscompile_prebuild_steps()
include_directories("extern/libtommath")
include_directories("extern/libtomcrypt/src/headers")
include_directories("extern/decNumber")
include_directories("extern/icu/include")
include_directories("extern/zlib")
@ -339,6 +341,33 @@ file(GLOB libtommath_src "extern/libtommath/*.c" "extern/libtommath/*.h")
add_library (libtommath ${libtommath_src})
project_group (libtommath Extern)
########################################
# LIBRARY libtomcrypt
########################################
file(GLOB_RECURSE libtomcrypt_src "extern/libtomcrypt/src/*")
list(FILTER libtomcrypt_src EXCLUDE REGEX ".*aes_tab.c")
list(FILTER libtomcrypt_src EXCLUDE REGEX ".*whirltab.c")
list(FILTER libtomcrypt_src EXCLUDE REGEX ".*sober128tab.c")
add_library (libtomcrypt ${libtomcrypt_src})
target_compile_definitions (libtomcrypt PRIVATE LTC_NO_ROLC)
project_group (libtomcrypt Extern)
########################################
# LIBRARY decNumber
########################################
file(GLOB_RECURSE decNumber_src "extern/decNumber/*.c" "extern/decNumber/*.h")
list(FILTER decNumber_src EXCLUDE REGEX ".*decBasic.c")
list(FILTER decNumber_src EXCLUDE REGEX ".*decCommon.c")
add_library (decNumber ${decNumber_src})
project_group (decNumber Extern)
########################################
# EXECUTABLE btyacc
########################################

1
builds/cmake/Configure.cmake
View File

@ -200,6 +200,7 @@ set(functions_list
accept4
AO_compare_and_swap_full
clock_gettime
ctime_r
dirname
fallocate
fchmod

10
builds/install/arch-specific/aix/classic/makeInstallImage.sh.in
View File

@ -113,7 +113,7 @@ copyFiles() {
mkdir $DestDir/UDF
mkdir $DestDir/misc
mkdir $DestDir/misc/upgrade
for i in ib_udf metadata security; do
for i in metadata security; do
mkdir $DestDir/misc/upgrade/$i
done
@ -184,16 +184,8 @@ copyFiles() {
cp $BuiltFBDir/intl/libfbintl.so $DestDir/intl/fbintl
cp $BuiltFBDir/UDF/ib_udf.so $DestDir/UDF/
cp $BuiltFBDir/UDF/fbudf.so $DestDir/UDF/
# Note that the following items copy files from outside the build tree
# Copy the sql-declarations into the UDF-directory
cp $BuildRootDir/src/extlib/ib_udf.sql $DestDir/UDF/
cp $BuildRootDir/src/extlib/ib_udf2.sql $DestDir/UDF/
cp $BuildRootDir/src/extlib/fbudf/fbudf.sql $DestDir/UDF/
# Copy various documentation
ls $BuildRootDir/doc/*.pdf >/dev/null 2>&1 && cp $BuildRootDir/doc/*.pdf $DestDir/doc
cp $BuildRootDir/doc/sql.extensions/README* $DestDir/doc/sql.extensions

13
builds/install/arch-specific/freebsd/install.sh.in
View File

@ -139,7 +139,7 @@ copyFiles() {
makeDirs "@FB_BINDIR@ @FB_SBINDIR@ @FB_CONFDIR@ @FB_LIBDIR@ @FB_INCDIR@ @FB_DOCDIR@/sql.extensions @FB_UDFDIR@ @FB_SAMPLEDIR@ \
@FB_SAMPLEDBDIR@ @FB_HELPDIR@ @FB_INTLDIR@ @FB_MISCDIR@ @FB_SECDBDIR@ @FB_MSGDIR@ @FB_LOGDIR@ @FB_GUARDDIR@ @FB_PLUGDIR@"
for i in ib_udf metadata security; do
for i in metadata security; do
makeDirs @FB_MISCDIR@/upgrade/$i
done
@ -263,18 +263,7 @@ copyFiles() {
chmod 0755 ${TargetDir}@FB_INTLDIR@/fbintl
chmod 0644 ${TargetDir}@FB_INTLDIR@/fbintl.conf
#UDF
cp $BuiltFBDir/UDF/ib_udf.so ${TargetDir}@FB_UDFDIR@
cp $BuiltFBDir/UDF/fbudf.so ${TargetDir}@FB_UDFDIR@
# Note that the following items copy files from outside the build tree.
# Copy the sql-declarations into the UDF-directory
cp $BuildRootDir/src/extlib/ib_udf.sql ${TargetDir}@FB_UDFDIR@
cp $BuildRootDir/src/extlib/ib_udf2.sql ${TargetDir}@FB_UDFDIR@
cp $BuildRootDir/src/extlib/fbudf/fbudf.sql ${TargetDir}@FB_UDFDIR@
chown root:wheel ${TargetDir}@FB_UDFDIR@/*.so ${TargetDir}@FB_UDFDIR@/*.sql
chmod 0755 ${TargetDir}@FB_UDFDIR@/*.so
chmod 0644 ${TargetDir}@FB_UDFDIR@/*.sql
#doc
cp $BuildRootDir/doc/README.* ${TargetDir}@FB_DOCDIR@

2
builds/install/arch-specific/linux/README
View File

@ -1,4 +1,4 @@
Firebird 3 Server for Linux
Firebird 4 Server for Linux
More information can be found about the Firebird

19
builds/install/arch-specific/linux/makeInstallImage.sh.in
View File

@ -35,7 +35,8 @@ BuildRootDir=..
BuiltFBDir=Release/firebird # Where the just build fb exists.
TargetDir=buildroot # Where we want to build the install image
SecurityDatabase=security4.fdb
TomBuild="@TOMBUILD@"
TomMathBuild="@TOMMATH_BUILD@"
TomCryptBuild="@TOMCRYPT_BUILD@"
#------------------------------------------------------------------------
@ -235,11 +236,16 @@ copyFiles() {
cp -df $BuiltFBDir/lib/libfbclient.so* ${TargetDir}@FB_LIBDIR@
cp -f $BuiltFBDir/lib/libib_util.so ${TargetDir}@FB_LIBDIR@/libib_util.so
if [ "$TomBuild" = "Y" ]; then
if [ "$TomMathBuild" = "Y" ]; then
makeDirs @FB_LIBDIR@/.tm
cp -df $BuildRootDir/extern/libtommath/.libs/libtommath.so* ${TargetDir}@FB_LIBDIR@/.tm
fi
if [ "$TomCryptBuild" = "Y" ]; then
makeDirs @FB_LIBDIR@/.tm
cp -df $BuildRootDir/extern/libtomcrypt/.libs/libtomcrypt.so* ${TargetDir}@FB_LIBDIR@/.tm
fi
chmod 0755 ${TargetDir}@FB_LIBDIR@/*.so*
#plugins
@ -256,17 +262,8 @@ copyFiles() {
chmod 0755 ${TargetDir}@FB_INTLDIR@/fbintl
chmod 0644 ${TargetDir}@FB_INTLDIR@/fbintl.conf
#UDF
cp $BuiltFBDir/UDF/ib_udf.so ${TargetDir}@FB_UDFDIR@
cp $BuiltFBDir/UDF/fbudf.so ${TargetDir}@FB_UDFDIR@
# Note that the following items copy files from outside the build tree.
# Copy the sql-declarations into the UDF-directory
cp $BuildRootDir/src/extlib/ib_udf.sql ${TargetDir}@FB_UDFDIR@
cp $BuildRootDir/src/extlib/ib_udf2.sql ${TargetDir}@FB_UDFDIR@
cp $BuildRootDir/src/extlib/fbudf/fbudf.sql ${TargetDir}@FB_UDFDIR@
chmod 0755 ${TargetDir}@FB_UDFDIR@/*.so
chmod 0644 ${TargetDir}@FB_UDFDIR@/*.sql
#doc
cp $BuildRootDir/doc/*.pdf ${TargetDir}@FB_DOCDIR@

6
builds/install/arch-specific/netbsd/install.sh.in
View File

@ -179,12 +179,6 @@ cp -Rf $BuiltFBDir/lib/libfbclient.so* $DestDir/lib || exit
cp -f $BuiltFBDir/lib/libib_util.so $DestDir/lib/libib_util.so || exit
cp $BuiltFBDir/intl/libfbintl.so $DestDir/intl/fbintl || exit
cp $BuiltFBDir/UDF/ib_udf.so $DestDir/UDF/ || exit
cp $BuiltFBDir/UDF/fbudf.so $DestDir/UDF/ || exit
# Copy the sql-declarations into the UDF-directory
cp $BuildRootDir/src/extlib/ib_udf.sql $DestDir/UDF/ || exit
cp $BuildRootDir/src/extlib/fbudf/fbudf.sql $DestDir/UDF/ || exit
# Note that this copies files from outside the build tree.
echo Installing documentation

268
builds/install/arch-specific/win32/BuildExecutableInstall.bat
View File

@ -104,11 +104,11 @@ set FBBUILD_PROD_STATUS=PROD)
:: Make sure we have everything we need. If something is missing then
:: let's bail out now.
sed --version | findstr version > nul
@if %ERRORLEVEL% GEQ 1 (
call :ERROR Could not locate sed
goto :EOF
) else (@echo o sed found.)
@echo o Checking for sed...
(cmd /c "sed.exe --version 2>&1 | findstr version > nul ") || ( call :ERROR Could not locate sed && @goto :EOF )
@echo o Checking for unix2dos...
(cmd /c "unix2dos.exe --version 2>&1 | findstr version > nul" ) || ( call :ERROR Could not locate unix2dos && @goto :EOF )
if %FBBUILD_ZIP_PACK% EQU 1 (
if not defined SEVENZIP (
@ -142,7 +142,6 @@ if not DEFINED FB_EXTERNAL_DOCS (
goto :EOF
)
)
::End of CHECK_ENVIRONMENT
::------------------------
@ -188,15 +187,15 @@ set FBBUILD_FILE_ID=%FBBUILD_PRODUCT_VER_STRING%-%FBBUILD_PACKAGE_NUMBER%_%FB_TA
@echo s/define compression/define %ISS_COMPRESS%/ >> %temp%.\b$3.txt
@echo s/FBBUILD_PRODUCT_VER_STRING/%FBBUILD_PRODUCT_VER_STRING%/ >> %temp%.\b$3.txt
sed -f %temp%.\b$3.txt FirebirdInstall_30.iss > FirebirdInstall_%FBBUILD_FILE_ID%.iss
sed -f %temp%.\b$3.txt FirebirdInstall.iss > FirebirdInstall_%FBBUILD_FILE_ID%.iss
:: This is a better way of achieving what is done in make_all.bat, but we don't
:: test for sed in that script.
@sed /@UDF_COMMENT@/s/@UDF_COMMENT@/#/ < %FB_ROOT_PATH%\builds\install\misc\firebird.conf.in > %FB_OUTPUT_DIR%\firebird.conf
set FBBUILD_FB30_CUR_VER=%FB_MAJOR_VER%.%FB_MINOR_VER%.%FB_REV_NO%
set FBBUILD_FB_CUR_VER=%FBBUILD_FB30_CUR_VER%
set FBBUILD_FB_LAST_VER=%FBBUILD_FB25_CUR_VER%
set FBBUILD_FB40_CUR_VER=%FB_MAJOR_VER%.%FB_MINOR_VER%.%FB_REV_NO%
set FBBUILD_FB_CUR_VER=%FBBUILD_FB40_CUR_VER%
set FBBUILD_FB_LAST_VER=%FBBUILD_FB30_CUR_VER%
:: Now set some version strings of our legacy releases.
:: This helps us copy the correct documentation,
@ -204,7 +203,8 @@ set FBBUILD_FB_LAST_VER=%FBBUILD_FB25_CUR_VER%
set FBBUILD_FB15_CUR_VER=1.5.6
set FBBUILD_FB20_CUR_VER=2.0.7
set FBBUILD_FB21_CUR_VER=2.1.7
set FBBUILD_FB25_CUR_VER=2.5.5
set FBBUILD_FB25_CUR_VER=2.5.7
set FBBUILD_FB30_CUR_VER=3.0.2
:: Now fix up the major.minor version strings in the readme files.
:: We place output in %FB_GEN_DIR%\readmes
@ -216,6 +216,8 @@ set FBBUILD_FB25_CUR_VER=2.5.5
@echo s/\$MAJOR/%FB_MAJOR_VER%/g > %temp%.\b$4.txt
@echo s/\$MINOR/%FB_MINOR_VER%/g >> %temp%.\b$4.txt
@echo s/\$RELEASE/%FB_REV_NO%/g >> %temp%.\b$4.txt
@echo %FBBUILD_PROD_STATUS% release. Copying Readme_%FBBUILD_PROD_STATUS%.txt Readme.txt
@copy Readme_%FBBUILD_PROD_STATUS%.txt Readme.txt
@for %%f in (Readme.txt installation_readme.txt After_Installation.url) do (
@echo Processing version strings in %%f
@sed -f %temp%.\b$4.txt %%f > %FB_GEN_DIR%\readmes\%%f
@ -243,23 +245,12 @@ del %temp%.\b$?.txt
::=====================
@echo Copying MSVC runtime libraries...
if not exist %FB_OUTPUT_DIR%\system32 (mkdir %FB_OUTPUT_DIR%\system32)
@echo on
@for %%f in ( msvcp%MSVC_VERSION%?.dll msvcr%MSVC_VERSION%?.dll ) do (
if exist "%VCINSTALLDIR%\redist\%PROCESSOR_ARCHITECTURE%\Microsoft.VC%MSVC_VERSION%0.CRT\%%f" (
copy "%VCINSTALLDIR%\redist\%PROCESSOR_ARCHITECTURE%\Microsoft.VC%MSVC_VERSION%0.CRT\%%f" %FB_OUTPUT_DIR%\
)
)
@echo off
@if %ERRORLEVEL% GEQ 1 ( (call :ERROR Copying MSVC runtime library failed with error %ERRORLEVEL% ) & (goto :EOF))
:: grab some missing bits'n'pieces from different parts of the source tree
::=========================================================================
@echo Copying ib_util etc
copy %FB_ROOT_PATH%\src\extlib\ib_util.h %FB_OUTPUT_DIR%\include > nul || (call :WARNING Copying ib_util.h failed.)
copy %FB_ROOT_PATH%\lang_helpers\ib_util.pas %FB_OUTPUT_DIR%\include > nul || (call :WARNING Copying ib_util.pas failed.)
@if %errorlevel% GEQ 1 ( (call :ERROR Copying MSVC runtime library failed with error %errorlevel% ) && (goto :EOF))
@implib.exe | findstr "Borland" > nul
@if errorlevel 0 (
@ -280,6 +271,11 @@ if "%PROCESSOR_ARCHITECTURE%"=="x86" (
@copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\srp\srp.pdb %FB_OUTPUT_DIR%\ > nul
@copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\udr_engine\udr_engine.pdb %FB_OUTPUT_DIR%\ > nul
)
:: Maybe include these and other executables, one day ?
:: @copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\gbak\gbak.pdb %FB_OUTPUT_DIR%\ > nul
:: @copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\gfix\gfix.pdb %FB_OUTPUT_DIR%\ > nul
:: @copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\isql\isql.pdb %FB_OUTPUT_DIR%\ > nul
@echo Started copying docs...
@rmdir /S /Q %FB_OUTPUT_DIR%\doc 2>nul
@ -291,33 +287,37 @@ if "%PROCESSOR_ARCHITECTURE%"=="x86" (
goto :EOF
)
@echo Copying udf library scripts...
for %%v in ( ib_udf.sql ib_udf2.sql ) do (
@copy %FB_ROOT_PATH%\src\extlib\%%v %FB_OUTPUT_DIR%\UDF\%%v > nul
@if %ERRORLEVEL% GEQ 1 (
call :ERROR Copying %FB_ROOT_PATH%\src\extlib\%%v failed.
goto :EOF
)
)
for %%v in ( fbudf.sql fbudf.txt ) do (
copy %FB_ROOT_PATH%\src\extlib\fbudf\%%v %FB_OUTPUT_DIR%\UDF\%%v > nul
@if %ERRORLEVEL% GEQ 1 (
call :ERROR Copying %FB_ROOT_PATH%\src\extlib\%%v failed with error %ERRORLEVEL%
goto :EOF
)
)
:: Various upgrade scripts and docs
mkdir %FB_OUTPUT_DIR%\misc\upgrade\security 2>nul
@copy %FB_ROOT_PATH%\src\misc\upgrade\v3.0\security_* %FB_OUTPUT_DIR%\misc\upgrade\security > nul
@if %ERRORLEVEL% GEQ 1 (
call :ERROR copy %FB_ROOT_PATH%\src\misc\upgrade\v3.0\security_* %FB_OUTPUT_DIR%\misc\upgrade\security failed with error %ERRORLEVEL%.
goto :EOF
)
:: INTL script
@copy %FB_ROOT_PATH%\src\misc\intl.sql %FB_OUTPUT_DIR%\misc\ > nul
@if %ERRORLEVEL% GEQ 1 (
call :ERROR copy %FB_ROOT_PATH%\src\misc\intl.sql %FB_OUTPUT_DIR%\misc failed with error %ERRORLEVEL%.
goto :EOF
)
@echo Copying other documentation...
@copy %FB_GEN_DIR%\readmes\installation_readme.txt %FB_OUTPUT_DIR%\doc\installation_readme.txt > nul
:: WhatsNew doesn't exist at the moment (Alpha1) - perhaps it will turn up later in the release cycle.
:: In any case, if it is not an error if it doesn't exist
@ren %FB_OUTPUT_DIR%\doc\WhatsNew %FB_OUTPUT_DIR%\doc\WhatsNew.txt
:: FIX ME - we now have some .md files and ChangeLog is no longer a monster.
:: Maybe we can just do nothing here.
:: If we are not doing a final release then include stuff that is
:: likely to be of use to testers, especially as our release notes
:: may be incomplete or non-existent
::@if /I "%FBBUILD_PROD_STATUS%"=="DEV" (
:: @copy %FB_ROOT_PATH%\ChangeLog %FB_OUTPUT_DIR%\doc\ChangeLog.txt > nul
::)
@mkdir %FB_OUTPUT_DIR%\doc\sql.extensions 2>nul
@ -334,6 +334,8 @@ if defined FB_EXTERNAL_DOCS (
@echo ... %%v
(@copy /Y %FB_EXTERNAL_DOCS%\%%v %FB_OUTPUT_DIR%\doc\%%v > nul) || (call :WARNING Copying %FB_EXTERNAL_DOCS%\%%v failed.)
)
@echo Finished copying pdf docs...
@echo.
)
:: Clean out text notes that are either not relevant to Windows or
@ -382,8 +384,8 @@ for /R %FB_OUTPUT_DIR%\doc %%v in (.) do (
:: This requires WiX 3.0 to be installed
::============
:: This is only relevent if we are shipping packages built with Visual Studio 2010 (MSVC10)
:: for Firebird 3.0 there are no plans to ship oficial builds with other MSVC runtimes. But we could.
if %MSVC_VERSION% EQU 10 (
:: for Firebird 3.0 there are no plans to ship official builds with other MSVC runtimes. But we could.
if %MSVC_VERSION% EQU 12 (
if not exist %FB_OUTPUT_DIR%\system32\vccrt%MSVC_VERSION%_%FB_TARGET_PLATFORM%.msi (
"%WIX%\bin\candle.exe" -v -sw1091 %FB_ROOT_PATH%\builds\win32\msvc%MSVC_VERSION%\VCCRT_%FB_TARGET_PLATFORM%.wxs -out %FB_GEN_DIR%\vccrt_%FB_TARGET_PLATFORM%.wixobj
"%WIX%\bin\light.exe" -sw1076 %FB_GEN_DIR%\vccrt_%FB_TARGET_PLATFORM%.wixobj -out %FB_OUTPUT_DIR%\system32\vccrt%MSVC_VERSION%_%FB_TARGET_PLATFORM%.msi
@ -430,6 +432,29 @@ endlocal
@goto :EOF
:INCLUDE_DIR
:: Prepare other files needed for deployment to /include dir
setlocal
:: grab some missing bits'n'pieces from different parts of the source tree
::=========================================================================
@echo Copying ib_util etc
@copy %FB_ROOT_PATH%\src\extlib\ib_util.h %FB_OUTPUT_DIR%\include > nul || (call :WARNING Copying ib_util.h failed. && @goto :EOF )
@copy %FB_ROOT_PATH%\lang_helpers\ib_util.pas %FB_OUTPUT_DIR%\include > nul || (call :WARNING Copying ib_util.pas failed. && @goto :EOF )
@echo Copying other include files required for development...
set OUTPATH=%FB_OUTPUT_DIR%\include
@copy %FB_ROOT_PATH%\src\yvalve\perf.h %OUTPATH%\ > nul
@copy %FB_ROOT_PATH%\src\include\gen\firebird.pas %OUTPATH%\firebird\ > nul || (@call :ERROR Failure executing copy %FB_ROOT_PATH%\src\include\gen\firebird.pas %OUTPATH%\firebird\ && @goto :EOF )
@xcopy /e /i /y %FB_ROOT_PATH%\src\include\firebird\impl %OUTPATH%\firebird\ > nul || (@call :ERROR Failure executing @xcopy /e /i /y %FB_ROOT_PATH%\src\include\firebird\* %OUTPATH%\firebird\ && @goto :EOF )
@if %ERRLEV% GEQ 1 goto :END
endlocal
::End of INCLUDE_DIR
::------------------
@goto :EOF
:DB_CONF
:: Generate sample databases file
::===============================
@ -472,30 +497,47 @@ copy %FB_ROOT_PATH%\builds\install\misc\databases.conf.in %FB_OUTPUT_DIR%\databa
@goto :EOF
:SET_CRLF
:: Get a list of all files in the tree make sure
:: that and they all have windows EOL
::===============================================
for /F %%W in ( 'dir %FB_OUTPUT_DIR% /b /a-d /s' ) do (
for %%X in ( txt conf sql c cpp hpp h bat pas e def rc md ) do (
if /I "%%~xW" EQU ".%%X" ( unix2dos --u2d --safe %%W 2>nul >nul )
)
)
::End of SET_CRLF
::-------------
@goto :EOF
:GEN_ZIP
::======
if %FBBUILD_ZIP_PACK% EQU 0 goto :EOF
:: Generate the directory tree to be zipped
@echo - Generate the directory tree to be zipped
set FBBUILD_ZIP_PACK_ROOT=%FB_ROOT_PATH%\builds\zip_pack_%FB_TARGET_PLATFORM%
if not exist %FBBUILD_ZIP_PACK_ROOT% @mkdir %FBBUILD_ZIP_PACK_ROOT% 2>nul
@del /s /q %FBBUILD_ZIP_PACK_ROOT%\ > nul
@copy /Y %FB_OUTPUT_DIR% %FBBUILD_ZIP_PACK_ROOT% > nul
for %%v in (doc doc\sql.extensions help include intl lib udf misc misc\upgrade misc\upgrade\ib_udf misc\upgrade\security misc\upgrade\metadata system32 plugins ) do (
@mkdir %FBBUILD_ZIP_PACK_ROOT%\%%v 2>nul
@dir /A-D %FB_OUTPUT_DIR%\%%v\*.* > nul 2>nul
if not ERRORLEVEL 1 @copy /Y %FB_OUTPUT_DIR%\%%v\*.* %FBBUILD_ZIP_PACK_ROOT%\%%v\ > nul
)
::@copy /Y %FB_OUTPUT_DIR% %FBBUILD_ZIP_PACK_ROOT% > nul
::for %%v in (doc doc\sql.extensions help include intl lib udf misc misc\upgrade\security plugins system32 ) do (
:: @mkdir %FBBUILD_ZIP_PACK_ROOT%\%%v 2>nul
:: @dir /b /a-d /s %FB_OUTPUT_DIR%\%%v\*.* >nul 2>nul
:: if not ERRORLEVEL 1 @copy /Y %FB_OUTPUT_DIR%\%%v\*.* %FBBUILD_ZIP_PACK_ROOT%\%%v\ > nul
::)
@xcopy /Y /E /S %FB_OUTPUT_DIR% %FBBUILD_ZIP_PACK_ROOT% > nul
@if %FB2_EXAMPLES% equ 1 for %%v in (examples examples\api examples\build_win32 examples\dbcrypt examples\empbuild examples\include examples\interfaces examples\package examples\stat examples\udf examples\udr ) do (
@mkdir %FBBUILD_ZIP_PACK_ROOT%\%%v 2>nul
dir %FB_OUTPUT_DIR%\%%v\*.* > nul 2>nul
if not ERRORLEVEL 1 @copy /Y %FB_OUTPUT_DIR%\%%v\*.* %FBBUILD_ZIP_PACK_ROOT%\%%v\ > nul
)
@echo - Add examples to zip tree
@xcopy /Y /E /S %FB_OUTPUT_DIR%\examples\*.* %FBBUILD_ZIP_PACK_ROOT%\examples > nul
::@if %FB2_EXAMPLES% equ 1 for %%v in (examples examples\api examples\build_win32 examples\dbcrypt examples\empbuild examples\include examples\interfaces examples\package examples\stat examples\udf examples\udr ) do (
:: @mkdir %FBBUILD_ZIP_PACK_ROOT%\%%v 2>nul
:: dir %FB_OUTPUT_DIR%\%%v\*.* > nul 2>nul
:: if not ERRORLEVEL 1 @copy /Y %FB_OUTPUT_DIR%\%%v\*.* %FBBUILD_ZIP_PACK_ROOT%\%%v\ > nul
::)
:: Now remove stuff that is not needed.
@echo - Now remove stuff from zip tree that is not needed...
setlocal
set FB_RM_FILE_LIST=doc\installation_readme.txt bin\gpre_boot.exe bin\gpre_static.exe bin\gpre_embed.exe bin\gbak_embed.exe bin\isql_embed.exe bin\gds32.dll bin\btyacc.exe
set FB_RM_FILE_LIST=doc\installation_readme.txt system32\vccrt%MSVC_VERSION%_%FB_TARGET_PLATFORM%.wixpdb icudt52l_empty.dat
for %%v in ( %FB_RM_FILE_LIST% ) do (
@del %FBBUILD_ZIP_PACK_ROOT%\%%v > nul 2>&1
)
@ -509,8 +551,10 @@ if not "%FBBUILD_SHIP_PDB%"=="ship_pdb" (
@del /q %FBBUILD_ZIP_PACK_ROOT%\*.pdb > nul 2>&1
)
:: grab install notes for zip pack
@copy %FB_ROOT_PATH%\doc\install_win32.txt %FBBUILD_ZIP_PACK_ROOT%\doc\README_installation.txt > nul
rmdir /s /q %FBBUILD_ZIP_PACK_ROOT%\examples\build_unix
:: Don't grab old install notes for zip pack - document needs a complete re-write.
::@copy %FB_ROOT_PATH%\doc\install_win32.txt %FBBUILD_ZIP_PACK_ROOT%\doc\README_installation.txt > nul
::End of GEN_ZIP
::--------------
@ -566,8 +610,8 @@ endlocal
::
::=================================================
if %FBBUILD_ISX_PACK% NEQ 1 goto :EOF
@Echo Now let's compile the InnoSetup scripts
@Echo.
@echo Now let's compile the InnoSetup scripts
@echo.
%INNO5_SETUP_PATH%\iscc %FB_ROOT_PATH%\builds\install\arch-specific\win32\FirebirdInstall_%FBBUILD_FILE_ID%.iss
@echo.
@ -649,16 +693,12 @@ if NOT DEFINED GNU_TOOLCHAIN (
:ERROR
::====
:: errorlevel gets reset automatically so capture it before we lose it.
set ERRLEV=%errorlevel%
@echo.
@echo Error in BuildExecutableInstall
@echo Error %ERRLEV% in BuildExecutableInstall
@echo %*
@echo.
popd
:: Attempt to execute a phony command. This will ensure
:: that ERRORLEVEL is set on exit.
cancel_script > nul 2>&1
:: And set ERRLEV in case we are called by run_all.bat
set ERRLEV=1
::End of ERROR
::------------
@goto :EOF
@ -666,25 +706,22 @@ set ERRLEV=1
:WARNING
::======
set ERRLEV=%errorlevel%
@echo.
@echo **** WARNING - Execution of a non-critical component failed.
@echo **** WARNING - Execution of a non-critical component failed with error level %ERRLEV%. ****
@echo %*
@echo.
if "%FBBUILD_PROD_STATUS%"=="PROD" (
@echo.
@echo Production status is Final or Release Candidate
@echo Error must be fixed before continuing
@echo Error %ERRLEV% must be fixed before continuing
@echo.
cancel_script > nul 2>&1
) else (
@set | findstr win > nul 2>&1
)
@goto :EOF
:MAIN
::====
::Check if on-line help is required
for %%v in ( %1 %2 %3 %4 %5 %6 %7 %8 %9 ) do (
( @if /I "%%v"=="-h" (goto :HELP & goto :EOF) )
@ -701,73 +738,81 @@ popd
@if not defined FB2_ISS_DEBUG (set FB2_ISS_DEBUG=0)
@if not defined FB2_EXAMPLES (set FB2_EXAMPLES=1)
@Echo.
@Echo Reading command-line parameters...
@echo.
@echo Reading command-line parameters...
@(@call :SET_PARAMS %* )
@if "%ERRLEV%"=="1" (goto :ERROR %errorlevel% calling SET_PARAMS )
@if "%ERRLEV%"=="1" (@goto :ERROR %errorlevel% calling SET_PARAMS && @goto :END)
@Echo.
@Echo Checking that all required components are available...
@(@call :CHECK_ENVIRONMENT ) || (@echo Error calling CHECK_ENVIRONMENT & @goto :EOF)
@Echo.
@echo.
@echo Checking that all required components are available...
@(@call :CHECK_ENVIRONMENT ) || (@echo Error calling CHECK_ENVIRONMENT && @goto :END)
@echo.
@Echo Setting version number...
@(@call :SED_MAGIC ) || (@echo Error calling SED_MAGIC & @goto :EOF)
@Echo.
@echo Setting version number...
@(@call :SED_MAGIC ) || (@echo Error calling SED_MAGIC && @goto :END)
@echo.
@Echo Copying additional files needed for installation, documentation etc.
@(@call :COPY_XTRA ) || (@echo Error calling COPY_XTRA & @goto :EOF)
@Echo.
@echo Copying additional files needed for installation, documentation etc.
@(@call :COPY_XTRA ) || (@echo Error calling COPY_XTRA && @goto :END )
@echo.
:: WIX is not necessary for a snapshot build, so we don't throw
:: an error if WIX is not defined. On the other hand,
:: if it is there anyway, use it.
if defined WIX (
@Echo Building MSI runtimes
@(@call :BUILD_CRT_MSI ) || (@echo Error calling BUILD_CRT_MSI & @goto :EOF)
@Echo.
@echo Building MSI runtimes
@(@call :BUILD_CRT_MSI ) || (@echo Error calling BUILD_CRT_MSI && @goto :END)
@echo.
)
@Echo Concatenating header files for ibase.h
@(@call :IBASE_H ) || (@echo Error calling IBASE_H & @goto :EOF)
@Echo.
@echo Concatenating header files for ibase.h
@(@call :IBASE_H ) || (@echo Error calling IBASE_H && @goto :END)
@echo.
@Echo Writing databases conf
@(@call :DB_CONF ) || (@echo Error calling DB_CONF & @goto :EOF)
@Echo.
@Echo Copying miscellany such as the QLI help database
@(@call :MISC ) || (@echo Error calling MISC & @goto :EOF)
@Echo.
@Echo Copying firebird.msg
@(@call :FB_MSG ) || (@echo Error calling FB_MSG & @goto :EOF)
@Echo.
@echo Prepare include directory
@(@call :INCLUDE_DIR ) || (@echo Error calling INCLUDE_DIR && @goto :END)
@echo.
@echo Writing databases conf
@(@call :DB_CONF ) || (@echo Error calling DB_CONF && @goto :END)
@echo.
@echo Copying miscellany such as the QLI help database
@(@call :MISC ) || (@echo Error calling MISC & @goto :END)
@echo.
@echo Copying firebird.msg
@(@call :FB_MSG ) || (@echo Error calling FB_MSG && @goto :END)
@echo.
@echo Fix up line endings...
@(@call :SET_CRLF ) || (@echo Error calling SET_CRLF && @goto :EOF)
@echo.
if %FBBUILD_ZIP_PACK% EQU 1 (
@echo Generating image of zipped install
@(@call :GEN_ZIP ) || (@echo Error calling GEN_ZIP & @goto :EOF)
@(@call :GEN_ZIP ) || (@echo Error calling GEN_ZIP && @goto :END)
@echo.
)
::@Echo Creating .local files for libraries
::@(@call :TOUCH_LOCAL ) || (@echo Error calling TOUCH_LOCAL & @goto :EOF)
::@Echo.
::@echo Creating .local files for libraries
::@(@call :TOUCH_LOCAL ) || (@echo Error calling TOUCH_LOCAL & @goto :END)
::@echo.
@(@call :TOUCH_ALL ) || (@echo Error calling TOUCH_ALL & @goto :EOF)
@(@call :TOUCH_ALL ) || (@echo Error calling TOUCH_ALL && @goto :END)
@echo.
if %FBBUILD_ZIP_PACK% EQU 1 (
@echo Zipping files for zip pack
@(@call :ZIP_PACK ) || (@echo Error calling ZIP_PACK & @goto :EOF)
@(@call :ZIP_PACK ) || (@echo Error calling ZIP_PACK && @goto :END)
@echo.
)
if %FBBUILD_ISX_PACK% EQU 1 (
@(@call :ISX_PACK ) || (@echo Error calling ISX_PACK & @goto :EOF)
@(@call :ISX_PACK ) || (@echo Error calling ISX_PACK && @goto :END)
@echo.
)
@(@call :DO_MD5SUMS ) || (@echo Error calling DO_MD5SUMS & @goto :EOF)
@(@call :DO_MD5SUMS ) || (@echo Error calling DO_MD5SUMS && @goto :END)
@echo.
@ -777,10 +822,11 @@ if %FBBUILD_ISX_PACK% EQU 1 (
::@if %FB2_ISS_DEBUG% equ 0 (ENDLOCAL)
::End of MAIN
::-----------
@goto :EOF
@goto :END
:END
popd
exit /b

161
builds/install/arch-specific/win32/FirebirdInstall_30.iss → builds/install/arch-specific/win32/FirebirdInstall.iss
View File

@ -51,7 +51,7 @@
;Hard code some defaults to aid debugging and running script standalone.
;In practice, these values are set in the environment and we use the env vars.
#define MajorVer "3"
#define MajorVer "4"
#define MinorVer "0"
#define PointRelease "0"
#define BuildNumber "0"
@ -120,7 +120,8 @@
;------If necessary we can turn off i18n by uncommenting this undefine
;#undef i18n
;------In general this is a good idea for alpha and beta releases.
#undef i18n
;----- If we are debugging the script (and not executed from command prompt)
;----- there is no guarantee that the environment variable exists. However an
@ -200,10 +201,10 @@
#if PlatformTarget == "x64"
#define WOW64Dir="output_win32"
#endif
#define msvc_version 10
#define msvc_version 12
;BaseVer should be used for all v2.5.n installs.
;This allows us to upgrade silently from 2.5.m to 2.5.n
;BaseVer should be used for all MajorVer.MinorVer installs.
;This allows us to upgrade silently from MajorVer.MinorVer.m to MajorVer.MinorVer.n
#define BaseVer MajorVer + "_" + MinorVer
#define AppVer MajorVer + "_" + MinorVer
#define GroupnameVer MajorVer + "." + MinorVer
@ -214,8 +215,9 @@
#define FB21_cur_ver GetEnv("FBBUILD_FB21_CUR_VER")
#define FB25_cur_ver GetEnv("FBBUILD_FB25_CUR_VER")
#define FB30_cur_ver GetEnv("FBBUILD_FB30_CUR_VER")
#define FB_cur_ver FB30_cur_ver
#define FB_last_ver FB25_cur_ver
#define FB40_cur_ver GetEnv("FBBUILD_FB40_CUR_VER")
#define FB_cur_ver FB40_cur_ver
#define FB_last_ver FB30_cur_ver
; We can save space by shipping a pdb package that just includes
; the pdb files. It would then upgrade an existing installation,
@ -308,12 +310,12 @@ Name: en; MessagesFile: compiler:Default.isl; InfoBeforeFile: {#GenDir}\installa
Name: ba; MessagesFile: compiler:Languages\Bosnian.isl; InfoBeforeFile: {#GenDir}\ba\Instalacija_ProcitajMe.txt; InfoAfterFile: {#GenDir}\ba\ProcitajMe.txt;
Name: cz; MessagesFile: compiler:Languages\Czech.isl; InfoBeforeFile: {#GenDir}\cz\instalace_ctime.txt; InfoAfterFile: {#GenDir}\cz\ctime.txt;
Name: fr; MessagesFile: compiler:Languages\French.isl; InfoBeforeFile: {#GenDir}\fr\installation_lisezmoi.txt; InfoAfterFile: {#GenDir}\fr\lisezmoi.txt;
Name: de; MessagesFile: compiler:Languages\German.isl; InfoBeforeFile: {#GenDir}\de\installation_liesmich.txt; InfoAfterFile: {#GenDir}\de\liesmich.txt;
Name: es; MessagesFile: compiler:Languages\Spanish.isl; InfoBeforeFile: {#GenDir}\es\leame_instalacion.txt; InfoAfterFile: {#GenDir}\es\leame.txt;
Name: hu; MessagesFile: compiler:Languages\Hungarian.isl; InfoBeforeFile: {#GenDir}\hu\telepitesi_segedlet.txt; InfoAfterFile: {#GenDir}\hu\olvass_el.txt;
Name: it; MessagesFile: compiler:Languages\Italian.isl; InfoBeforeFile: {#GenDir}\it\leggimi_installazione.txt; InfoAfterFile: {#GenDir}\it\leggimi.txt
Name: pl; MessagesFile: compiler:Languages\Polish.isl; InfoBeforeFile: {#GenDir}\pl\instalacja_czytajto.txt; InfoAfterFile: {#GenDir}\pl\czytajto.txt;
Name: pt; MessagesFile: compiler:Languages\Portuguese.isl; InfoBeforeFile: {#GenDir}\pt\instalacao_leia-me.txt; InfoAfterFile: {#GenDir}\pt\leia-me.txt
;Name: de; MessagesFile: compiler:Languages\German.isl; InfoBeforeFile: {#GenDir}\de\installation_liesmich.txt; InfoAfterFile: {#GenDir}\de\liesmich.txt;
;Name: es; MessagesFile: compiler:Languages\Spanish.isl; InfoBeforeFile: {#GenDir}\es\leame_instalacion.txt; InfoAfterFile: {#GenDir}\es\leame.txt;
;Name: hu; MessagesFile: compiler:Languages\Hungarian.isl; InfoBeforeFile: {#GenDir}\hu\telepitesi_segedlet.txt; InfoAfterFile: {#GenDir}\hu\olvass_el.txt;
;Name: it; MessagesFile: compiler:Languages\Italian.isl; InfoBeforeFile: {#GenDir}\it\leggimi_installazione.txt; InfoAfterFile: {#GenDir}\it\leggimi.txt
;Name: pl; MessagesFile: compiler:Languages\Polish.isl; InfoBeforeFile: {#GenDir}\pl\instalacja_czytajto.txt; InfoAfterFile: {#GenDir}\pl\czytajto.txt;
;Name: pt; MessagesFile: compiler:Languages\Portuguese.isl; InfoBeforeFile: {#GenDir}\pt\instalacao_leia-me.txt; InfoAfterFile: {#GenDir}\pt\leia-me.txt
Name: ru; MessagesFile: compiler:Languages\Russian.isl; InfoBeforeFile: {#GenDir}\ru\installation_readme.txt; InfoAfterFile: {#GenDir}\ru\readme.txt;
;Name: si; MessagesFile: compiler:Languages\Slovenian.isl; InfoBeforeFile: {#GenDir}\si\instalacija_precitajMe.txt; InfoAfterFile: {#GenDir}\readme.txt;
#endif
@ -340,18 +342,20 @@ Name: ru; MessagesFile: compiler:Languages\Russian.isl; InfoBeforeFile: {#GenDir
#include "ba\custom_messages_ba.inc"
#include "cz\custom_messages_cz.inc"
#include "fr\custom_messages_fr.inc"
#include "de\custom_messages_de.inc"
#include "es\custom_messages_es.inc"
#include "hu\custom_messages_hu.inc"
#include "it\custom_messages_it.inc"
#include "pl\custom_messages_pl.inc"
#include "pt\custom_messages_pt.inc"
;#include "de\custom_messages_de.inc"
;#include "es\custom_messages_es.inc"
;#include "hu\custom_messages_hu.inc"
;#include "it\custom_messages_it.inc"
;#include "pl\custom_messages_pl.inc"
;#include "pt\custom_messages_pt.inc"
#include "ru\custom_messages_ru.inc"
;#include "si\custom_messages_si.inc"
#endif
#ifdef iss_debug
; *** Note - this comment section needs revision - only aplicable to ansi installer???
; *** Note - this comment section needs revision or deletion.
; It is only applicable to the ansi installer, which is no longer
; supported for Firebird 3
; By default, the languages available at runtime depend on the user's
; code page. A user with the Western European code page set will not
; even see that we support installation with the czech language
@ -376,23 +380,23 @@ Name: ClientComponent; Description: {cm:ClientComponent}; Types: ServerInstall D
[Tasks]
;Server tasks
Name: UseClassicServerTask; Description: {cm:RunCS}; GroupDescription: {cm:ServerTaskDescription}; Components: ServerComponent; MinVersion: 4.0,4.0; Flags: exclusive; Check: ConfigureFirebird;
Name: UseSuperClassicTask; Description: {cm:RunSC}; GroupDescription: {cm:ServerTaskDescription}; Components: ServerComponent; MinVersion: 4.0,4.0; Flags: exclusive; Check: ConfigureFirebird;
Name: UseSuperClassicTask\UseGuardianTask; Description: {cm:UseGuardianTask}; Components: ServerComponent; MinVersion: 4.0,4.0; Flags: unchecked dontinheritcheck;Check: ConfigureFirebird;
Name: UseClassicServerTask; Description: {cm:RunCS}; GroupDescription: {cm:ServerTaskDescription}; Components: ServerComponent; MinVersion: 4.0,4.0; Flags: exclusive unchecked; Check: ConfigureFirebird;
Name: UseSuperClassicTask; Description: {cm:RunSC}; GroupDescription: {cm:ServerTaskDescription}; Components: ServerComponent; MinVersion: 4.0,4.0; Flags: exclusive unchecked; Check: ConfigureFirebird;
Name: UseSuperClassicTask\UseGuardianTask; Description: {cm:UseGuardianTask}; Components: ServerComponent; MinVersion: 4.0,4.0; Flags: unchecked dontinheritcheck; Check: ConfigureFirebird;
Name: UseSuperServerTask; Description: {cm:RunSS}; GroupDescription: {cm:ServerTaskDescription}; Components: ServerComponent; MinVersion: 4.0,4.0; Flags: exclusive; Check: ConfigureFirebird;
Name: UseSuperServerTask\UseGuardianTask; Description: {cm:UseGuardianTask}; Components: ServerComponent; MinVersion: 4.0,4.0; Flags: unchecked dontinheritcheck; Check: ConfigureFirebird;
Name: UseApplicationTask; Description: {cm:UseApplicationTaskMsg}; GroupDescription: {cm:TaskGroupDescription}; Components: ServerComponent; MinVersion: 4,4; Flags: exclusive; Check: ConfigureFirebird;
Name: UseApplicationTask; Description: {cm:UseApplicationTaskMsg}; GroupDescription: {cm:TaskGroupDescription}; Components: ServerComponent; MinVersion: 4,4; Flags: exclusive unchecked; Check: ConfigureFirebird;
Name: UseServiceTask; Description: {cm:UseServiceTask}; GroupDescription: {cm:TaskGroupDescription}; Components: ServerComponent; MinVersion: 0,4; Flags: exclusive; Check: ConfigureFirebird;
Name: AutoStartTask; Description: {cm:AutoStartTask}; Components: ServerComponent; MinVersion: 4,4; Check: ConfigureFirebird;
;Name: MenuGroupTask; Description: Create a Menu &Group; Components: DevAdminComponent; MinVersion: 4,4
;Copying of client libs to <sys>
Name: CopyFbClientToSysTask; Description: {cm:CopyFbClientToSysTask}; Components: ClientComponent; MinVersion: 4,4; Flags: Unchecked; Check: ShowCopyFbClientLibTask;
Name: CopyFbClientToSysTask; Description: {cm:CopyFbClientToSysTask}; Components: ClientComponent; MinVersion: 4,4; Check: ShowCopyFbClientLibTask;
Name: CopyFbClientAsGds32Task; Description: {cm:CopyFbClientAsGds32Task}; Components: ClientComponent; MinVersion: 4,4; Flags: Unchecked; Check: ShowCopyGds32Task;
Name: EnableLegacyClientAuth; Description: {cm:EnableLegacyClientAuth}; Components: ClientComponent; MinVersion: 4,4; Flags: Unchecked; Check: ConfigureAuthentication;
[Run]
#if msvc_version == 10
#if msvc_version >= 10
Filename: msiexec.exe; Parameters: "/qn /i ""{tmp}\vccrt{#msvc_version}_Win32.msi"" /L*v ""{tmp}\vccrt{#msvc_version}_Win32.log"" "; StatusMsg: "Installing MSVC 32-bit runtime libraries to system directory"; Check: HasWI30; Components: ClientComponent;
#if PlatformTarget == "x64"
Filename: msiexec.exe; Parameters: "/qn /i ""{tmp}\vccrt{#msvc_version}_x64.msi"" /L*v ""{tmp}\vccrt{#msvc_version}_x64.log"" "; StatusMsg: "Installing MSVC 64-bit runtime libraries to system directory"; Check: HasWI30; Components: ClientComponent;
@ -436,7 +440,7 @@ Name: {group}\Firebird Server; Filename: {app}\firebird.exe; Parameters: {code:S
Name: {group}\Firebird Guardian; Filename: {app}\fbguard.exe; Parameters: {code:StartAppParams}; Flags: runminimized; MinVersion: 4.0,4.0; Check: InstallGuardianIcon; IconIndex: 1; Components: ServerComponent; Comment: Run Firebird Server (with guardian);
Name: {group}\Firebird ISQL Tool; Filename: {app}\isql.exe; Parameters: -z; WorkingDir: {app}; MinVersion: 4.0,4.0; Comment: {cm:RunISQL}
Name: {group}\Firebird {#FB_cur_ver} Release Notes; Filename: {app}\doc\Firebird_v{#FB_cur_ver}.ReleaseNotes.pdf; MinVersion: 4.0,4.0; Comment: {#MyAppName} {cm:ReleaseNotes}
;Name: {group}\Firebird {#GroupnameVer} Quick Start Guide; Filename: {app}\doc\Firebird-2.5-QuickStart.pdf; MinVersion: 4.0,4.0; Comment: {#MyAppName} {#FB_cur_ver}
;Name: {group}\Firebird {#GroupnameVer} Quick Start Guide; Filename: {app}\doc\Firebird-{#MajorVer}-QuickStart.pdf; MinVersion: 4.0,4.0; Comment: {#MyAppName} {#FB_cur_ver}
Name: "{group}\After Installation"; Filename: "{app}\doc\After_Installation.url"; Comment: "New User? Here's a quick guide to what you should do next."
Name: "{group}\Firebird Web-site"; Filename: "{app}\doc\firebirdsql.org.url"
;Always install the original english version
@ -460,12 +464,12 @@ Source: {#GenDir}\readme.txt; DestDir: {app}; Components: DevAdminComponent; Fla
Source: {#GenDir}\ba\*.txt; DestDir: {app}\doc; Components: DevAdminComponent; Flags: ignoreversion; Languages: ba;
Source: {#GenDir}\cz\*.txt; DestDir: {app}\doc; Components: DevAdminComponent; Flags: ignoreversion; Languages: cz;
Source: {#GenDir}\fr\*.txt; DestDir: {app}\doc; Components: DevAdminComponent; Flags: ignoreversion; Languages: fr;
Source: {#GenDir}\de\*.txt; DestDir: {app}\doc; Components: DevAdminComponent; Flags: ignoreversion; Languages: de;
Source: {#GenDir}\es\*.txt; DestDir: {app}\doc; Components: DevAdminComponent; Flags: ignoreversion; Languages: es;
Source: {#GenDir}\hu\*.txt; DestDir: {app}\doc; Components: DevAdminComponent; Flags: ignoreversion; Languages: hu;
Source: {#GenDir}\it\*.txt; DestDir: {app}\doc; Components: DevAdminComponent; Flags: ignoreversion; Languages: it;
Source: {#GenDir}\pl\*.txt; DestDir: {app}\doc; Components: DevAdminComponent; Flags: ignoreversion; Languages: pl;
Source: {#GenDir}\pt\*.txt; DestDir: {app}\doc; Components: DevAdminComponent; Flags: ignoreversion; Languages: pt;
;Source: {#GenDir}\de\*.txt; DestDir: {app}\doc; Components: DevAdminComponent; Flags: ignoreversion; Languages: de;
;Source: {#GenDir}\es\*.txt; DestDir: {app}\doc; Components: DevAdminComponent; Flags: ignoreversion; Languages: es;
;Source: {#GenDir}\hu\*.txt; DestDir: {app}\doc; Components: DevAdminComponent; Flags: ignoreversion; Languages: hu;
;Source: {#GenDir}\it\*.txt; DestDir: {app}\doc; Components: DevAdminComponent; Flags: ignoreversion; Languages: it;
;Source: {#GenDir}\pl\*.txt; DestDir: {app}\doc; Components: DevAdminComponent; Flags: ignoreversion; Languages: pl;
;Source: {#GenDir}\pt\*.txt; DestDir: {app}\doc; Components: DevAdminComponent; Flags: ignoreversion; Languages: pt;
Source: {#GenDir}\ru\*.txt; DestDir: {app}\doc; Components: DevAdminComponent; Flags: ignoreversion; Languages: ru;
;Source: {#GenDir}\si\*.txt; DestDir: {app}\doc; Components: DevAdminComponent; Flags: ignoreversion; Languages: si;
#endif
@ -524,15 +528,15 @@ Source: {#WOW64Dir}\msvcp{#msvc_version}?.dll; DestDir: {app}\WOW64; Components:
#endif
#endif /* if msvc_version >= 10 */
#if msvc_version == 10
;Try to install CRT libraries to <sys> via msi, _IF_ msvc_version is 10.
#if msvc_version >= 10
;Try to install CRT libraries to <sys> via msi, _IF_ msvc_version is 10 or later.
#if PlatformTarget == "x64"
;MinVersion 0,5.0 means no version of Win9x and at least Win2k if NT O/S
;In addition, O/S must have Windows Installer 3.0.
Source: {#FilesDir}\system32\vccrt10_x64.msi; DestDir: {tmp}; Check: HasWI30; MinVersion: 0,5.0; Components: ClientComponent;
Source: {#WOW64Dir}\system32\vccrt10_Win32.msi; DestDir: {tmp}; Check: HasWI30; MinVersion: 0,5.0; Components: ClientComponent;
Source: {#FilesDir}\system32\vccrt{#msvc_version}_x64.msi; DestDir: {tmp}; Check: HasWI30; MinVersion: 0,5.0; Components: ClientComponent;
Source: {#WOW64Dir}\system32\vccrt{#msvc_version}_Win32.msi; DestDir: {tmp}; Check: HasWI30; MinVersion: 0,5.0; Components: ClientComponent;
#else
Source: {#FilesDir}\system32\vccrt10_Win32.msi; DestDir: {tmp}; Check: HasWI30; MinVersion: 0,5.0; Components: ClientComponent;
Source: {#FilesDir}\system32\vccrt{#msvc_version}_Win32.msi; DestDir: {tmp}; Check: HasWI30; MinVersion: 0,5.0; Components: ClientComponent;
#endif
#endif
@ -544,7 +548,7 @@ Source: {#FilesDir}\doc\sql.extensions\*.*; DestDir: {app}\doc\sql.extensions; C
;Other stuff
Source: {#FilesDir}\help\*.*; DestDir: {app}\help; Components: DevAdminComponent; Flags: ignoreversion;
Source: {#FilesDir}\include\*.*; DestDir: {app}\include; Components: DevAdminComponent; Flags: ignoreversion;
Source: {#FilesDir}\include\*.*; DestDir: {app}\include; Components: DevAdminComponent; Flags: ignoreversion recursesubdirs createallsubdirs;
Source: {#FilesDir}\intl\fbintl.dll; DestDir: {app}\intl; Components: ServerComponent; Flags: sharedfile ignoreversion;
Source: {#FilesDir}\intl\fbintl.conf; DestDir: {app}\intl; Components: ServerComponent; Flags: onlyifdoesntexist
Source: {#FilesDir}\lib\*.*; DestDir: {app}\lib; Components: DevAdminComponent; Flags: ignoreversion;
@ -556,6 +560,7 @@ Source: {#FilesDir}\UDF\fbudf.dll; DestDir: {app}\UDF; Components: ServerCompone
Source: {#FilesDir}\UDF\*.sql; DestDir: {app}\UDF; Components: ServerComponent; Flags: ignoreversion;
Source: {#FilesDir}\UDF\*.txt; DestDir: {app}\UDF; Components: ServerComponent; Flags: ignoreversion;
Source: {#FilesDir}\plugins.conf; DestDir: {app}; Components: ServerComponent; Flags: ignoreversion;
Source: {#FilesDir}\plugins\*.dll; DestDir: {app}\plugins; Components: ServerComponent; Flags: ignoreversion;
Source: {#FilesDir}\plugins\*.conf; DestDir: {app}\plugins; Components: ServerComponent; Flags: ignoreversion;
@ -627,20 +632,11 @@ Var
// no other working installation is found (unless we are installing
// over the same version)
//These three command-line options change the default behaviour
// during a scripted install
// They also control whether their associated task checkboxes are displayed
// during an interactive install
NoCPL: Boolean; // pass /nocpl on command-line.
NoGdsClient: Boolean; // pass /nogds32 on command line.
CopyFbClient: Boolean; // pass /copyfbclient on command line.
// Options for scripted uninstall.
CleanUninstall: Boolean; // If /clean is passed to the uninstaller it will delete
// user config files - firebird.conf, firebird.log,
// databases.conf, fbtrace.conf and the security database.
SYSDBAName: String; // Name of SYSDBA
SYSDBAPassword: String; // SYSDBA password
#ifdef setuplogging
@ -665,18 +661,14 @@ begin
{ Create a page to grab the new SYSDBA password }
AdminUserPage := CreateInputQueryPage(wpSelectTasks,
'Create a password for the Database System Administrator'
, 'Or click through to use the default password of ''masterkey''. ' + #13#10
' *** Note - in Firebird 3 masterkey and masterke are different passwords. ***'
, ''
);
AdminUserPage.Add('SYSDBA Name:', False);
AdminUserPage.Add('Password:', True);
AdminUserPage.Add('Retype Password:', True);
ExpandConstant( '{cm:CreateSYSDBAPassword}' )
, ExpandConstant( '{cm:ClickThroughPWCreation}' ) + #13#10 +
ExpandConstant( '{cm:PasswordNote}' ) , '' );
AdminUserPage.Add( ExpandConstant( '{cm:SYSDBAPassword}' ), True);
AdminUserPage.Add( ExpandConstant( '{cm:RetypeSYSDBAPassword}' ), True);
AdminUserPage.Values[0] := SYSDBAName;
AdminUserPage.Values[0] := SYSDBAPassword;
AdminUserPage.Values[1] := SYSDBAPassword;
AdminUserPage.Values[2] := SYSDBAPassword;
end;
@ -693,9 +685,11 @@ begin
CommandLine:=GetCmdTail;
if ((pos('HELP',Uppercase(CommandLine)) > 0) or
(pos('--',Uppercase(CommandLine)) > 0) or
(pos('/?',Uppercase(CommandLine)) > 0) or
(pos('/H',Uppercase(CommandLine)) > 0) ) then begin
(pos('--',Uppercase(CommandLine)) > 0) )
// or
// (pos('/?',Uppercase(CommandLine)) > 0) or // InnoSetup displays its own help if these switches are passed.
// (pos('/H',Uppercase(CommandLine)) > 0) ) // Note also that our help scren only appears after the Choose Language dialogue :-(
then begin
ShowHelpDlg;
result := False;
Exit;
@ -705,21 +699,10 @@ begin
if pos('FORCE',Uppercase(CommandLine)) > 0 then
ForceInstall:=True;
// For now we disable installation of the cpl applet until it is fixed.
// if pos('NOCPL', Uppercase(CommandLine)) > 0 then
NoCPL := True;
if pos('NOGDS32', Uppercase(CommandLine)) > 0 then
NoGdsClient := True;
if pos('COPYFBCLIENT', Uppercase(CommandLine)) > 0 then
CopyFbClient := True;
cmdParams := TStringList.create;
for i:=0 to ParamCount do begin
cmdParams.add(ParamStr(i));
if pos('SYSDBANAME', Uppercase(ParamStr(i)) ) > 0 then
SYSDBAName := Copy(ParamStr(i),Length('/SYSDBANAME=')+1,Length(ParamStr(i))-Length('/SYSDBANAME=') );
if pos('SYSDBAPASSWORD', Uppercase(ParamStr(i)) ) > 0 then
SYSDBAPassword := Copy(ParamStr(i),Length('/SYSDBAPASSWORD=')+1,Length(ParamStr(i))-Length('/SYSDBAPASSWORD=') );
end;
@ -864,15 +847,13 @@ end;
function GetAdminUserName: String;
begin
Result := AdminUserPage.Values[0];
if Result = '' then
Result := 'SYSDBA';
Result := 'SYSDBA';
end;
function GetAdminUserPassword: String;
begin
Result := AdminUserPage.Values[1];
Result := AdminUserPage.Values[0];
if Result = '' then
Result := 'masterkey';
end;
@ -885,10 +866,10 @@ var
AStringList: TStringList;
TempDir: String;
ResultCode: Integer;
TempStr: string;
CmdStr: string;
begin
TempDir := ExpandConstant( '{tmp}' );
TempStr := ExpandConstant( '{app}\isql.exe' );
CmdStr := ExpandConstant( '{app}\isql.exe' );
AStringList := TStringList.create;
with AStringList do begin
Add( 'create user ' + GetAdminUserName + ' password ''' + GetAdminUserPassword + ''' using plugin Srp;' );
@ -899,7 +880,7 @@ begin
Add( 'exit;' );
SaveToFile( Tempdir +'\temp.sql' );
end;
Result := Exec( ExpandConstant( '{app}\isql.exe' ) , ' -m -m2 -user SYSDBA -i ' + TempDir + '\temp.sql -o ' + TempDir + '\temp.sql.txt employee ' , TempDir, SW_HIDE, ewWaitUntilTerminated, ResultCode );
Result := Exec( CmdStr , ' -m -m2 -user SYSDBA -i ' + TempDir + '\temp.sql -o ' + TempDir + '\temp.sql.txt employee ' , TempDir, SW_HIDE, ewWaitUntilTerminated, ResultCode );
DeleteFile( TempDir + +'\temp.sql ');
end;
@ -1061,7 +1042,7 @@ var
begin
case CurStep of
ssInstall: begin
RenamePreFB3RC1Files;
// RenamePreFB3RC1Files;
SetupSharedFilesArray;
GetSharedLibCountBeforeCopy;
end;
@ -1233,30 +1214,18 @@ function NextButtonClick(CurPageID: Integer): Boolean;
var
i: integer;
begin
{ check user has entered sysdba password correctly. }
Result := True;
Result := True;
case CurPageID of
AdminUserPage.ID : begin
if not (AdminUserPage.Values[0] = '') and (AdminUserPage.Values[1] = '') then begin
Result := False;
MsgBox(ExpandConstant('{cm:SYSDBAPasswordEmpty}'), mbError, MB_OK);
end;
i := CompareStr(AdminUserPage.Values[1],AdminUserPage.Values[2]);
{ check user has entered new sysdba password correctly. }
i := CompareStr(AdminUserPage.Values[0],AdminUserPage.Values[1]);
If not (i = 0) then begin
Result := False;
AdminUserPage.Values[0] :='';
AdminUserPage.Values[1] :='';
AdminUserPage.Values[2] :='';
MsgBox(ExpandConstant('{cm:SYSDBAPasswordMismatch}'), mbError, MB_OK);
end;
end;
(* wpSelectDir : begin
if PreFB3RC1InstallDetected then begin
MsgBox(ExpandConstant('{cm:PreFB3RC1VersionInstalled}'), mbError, MB_OK)
Result := false;
end;
end;
*)
end;
end;

36
builds/install/arch-specific/win32/FirebirdInstallEnvironmentChecks.inc
View File

@ -106,6 +106,8 @@ Const
FB25_x64_Install = 14;
FB30Install = 15;
FB30_x64_Install = 16;
Current32Install = FB30Install;
Current64Install = FB30_x64_Install;
MaxProdInstalled = FB30_x64_Install;
@ -127,6 +129,8 @@ Const
FB21_x64 = $04000;
FB25_x64 = $08000;
FB30_x64 = $10000;
CurFB32 = FB30;
CurFB64 = FB30_x64;
// Likely gds32 version strings for installed versions of Firebird or InterBase are:
// [6,0,n,n] InterBase 6.0
@ -992,8 +996,8 @@ end;
function ShowInstallCPLAppletTask: boolean;
begin
//If NOCPL is on the command line then don't offer the task in UI mode.
result := ((not NoCPL) and ConfigureFirebird);
// result := ((not NoCPL) and ConfigureFirebird);
result := false;
end;
@ -1008,30 +1012,22 @@ end;
function CopyGds32: boolean;
begin
//Note that we invert the value of NOGDSCLIENT so we provide the
//correct answer to the question 'Do we copy GDS32 to <sys>' which is
//the default behaviour.
result := False;
if ConfigureFirebird then begin
//If one of these is false then either the commandline switch was passed
//or the user unchecked the Copy client as GDS32 box
result := ( (not NoGdsClient) AND (IsTaskSelected('CopyFbClientAsGds32Task') ));
result := ( IsTaskSelected( 'CopyFbClientAsGds32Task' ) );
end;
end;
function ShowCopyGds32Task: boolean;
begin
//If NOGDS32 is on the command line then don't offer the task in UI mode.
result := ((not NoGdsClient) and ConfigureFirebird);
result := ( ConfigureFirebird );
end;
function CopyFbClientLib: boolean;
begin
//Note that the default for this is the opposite to CopyGds32.
//result := ( (CopyFbClient) OR (ShouldProcessEntry('ClientComponent', 'CopyFbClientToSysTask')= srYes) );
result := ( (not CopyFbClient) AND (IsTaskSelected('CopyFbClientToSysTask') ));
result := ( IsTaskSelected( 'CopyFbClientToSysTask' ) );
end;
@ -1040,7 +1036,7 @@ function ShowCopyFbClientLibTask: boolean;
begin
result := False;
if ConfigureFirebird then
result := ((not CopyFbClient) and ConfigureFirebird);
result := ( ConfigureFirebird );
end;
@ -1091,12 +1087,12 @@ end;
for i:=0 to ProductsInstalledCount-1 do
InstallSummary := InstallSummary + InstallSummaryArray[i] + #13;
// If FB21 is installed and installed platform does not match current platform
// If older firebird is installed and installed platform does not match product we are installing
// then notify user.
#if PlatformTarget == "x64"
If ((ProductsInstalled AND FB21_x64 ) = FB21_x64 ) then
if ((ProductsInstalled AND CurFB64 ) = CurFB64 ) then
#else
If ((ProductsInstalled AND FB21 ) = FB21 ) then
if ((ProductsInstalled AND CurFB32 ) = CurFB32 ) then
#endif
InstallSummary := InstallSummary
+#13 + ExpandConstant('{cm:InstallSummarySuffix1}')
@ -1167,7 +1163,7 @@ begin
end;
procedure RenamePreFB3RC1Files;
{ procedure RenamePreFB3RC1Files;
//The method of specifying the architecture used changed after Beta 2
//Detect this old config and rename it.
var
@ -1178,10 +1174,10 @@ begin
if pos('SharedDatabase', FirebirdConfStr) > 0 then begin
RenameFile(GetAppPath+'\firebird.conf', GetAppPath+'\firebird.conf.preRC1');
RenameFile(GetAppPath+'\security4.fdb', GetAppPath+'\security4.fdb.preRC1');
end
end
end
end;
}
function ConfigureAuthentication: boolean;
begin

51
builds/install/arch-specific/win32/Readme_DEV.txt Normal file
View File

@ -0,0 +1,51 @@
====================================
Firebird $MAJOR.$MINOR.$RELEASE (Alpha/Beta Windows Build)
====================================
o Introduction
o Intended Users
o Reporting Bugs
Introduction
============
Welcome to Firebird $MAJOR.$MINOR.
Intended Users
==============
This is an alpha or beta release of Firebird $MAJOR.$MINOR.
It is intended for test purposes only and is not
considered ready for use in production.
o DO NOT STORE CRITICAL DATA USING THIS TEST VERSION
Databases created by this release may not be
compatible with future releases of Firebird $MAJOR.$MINOR.
o Please make sure you read the installation
readme and the release notes.
Reporting Bugs
==============
This is an experimental version.
DO NOT REPORT A BUG IN THIS RELEASE
unless you really know what you are doing.
Check first on the firebird-devel list. If you
don't know where the firebird-devel list is then
you shouldn't be using this version of Firebird!
Please don't use the Firebird-devel list for
technical support unless the question specifically
relates to a new feature in Firebird $MAJOR.$MINOR
Happy Testing!
From the Firebird team.

0
builds/install/arch-specific/win32/Readme.txt → builds/install/arch-specific/win32/Readme_PROD.txt
View File

18
builds/install/arch-specific/win32/ba/Instalacija_ProcitajMe.txt
View File

@ -1,5 +1,5 @@
Firebird Database Server $MAJOR.$MINOR.$RELEASE (Release Candidate 2)
========================================================
Firebird Database Server $MAJOR.$MINOR.$RELEASE
===============================================
Ovaj dokument je vodic za instalaciju ovog paketa
Firebird-a $MAJOR.$MINOR za Windows platformu. Ovaj tekst
@ -21,7 +21,7 @@ Sadrzaj
o Prije instalacije
o Deployment gds32.dll
o Instalacija Guardian-a
o Re-instalacija Firebird-a 3
o Re-instalacija Firebird-a
o Poznati problemi u vezi s instalacijom
o Deinstalacija
o Instalacija batch datotekom
@ -37,8 +37,8 @@ fbclient.dll i gds32.dll uklonjeni iz <system32>.
Pogledajte UNINSTALL sekciju ispod za vise informacija o ovome.
Ako ste instalirali beta ili alpha verziju
firebird-a 3, instalacija ce preimenovati firebid.conf i
security3.fdb jer ove datoteke vise nisu kompatibilne.
firebird-a, instalacija ce preimenovati firebird.conf i
security4.fdb jer ove datoteke vise nisu kompatibilne.
Deployment gds32.dll
@ -64,12 +64,12 @@ SuperServer ili SuperClassic, onda je ponudjen
ali nije izabran po default-u.
Re-instalacija Firebird-a 3
-----------------------------
Re-instalacija Firebird-a
-------------------------
Instalacioni program radi sve sto moze da detektuje i
sacuva prethodnu instalaciju. Ako instalacija detektuje
firebird.conf ili security3.fdb onda nece ponuditi
firebird.conf ili security4.fdb onda nece ponuditi
opciju da instalira legacy_auth. Niti ce ponuditi
opciju da postavi SYSDBA username i password.
@ -127,7 +127,7 @@ o Deinstalacija ostavlja 5 datoteka u install
- firebird.conf
- fbtrace.conf
- firebird.log
- security3.fdb
- security4.fdb
Ovo je uradjeno namjerno. Ove datoteke su sve
potencijalno modifikovane od strane korisnika i mogu

9
builds/install/arch-specific/win32/ba/custom_messages_ba.inc
View File

@ -57,7 +57,6 @@ ba.IconUninstall=Deinstalacija Firebird-a %1
ba.ReleaseNotes= release notes. (Potreban je Acrobat Reader.)
ba.InstallationGuide= installation guide. (Potreban je Acrobat Reader.)
ba.BugFixes= bug fixes. (Potreban je Acrobat Reader.)
ba.Uninstall=Deinstalacija Firebird-a %1
ba.Winsock2Web1=Winsock 2 nije instaliran.
ba.Winsock2Web2=Želite li da posjetite Winsock 2 Update Home Page?
@ -81,4 +80,10 @@ ba.initSecurityDb=Dodavanje SYSDBA u security database.
ba.SYSDBAPasswordMismatch=Lozinke se ne slažu. Molimo ponovo unesite lozinku za SYSDBA korisnika.
ba.SYSDBAPasswordEmpty=Lozinka je prazna. Morate unijeti lozinku za SYSDBA korisnika.
ba.EnableLegacyClientAuth=Omogući a&utorizaciju za stare (legacy) Firebird klijente?
ba.CreateSYSDBAPassword=Postavite lozinku za Database System Administrator-a
ba.ClickThroughPWCreation=Ili samo kliknite da koristite default lozinku masterkey.
ba.PasswordNote=*** Vazno - u Firebird-u 3 masterkey i masterke su razlicite lozinke. ***
ba.SYSDBAPassword=SYSDBA lozinka:
ba.RetypeSYSDBAPassword=Ponovite SYSDBA lozinku:
ba.InstallingMSVC32runtimes=Instaliram MSVC 32-bit runtime biblioteke u system directory
ba.InstallingMSVC64runtimes=Instaliram MSVC 64-bit runtime biblioteke u system directory

8
builds/install/arch-specific/win32/custom_messages.inc
View File

@ -80,3 +80,11 @@ en.initSecurityDb=Adding SYSDBA to security database.
en.SYSDBAPasswordMismatch=Password entry mismatch. Please re-enter the SYSDBA password.
en.SYSDBAPasswordEmpty=Password is empty. You must enter a password for SYSDBA.
en.EnableLegacyClientAuth=Enable a&uthorization for legacy Firebird clients?
en.CreateSYSDBAPassword=Create a password for the Database System Administrator
en.ClickThroughPWCreation=Or click through to use the default password of masterkey.
en.PasswordNote=*** Note - in Firebird 3 masterkey and masterke are different passwords. ***
en.SYSDBAPassword=SYSDBA Password:
en.RetypeSYSDBAPassword=Retype SYSDBA Password:
en.InstallingMSVC32runtimes=Installing MSVC 32-bit runtime libraries to system directory
en.InstallingMSVC64runtimes=Installing MSVC 64-bit runtime libraries to system directory

104
builds/install/arch-specific/win32/cz/custom_messages_cz.inc
View File

@ -1,58 +1,58 @@
cz.MyAppName=Databázový server Firebird %1
cz.ServerInstall=Plná instalace serveru a vývojových nástrojù.
cz.SuperServerInstall=Plná instalace Super serveru a vývojových nástrojù.
cz.ClassicServerInstall=Plná instalace Classic serveru a vývojových nástrojù.
cz.DeveloperInstall=Instalace klientských nástrojù pro vývojáøe a databázové administrátory.
cz.ClientInstall=Minimální klientská instalace - bez serveru èi nástrojù.
cz.ServerInstall=Plná instalace serveru a vývojových nástrojů.
cz.SuperServerInstall=Plná instalace Super serveru a vývojových nástrojů.
cz.ClassicServerInstall=Plná instalace Classic serveru a vývojových nástrojů.
cz.DeveloperInstall=Instalace klientských nástrojů pro vývojáře a databázové administrátory.
cz.ClientInstall=Minimální klientská instalace - bez serveru či nástrojů.
cz.CustomInstall=Uživatelská instalace
cz.SuperServerComponent=Super server binárka
cz.ClassicServerComponent=Classic server binárka
cz.ServerComponent=Serverové souèásti
cz.ServerComponent=Serverové součásti
cz.DevAdminComponent=Nástroje pro vývoj a správu
cz.ClientComponent=Klientské souèásti
cz.UseGuardianTask=Použít &Hlídaèe pro øízení serveru?
cz.UseApplicationTaskMsg=Spouštìt jako &Aplikaci?
cz.TaskGroupDescription=Spouštìt Firebird server jako:
cz.UseServiceTask=Spouštìt jako &Službu?
cz.AutoStartTask=Spustit &Firebird automaticky pøi startu systému?
cz.SuperClassicTask="Použít SuperClassic?"
cz.CopyFbClientToSysTask=Kopírovat &Firebird klientskou knihovnu do složky <system>?
cz.CopyFbClientAsGds32Task=Vytvoøit klientskou knihovnu GDS32.DLL pro podporu &závislých aplikací?
cz.InstallCPLAppletTask="Nainstalovat ovladaè do Ocládacích &Panelù?"
cz.instreg=Aktualizování registrù
cz.ClientComponent=Klientské součásti
cz.UseGuardianTask=Použít &Hlídače pro řízení serveru?
cz.UseApplicationTaskMsg=Spouštět jako &Aplikaci?
cz.TaskGroupDescription=Spouštět Firebird server jako:
cz.UseServiceTask=Spouštět jako &Službu?
cz.AutoStartTask=Spustit &Firebird automaticky při startu systému?
cz.SuperClassicTask=Použít SuperClassic?
cz.CopyFbClientToSysTask=Kopírovat Firebird &klientskou knihovnu do složky <system>?
cz.CopyFbClientAsGds32Task=Vytvořit klientskou knihovnu GDS32.DLL pro podporu &starších aplikací?
cz.InstallCPLAppletTask=Nainstalovat ovladač do Ocládacích &Panelů?
cz.instreg=Aktualizování registrů
cz.instclientCopyFbClient=Kopírování fbclient do složky <sys>
cz.instclientGenGds32=Vytváøení gds32.dll do složky <sys>
cz.instclientDecLibCountGds32="Snížení èítaèe a pøípadné odstranìní sdílené knihovny pro gds32."
cz.instclientDecLibCountFbClient="Snížení èítaèe a pøípadné odstranìní sdílené knihovny pro fbclient."
cz.instclientGenGds32=Vytváření gds32.dll do složky <sys>
cz.instclientDecLibCountGds32=Snížení čítače a případné odstranění sdílené knihovny pro gds32.
cz.instclientDecLibCountFbClient=Snížení čítače a případné odstranění sdílené knihovny pro fbclient.
cz.instsvcSetup=Nastavování služby
cz.instsvcStartQuestion=Spustit službu Firebird nyní?
cz.instsvcStartMsg=Spouštìní služby serveru
cz.instsvcStopMsg="Zastavování služby"
cz.instsvcRemove="Odstraòování služby"
cz.instsvcStartMsg=Spouštění služby serveru
cz.instsvcStopMsg=Zastavování služby
cz.instsvcRemove=Odstraňování služby
cz.instappStartQuestion=Spustit Firebird nyní?
cz.instappStartMsg=Spouštìní aplikace serveru
cz.instappStartMsg=Spouštění aplikace serveru
cz.InstallSummarySuffix1=Tato verze Firebirdu se stane výchoz instalací.
cz.InstallSummarySuffix2=Pamatujte, že instalování této verze Firebirdu,
cz.InstallSummarySuffix3= když je již nainstalována verze novìjší,
cz.InstallSummarySuffix4= mùže mít nepøedvídatelné výsledky.
cz.InstallSummarySuffix3= když je již nainstalována verze novější,
cz.InstallSummarySuffix4= může mít nepředvídatelné výsledky.
cz.InstallSummaryCancel1= Pokud budete v této instalaci pokraèovat, Firebird bude nainstalován, ale nebude nastaven.
cz.InstallSummaryCancel2= Instalaci budete muset dokonèit ruènì.
cz.InstallSummaryCancel3= Chcete pøerušit tuto instalaci?
cz.InstallSummaryCancel1= Pokud budete v této instalaci pokračovat, Firebird bude nainstalován, ale nebude nastaven.
cz.InstallSummaryCancel2= Instalaci budete muset dokončit ručně.
cz.InstallSummaryCancel3= Chcete přerušit tuto instalaci?
cz.InstalledProducts=Pøedinstalaèní kontrola nalezla existujicí Firebird %s èi Interbase %s.
cz.InstalledProducts=Předinstalační kontrola nalezla existujicí Firebird %s či Interbase %s.
cz.InstalledProdCountSingular=verze
cz.InstalledProdCountPlural=verzí
cz.FbRunning1=Stávající Firebird %s server je spuštìný.
cz.FbRunning2= Døíve, než budete pokraèovat, musíte
cz.FbRunning3= ukonèit program èi službu.
cz.FbRunning1=Stávající Firebird %s server je spuštěný.
cz.FbRunning2= Dříve, než budete pokračovat, musíte
cz.FbRunning3= ukončit program či službu.
cz.PreviousInstallBroken= (Z dùvodu chybného oznaèení verze, se instalace zdá být poškozena.)
cz.PreviousInstallGood= (Instalace se zdá být v poøádku.)
cz.PreviousInstallBroken= (Z důvodu chybného označení verze, se instalace zdá být poškozena.)
cz.PreviousInstallGood= (Instalace se zdá být v pořádku.)
cz.IconReadme=Firebird %1 èti mì
cz.IconReadme=Firebird %1 čti mě
cz.IconUninstall=Odinstalovat Firebird %1
cz.ReleaseNotes= poznámky k vydání. (Vyžaduje Acrobat Reader.)
cz.InstallationGuide= návod k instalaci. (Vyžaduje Acrobat Reader.)
@ -60,20 +60,32 @@ cz.BugFixes= opravené chyby. (Vyžaduje Acrobat Reader.)
cz.Uninstall=Odinstalovat Firebird %1
cz.Winsock2Web1=Není nainstalovaný Winsock 2.
cz.Winsock2Web2=Chcete navštívit domovskou stránku aktualizace Winsock 2?
cz.NoWinsock2=Než budete pokraèovat, nainstalujte prosím aktualizaci Winsock 2.
cz.NoWinsock2=Než budete pokračovat, nainstalujte prosím aktualizaci Winsock 2.
cz.MSWinsock2Update=http://www.microsoft.com/windows95/downloads/contents/WUAdminTools/S_WUNetworkingTools/W95Sockets2/Default.asp
cz.RunCSNoGuardian=Spustit Firebird Classic server (bez hlídaèe)
cz.RunSSNoGuardian=Spustit Firebird Super server (bez hlídaèe)
cz.RunSSWithGuardian=Spustit Firebird Super server (s hlídaèem)
cz.RunCSWithGuardian=Spustit Firebird Classic server (s hlídaèem)
cz.RunISQL=Spustit interaktivní SQL nástroj založený na pøíkazové øádce
cz.RunCSNoGuardian=Spustit Firebird Classic server (bez hlídače)
cz.RunSSNoGuardian=Spustit Firebird Super server (bez hlídače)
cz.RunSSWithGuardian=Spustit Firebird Super server (s hlídačem)
cz.RunCSWithGuardian=Spustit Firebird Classic server (s hlídačem)
cz.RunISQL=Spustit interaktivní SQL nástroj založený na příkazové řádce
cz.ReadmeFile=ctime.txt
cz.InstallationReadmeFile=instalace_ctime.txt
;cz.IncompleteTranslationNotice=Tento dokument není aktuální. Pro poslední informace, prosím, nahlédnìte do originální anglické dokumentace.
cz.RunCS=Spustit Firebird Classic server
cz.RunSC=Spustit Firebird SuperClassic server
cz.RunSS=Spustit Firebird SuperServer
cz.IncompleteTranslationNotice=Tento dokument není aktuální. Pro poslední informace, prosím, nahlédněte do originální anglické dokumentace.
cz.RunCS=Spustit Firebird v módu Classic server
cz.RunSC=Spustit Firebird v módu SuperClassic server
cz.RunSS=Spustit Firebird v módu SuperServer
cz.ServerTaskDescription=Zvolte architekturu serveru:
cz.initSecurityDb=Přidat SYSDBA do bezpečnostní databáze.
cz.SYSDBAPasswordMismatch=Zadané heslo nesouhlasí. Zadejte prosím heslo pro SYSDBA znovu.
cz.SYSDBAPasswordEmpty=Není zadané heslo. Heslo pro SYSDBA musíte zadat.
cz.EnableLegacyClientAuth=Povolit &ověření starších klientů Firebirdu?
cz.CreateSYSDBAPassword=Vytvořit heslo pro systémového správce databáze
cz.ClickThroughPWCreation=Nebo klepněte pro použití výchozího hesla masterkey.
cz.PasswordNote=*** Pozor - ve Firebirdu 3 jsou masterkey a masterke dvě odlišná hesla. ***
cz.SYSDBAPassword=Heslo pro SYSDBA:
cz.RetypeSYSDBAPassword=Znovu heslo pro SYSDBA:
cz.InstallingMSVC32runtimes=Instaluji 32bitové běhové knihovny MSVC do systémové složky
cz.InstallingMSVC64runtimes=Instaluji 64bitové běhové knihovny MSVC do systémové složky

149
builds/install/arch-specific/win32/cz/instalace_ctime.txt
View File

@ -1,7 +1,148 @@
Databázový server Firebird $MAJOR.$MINOR.$RELEASE
==================================================
=======================================================
Tento dokument je návod pro instalaci tohoto balíčku
Firebird $MAJOR.$MINOR na platformě Windows. Zdejší poznámky
odkazují spíše na balíček samotný, než obecně na
Firebird $MAJOR.$MINOR. Navíc jsou tyto poznámky
primárně zaměřeny na uživatele spustitelného instalátoru.
Předpokládá se, že čtenář tohoto dokumentu je již
obeznámen s Firebirdem. Pokud přecházíte
na Firebird $MAJOR.$MINOR přímo z Fb 2.5, doporučujeme
vám pro zjištění změn pročíst dokumentaci Fb $MAJOR.$MINOR.
Obsah
-----
o Před instalací
o Instalace gds32.dll
o Instalace Hlídače
o Reinstalace Firebird $MAJOR.$MINOR
o Známé problémy instalace
o Odinstalace
o Instalace z dávkového souboru
Před instalací
--------------
Doporučuje se před instalací tohoto balíčku
ODINSTALOVAT všechny předchozí verze Firebirdu
či InterBase. Je zvláště důležité zkontrolovat,
že fbclient.dll a gds32.dll byly odstraněny
ze složky <system32>. Pro více informací o tom,
viz část ODINSTALACE níže.
Máte-li nainstalovanou beta či alpha verzi
Firebirdu $MAJOR.$MINOR, instalátor přejmenuje firebird.conf
a security3.fdb, jelikož tyto soubory již nejsou kompatibilní.
Instalace gds32.dll
-------------------
Tato knihovna pro kompatibilitu už nebude nadále
implicitně instalována do systémové složky Windows.
Avšak zůstává jako volba při instalaci.
Instalace Hlídače
-----------------
Doufáme v možné vyřazení Hlídače. Hlídač nefunguje
s Classic serverem a binární instalátor jej při instalaci
nenabízí, pokud je navolen Classic server.
Pokud je zvolen SeperServer, nebo SuperClassic, volba
Hlídače je dostupná, ale standardně vypnutá.
Reinstalace of Firebird $MAJOR.$MINOR
---------------------------
Instalační program dělá vše pro detekci a zachování předchozí instalace.
Jestliže instalátor rozpozná firebird.conf či security3.fdb, nebude
nabízet možnost instalace legacy_auth. Rovněž nebude nabízet
volbu pro nastavení hesla pro SYSDBA.
Známé problémy instalace
------------------------
o Binární instalátor je možné použít pouze
k instalaci výchozí instance Firebird $MAJOR.$MINOR.
Pokud chcete instalovat další pojmenované
instance, musíte je nainstalovat ručně
z instalačního balíčku zip.
o Bohužel, instalátor nedokáže spolehlivě detekovat
předchozí běžící verzi Firebirdu, spuštěnou jako
Classic Server.
o Instalátor služby (instsvc) využívá stejné implicitní
pojmenování pro 32bitovou i 64bitovou instalaci.
To je záměr. Služba se nachází v jediném jmenném prostoru.
o Instalaci určitě spouštějte jako správce. Tj., pokud použijete
binární instalátor, klepněte pravým tlačítkem myši a zvolte
'Spustit jako správce'. Jinak instalátor nebude schopen spustit
službu Firebird na konci instalace.
o Jestliže nebyly správně nainstalované běhové knihovný
MS, selže načtení knihoven uvolněných pomocí
instclient. V takovém případfě by uživatel měl
nainstalovat příslušnou verzi vcredist.exe, jak bylo
zmíněno výše.
Odinstalace
-----------
o Je upřednostňované, aby tento balíček byl
správně odinstalován použitím dodávané
odinstalční aplikace. Tato může být spuštěna
z Ovládacích panelů. Jinak může být odinstalován
spuštěním unins000.exe přímo z instalační
složky.
o Pokud Firebird běží jako aplikace (místo jako
služba), je doporučeno abyste před spuštením
odinstalátoru ručně zastavili server.
To protože odinstalátor nemůže ukončit běžící
aplikaci. Pokud server během odinstalace beží,
odinstalace skončí chybou. Pozůstalé soubory
musíte vymazat ručně.
o Odinstalace v instalační složce zanechá
čtyri soubory:
- databases.conf
- firebird.conf
- fbtrace.conf
- firebird.log
- security3.fdb
To je záměr. Všechny tyto soubory jsou
potencionálně pozměnitelné uživatelem a
mohou být potřeba, pokud někdy v budoucnu
bude Firebird reinstalovaný. Pokud nejsou více
třeba, mohou být odstraněny.
o Nová funkce odinstalátoru je možnost spustit
jej s parametrem /CLEAN. To provede kontrolu
počítadel sdílených souborů pro každý z výše
uvedených souborů. V případě možnosti budou
soubory odstraněny.
Instalace z dávkového souboru
-----------------------------
Instalační program lze spustit z dávkového souboru.
Pro úplnou informaci se prosím přečtěte dokument:
instalace_davkova.txt
------------------------------------------------------
Documentation for Firebird $MAJOR.$MINOR is not yet available.
-------------------------------------------------------

2
builds/install/arch-specific/win32/fr/custom_messages_fr.inc
View File

@ -85,7 +85,7 @@ fr.CreateSYSDBAPassword=Créer un mot de passe pour l'Administrateur Système
fr.ClickThroughPWCreation=Ou cliquer pour utiliser le mote de passe par défaut masterkey.
fr.PasswordNote=*** Note - avec Firebird 3 masterkey et masterke sont des mots de passe différents. ***
fr.SYSDBAPassword=Mot de passe SYSDBA:
fr.RetypeSYSDBAPassword=Confirmer le mote de passe SYSDBA:
fr.RetypeSYSDBAPassword=Confirmer le mot de passe SYSDBA:
fr.InstallingMSVC32runtimes=Installer les bibliothèques MSVC 32-bit dans le répertoire système
fr.InstallingMSVC64runtimes=Installer les bibliothèques MSVC 64-bit dans le répertoire système

6
builds/install/arch-specific/win32/fr/installation_lisezmoi.txt
View File

@ -28,7 +28,7 @@ Contenu
o Avant l'installation
o Déployement de gds32.dll
o Installation du Guardian
o Réinstallation de Firebird 3
o Réinstallation de Firebird
o Problèmes connus d'installation
o Desinstallation
o Installation depuis un fichier batch
@ -44,7 +44,7 @@ Il est particulièrement important de vérifier que
fbclient.dll et gds32.dll ont été retirés de <system32>.
Si vous avez installé une version beta ou alpha de Firebird $MAJOR.$MINOR,
l'installeur va renommer firebird.conf et security3.fdb, car ces
l'installeur va renommer firebird.conf et security4.fdb, car ces
fichiers ne sont plus compatibles avec la version actuelle.
@ -131,7 +131,7 @@ o La désinstallation laisse cinq fichiers dans le
- firebird.conf
- fbtrace.conf
- firebird.log
- security3.fdb
- security4.fdb
Ceci est intentionnel. Ces fichiers sont tous
potentiellement modifiables par les utilisateurs et peuvent

5
builds/install/arch-specific/win32/i18n_readme.txt
View File

@ -40,9 +40,8 @@ an existing translation. The steps to follow are these:
o The Win32 install files are located in install\arch-specific\win32.
This sub-directory is located as follows:
Firebird 1.5 - firebird2\src
Firebird 2.n - firebird2\builds
Firebird 3.n - firebird2\builds
Firebird 1.5 - firebird2\src
Firebird 2.n and newer - firebird2\builds
o You can use a tool such as TortoiseSVN to checkout the Win32 install
kit. Just open the SVN checkout dialogue and enter something similar

23
builds/install/arch-specific/win32/installation_readme.txt
View File

@ -1,5 +1,5 @@
Firebird Database Server $MAJOR.$MINOR.$RELEASE (Release Candidate 2)
========================================================
Firebird Database Server $MAJOR.$MINOR.$RELEASE
===============================================
This document is a guide to installing this package of
@ -10,9 +10,9 @@ primarily aimed at users of the binary installer.
It is assumed that readers of this document are already
familiar with Firebird. If you are evaluating Firebird $MAJOR.$MINOR
as part of a migration from Firebird 2.5 you are advised to
review the Firebird $MAJOR.$MINOR documentation to understand
the changes made between 2.5 and $MAJOR.$MINOR.
as part of a migration from some older Firebird version you are advised
to review the Firebird $MAJOR.$MINOR documentation to understand
the changes made between your version and $MAJOR.$MINOR.
Contents
@ -36,9 +36,6 @@ this package. It is especially important to verify that
fbclient.dll and gds32.dll are removed from <system32>.
See the UNINSTALL section below for more info on this.
If you have installed a beta or alpha version of Firebird $MAJOR.$MINOR
the installer will rename firebird.conf and security3.fdb as
these files are no longer compatible.
Deployment of gds32.dll
@ -51,7 +48,7 @@ available. However it remains an option at install
time, along with system deployment of fbclient.dll.
Be sure to check that your target system has the
appropriate MSVC10 runtimes if you use these options.
appropriate MSVC12 runtimes if you use these options.
Installation of the Guardian
@ -64,12 +61,12 @@ chosen. If SuperServer or SuperClassic are chosen
it is offered but not selected by default.
Re-installation of Firebird 3
-----------------------------
Re-installation of Firebird
---------------------------
The binary installer does its best to detect and
preserve a previous install. If the installer detects
firebird.conf or security3.fdb it will not offer the
firebird.conf or security4.fdb it will not offer the
option to install legacy_auth. Neither will it offer
the option to set the SYSDBA username and password.
@ -129,7 +126,7 @@ o Uninstallation leaves five files in the install
- firebird.conf
- fbtrace.conf
- firebird.log
- security3.fdb
- security4.fdb
This is intentional. These files are all
potentially modifiable by users and may be required

168
builds/install/arch-specific/win32/installation_scripted.txt
View File

@ -3,9 +3,29 @@ Setup Command Line Parameters
=============================
Contents
o Summary
o General notes on preparing a scripted install
o Quick Summary of Firebird specific options
o Parameters specific to Firebird installs
o Parameters specific to Firebird uninstalls
o Examples
General notes on preparing a scripted install
---------------------------------------------
These notes only document the firebird specific options for a scripted
installation. Developers should refer to the full InnoSetup documentation
for a description of the other options available for a scripted install.
This can be found here:
http://www.jrsoftware.org/ishelp/
It is highly recommended that a scripted install is tested thoroughly
before deployment. The easiest way to test is to run the script without
the /SILENT parameter. This will present a standard installer with the
scripted options preselected.
NOTE that the /TASKS parameter clears all the default task settings. If
you only need to add a task to the defaults then use /MERGETASKS.
Quick summary of available parameters
@ -14,17 +34,12 @@ Quick summary of available parameters
Setup parameters specific to the Firebird Installer. They are case insensitive.
However, string values passed to the parameters are not.
/H
/FORCE
/NOCPL
/NOGDS32
/COPYFBCLIENT
HELP
/COMPONENTS="comma separated list of component names"
/TASKS="comma separated list of task names"
/MERGETASKS="comma separated list of task names"
/SYSDBANAME="SYSDBA"
/SYSDBAPASSWORD="masterkey"
/SUPPORTLEGACYCLIENTAUTH
/FORCE
Setup parameters specific to the Firebird Uninstaller
/CLEAN
@ -36,16 +51,15 @@ documentation for innosetup. A summary is available via /? or /HELP
Parameters specific to Firebird installs
----------------------------------------
/h
HELP
Invoke this file as a help screen at installation time.
Note that /? and /HELP are now used by innosetup itself for
innosetup specific help.
Note no / is prefixed !! Because /? and /HELP are now
used by innosetup itself to dispaly innosetup specific help.
/COMPONENTS="comma separated list of component names"
Choose from - ServerComponent\SuperServerComponent,
ServerComponent\ClassicServerComponent,
ServerComponent,
Choose from - ServerComponent,
DevAdminComponent and
ClientComponent
@ -53,23 +67,36 @@ Parameters specific to Firebird installs
parameter causes Setup to automatically select a custom type. A full
install requires combining components. For example:
/COMPONENTS="ServerComponent\SuperServerComponent,ServerComponent,DevAdminComponent,ClientComponent"
/COMPONENTS="ClientComponent"
would be required for a full install.
would be required for a client only install.
NOTE - If a full server instal is required there is no need to
specify /COMPONENTS. All three are chosen by default.
/TASKS="comma separated list of task names"
Specifies a list of tasks that should be initially selected or
deselected. To deselect a task, prefix its name with a "!" character.
Choose from - UseGuardianTask
UseApplicationTask
Choose from - UseSuperServerTask
UseSuperServerTask\UseGuardianTask (optional)
or
UseSuperClassicTask
UseSuperClassicTask\UseGuardianTask (optional)
or
UseClassicServerTask
UseApplicationTask
or
UseServiceTask
AutoStartTask
InstallCPLAppletTask
MenuGroupTask
CopyFbClientToSysTask
CopyFbClientAsGds32Task
EnableLegacyClientAuth
Only the specified tasks (and their children) will be selected; the rest
will be deselected. Use the /MERGETASKS parameter instead if you want to
@ -77,16 +104,7 @@ Parameters specific to Firebird installs
By default the following tasks are run:
UseGuardianTask
UseServiceTask
AutoStartTask
InstallCPLAppletTask
MenuGroupTask
CopyFbClientAsGds32Task
The /TASKS option is not recommended for use with the /NOCPL, NOGDS32
or /COPYFBCLIENT.
UseSuperServerTask,UseServiceTask,AutoStartTask,CopyFbClientToSysTask
/MERGETASKS="comma separated list of task names"
@ -98,6 +116,14 @@ Parameters specific to Firebird installs
selected/deselected after any previous tasks are restored.
/SYSDBAPASSWORD="mypassword"
If supplied this will override the default SYSDBA password "masterkey".
NOTE: If an existing Security database is found this parameter will be
ignored.
/FORCE
Tells the installer to ignore its analysis of the existing
@ -109,60 +135,7 @@ Parameters specific to Firebird installs
users by breaking a perfectly good working install of Firebird or InterBase.
Its your choice.
/NOCPL
Don't install the Control Panel Applet.
(This option is not intended to be used with the /TASKS parameter.)
/NOGDS32
Don't install a copy of the client library as gds32 into the system directory,
even if installation analysis concludes it is OK to do so.
(This option is not intended to be used with the /TASKS parameter.)
/COPYFBCLIENT
Copy the fbclient.dll to the system directory. This is recommended
for client installs if you are sure that you will only ever be
accessing a single server version. If your client applications are
likely to take advantage of accessing different server versions this
is not recommended. See
doc/README.Win32LibraryInstallation.txt
for more information.
(This option is not intended to be used with the /TASKS parameter.)
/SYSDBANAME="SYSDBA"
SYSDBA name will default to SYSDBA unless overridden with this parameter.
NOTE: If an existing Security database is found this parameter should be
ignored.
/SYSDBAPASSWORD="masterkey"
SYSDBA password will use the default "masterkey" password.
NOTE: If an existing Security database is found this parameter should be
ignored.
/SUPPORTLEGACYCLIENTAUTH
Updates firebird.conf. Sets AuthServer thus:
AuthServer = Srp, Win_Sspi, Legacy_Auth
NOTE: This option does not check to see if AuthServer has already been
modified.
Parameters specific to Firebird uninstalls
------------------------------------------
@ -176,10 +149,37 @@ Parameters specific to Firebird uninstalls
databases.conf
firebird.log
security3.fdb
fbtrace.conf
fbtrace.conf
The assumption is that these files will be useful to users
re-installing or upgrading Firebird. Starting with Firebird 2.1
(using InnoSetup 5 to build the installation package) it is now
possible to pass the /clean option to remove these files.
Examples
--------
These examples are just for firebird related options. In practice you
they will probably be combined with options such as /SILENT, /LOG,
/RESTARTEXITCODE etc.
1/ Full server install of super server architecture
o Change SYSDBA password from default masterkey,
o deploy gds32 to <SYS>
o enable legacy authentication for older clients
/MERGETASKS="CopyFbClientAsGds32Task,EnableLegacyClientAuth" /SYSDBAPASSWORD="mypassword"
2/ Deploy Classic Server and keep other default tasks
/MERGETASKS="UseClassicServerTask"
3/ Really mess things up by accidentally deselecting the defaults and
letting InnoSetup guess:
/TASKS="CopyFbClientAsGds32Task"
Be careful when using the /TASKS parameter !

8
builds/install/arch-specific/win32/ru/custom_messages_ru.inc
View File

@ -79,4 +79,10 @@ ru.initSecurityDb=Добавляем SYSDBA в базу данных безоп
ru.SYSDBAPasswordMismatch=Несовпадение пароля. Повторите ввод пароля для SYSDBA.
ru.SYSDBAPasswordEmpty=Пароль не задан. Вы должны ввести пароль для SYSDBA.
ru.EnableLegacyClientAuth=Разрешить авторизацию предыдущих версий клиента Firebird?
ru.CreateSYSDBAPassword=Создать пароль администратора
ru.ClickThroughPWCreation=Либо пропустите этот шаг если хотите использовать пароль 'masterkey'.
ru.PasswordNote=*** Обратите внимание: в Firebird 3 'masterkey' и 'masterke' это разные пароли. ***
ru.SYSDBAPassword=Пароль SYSDBA:
ru.RetypeSYSDBAPassword=Повторите пароль:
ru.InstallingMSVC32runtimes=Устанавливаются библиотеки MSVC 32-bit runtime
ru.InstallingMSVC64runtimes=Устанавливаются библиотеки MSVC 64-bit runtime

14
builds/install/arch-specific/win32/ru/installation_readme.txt
View File

@ -9,10 +9,10 @@
Предполагается, что читатели данного документа уже
знакомы с Firebird. Если же вы знакомитесь
с Firebird $MAJOR.$MINOR в процессе миграции с версии
2.5, то рекомендуем вам обратиться к документации по
версии $MAJOR.$MINOR с целью ознакомиться с основными
отличиями между версиями 2.5 и $MAJOR.$MINOR.
с Firebird $MAJOR.$MINOR в процессе миграции с
предыдущей версии, то рекомендуем вам обратиться к документации
по версии $MAJOR.$MINOR с целью ознакомиться с основными
отличиями между вашей версией и $MAJOR.$MINOR.
Содержание
@ -36,7 +36,7 @@ o Установка из пакетного (bat) файла
каталога <system32>.
Если у вас установлена Альфа или Бета версия Firebird $MAJOR.$MINOR,
то программа установки переименует файлы firebird.conf и security3.fdb
то программа установки переименует файлы firebird.conf и security4.fdb
из-за их несовместимости с устанавливаемой версией.
@ -67,7 +67,7 @@ MS VC runtime версии 10.0 установлены в системе.
Программа установки пытается обнаружить и сохранить ранее установленную
версию Firebird. Если программа установки обнаруживает файлы firebird.conf
или security3.fdb, то некоторые настройки авторизации могут быть недоступны,
или security4.fdb, то некоторые настройки авторизации могут быть недоступны,
в частности возможность установить пароль пользователя SYSDBA.
@ -123,7 +123,7 @@ o Деинсталлятор оставляет четыре файла в ка
- firebird.conf
- fbtrace.conf
- firebird.log
- security3.fdb
- security4.fdb
Это происходит намеренно. Эти файлы потенциально
могут быть изменены пользователем и могут

5
builds/install/misc/firebird.conf.in
View File

@ -180,12 +180,11 @@
# NOTE: THE EXTERNAL FUNCTION ENGINE FEATURE COULD BE USED TO COMPROMISE
# THE SERVER/HOST AS WELL AS DATABASE SECURITY!!
#
# IT IS STRONGLY RECOMMENDED THAT THIS SETTING BE USED TO LIMIT
# EXTERNAL FUNCTION LOCATIONS!
# IT IS STRONGLY RECOMMENDED THAT THIS SETTING BE SET TO NONE!
#
# Type: string (special format)
#
#UdfAccess = Restrict UDF
#UdfAccess = None
# ----------------------------

29
builds/install/posix-common/posixLibrary.sh.in
View File

@ -219,10 +219,15 @@ checkLibrary() {
#------------------------------------------------------------------------
# Make sure we have required libraries installed
checkLibraries() {
if [ "@TOMBUILD@" != "Y" ]
if [ "@TOMMATH_BUILD@" != "Y" ]
then
checkLibrary tommath
fi
if [ "@TOMCRYPT_BUILD@" != "Y" ]
then
checkLibrary tomcrypt
fi
}
@ -285,21 +290,21 @@ checkIfServerRunning() {
# The following check for running interbase or firebird 1.0 servers.
checkString=`grepProcess "ibserver|ibguard"`
if [ ! -z "$checkString" ]
if [ ! -z "$checkString" ]
then
echo "An instance of the Firebird/InterBase Super server seems to be running."
echo "An instance of the Firebird/InterBase Super server seems to be running."
echo "(the ibserver or ibguard process was detected running on your system)"
echo "Please quit all Firebird applications and then proceed."
exit 1
exit 1
fi
checkString=`grepProcess "gds_inet_server|gds_pipe"`
if [ ! -z "$checkString" ]
if [ ! -z "$checkString" ]
then
echo "An instance of the Firebird/InterBase Classic server seems to be running."
echo "An instance of the Firebird/InterBase Classic server seems to be running."
echo "(the gds_inet_server or gds_pipe process was detected running on your system)"
echo "Please quit all Firebird applications and then proceed."
exit 1
echo "Please quit all Firebird applications and then proceed."
exit 1
fi
}
@ -344,7 +349,7 @@ replaceLineInFile() {
newLine="$2"
oldLine=`grep "$3" $FileName`
if [ -z "$oldLine" ]
if [ -z "$oldLine" ]
then
echo "$newLine" >> "$FileName"
elif [ "$oldLine" != "$newLine" ]
@ -702,7 +707,7 @@ archivePriorInstallSystemFiles() {
echo " The installation target directory $DestFile already exists."
echo " This and other related files found will be"
echo " archived in the file : ${tarArc}"
echo ""
echo ""
if [ ! -z "$InteractiveInstall" ]
then
@ -797,7 +802,7 @@ removeInstalledFiles() {
#------------------------------------------------------------------------
# removeUninstallFiles
# Under the install directory remove all the empty directories
# Under the install directory remove all the empty directories
# If some files remain then
removeUninstallFiles() {
@ -809,7 +814,7 @@ removeUninstallFiles() {
#------------------------------------------------------------------------
# removeEmptyDirs
# Under the install directory remove all the empty directories
# Under the install directory remove all the empty directories
# This routine loops, since deleting a directory possibly makes
# the parent empty as well

106
builds/posix/Makefile.in
View File

@ -9,29 +9,29 @@
# version 2.1 of the License, or (at your option) any later version.
# You may obtain a copy of the Licence at
# http://www.gnu.org/licences/lgpl.html
#
#
# As a special exception this file can also be included in modules
# with other source code as long as that source code has been
# released under an Open Source Initiative certificed licence.
# More information about OSI certification can be found at:
# http://www.opensource.org
#
# with other source code as long as that source code has been
# released under an Open Source Initiative certificed licence.
# More information about OSI certification can be found at:
# http://www.opensource.org
#
# This module is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Lesser General Public Licence for more details.
#
# This module was created by members of the firebird development
# team. All individual contributions remain the Copyright (C) of
# those individuals and all rights are reserved. Contributors to
# this file are either listed below or can be obtained from a SVN
#
# This module was created by members of the firebird development
# team. All individual contributions remain the Copyright (C) of
# those individuals and all rights are reserved. Contributors to
# this file are either listed below or can be obtained from a SVN
# history command.
#
# Created by: Mark O'Donohue <mark.odonohue@ludwig.edu.au>
#
# Contributor(s):
# Alex Peshkoff - created single makefile based on Mark's files
#
#
ROOT=$(shell cd ..; pwd)
@ -137,12 +137,18 @@ external:
$(MAKE) -C $(ROOT)/extern/decNumber
ln -sf $(ROOT)/extern/decNumber/libdecFloat.a $(LIB)
ifeq ($(TOMBUILD_FLG),Y)
ifeq ($(TOMMATH_BUILD_FLG),Y)
CFLAGS="$(CFLAGS)" $(MAKE) -C $(ROOT)/extern/libtommath -f makefile.shared GCC=$(GCC)
ln -sf $(TOMMATH_SO).$(TOMMATH_VER) $(LIB)
ln -sf $(TOMMATH_SO) $(LIB)
endif
ifeq ($(TOMCRYPT_BUILD_FLG),Y)
CFLAGS="$(CFLAGS)" $(MAKE) -C $(ROOT)/extern/libtomcrypt -f makefile.shared GCC=$(GCC)
ln -sf $(TOMCRYPT_SO).$(TOMCRYPT_VER) $(LIB)
ln -sf $(TOMCRYPT_SO) $(LIB)
endif
ifeq ($(STD_EDITLINE),false)
ifeq ($(EDITLINE_FLG),Y)
$(MAKE) -f $(GEN_ROOT)/Makefile.extern.editline
@ -164,12 +170,26 @@ export_lists: $(ALLVERS)
#
.PHONY: tommath
TOMLIB=$(LIB)/libtommath.a
TOMMATH_LIB=$(LIB)/libtommath.a
TOM_Objs=$(addprefix ../extern/libtommath/,$(call doObjects,$(call dirFiles,../extern/libtommath)))
tommath: $(TOMLIB)
tommath: $(TOMMATH_LIB)
$(TOMLIB): $(TOM_Objs)
$(TOMMATH_LIB): $(TOM_Objs)
-$(RM) $@
$(STATICLIB_LINK) $@ $^
#___________________________________________________________________________
# LibTomCrypt - used by cross-builds
#
.PHONY: tomcrypt
TOMCRYPT_LIB=$(LIB)/libtomcrypt.a
TOM_Objs=$(addprefix ../extern/libtomcrypt/,$(call doObjects,$(call dirFiles,../extern/libtomcrypt)))
tomcrypt: $(TOMCRYPT_LIB)
$(TOMCRYPT_LIB): $(TOM_Objs)
-$(RM) $@
$(STATICLIB_LINK) $@ $^
@ -197,7 +217,7 @@ endif
# Now having ready such useful tools as gbak and isql, we may restore / create
# required databases and switch to full-featured gpre
$(MAKE) gpre
# Pay attention - after build force gpre_current to point to gpre
# Pay attention - after build force gpre_current to point to gpre
# even if gpre itself was not rebuilt
-$(RM) $(GPRE_CURRENT)
(cd $(BIN); $(LN) $(notdir $(GPRE)) $(notdir $(GPRE_CURRENT)))
@ -232,7 +252,7 @@ endif
# Now having ready such useful tools as gbak and isql, we may restore / create
# required databases and switch to full-featured gpre
$(MAKE) gpre
# Pay attention - after build force gpre_current to point to gpre
# Pay attention - after build force gpre_current to point to gpre
# even if gpre itself was not rebuilt
-$(RM) $(GPRE_CURRENT)
(cd $(BIN); $(LN) $(notdir $(RUN_GPRE)) $(notdir $(GPRE_CURRENT)))
@ -243,13 +263,14 @@ cross2:
ln -sf $(SRC_ROOT)/include/cross/$(CROSS_CONFIG) $(SRC_ROOT)/include/gen/autoconfig.h
$(MAKE) prerequisites
$(MAKE) tommath
$(MAKE) tomcrypt
$(MAKE) yvalve
$(MAKE) engine
$(MAKE) fbintl
$(MAKE) utilities
$(MAKE) $(GPRE)
$(MAKE) plugins
$(MAKE) -f Makefile.plugins_examples -C $(GEN_ROOT)/examples/
$(MAKE) -f Makefile.plugins_examples
$(MAKE) cross_rest
#___________________________________________________________________________
@ -375,27 +396,10 @@ msg.timestamp: $(MSG_FILES)
$(TOUCH) $@
.PHONY: udfs ibutil ibudf fbudf udfsupport
.PHONY: ibutil udfsupport
udfsupport:
$(MAKE) ibutil
$(MAKE) udfs
udfs: ibudf fbudf
UDF = $(FB_BUILD)/UDF
IBUDF_SO = $(UDF)/ib_udf.$(SHRLIB_EXT)
FBUDF_SO = $(UDF)/fbudf.$(SHRLIB_EXT)
ibudf: $(IBUDF_SO)
$(IBUDF_SO): $(IBUDF_Objects)
$(call LINK_UDF,ib_udf) -o $@ $^ $(LINK_UDF_LIBS)
fbudf: $(FBUDF_SO)
$(FBUDF_SO): $(FBUDF_Objects) $(COMMON_LIB)
$(call LINK_UDF,fbudf) -o $@ $^ $(LINK_UDF_LIBS) $(FIREBIRD_LIBRARY_LINK)
ibutil: $(LIBIBUTIL_SO)
@ -404,7 +408,7 @@ $(LIBIBUTIL_SO): $(UTIL_Objects)
#___________________________________________________________________________
# most of utilities, including network server and UDFs
# most of utilities, including network server and UDF support
# qli is not here cause it needs special database (help.fdb), therefore needs gbak
#
@ -477,20 +481,22 @@ $(NBACKUP): $(NBACKUP_Objects) $(COMMON_LIB)
# plugins - some of them are required to build examples, use separate entry for them
#
.PHONY: udr legacy_user_management legacy_auth_server trace auth_debug
.PHONY: udr legacy_user_management legacy_auth_server trace auth_debug udf_compat
UDR_PLUGIN = $(call makePluginName,udr_engine)
LEGACY_USER_MANAGER = $(call makePluginName,Legacy_UserManager)
LEGACY_AUTH_SERVER = $(call makePluginName,Legacy_Auth)
SRP_USER_MANAGER = $(call makePluginName,Srp)
FBTRACE = $(call makePluginName,fbtrace)
AUTH_DEBUGGER = $(call makePluginName,Auth_Debug)
UDF_BACKWARD_COMPATIBILITY_BASENAME = $(LIB_PREFIX)udf_compat.$(SHRLIB_EXT)
UDF_BACKWARD_COMPATIBILITY = $(PLUGINS)/udr/$(UDF_BACKWARD_COMPATIBILITY_BASENAME)
BUILD_DEBUG:=
ifeq ($(TARGET),Debug)
BUILD_DEBUG:=auth_debug
endif
plugins: udr legacy_user_management legacy_auth_server srp_user_management trace $(BUILD_DEBUG)
plugins: udr legacy_user_management legacy_auth_server srp_user_management trace $(BUILD_DEBUG) udf_compat
udr: $(UDR_PLUGIN) $(PLUGINS)/udr_engine.conf
@ -525,6 +531,15 @@ srp_user_management: $(SRP_USER_MANAGER)
$(SRP_USER_MANAGER): $(SRP_USERS_MANAGE_Objects) $(COMMON_LIB)
$(LINK_PLUGIN) $(call LIB_LINK_SONAME,$(notdir $@).0) -o $@ $^ $(LINK_PLUG_LIBS) $(FIREBIRD_LIBRARY_LINK)
udf_compat: $(UDF_BACKWARD_COMPATIBILITY) $(COMPAT_SQL)
$(UDF_BACKWARD_COMPATIBILITY): $(COMPAT_Objects)
$(LIB_LINK) $(LIB_LINK_OPTIONS) $(call LIB_LINK_SONAME,$(UDF_BACKWARD_COMPATIBILITY_BASENAME)) \
$(LINK_UDR_PLUGIN_SYMBOLS) $(LIB_PATH_OPTS) $(UNDEF_FLAGS) -o $@ $^ $(THR_LIBS)
$(COMPAT_SQL): $(SRC_COMPAT_SQL)
cp $^ $@
#___________________________________________________________________________
# codes - developers change them sometimes
#
@ -569,7 +584,7 @@ $(QLI): $(QLI_Objects) $(COMMON_LIB)
examples: include_generic
$(MAKE) -f Makefile.examples -C $(GEN_ROOT)/examples/
$(MAKE) -f Makefile.plugins_examples -C $(GEN_ROOT)/examples/
$(MAKE) -f Makefile.plugins_examples
message_file: $(FIREBIRD_MSG)
@ -641,7 +656,7 @@ $(INCLUDE_DEST)/firebird/%: $(SRC_ROOT)/include/firebird/%
include $(ROOT)/gen/make.shared.targets
Dependencies = $(AllObjects:.o=.d)
Dependencies = $(AllObjects:.o=.d)
-include $(Dependencies)
@ -650,7 +665,7 @@ Dependencies = $(AllObjects:.o=.d)
#
.PHONY: install silent_install install-embedded package packages dist
install install-embedded silent_install package packages dist:
$(MAKE) -f Makefile.install $@
@ -665,7 +680,7 @@ install install-embedded silent_install package packages dist:
clean: clean_objects clean_dependancies clean_extern_objects clean_build \
clean_yacc_gen clean_gpre_gen clean_dbs clean_examples clean_tommath \
clean_decfloat
clean_tomcrypt clean_decfloat
ifeq ($(EDITLINE_FLG),Y)
ifeq ($(STD_EDITLINE),false)
@ -705,6 +720,9 @@ clean_editline:
clean_tommath:
-$(MAKE) -C $(ROOT)/extern/libtommath clean
clean_tomcrypt:
-$(MAKE) -C $(ROOT)/extern/libtomcrypt clean
clean_decfloat:
-$(MAKE) -C $(ROOT)/extern/decNumber clean

11
builds/posix/Makefile.in.plugins_examples
View File

@ -28,7 +28,7 @@
# Adriano dos Santos Fernandes
#
ROOT=$(shell cd ../..; pwd)
ROOT=$(shell cd ..; pwd)
ifeq ($(IsDeveloper), Y)
DefaultTarget := Debug
@ -50,19 +50,12 @@ include $(ROOT)/gen/make.shared.variables
@SET_MAKE@
# Override make.defaults
LINK_PLUGIN_SYMBOLS = $(call LIB_LINK_MAPFILE,../$(PLUGIN_VERS))
.PHONY: all udrcpp_example dc_example kh_example crypt_app
all: udrcpp_example dc_example kh_example crypt_app
UDR_Objects = $(call makeObjects,../examples/udr,Functions.cpp) \
$(call makeObjects,../examples/udr,Procedures.cpp) \
$(call makeObjects,../examples/udr,Triggers.cpp)
UDR_Objects = $(call dirObjects,../examples/udr)
UDR_Plugin = $(PLUGINS)/udr/$(LIB_PREFIX)udrcpp_example.$(SHRLIB_EXT)
AllObjects = $(UDR_Objects)

3
builds/posix/firebird.vers
View File

@ -343,8 +343,11 @@ fb_ping
fb_get_master_interface
# Legacy handles translation
fb_get_database_handle
fb_get_transaction_handle
#fb_get_statement_interface
fb_database_crypt_callback
fb_dsql_set_timeout

26
builds/posix/make.defaults
View File

@ -48,7 +48,8 @@ LNG_ROOT=$(ROOT)/lang_helpers
EXA_ROOT=$(ROOT)/examples
IsCross=@IS_CROSS@
TOMBUILD_FLG=@TOMBUILD@
TOMMATH_BUILD_FLG=@TOMMATH_BUILD@
TOMCRYPT_BUILD_FLG=@TOMCRYPT_BUILD@
FB_BUILD=$(GEN_ROOT)/$(TARGET)/firebird
ifeq ($(IsCross), Y)
@ -134,6 +135,9 @@ CAS_OPTIONS=@CAS_OPTIONS@
MATHLIB=@MATHLIB@
DECLIB=-ldecFloat
# crypt library
CRYPTLIB=@CRYPTLIB@
LSB_FLG=@LSB_FLG@
ifeq ($(LSB_FLG), Y)
LSB_UNDEF=-Wl,--allow-shlib-undefined
@ -194,14 +198,6 @@ SHRLIB_FOREIGN_EXT= $(SHRLIB_EXT)
# Include file with version variable definitions
include $(ROOT)/gen/Make.Version
#MajorVer = 2
#MinorVer = 5
#RevNo = 0
#BuildNum = 28678
#BuildType = T
#BuildSuffix = Firebird 3.0 Unstable
#PackageVersion = Unstable
#FirebirdVersion = 2.5.0
# Add windows dll to library patterns
@ -219,7 +215,7 @@ vpath %.dll $(LIB)
# From jrd
# The firebird shared library name
# The firebird shared library name
# SD: This name is also hard-coded in builds/install/.../linux/classic scripts.
# Scold me, but I don't want library names to be in configure.in
#
@ -264,6 +260,12 @@ TOMMATH_INC=$(TOMMATH)
TOMMATH_SO=$(TOMMATH)/.libs/libtommath.so
TOMMATH_VER=0
# Own tomcrypt support
TOMCRYPT=$(ROOT)/extern/libtomcrypt
TOMCRYPT_INC=$(TOMCRYPT)/src/headers
TOMCRYPT_SO=$(TOMCRYPT)/.libs/libtomcrypt.so
TOMCRYPT_VER=0
# LINKER OPTIONS
#
@ -304,7 +306,7 @@ endif
LIB_PATH_OPTS = $(call LIB_LINK_RPATH,lib) $(call LIB_LINK_RPATH,intl)
LIB_LINK_SONAME= -Wl,-soname,$(1)
LIB_LINK_MAPFILE= -Wl,--version-script,$(1)
FIREBIRD_LIBRARY_LINK= -L$(LIB) -lfbclient $(MATHLIB)
FIREBIRD_LIBRARY_LINK= -L$(LIB) -lfbclient $(MATHLIB) $(CRYPTLIB)
EXE_LINK_OPTIONS= $(LDFLAGS) $(THR_FLAGS) $(UNDEF_FLAGS) $(LIB_PATH_OPTS) $(LINK_EMPTY_SYMBOLS)
LIB_LINK_OPTIONS= $(LDFLAGS) $(THR_FLAGS) -shared
@ -330,7 +332,7 @@ LINK_TRACE_LIBS = -L$(LIB) $(SO_LINK_LIBS)
LINK_FIREBIRD = $(LIB_LINK) $(LINK_FIREBIRD_SYMBOLS) $(LIB_LINK_OPTIONS) $(LIB_FIREBIRD_OPTIONS) $(UNDEF_FLAGS)\
$(call LIB_LINK_SONAME,$(LibrarySoName)) $(call LIB_LINK_RPATH,lib)
LINK_FIREBIRD_LIBS = -L$(LIB) $(LIB_GUI) $(SO_LINK_LIBS) $(MATHLIB)
LINK_FIREBIRD_LIBS = -L$(LIB) $(LIB_GUI) $(SO_LINK_LIBS) $(MATHLIB) $(CRYPTLIB)
LINK_ENGINE = $(LIB_LINK) $(LINK_PLUGIN_SYMBOLS) $(LIB_LINK_OPTIONS) $(LIB_FIREBIRD_OPTIONS) $(UNDEF_FLAGS)\
$(call LIB_LINK_SONAME,$(EngineSoName)) $(call LIB_LINK_RPATH,lib)

10
builds/posix/make.rules
View File

@ -34,10 +34,14 @@
# Please don't use compiler/platform specific flags here - nmcc 02-Nov-2002
WFLAGS =-I$(SRC_ROOT)/include/gen -I$(SRC_ROOT)/include $(CPPFLAGS)
ifeq ($(TOMBUILD_FLG),Y)
ifeq ($(TOMMATH_BUILD_FLG),Y)
WFLAGS += -I$(TOMMATH_INC)
endif
ifeq ($(TOMCRYPT_BUILD_FLG),Y)
WFLAGS += -I$(TOMCRYPT_INC)
endif
ifeq ($(LSB_FLG),Y)
WFLAGS += -DLSB_BUILD
endif
@ -106,6 +110,10 @@ $(OBJ)/%.o: $(SRC_ROOT)/%.cpp
$(CXX) $(WCXXFLAGS) -c $(firstword $<) -o $@
@sed $(INLINE_EDIT_SED) -e "1,2s/:/: \$$(wildcard/" -e "\$$s/\(.*\)/\\1)/" $(patsubst %.o,%.d,$@)
$(OBJ)/%.o: $(ROOT)/%.cpp
$(CC) $(WCFLAGS) -c $(firstword $<) -o $@
@sed $(INLINE_EDIT_SED) -e "1,2s/:/: \$$(wildcard/" -e "\$$s/\(.*\)/\\1)/" $(patsubst %.o,%.d,$@)
.SUFFIXES: .epp .e
# Rules for making resource files

11
builds/posix/make.shared.variables
View File

@ -1,6 +1,6 @@
# Helper functions
doObjects= $(patsubst %.y,%.o,$(patsubst %.epp,%.o,$(patsubst %.c,%.o,$(1:.cpp=.o))))
makeObjects= $(addprefix $(OBJ)/$(1)/,$(call doObjects,$2))
makeObjects= $(addprefix $(OBJ)/$(patsubst ../%,%,$(1))/,$(call doObjects,$2))
dirFiles= $(sort $(notdir $(wildcard ../src/$(1)/*.cpp)) $(notdir $(wildcard ../src/$(1)/*.c)) \
$(notdir $(wildcard ../src/$(1)/*.epp)) $(notdir $(wildcard ../src/$(1)/*.y)))
dirInPath= $(call makeObjects,$(1),$(call dirFiles,$(1)))
@ -196,11 +196,14 @@ AllObjects += $(UDRENG_Objects)
# UDF support
IBUDF_Objects:= $(call makeObjects,extlib,ib_udf.cpp)
FBUDF_Objects:= $(call makeObjects,extlib/fbudf,fbudf.cpp)
UTIL_Objects:= $(call makeObjects,extlib,ib_util.cpp)
AllObjects += $(IBUDF_Objects) $(FBUDF_Objects) $(UTIL_Objects)
# UDR backward compatible with distributed UDFs
COMPAT_Objects:= $(call makeObjects,extlib,UdfBackwardCompatibility.cpp)
SRC_COMPAT_SQL:= $(SRC_ROOT)/extlib/UdfBackwardCompatibility.sql
COMPAT_SQL:= $(PLUGINS)/udr/udf_compat.sql
AllObjects += $(UTIL_Objects) $(COMPAT_Objects)
# Regenerate error codes

4
builds/posix/postfix.darwin
View File

@ -96,8 +96,6 @@ darwin_finish_cs_framework:
chmod +x ../builds/install/arch-specific/darwin/changeMultiConnectMode
cp ../builds/install/arch-specific/darwin/changeMultiConnectMode \
$(FB_FW)/Resources/bin/changeMultiConnectMode.sh
cp ../src/extlib/ib_udf.sql $(FB_FW)/Resources/English.lproj/var/UDF
cp ../src/extlib/fbudf/fbudf.sql $(FB_FW)/Resources/English.lproj/var/UDF
cp ../builds/install/arch-specific/darwin/FrameworkInfo.plist \
$(FB_FW)/Resources/Info.plist
cp ../builds/install/arch-specific/darwin/launchd.org.firebird.gds.plist \
@ -165,8 +163,6 @@ darwin_finish_ss_framework:
cp ../gen/firebird/bin/gdef $(FB_FW)/Resources/bin
cp ../gen/firebird/bin/fbsvcmgr $(FB_FW)/Resources/bin
cp ../gen/firebird/bin/fbtracemgr $(FB_FW)/Resources/bin
cp ../src/extlib/ib_udf.sql $(FB_FW)/Resources/English.lproj/var/UDF
cp ../src/extlib/fbudf/fbudf.sql $(FB_FW)/Resources/English.lproj/var/UDF
cp ../builds/install/arch-specific/darwin/FrameworkInfo.plist \
$(FB_FW)/Resources/Info.plist
cp ../builds/install/arch-specific/darwin/launchdss.org.firebird.gds.plist \

10
builds/win32/make_all.bat
View File

@ -38,7 +38,6 @@ if errorlevel 1 call :ERROR build failed - see make_all_%FB_TARGET_PLATFORM%.log
@mkdir %FB_OUTPUT_DIR% 2>nul
@mkdir %FB_OUTPUT_DIR%\intl 2>nul
@mkdir %FB_OUTPUT_DIR%\udf 2>nul
@mkdir %FB_OUTPUT_DIR%\help 2>nul
@mkdir %FB_OUTPUT_DIR%\doc 2>nul
@mkdir %FB_OUTPUT_DIR%\doc\sql.extensions 2>nul
@ -47,12 +46,13 @@ if errorlevel 1 call :ERROR build failed - see make_all_%FB_TARGET_PLATFORM%.log
@mkdir %FB_OUTPUT_DIR%\lib 2>nul
@mkdir %FB_OUTPUT_DIR%\system32 2>nul
@mkdir %FB_OUTPUT_DIR%\plugins 2>nul
@mkdir %FB_OUTPUT_DIR%\plugins\udr 2>nul
@copy %FB_ROOT_PATH%\temp\%FB_OBJ_DIR%\firebird\* %FB_OUTPUT_DIR% >nul
@copy %FB_ROOT_PATH%\temp\%FB_OBJ_DIR%\firebird\intl\* %FB_OUTPUT_DIR%\intl >nul
@copy %FB_ROOT_PATH%\temp\%FB_OBJ_DIR%\firebird\udf\* %FB_OUTPUT_DIR%\udf >nul
@copy %FB_ROOT_PATH%\temp\%FB_OBJ_DIR%\firebird\system32\* %FB_OUTPUT_DIR%\system32 >nul
@copy %FB_ROOT_PATH%\temp\%FB_OBJ_DIR%\firebird\plugins\*.dll %FB_OUTPUT_DIR%\plugins >nul
@copy %FB_ROOT_PATH%\temp\%FB_OBJ_DIR%\firebird\plugins\udr\*.dll %FB_OUTPUT_DIR%\plugins\udr >nul
@copy %FB_ROOT_PATH%\temp\%FB_OBJ_DIR%\yvalve\fbclient.lib %FB_OUTPUT_DIR%\lib\fbclient_ms.lib >nul
@copy %FB_ROOT_PATH%\temp\%FB_OBJ_DIR%\ib_util\ib_util.lib %FB_OUTPUT_DIR%\lib\ib_util_ms.lib >nul
@ -110,10 +110,8 @@ copy %FB_ROOT_PATH%\src\include\gen\iberror.h %FB_OUTPUT_DIR%\include > nul
:: New API headers
copy %FB_ROOT_PATH%\src\include\firebird\*.h %FB_OUTPUT_DIR%\include\firebird > nul
:: UDF
copy %FB_ROOT_PATH%\src\extlib\ib_udf.sql %FB_OUTPUT_DIR%\udf > nul
copy %FB_ROOT_PATH%\src\extlib\ib_udf2.sql %FB_OUTPUT_DIR%\udf > nul
copy %FB_ROOT_PATH%\src\extlib\fbudf\fbudf.sql %FB_OUTPUT_DIR%\udf > nul
:: UDR
copy %FB_ROOT_PATH%\src\extlib\*.sql %FB_OUTPUT_DIR%\plugins\udr > nul
:: Installers
@copy %FB_INSTALL_SCRIPTS%\install_service.bat %FB_OUTPUT_DIR% >nul

32
builds/win32/make_boot.bat
View File

@ -35,7 +35,10 @@ for %%v in ( alice auth burp dsql gpre isql jrd misc msgs qli examples yvalve) d
call :btyacc
if "%ERRLEV%"=="1" goto :END
call :LibTomMath
call :LibTom
if "%ERRLEV%"=="1" goto :END
call :decNumber
if "%ERRLEV%"=="1" goto :END
call :decNumber
@ -120,19 +123,42 @@ if errorlevel 1 call :boot2 btyacc
goto :EOF
::===================
:: BUILD LibTomMath
:: BUILD LibTom
:: NS: Note we need both debug and non-debug version as it is a static library linked to CRT
:: and linking executable with both debug and non-debug CRT results in undefined behavior
:LibTomMath
:LibTom
@echo.
@call set_build_target.bat %* RELEASE
@echo Building LibTomMath (%FB_OBJ_DIR%)...
@call compile.bat %FB_ROOT_PATH%\extern\libtommath\libtommath_MSVC%MSVC_VERSION% libtommath_%FB_OBJ_DIR%_%FB_TARGET_PLATFORM%.log libtommath
if errorlevel 1 call :boot2 libtommath_%FB_OBJ_DIR%
@echo Building LibTomCrypt (%FB_OBJ_DIR%)...
@call compile.bat %FB_ROOT_PATH%\extern\libtomcrypt\libtomcrypt_MSVC%MSVC_VERSION% libtomcrypt_%FB_OBJ_DIR%_%FB_TARGET_PLATFORM%.log libtomcrypt
if errorlevel 1 call :boot2 libtomcrypt_%FB_OBJ_DIR%
@call set_build_target.bat %* DEBUG
@echo Building LibTomMath (%FB_OBJ_DIR%)...
@call compile.bat %FB_ROOT_PATH%\extern\libtommath\libtommath_MSVC%MSVC_VERSION% libtommath_%FB_OBJ_DIR%_%FB_TARGET_PLATFORM%.log libtommath
if errorlevel 1 call :boot2 libtommath_%FB_OBJ_DIR%
@echo Building LibTomCrypt (%FB_OBJ_DIR%)...
@call compile.bat %FB_ROOT_PATH%\extern\libtomcrypt\libtomcrypt_MSVC%MSVC_VERSION% libtomcrypt_%FB_OBJ_DIR%_%FB_TARGET_PLATFORM%.log libtomcrypt
if errorlevel 1 call :boot2 libtomcrypt_%FB_OBJ_DIR%
@call set_build_target.bat %*
goto :EOF
::===================
:: BUILD decNumber
:decNumber
@echo.
@call set_build_target.bat %* RELEASE
@echo Building decNumber (%FB_OBJ_DIR%)...
@call compile.bat %FB_ROOT_PATH%\extern\decNumber\msvc\decNumber_MSVC%MSVC_VERSION% decNumber_%FB_OBJ_DIR%_%FB_TARGET_PLATFORM%.log decNumber
if errorlevel 1 call :boot2 decNumber_%FB_OBJ_DIR%
@call set_build_target.bat %* DEBUG
@echo Building decNumber (%FB_OBJ_DIR%)...
@call compile.bat %FB_ROOT_PATH%\extern\decNumber\msvc\decNumber_MSVC%MSVC_VERSION% decNumber_%FB_OBJ_DIR%_%FB_TARGET_PLATFORM%.log decNumber
if errorlevel 1 call :boot2 decNumber_%FB_OBJ_DIR%
@call set_build_target.bat %*
goto :EOF

4
builds/win32/make_examples.bat
View File

@ -27,6 +27,10 @@
@call compile.bat %FB_ROOT_PATH%\builds\win32\%VS_VER%\FirebirdExamples intlbuild_%FB_TARGET_PLATFORM%.log intlbuild
)
@call compile.bat %FB_ROOT_PATH%\builds\win32\%VS_VER%\FirebirdExamples udrcpp_example_%FB_TARGET_PLATFORM%.log udrcpp_example
if errorlevel 1 (
@call :ERROR building udrcpp example failed - see make_examples_%FB_TARGET_PLATFORM%.log for details
@goto :EOF
)
@echo.
@call :MOVE

1
builds/win32/msvc10/common.vcxproj
View File

@ -114,6 +114,7 @@
<ClInclude Include="..\..\..\src\common\classes\array.h" />
<ClInclude Include="..\..\..\src\common\classes\auto.h" />
<ClInclude Include="..\..\..\src\common\classes\BaseStream.h" />
<ClInclude Include="..\..\..\src\common\classes\BatchCompletionState.h" />
<ClInclude Include="..\..\..\src\common\classes\BlrReader.h" />
<ClInclude Include="..\..\..\src\common\classes\BlrWriter.h" />
<ClInclude Include="..\..\..\src\common\classes\ByteChunk.h" />

53
builds/win32/msvc10/common.vcxproj.filters
View File

@ -222,21 +222,6 @@
<ClCompile Include="..\..\..\src\common\DecFloat.cpp">
<Filter>classes</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\common\tomcrypt\crypt_argchk.c">
<Filter>tomcrypt</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\common\tomcrypt\md5.c">
<Filter>tomcrypt</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\common\tomcrypt\sha1.c">
<Filter>tomcrypt</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\common\tomcrypt\sha256.c">
<Filter>tomcrypt</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\common\tomcrypt\sha512.c">
<Filter>tomcrypt</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\common\classes\TomCryptHash.cpp">
<Filter>classes</Filter>
</ClCompile>
@ -557,43 +542,7 @@
<ClInclude Include="..\..\..\src\common\DecFloat.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_argchk.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_cfg.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_cipher.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_custom.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_hash.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_mac.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_macros.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_math.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_misc.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_pk.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_pkcs.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_prng.h">
<ClInclude Include="..\..\..\src\common\classes\BatchCompletionState.h">
<Filter>headers</Filter>
</ClInclude>
</ItemGroup>

2
builds/win32/msvc10/engine.vcxproj
View File

@ -37,6 +37,7 @@
<ClCompile Include="..\..\..\src\dsql\BoolNodes.cpp" />
<ClCompile Include="..\..\..\src\dsql\ddl.cpp" />
<ClCompile Include="..\..\..\src\dsql\dsql.cpp" />
<ClCompile Include="..\..\..\src\dsql\DsqlBatch.cpp" />
<ClCompile Include="..\..\..\src\dsql\DsqlCompilerScratch.cpp" />
<ClCompile Include="..\..\..\src\dsql\DsqlCursor.cpp" />
<ClCompile Include="..\..\..\src\dsql\DSqlDataTypeUtil.cpp" />
@ -168,6 +169,7 @@
<ClInclude Include="..\..\..\src\dsql\DdlNodes.h" />
<ClInclude Include="..\..\..\src\dsql\ddl_proto.h" />
<ClInclude Include="..\..\..\src\dsql\dsql.h" />
<ClInclude Include="..\..\..\src\dsql\DsqlBatch.h" />
<ClInclude Include="..\..\..\src\dsql\DsqlCompilerScratch.h" />
<ClInclude Include="..\..\..\src\dsql\DsqlCursor.h" />
<ClInclude Include="..\..\..\src\dsql\DSqlDataTypeUtil.h" />

9
builds/win32/msvc10/engine.vcxproj.filters
View File

@ -459,6 +459,12 @@
<ClCompile Include="..\..\..\src\jrd\extds\ValidatePassword.cpp">
<Filter>JRD files\EXTDS</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\jrd\Savepoint.cpp">
<Filter>JRD files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\dsql\DsqlBatch.cpp">
<Filter>DSQL</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\src\jrd\recsrc\RecordSource.h">
@ -986,6 +992,9 @@
<ClInclude Include="..\..\..\src\jrd\extds\ValidatePassword.h">
<Filter>Header files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\dsql\DsqlBatch.h">
<Filter>Header files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\src\dsql\DdlNodes.epp">

30
builds/win32/msvc12/Firebird.sln
View File

@ -24,8 +24,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fbserver", "fbserver.vcxpro
{F8798A49-9D20-451E-A7BD-FEB5237103B5} = {F8798A49-9D20-451E-A7BD-FEB5237103B5}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fbudf", "fbudf.vcxproj", "{9DC67B05-AC3E-49A3-B0CC-83B25D757445}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gbak", "gbak.vcxproj", "{B732F5D2-B5D9-417F-B156-D790F466CB8E}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gfix", "gfix.vcxproj", "{44A9E4AD-B932-4620-B319-431A153BB341}"
@ -41,8 +39,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gsplit", "gsplit.vcxproj",
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gstat", "gstat.vcxproj", "{7E862973-37C4-4202-80E7-490ED4DEDA14}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ib_udf", "ib_udf.vcxproj", "{0D4A2D8E-6461-479E-9399-F7929174E050}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ib_util", "ib_util.vcxproj", "{EABA0FF3-1C4D-4FAB-8418-31C9061F3F0D}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "instreg", "instreg.vcxproj", "{19470DE6-1975-4F9B-B1BE-E87A83240B15}"
@ -86,6 +82,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "srp", "srp.vcxproj", "{BD00
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "legacy_auth", "legacy_auth.vcxproj", "{062BD3C7-2D01-44F6-8D79-070F688C559F}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "udf_compat", "udf_compat.vcxproj", "{6794EB8C-6425-422D-A3B0-14EED54C0E98}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@ -150,14 +148,6 @@ Global
{23EC8DAA-6718-4EF3-979F-89F611C7D504}.Release|Win32.Build.0 = Release|Win32
{23EC8DAA-6718-4EF3-979F-89F611C7D504}.Release|x64.ActiveCfg = Release|x64
{23EC8DAA-6718-4EF3-979F-89F611C7D504}.Release|x64.Build.0 = Release|x64
{9DC67B05-AC3E-49A3-B0CC-83B25D757445}.Debug|Win32.ActiveCfg = Debug|Win32
{9DC67B05-AC3E-49A3-B0CC-83B25D757445}.Debug|Win32.Build.0 = Debug|Win32
{9DC67B05-AC3E-49A3-B0CC-83B25D757445}.Debug|x64.ActiveCfg = Debug|x64
{9DC67B05-AC3E-49A3-B0CC-83B25D757445}.Debug|x64.Build.0 = Debug|x64
{9DC67B05-AC3E-49A3-B0CC-83B25D757445}.Release|Win32.ActiveCfg = Release|Win32
{9DC67B05-AC3E-49A3-B0CC-83B25D757445}.Release|Win32.Build.0 = Release|Win32
{9DC67B05-AC3E-49A3-B0CC-83B25D757445}.Release|x64.ActiveCfg = Release|x64
{9DC67B05-AC3E-49A3-B0CC-83B25D757445}.Release|x64.Build.0 = Release|x64
{B732F5D2-B5D9-417F-B156-D790F466CB8E}.Debug|Win32.ActiveCfg = Debug|Win32
{B732F5D2-B5D9-417F-B156-D790F466CB8E}.Debug|Win32.Build.0 = Debug|Win32
{B732F5D2-B5D9-417F-B156-D790F466CB8E}.Debug|x64.ActiveCfg = Debug|x64
@ -206,14 +196,6 @@ Global
{7E862973-37C4-4202-80E7-490ED4DEDA14}.Release|Win32.Build.0 = Release|Win32
{7E862973-37C4-4202-80E7-490ED4DEDA14}.Release|x64.ActiveCfg = Release|x64
{7E862973-37C4-4202-80E7-490ED4DEDA14}.Release|x64.Build.0 = Release|x64
{0D4A2D8E-6461-479E-9399-F7929174E050}.Debug|Win32.ActiveCfg = Debug|Win32
{0D4A2D8E-6461-479E-9399-F7929174E050}.Debug|Win32.Build.0 = Debug|Win32
{0D4A2D8E-6461-479E-9399-F7929174E050}.Debug|x64.ActiveCfg = Debug|x64
{0D4A2D8E-6461-479E-9399-F7929174E050}.Debug|x64.Build.0 = Debug|x64
{0D4A2D8E-6461-479E-9399-F7929174E050}.Release|Win32.ActiveCfg = Release|Win32
{0D4A2D8E-6461-479E-9399-F7929174E050}.Release|Win32.Build.0 = Release|Win32
{0D4A2D8E-6461-479E-9399-F7929174E050}.Release|x64.ActiveCfg = Release|x64
{0D4A2D8E-6461-479E-9399-F7929174E050}.Release|x64.Build.0 = Release|x64
{EABA0FF3-1C4D-4FAB-8418-31C9061F3F0D}.Debug|Win32.ActiveCfg = Debug|Win32
{EABA0FF3-1C4D-4FAB-8418-31C9061F3F0D}.Debug|Win32.Build.0 = Debug|Win32
{EABA0FF3-1C4D-4FAB-8418-31C9061F3F0D}.Debug|x64.ActiveCfg = Debug|x64
@ -368,6 +350,14 @@ Global
{062BD3C7-2D01-44F6-8D79-070F688C559F}.Release|Win32.Build.0 = Release|Win32
{062BD3C7-2D01-44F6-8D79-070F688C559F}.Release|x64.ActiveCfg = Release|x64
{062BD3C7-2D01-44F6-8D79-070F688C559F}.Release|x64.Build.0 = Release|x64
{6794EB8C-6425-422D-A3B0-14EED54C0E98}.Debug|Win32.ActiveCfg = Debug|Win32
{6794EB8C-6425-422D-A3B0-14EED54C0E98}.Debug|Win32.Build.0 = Debug|Win32
{6794EB8C-6425-422D-A3B0-14EED54C0E98}.Debug|x64.ActiveCfg = Debug|x64
{6794EB8C-6425-422D-A3B0-14EED54C0E98}.Debug|x64.Build.0 = Debug|x64
{6794EB8C-6425-422D-A3B0-14EED54C0E98}.Release|Win32.ActiveCfg = Release|Win32
{6794EB8C-6425-422D-A3B0-14EED54C0E98}.Release|Win32.Build.0 = Release|Win32
{6794EB8C-6425-422D-A3B0-14EED54C0E98}.Release|x64.ActiveCfg = Release|x64
{6794EB8C-6425-422D-A3B0-14EED54C0E98}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

2
builds/win32/msvc12/FirebirdCommon.props
View File

@ -10,7 +10,7 @@
<ClCompile>
<AdditionalOptions>/EHsc- %(AdditionalOptions)</AdditionalOptions>
<OmitFramePointers>true</OmitFramePointers>
<AdditionalIncludeDirectories>../../../src/include;../../../src/include/gen;../../../extern/libtommath;../../../extern/libatomic_ops/src;../../../extern/zlib;../../../extern/icu/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../../src/include;../../../src/include/gen;../../../extern/libtomcrypt/src/headers;../../../extern/libtommath;../../../extern/icu/include;../../../extern/zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<ExceptionHandling>
</ExceptionHandling>
<RuntimeTypeInfo>false</RuntimeTypeInfo>

40
builds/win32/msvc12/VCCRT_Shared_Body.wxi Normal file
View File

@ -0,0 +1,40 @@
<?xml version="1.0" encoding="utf-8"?><Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Product Id="$(var.PRODUCT_ID)"
Name="MSI to redistribute MS VS2013 CRT libraries for $(var.CPUArch)"
Language="1033"
Version="$(var.MS_CRT_VER)"
Manufacturer="$(var.MANUFACTURER)"
UpgradeCode="$(var.UPGRADE_CODE)"
>
<Package Id="$(var.PACKAGE_ID)"
Description="$(var.DESCRIPTION)"
Comments="$(var.COMMENTS)"
Manufacturer="$(var.MANUFACTURER)"
InstallerVersion="405"
Compressed="yes"
Platform="$(var.CPUArch)"
/>
<Media Id="1" Cabinet="VCCRT.cab" EmbedCab="yes"
/>
<Directory Id="TARGETDIR" Name="SourceDir">
<Merge Id="CRT" Language="0" SourceFile="$(var.MMDIR)\$(var.MSM)" DiskId="1" />
</Directory>
<Feature Id="CRT_WinSXS" Title="CRT WinSXS" Level="1">
<MergeRef Id="CRT" />
</Feature>
<InstallExecuteSequence>
<RemoveRegistryValues />
<RemoveFiles />
<InstallFiles />
<WriteRegistryValues />
</InstallExecuteSequence>
</Product>
</Include>

17
builds/win32/msvc12/VCCRT_Shared_Header.wxi Normal file
View File

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
<!-- This is bad - we really should not be hard coding this
version string, but for now it will have to do. .-->
<?define MS_CRT_VER = "12.00.21005.1" ?>
<?define DESCRIPTION = "MSI to redistribute VS2013 CRT libraries" ?>
<?define COMMENTS = "This MSI specially created for Firebird." ?>
<?define MMDIR = "C:\Program Files (x86)\Common Files\Merge Modules" ?>
<?define MANUFACTURER = "The Firebird Project" ?>
</Include>

15
builds/win32/msvc12/VCCRT_Win32.wxi Normal file
View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
<?define PRODUCT_ID=* ?>
<?define PACKAGE_ID=* ?>
<?define UPGRADE_CODE=0d102e75-eb00-48fe-8450-77ca10b72f6f ?>
<?define MSM="microsoft_vc120_crt_x86.msm" ?>
<?define CPUArch="x86" ?>
</Include>

12
builds/win32/msvc12/VCCRT_Win32.wxs Normal file
View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<?include $(sys.SOURCEFILEDIR)\VCCRT_Shared_Header.wxi ?>
<?include $(sys.SOURCEFILEDIR)\VCCRT_Win32.wxi ?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<?include $(sys.SOURCEFILEDIR)\VCCRT_Shared_Body.wxi ?>
</Wix>

15
builds/win32/msvc12/VCCRT_x64.wxi Normal file
View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
<?define PRODUCT_ID=* ?>
<?define PACKAGE_ID=* ?>
<?define UPGRADE_CODE=f3fc8976-eced-4f3f-9cd4-c7c5941593fc ?>
<?define MSM="microsoft_vc120_crt_x64.msm" ?>
<?define CPUArch="x64" ?>
</Include>

12
builds/win32/msvc12/VCCRT_x64.wxs Normal file
View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<?include $(sys.SOURCEFILEDIR)\VCCRT_Shared_Header.wxi ?>
<?include $(sys.SOURCEFILEDIR)\VCCRT_x64.wxi ?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<?include $(sys.SOURCEFILEDIR)\VCCRT_Shared_Body.wxi ?>
</Wix>

27
builds/win32/msvc12/common.vcxproj
View File

@ -89,11 +89,6 @@
<ClCompile Include="..\..\..\src\common\ThreadData.cpp" />
<ClCompile Include="..\..\..\src\common\ThreadStart.cpp" />
<ClCompile Include="..\..\..\src\common\Tokens.cpp" />
<ClCompile Include="..\..\..\src\common\tomcrypt\crypt_argchk.c" />
<ClCompile Include="..\..\..\src\common\tomcrypt\md5.c" />
<ClCompile Include="..\..\..\src\common\tomcrypt\sha1.c" />
<ClCompile Include="..\..\..\src\common\tomcrypt\sha256.c" />
<ClCompile Include="..\..\..\src\common\tomcrypt\sha512.c" />
<ClCompile Include="..\..\..\src\common\unicode_util.cpp" />
<ClCompile Include="..\..\..\src\common\utils.cpp" />
<ClCompile Include="..\..\..\src\common\UtilSvc.cpp" />
@ -110,6 +105,7 @@
<ClInclude Include="..\..\..\src\common\classes\array.h" />
<ClInclude Include="..\..\..\src\common\classes\auto.h" />
<ClInclude Include="..\..\..\src\common\classes\BaseStream.h" />
<ClInclude Include="..\..\..\src\common\classes\BatchCompletionState.h" />
<ClInclude Include="..\..\..\src\common\classes\BlrReader.h" />
<ClInclude Include="..\..\..\src\common\classes\BlrWriter.h" />
<ClInclude Include="..\..\..\src\common\classes\ByteChunk.h" />
@ -200,19 +196,6 @@
<ClInclude Include="..\..\..\src\common\ThreadData.h" />
<ClInclude Include="..\..\..\src\common\ThreadStart.h" />
<ClInclude Include="..\..\..\src\common\Tokens.h" />
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt.h" />
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_argchk.h" />
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_cfg.h" />
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_cipher.h" />
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_custom.h" />
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_hash.h" />
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_mac.h" />
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_macros.h" />
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_math.h" />
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_misc.h" />
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_pk.h" />
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_pkcs.h" />
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_prng.h" />
<ClInclude Include="..\..\..\src\common\unicode_util.h" />
<ClInclude Include="..\..\..\src\common\UtilSvc.h" />
<ClInclude Include="..\..\..\src\common\utils_proto.h" />
@ -304,7 +287,7 @@
<Culture>0x041d</Culture>
</ResourceCompile>
<Lib>
<AdditionalDependencies>ws2_32.lib;../../../extern/libtommath/lib/$(PlatformName)\$(Configuration)\tommath.lib;../../../extern/decNumber/lib/$(PlatformName)\$(Configuration)\decnumber.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>ws2_32.lib;../../../extern/libtommath/lib/$(PlatformName)\$(Configuration)\tommath.lib;../../../extern/libtomcrypt/lib/$(PlatformName)\$(Configuration)\tomcrypt.lib;../../../extern/decNumber/lib/$(PlatformName)\$(Configuration)\decnumber.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@ -320,7 +303,7 @@
<Culture>0x041d</Culture>
</ResourceCompile>
<Lib>
<AdditionalDependencies>ws2_32.lib;../../../extern/libtommath/lib/$(PlatformName)\$(Configuration)\tommath.lib;../../../extern/decNumber/lib/$(PlatformName)\$(Configuration)\decnumber.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>ws2_32.lib;../../../extern/libtommath/lib/$(PlatformName)\$(Configuration)\tommath.lib;../../../extern/libtomcrypt/lib/$(PlatformName)\$(Configuration)\tomcrypt.lib;../../../extern/decNumber/lib/$(PlatformName)\$(Configuration)\decnumber.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@ -339,7 +322,7 @@
<Culture>0x041d</Culture>
</ResourceCompile>
<Lib>
<AdditionalDependencies>ws2_32.lib;../../../extern/libtommath/lib/$(PlatformName)\$(Configuration)\tommath.lib;../../../extern/decNumber/lib/$(PlatformName)\$(Configuration)\decnumber.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>ws2_32.lib;../../../extern/libtommath/lib/$(PlatformName)\$(Configuration)\tommath.lib;../../../extern/libtomcrypt/lib/$(PlatformName)\$(Configuration)\tomcrypt.lib;../../../extern/decNumber/lib/$(PlatformName)\$(Configuration)\decnumber.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@ -357,7 +340,7 @@
<Culture>0x041d</Culture>
</ResourceCompile>
<Lib>
<AdditionalDependencies>ws2_32.lib;../../../extern/libtommath/lib/$(PlatformName)\$(Configuration)\tommath.lib;../../../extern/decNumber/lib/$(PlatformName)\$(Configuration)\decnumber.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>ws2_32.lib;../../../extern/libtommath/lib/$(PlatformName)\$(Configuration)\tommath.lib;../../../extern/libtomcrypt/lib/$(PlatformName)\$(Configuration)\tomcrypt.lib;../../../extern/decNumber/lib/$(PlatformName)\$(Configuration)\decnumber.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Lib>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

56
builds/win32/msvc12/common.vcxproj.filters
View File

@ -13,9 +13,6 @@
<Filter Include="headers">
<UniqueIdentifier>{03f83331-723e-4ba5-9ebb-348f0554a088}</UniqueIdentifier>
</Filter>
<Filter Include="tomcrypt">
<UniqueIdentifier>{dd0bb92e-0a1e-4406-96ff-5265e8d28258}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\src\common\xdr.cpp">
@ -222,21 +219,6 @@
<ClCompile Include="..\..\..\src\common\DecFloat.cpp">
<Filter>classes</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\common\tomcrypt\crypt_argchk.c">
<Filter>tomcrypt</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\common\tomcrypt\md5.c">
<Filter>tomcrypt</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\common\tomcrypt\sha1.c">
<Filter>tomcrypt</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\common\tomcrypt\sha256.c">
<Filter>tomcrypt</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\common\tomcrypt\sha512.c">
<Filter>tomcrypt</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\common\classes\TomCryptHash.cpp">
<Filter>classes</Filter>
</ClCompile>
@ -557,43 +539,7 @@
<ClInclude Include="..\..\..\src\common\DecFloat.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_argchk.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_cfg.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_cipher.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_custom.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_hash.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_mac.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_macros.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_math.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_misc.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_pk.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_pkcs.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_prng.h">
<ClInclude Include="..\..\..\src\common\classes\BatchCompletionState.h">
<Filter>headers</Filter>
</ClInclude>
</ItemGroup>

2
builds/win32/msvc12/engine.vcxproj
View File

@ -37,6 +37,7 @@
<ClCompile Include="..\..\..\src\dsql\BoolNodes.cpp" />
<ClCompile Include="..\..\..\src\dsql\ddl.cpp" />
<ClCompile Include="..\..\..\src\dsql\dsql.cpp" />
<ClCompile Include="..\..\..\src\dsql\DsqlBatch.cpp" />
<ClCompile Include="..\..\..\src\dsql\DsqlCompilerScratch.cpp" />
<ClCompile Include="..\..\..\src\dsql\DsqlCursor.cpp" />
<ClCompile Include="..\..\..\src\dsql\DSqlDataTypeUtil.cpp" />
@ -168,6 +169,7 @@
<ClInclude Include="..\..\..\src\dsql\DdlNodes.h" />
<ClInclude Include="..\..\..\src\dsql\ddl_proto.h" />
<ClInclude Include="..\..\..\src\dsql\dsql.h" />
<ClInclude Include="..\..\..\src\dsql\DsqlBatch.h" />
<ClInclude Include="..\..\..\src\dsql\DsqlCompilerScratch.h" />
<ClInclude Include="..\..\..\src\dsql\DsqlCursor.h" />
<ClInclude Include="..\..\..\src\dsql\DSqlDataTypeUtil.h" />

6
builds/win32/msvc12/engine.vcxproj.filters
View File

@ -462,6 +462,9 @@
<ClCompile Include="..\..\..\src\jrd\Savepoint.cpp">
<Filter>JRD files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\dsql\DsqlBatch.cpp">
<Filter>DSQL</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\src\jrd\recsrc\RecordSource.h">
@ -989,6 +992,9 @@
<ClInclude Include="..\..\..\src\jrd\extds\ValidatePassword.h">
<Filter>Header files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\dsql\DsqlBatch.h">
<Filter>Header files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\src\dsql\DdlNodes.epp">

45
builds/win32/msvc12/fbudf.vcxproj.filters
View File

@ -1,45 +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>{338702b2-c4d3-4740-90fb-39ab24cb52c6}</UniqueIdentifier>
<Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{2d40ef80-0cc1-4de9-929b-ea0f3bc1e258}</UniqueIdentifier>
<Extensions>h;hpp;hxx;hm;inl</Extensions>
</Filter>
<Filter Include="Resource Files">
<UniqueIdentifier>{6bb99ef2-2ed0-40fe-aa79-1f484f9de430}</UniqueIdentifier>
<Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\src\extlib\fbudf\fbudf.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\extlib\fbudf\stdafx.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\src\extlib\fbudf\fbudf.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\jrd\ibase.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\extlib\fbudf\stdafx.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\src\extlib\fbudf\fbudf.sql" />
<None Include="..\..\..\src\extlib\fbudf\fbudf.txt" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\..\..\src\jrd\version.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
</Project>

235
builds/win32/msvc12/ib_udf.vcxproj
View File

@ -1,235 +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>{0D4A2D8E-6461-479E-9399-F7929174E050}</ProjectGuid>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v120_xp</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v120_xp</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
<Import Project="FirebirdCommon.props" />
<Import Project="FirebirdRelease.props" />
<Import Project="DllNoEmbedManifest.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
<Import Project="FirebirdCommon.props" />
<Import Project="FirebirdDebug.props" />
<Import Project="DllNoEmbedManifest.props" />
</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" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
<Import Project="FirebirdCommon.props" />
<Import Project="FirebirdRelease.props" />
<Import Project="DllNoEmbedManifest.props" />
</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" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
<Import Project="FirebirdCommon.props" />
<Import Project="FirebirdDebug.props" />
<Import Project="DllNoEmbedManifest.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\udf\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\udf\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\udf\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\udf\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Midl>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MkTypLibCompatible>true</MkTypLibCompatible>
<TargetEnvironment>Win32</TargetEnvironment>
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x041d</Culture>
</ResourceCompile>
<Link>
<AdditionalDependencies>comctl32.lib;ws2_32.lib;mpr.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\..\temp\$(Platform)\$(Configuration)\firebird\udf\$(ProjectName).dll</OutputFile>
<ModuleDefinitionFile>..\defs\ib_udf.def</ModuleDefinitionFile>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
<SubSystem>Windows</SubSystem>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Midl>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MkTypLibCompatible>true</MkTypLibCompatible>
<TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x041d</Culture>
</ResourceCompile>
<Link>
<AdditionalDependencies>comctl32.lib;ws2_32.lib;mpr.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\..\temp\$(Platform)\$(Configuration)\firebird\udf\$(ProjectName).dll</OutputFile>
<ModuleDefinitionFile>..\defs\ib_udf.def</ModuleDefinitionFile>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
<TargetMachine>MachineX64</TargetMachine>
<SubSystem>Windows</SubSystem>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Midl>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MkTypLibCompatible>true</MkTypLibCompatible>
<TargetEnvironment>Win32</TargetEnvironment>
</Midl>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<IntrinsicFunctions>true</IntrinsicFunctions>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x041d</Culture>
</ResourceCompile>
<Link>
<AdditionalDependencies>comctl32.lib;ws2_32.lib;mpr.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\..\temp\$(Platform)\$(Configuration)\firebird\udf\$(ProjectName).dll</OutputFile>
<ModuleDefinitionFile>..\defs\ib_udf.def</ModuleDefinitionFile>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
<SubSystem>Windows</SubSystem>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Midl>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MkTypLibCompatible>true</MkTypLibCompatible>
<TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<IntrinsicFunctions>true</IntrinsicFunctions>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x041d</Culture>
</ResourceCompile>
<Link>
<AdditionalDependencies>comctl32.lib;ws2_32.lib;mpr.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\..\temp\$(Platform)\$(Configuration)\firebird\udf\$(ProjectName).dll</OutputFile>
<ModuleDefinitionFile>..\defs\ib_udf.def</ModuleDefinitionFile>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
<TargetMachine>MachineX64</TargetMachine>
<SubSystem>Windows</SubSystem>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\src\extlib\ib_udf.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\src\extlib\ib_udf.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\..\..\src\jrd\version.rc">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\src\jrd</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\src\jrd</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\src\jrd</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\src\jrd</AdditionalIncludeDirectories>
</ResourceCompile>
</ItemGroup>
<ItemGroup>
<None Include="..\defs\ib_udf.def" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="ib_util.vcxproj">
<Project>{eaba0ff3-1c4d-4fab-8418-31c9061f3f0d}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

34
builds/win32/msvc12/ib_udf.vcxproj.filters
View File

@ -1,34 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="EXTLIB files">
<UniqueIdentifier>{71fb8e61-eec7-4d0c-8bcf-131fccc9d5db}</UniqueIdentifier>
<Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
</Filter>
<Filter Include="Header files">
<UniqueIdentifier>{3b800df6-cf93-47b3-82f4-031e7731cc4f}</UniqueIdentifier>
<Extensions>h;hpp;hxx;hm;inl</Extensions>
</Filter>
<Filter Include="Resource files">
<UniqueIdentifier>{23757d96-0a7d-4aa4-96af-8c0114d25877}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\src\extlib\ib_udf.cpp">
<Filter>EXTLIB files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\src\extlib\ib_udf.h">
<Filter>Header files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\..\..\src\jrd\version.rc">
<Filter>Resource files</Filter>
</ResourceCompile>
</ItemGroup>
<ItemGroup>
<None Include="..\defs\ib_udf.def" />
</ItemGroup>
</Project>

42
builds/win32/msvc12/fbudf.vcxproj → builds/win32/msvc12/udf_compat.vcxproj
View File

@ -19,7 +19,7 @@
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{9DC67B05-AC3E-49A3-B0CC-83B25D757445}</ProjectGuid>
<ProjectGuid>{6794EB8C-6425-422D-A3B0-14EED54C0E98}</ProjectGuid>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@ -92,10 +92,10 @@
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\udf\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\udf\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\udf\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\udf\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\udr\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\udr\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\udr\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\udr\</OutDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@ -120,6 +120,7 @@
<DataExecutionPrevention>
</DataExecutionPrevention>
<SubSystem>Windows</SubSystem>
<ModuleDefinitionFile>..\defs\udr_plugin.def</ModuleDefinitionFile>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@ -145,6 +146,7 @@
</DataExecutionPrevention>
<TargetMachine>MachineX64</TargetMachine>
<SubSystem>Windows</SubSystem>
<ModuleDefinitionFile>..\defs\udr_plugin.def</ModuleDefinitionFile>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@ -167,6 +169,7 @@
<DataExecutionPrevention>
</DataExecutionPrevention>
<SubSystem>Windows</SubSystem>
<ModuleDefinitionFile>..\defs\udr_plugin.def</ModuleDefinitionFile>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@ -189,33 +192,18 @@
</DataExecutionPrevention>
<TargetMachine>MachineX64</TargetMachine>
<SubSystem>Windows</SubSystem>
<ModuleDefinitionFile>..\defs\udr_plugin.def</ModuleDefinitionFile>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\src\extlib\fbudf\fbudf.cpp" />
<ClCompile Include="..\..\..\src\extlib\fbudf\stdafx.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\src\extlib\fbudf\fbudf.h" />
<ClInclude Include="..\..\..\src\jrd\ibase.h" />
<ClInclude Include="..\..\..\src\extlib\fbudf\stdafx.h" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\src\extlib\fbudf\fbudf.sql" />
<None Include="..\..\..\src\extlib\fbudf\fbudf.txt" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="common.vcxproj">
<Project>{15605f44-bffd-444f-ad4c-55dc9d704465}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="yvalve.vcxproj">
<Project>{4fe03933-98cd-4879-a135-fd9430087a6b}</Project>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\..\..\src\jrd\version.rc" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\src\extlib\UdfBackwardCompatibility.cpp" />
</ItemGroup>
<ItemGroup>
<None Include="..\defs\udr_plugin.def" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>

27
builds/win32/msvc12/udf_compat.vcxproj.filters Normal file
View File

@ -0,0 +1,27 @@
<?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>{b8e84500-8d51-41a9-879a-665157ad8cba}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{e1d0ec8b-34eb-49f1-88ee-e63ecfea0db1}</UniqueIdentifier>
</Filter>
<Filter Include="Resource files">
<UniqueIdentifier>{1995e0f6-f169-4a72-bcc9-21990c0db77a}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\..\..\src\jrd\version.rc">
<Filter>Resource files</Filter>
</ResourceCompile>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\src\extlib\UdfBackwardCompatibility.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="..\defs\udr_plugin.def" />
</ItemGroup>
</Project>

30
builds/win32/msvc14/Firebird.sln
View File

@ -24,8 +24,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fbserver", "fbserver.vcxpro
{F8798A49-9D20-451E-A7BD-FEB5237103B5} = {F8798A49-9D20-451E-A7BD-FEB5237103B5}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fbudf", "fbudf.vcxproj", "{9DC67B05-AC3E-49A3-B0CC-83B25D757445}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gbak", "gbak.vcxproj", "{B732F5D2-B5D9-417F-B156-D790F466CB8E}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gfix", "gfix.vcxproj", "{44A9E4AD-B932-4620-B319-431A153BB341}"
@ -41,8 +39,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gsplit", "gsplit.vcxproj",
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gstat", "gstat.vcxproj", "{7E862973-37C4-4202-80E7-490ED4DEDA14}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ib_udf", "ib_udf.vcxproj", "{0D4A2D8E-6461-479E-9399-F7929174E050}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ib_util", "ib_util.vcxproj", "{EABA0FF3-1C4D-4FAB-8418-31C9061F3F0D}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "instreg", "instreg.vcxproj", "{19470DE6-1975-4F9B-B1BE-E87A83240B15}"
@ -86,6 +82,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "srp", "srp.vcxproj", "{BD00
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "legacy_auth", "legacy_auth.vcxproj", "{062BD3C7-2D01-44F6-8D79-070F688C559F}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "udf_compat", "udf_compat.vcxproj", "{6794EB8C-6425-422D-A3B0-14EED54C0E98}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@ -150,14 +148,6 @@ Global
{23EC8DAA-6718-4EF3-979F-89F611C7D504}.Release|Win32.Build.0 = Release|Win32
{23EC8DAA-6718-4EF3-979F-89F611C7D504}.Release|x64.ActiveCfg = Release|x64
{23EC8DAA-6718-4EF3-979F-89F611C7D504}.Release|x64.Build.0 = Release|x64
{9DC67B05-AC3E-49A3-B0CC-83B25D757445}.Debug|Win32.ActiveCfg = Debug|Win32
{9DC67B05-AC3E-49A3-B0CC-83B25D757445}.Debug|Win32.Build.0 = Debug|Win32
{9DC67B05-AC3E-49A3-B0CC-83B25D757445}.Debug|x64.ActiveCfg = Debug|x64
{9DC67B05-AC3E-49A3-B0CC-83B25D757445}.Debug|x64.Build.0 = Debug|x64
{9DC67B05-AC3E-49A3-B0CC-83B25D757445}.Release|Win32.ActiveCfg = Release|Win32
{9DC67B05-AC3E-49A3-B0CC-83B25D757445}.Release|Win32.Build.0 = Release|Win32
{9DC67B05-AC3E-49A3-B0CC-83B25D757445}.Release|x64.ActiveCfg = Release|x64
{9DC67B05-AC3E-49A3-B0CC-83B25D757445}.Release|x64.Build.0 = Release|x64
{B732F5D2-B5D9-417F-B156-D790F466CB8E}.Debug|Win32.ActiveCfg = Debug|Win32
{B732F5D2-B5D9-417F-B156-D790F466CB8E}.Debug|Win32.Build.0 = Debug|Win32
{B732F5D2-B5D9-417F-B156-D790F466CB8E}.Debug|x64.ActiveCfg = Debug|x64
@ -206,14 +196,6 @@ Global
{7E862973-37C4-4202-80E7-490ED4DEDA14}.Release|Win32.Build.0 = Release|Win32
{7E862973-37C4-4202-80E7-490ED4DEDA14}.Release|x64.ActiveCfg = Release|x64
{7E862973-37C4-4202-80E7-490ED4DEDA14}.Release|x64.Build.0 = Release|x64
{0D4A2D8E-6461-479E-9399-F7929174E050}.Debug|Win32.ActiveCfg = Debug|Win32
{0D4A2D8E-6461-479E-9399-F7929174E050}.Debug|Win32.Build.0 = Debug|Win32
{0D4A2D8E-6461-479E-9399-F7929174E050}.Debug|x64.ActiveCfg = Debug|x64
{0D4A2D8E-6461-479E-9399-F7929174E050}.Debug|x64.Build.0 = Debug|x64
{0D4A2D8E-6461-479E-9399-F7929174E050}.Release|Win32.ActiveCfg = Release|Win32
{0D4A2D8E-6461-479E-9399-F7929174E050}.Release|Win32.Build.0 = Release|Win32
{0D4A2D8E-6461-479E-9399-F7929174E050}.Release|x64.ActiveCfg = Release|x64
{0D4A2D8E-6461-479E-9399-F7929174E050}.Release|x64.Build.0 = Release|x64
{EABA0FF3-1C4D-4FAB-8418-31C9061F3F0D}.Debug|Win32.ActiveCfg = Debug|Win32
{EABA0FF3-1C4D-4FAB-8418-31C9061F3F0D}.Debug|Win32.Build.0 = Debug|Win32
{EABA0FF3-1C4D-4FAB-8418-31C9061F3F0D}.Debug|x64.ActiveCfg = Debug|x64
@ -368,6 +350,14 @@ Global
{062BD3C7-2D01-44F6-8D79-070F688C559F}.Release|Win32.Build.0 = Release|Win32
{062BD3C7-2D01-44F6-8D79-070F688C559F}.Release|x64.ActiveCfg = Release|x64
{062BD3C7-2D01-44F6-8D79-070F688C559F}.Release|x64.Build.0 = Release|x64
{6794EB8C-6425-422D-A3B0-14EED54C0E98}.Debug|Win32.ActiveCfg = Debug|Win32
{6794EB8C-6425-422D-A3B0-14EED54C0E98}.Debug|Win32.Build.0 = Debug|Win32
{6794EB8C-6425-422D-A3B0-14EED54C0E98}.Debug|x64.ActiveCfg = Debug|x64
{6794EB8C-6425-422D-A3B0-14EED54C0E98}.Debug|x64.Build.0 = Debug|x64
{6794EB8C-6425-422D-A3B0-14EED54C0E98}.Release|Win32.ActiveCfg = Release|Win32
{6794EB8C-6425-422D-A3B0-14EED54C0E98}.Release|Win32.Build.0 = Release|Win32
{6794EB8C-6425-422D-A3B0-14EED54C0E98}.Release|x64.ActiveCfg = Release|x64
{6794EB8C-6425-422D-A3B0-14EED54C0E98}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

2
builds/win32/msvc14/FirebirdCommon.props
View File

@ -10,7 +10,7 @@
<ClCompile>
<AdditionalOptions>/EHsc- %(AdditionalOptions)</AdditionalOptions>
<OmitFramePointers>true</OmitFramePointers>
<AdditionalIncludeDirectories>../../../src/include;../../../src/include/gen;../../../extern/libtommath;../../../extern/icu/include;../../../extern/zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../../src/include;../../../src/include/gen;../../../extern/libtomcrypt/src/headers;../../../extern/libtommath;../../../extern/icu/include;../../../extern/zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<ExceptionHandling>
</ExceptionHandling>
<RuntimeTypeInfo>false</RuntimeTypeInfo>

27
builds/win32/msvc14/common.vcxproj
View File

@ -89,11 +89,6 @@
<ClCompile Include="..\..\..\src\common\ThreadData.cpp" />
<ClCompile Include="..\..\..\src\common\ThreadStart.cpp" />
<ClCompile Include="..\..\..\src\common\Tokens.cpp" />
<ClCompile Include="..\..\..\src\common\tomcrypt\crypt_argchk.c" />
<ClCompile Include="..\..\..\src\common\tomcrypt\md5.c" />
<ClCompile Include="..\..\..\src\common\tomcrypt\sha1.c" />
<ClCompile Include="..\..\..\src\common\tomcrypt\sha256.c" />
<ClCompile Include="..\..\..\src\common\tomcrypt\sha512.c" />
<ClCompile Include="..\..\..\src\common\unicode_util.cpp" />
<ClCompile Include="..\..\..\src\common\utils.cpp" />
<ClCompile Include="..\..\..\src\common\UtilSvc.cpp" />
@ -110,6 +105,7 @@
<ClInclude Include="..\..\..\src\common\classes\array.h" />
<ClInclude Include="..\..\..\src\common\classes\auto.h" />
<ClInclude Include="..\..\..\src\common\classes\BaseStream.h" />
<ClInclude Include="..\..\..\src\common\classes\BatchCompletionState.h" />
<ClInclude Include="..\..\..\src\common\classes\BlrReader.h" />
<ClInclude Include="..\..\..\src\common\classes\BlrWriter.h" />
<ClInclude Include="..\..\..\src\common\classes\ByteChunk.h" />
@ -200,19 +196,6 @@
<ClInclude Include="..\..\..\src\common\ThreadData.h" />
<ClInclude Include="..\..\..\src\common\ThreadStart.h" />
<ClInclude Include="..\..\..\src\common\Tokens.h" />
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt.h" />
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_argchk.h" />
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_cfg.h" />
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_cipher.h" />
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_custom.h" />
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_hash.h" />
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_mac.h" />
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_macros.h" />
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_math.h" />
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_misc.h" />
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_pk.h" />
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_pkcs.h" />
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_prng.h" />
<ClInclude Include="..\..\..\src\common\unicode_util.h" />
<ClInclude Include="..\..\..\src\common\UtilSvc.h" />
<ClInclude Include="..\..\..\src\common\utils_proto.h" />
@ -304,7 +287,7 @@
<Culture>0x041d</Culture>
</ResourceCompile>
<Lib>
<AdditionalDependencies>ws2_32.lib;../../../extern/libtommath/lib/$(PlatformName)\$(Configuration)\tommath.lib;../../../extern/decNumber/lib/$(PlatformName)\$(Configuration)\decnumber.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>ws2_32.lib;../../../extern/libtommath/lib/$(PlatformName)\$(Configuration)\tommath.lib;../../../extern/libtomcrypt/lib/$(PlatformName)\$(Configuration)\tomcrypt.lib;../../../extern/decNumber/lib/$(PlatformName)\$(Configuration)\decnumber.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@ -320,7 +303,7 @@
<Culture>0x041d</Culture>
</ResourceCompile>
<Lib>
<AdditionalDependencies>ws2_32.lib;../../../extern/libtommath/lib/$(PlatformName)\$(Configuration)\tommath.lib;../../../extern/decNumber/lib/$(PlatformName)\$(Configuration)\decnumber.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>ws2_32.lib;../../../extern/libtommath/lib/$(PlatformName)\$(Configuration)\tommath.lib;../../../extern/libtomcrypt/lib/$(PlatformName)\$(Configuration)\tomcrypt.lib;../../../extern/decNumber/lib/$(PlatformName)\$(Configuration)\decnumber.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@ -339,7 +322,7 @@
<Culture>0x041d</Culture>
</ResourceCompile>
<Lib>
<AdditionalDependencies>ws2_32.lib;../../../extern/libtommath/lib/$(PlatformName)\$(Configuration)\tommath.lib;../../../extern/decNumber/lib/$(PlatformName)\$(Configuration)\decnumber.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>ws2_32.lib;../../../extern/libtommath/lib/$(PlatformName)\$(Configuration)\tommath.lib;../../../extern/libtomcrypt/lib/$(PlatformName)\$(Configuration)\tomcrypt.lib;../../../extern/decNumber/lib/$(PlatformName)\$(Configuration)\decnumber.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@ -357,7 +340,7 @@
<Culture>0x041d</Culture>
</ResourceCompile>
<Lib>
<AdditionalDependencies>ws2_32.lib;../../../extern/libtommath/lib/$(PlatformName)\$(Configuration)\tommath.lib;../../../extern/decNumber/lib/$(PlatformName)\$(Configuration)\decnumber.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>ws2_32.lib;../../../extern/libtommath/lib/$(PlatformName)\$(Configuration)\tommath.lib;../../../extern/libtomcrypt/lib/$(PlatformName)\$(Configuration)\tomcrypt.lib;../../../extern/decNumber/lib/$(PlatformName)\$(Configuration)\decnumber.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Lib>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

56
builds/win32/msvc14/common.vcxproj.filters
View File

@ -13,9 +13,6 @@
<Filter Include="headers">
<UniqueIdentifier>{03f83331-723e-4ba5-9ebb-348f0554a088}</UniqueIdentifier>
</Filter>
<Filter Include="tomcrypt">
<UniqueIdentifier>{dd0bb92e-0a1e-4406-96ff-5265e8d28258}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\src\common\xdr.cpp">
@ -222,21 +219,6 @@
<ClCompile Include="..\..\..\src\common\DecFloat.cpp">
<Filter>classes</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\common\tomcrypt\crypt_argchk.c">
<Filter>tomcrypt</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\common\tomcrypt\md5.c">
<Filter>tomcrypt</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\common\tomcrypt\sha1.c">
<Filter>tomcrypt</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\common\tomcrypt\sha256.c">
<Filter>tomcrypt</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\common\tomcrypt\sha512.c">
<Filter>tomcrypt</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\common\classes\TomCryptHash.cpp">
<Filter>classes</Filter>
</ClCompile>
@ -557,43 +539,7 @@
<ClInclude Include="..\..\..\src\common\DecFloat.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_argchk.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_cfg.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_cipher.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_custom.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_hash.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_mac.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_macros.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_math.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_misc.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_pk.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_pkcs.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_prng.h">
<ClInclude Include="..\..\..\src\common\classes\BatchCompletionState.h">
<Filter>headers</Filter>
</ClInclude>
</ItemGroup>

2
builds/win32/msvc14/engine.vcxproj
View File

@ -37,6 +37,7 @@
<ClCompile Include="..\..\..\src\dsql\BoolNodes.cpp" />
<ClCompile Include="..\..\..\src\dsql\ddl.cpp" />
<ClCompile Include="..\..\..\src\dsql\dsql.cpp" />
<ClCompile Include="..\..\..\src\dsql\DsqlBatch.cpp" />
<ClCompile Include="..\..\..\src\dsql\DsqlCompilerScratch.cpp" />
<ClCompile Include="..\..\..\src\dsql\DsqlCursor.cpp" />
<ClCompile Include="..\..\..\src\dsql\DSqlDataTypeUtil.cpp" />
@ -168,6 +169,7 @@
<ClInclude Include="..\..\..\src\dsql\DdlNodes.h" />
<ClInclude Include="..\..\..\src\dsql\ddl_proto.h" />
<ClInclude Include="..\..\..\src\dsql\dsql.h" />
<ClInclude Include="..\..\..\src\dsql\DsqlBatch.h" />
<ClInclude Include="..\..\..\src\dsql\DsqlCompilerScratch.h" />
<ClInclude Include="..\..\..\src\dsql\DsqlCursor.h" />
<ClInclude Include="..\..\..\src\dsql\DSqlDataTypeUtil.h" />

6
builds/win32/msvc14/engine.vcxproj.filters
View File

@ -462,6 +462,9 @@
<ClCompile Include="..\..\..\src\jrd\Savepoint.cpp">
<Filter>JRD files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\dsql\DsqlBatch.cpp">
<Filter>DSQL</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\src\jrd\recsrc\RecordSource.h">
@ -989,6 +992,9 @@
<ClInclude Include="..\..\..\src\jrd\extds\ValidatePassword.h">
<Filter>Header files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\dsql\DsqlBatch.h">
<Filter>Header files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\src\dsql\DdlNodes.epp">

45
builds/win32/msvc14/fbudf.vcxproj.filters
View File

@ -1,45 +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>{338702b2-c4d3-4740-90fb-39ab24cb52c6}</UniqueIdentifier>
<Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{2d40ef80-0cc1-4de9-929b-ea0f3bc1e258}</UniqueIdentifier>
<Extensions>h;hpp;hxx;hm;inl</Extensions>
</Filter>
<Filter Include="Resource Files">
<UniqueIdentifier>{6bb99ef2-2ed0-40fe-aa79-1f484f9de430}</UniqueIdentifier>
<Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\src\extlib\fbudf\fbudf.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\extlib\fbudf\stdafx.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\src\extlib\fbudf\fbudf.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\jrd\ibase.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\extlib\fbudf\stdafx.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\src\extlib\fbudf\fbudf.sql" />
<None Include="..\..\..\src\extlib\fbudf\fbudf.txt" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\..\..\src\jrd\version.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
</Project>

235
builds/win32/msvc14/ib_udf.vcxproj
View File

@ -1,235 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.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>{0D4A2D8E-6461-479E-9399-F7929174E050}</ProjectGuid>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v140_xp</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v140_xp</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
<Import Project="FirebirdCommon.props" />
<Import Project="FirebirdRelease.props" />
<Import Project="DllNoEmbedManifest.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
<Import Project="FirebirdCommon.props" />
<Import Project="FirebirdDebug.props" />
<Import Project="DllNoEmbedManifest.props" />
</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" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
<Import Project="FirebirdCommon.props" />
<Import Project="FirebirdRelease.props" />
<Import Project="DllNoEmbedManifest.props" />
</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" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
<Import Project="FirebirdCommon.props" />
<Import Project="FirebirdDebug.props" />
<Import Project="DllNoEmbedManifest.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\udf\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\udf\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\udf\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\udf\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Midl>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MkTypLibCompatible>true</MkTypLibCompatible>
<TargetEnvironment>Win32</TargetEnvironment>
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x041d</Culture>
</ResourceCompile>
<Link>
<AdditionalDependencies>comctl32.lib;ws2_32.lib;mpr.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\..\temp\$(Platform)\$(Configuration)\firebird\udf\$(ProjectName).dll</OutputFile>
<ModuleDefinitionFile>..\defs\ib_udf.def</ModuleDefinitionFile>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
<SubSystem>Windows</SubSystem>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Midl>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MkTypLibCompatible>true</MkTypLibCompatible>
<TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x041d</Culture>
</ResourceCompile>
<Link>
<AdditionalDependencies>comctl32.lib;ws2_32.lib;mpr.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\..\temp\$(Platform)\$(Configuration)\firebird\udf\$(ProjectName).dll</OutputFile>
<ModuleDefinitionFile>..\defs\ib_udf.def</ModuleDefinitionFile>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
<TargetMachine>MachineX64</TargetMachine>
<SubSystem>Windows</SubSystem>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Midl>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MkTypLibCompatible>true</MkTypLibCompatible>
<TargetEnvironment>Win32</TargetEnvironment>
</Midl>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<IntrinsicFunctions>true</IntrinsicFunctions>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x041d</Culture>
</ResourceCompile>
<Link>
<AdditionalDependencies>comctl32.lib;ws2_32.lib;mpr.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\..\temp\$(Platform)\$(Configuration)\firebird\udf\$(ProjectName).dll</OutputFile>
<ModuleDefinitionFile>..\defs\ib_udf.def</ModuleDefinitionFile>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
<SubSystem>Windows</SubSystem>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Midl>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MkTypLibCompatible>true</MkTypLibCompatible>
<TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<IntrinsicFunctions>true</IntrinsicFunctions>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x041d</Culture>
</ResourceCompile>
<Link>
<AdditionalDependencies>comctl32.lib;ws2_32.lib;mpr.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\..\temp\$(Platform)\$(Configuration)\firebird\udf\$(ProjectName).dll</OutputFile>
<ModuleDefinitionFile>..\defs\ib_udf.def</ModuleDefinitionFile>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
<TargetMachine>MachineX64</TargetMachine>
<SubSystem>Windows</SubSystem>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\src\extlib\ib_udf.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\src\extlib\ib_udf.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\..\..\src\jrd\version.rc">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\src\jrd</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\src\jrd</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\src\jrd</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\src\jrd</AdditionalIncludeDirectories>
</ResourceCompile>
</ItemGroup>
<ItemGroup>
<None Include="..\defs\ib_udf.def" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="ib_util.vcxproj">
<Project>{eaba0ff3-1c4d-4fab-8418-31c9061f3f0d}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

34
builds/win32/msvc14/ib_udf.vcxproj.filters
View File

@ -1,34 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="EXTLIB files">
<UniqueIdentifier>{71fb8e61-eec7-4d0c-8bcf-131fccc9d5db}</UniqueIdentifier>
<Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
</Filter>
<Filter Include="Header files">
<UniqueIdentifier>{3b800df6-cf93-47b3-82f4-031e7731cc4f}</UniqueIdentifier>
<Extensions>h;hpp;hxx;hm;inl</Extensions>
</Filter>
<Filter Include="Resource files">
<UniqueIdentifier>{23757d96-0a7d-4aa4-96af-8c0114d25877}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\src\extlib\ib_udf.cpp">
<Filter>EXTLIB files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\src\extlib\ib_udf.h">
<Filter>Header files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\..\..\src\jrd\version.rc">
<Filter>Resource files</Filter>
</ResourceCompile>
</ItemGroup>
<ItemGroup>
<None Include="..\defs\ib_udf.def" />
</ItemGroup>
</Project>

42
builds/win32/msvc14/fbudf.vcxproj → builds/win32/msvc14/udf_compat.vcxproj
View File

@ -19,7 +19,7 @@
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{9DC67B05-AC3E-49A3-B0CC-83B25D757445}</ProjectGuid>
<ProjectGuid>{6794EB8C-6425-422D-A3B0-14EED54C0E98}</ProjectGuid>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@ -92,10 +92,10 @@
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\udf\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\udf\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\udf\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\udf\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\udr\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\udr\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\udr\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\udr\</OutDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@ -120,6 +120,7 @@
<DataExecutionPrevention>
</DataExecutionPrevention>
<SubSystem>Windows</SubSystem>
<ModuleDefinitionFile>..\defs\udr_plugin.def</ModuleDefinitionFile>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@ -145,6 +146,7 @@
</DataExecutionPrevention>
<TargetMachine>MachineX64</TargetMachine>
<SubSystem>Windows</SubSystem>
<ModuleDefinitionFile>..\defs\udr_plugin.def</ModuleDefinitionFile>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@ -167,6 +169,7 @@
<DataExecutionPrevention>
</DataExecutionPrevention>
<SubSystem>Windows</SubSystem>
<ModuleDefinitionFile>..\defs\udr_plugin.def</ModuleDefinitionFile>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@ -189,33 +192,18 @@
</DataExecutionPrevention>
<TargetMachine>MachineX64</TargetMachine>
<SubSystem>Windows</SubSystem>
<ModuleDefinitionFile>..\defs\udr_plugin.def</ModuleDefinitionFile>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\src\extlib\fbudf\fbudf.cpp" />
<ClCompile Include="..\..\..\src\extlib\fbudf\stdafx.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\src\extlib\fbudf\fbudf.h" />
<ClInclude Include="..\..\..\src\jrd\ibase.h" />
<ClInclude Include="..\..\..\src\extlib\fbudf\stdafx.h" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\src\extlib\fbudf\fbudf.sql" />
<None Include="..\..\..\src\extlib\fbudf\fbudf.txt" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="common.vcxproj">
<Project>{15605f44-bffd-444f-ad4c-55dc9d704465}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="yvalve.vcxproj">
<Project>{4fe03933-98cd-4879-a135-fd9430087a6b}</Project>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\..\..\src\jrd\version.rc" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\src\extlib\UdfBackwardCompatibility.cpp" />
</ItemGroup>
<ItemGroup>
<None Include="..\defs\udr_plugin.def" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>

27
builds/win32/msvc14/udf_compat.vcxproj.filters Normal file
View File

@ -0,0 +1,27 @@
<?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>{b8e84500-8d51-41a9-879a-665157ad8cba}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{e1d0ec8b-34eb-49f1-88ee-e63ecfea0db1}</UniqueIdentifier>
</Filter>
<Filter Include="Resource files">
<UniqueIdentifier>{1995e0f6-f169-4a72-bcc9-21990c0db77a}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\..\..\src\jrd\version.rc">
<Filter>Resource files</Filter>
</ResourceCompile>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\src\extlib\UdfBackwardCompatibility.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="..\defs\udr_plugin.def" />
</ItemGroup>
</Project>

57
configure.ac
View File

@ -237,7 +237,7 @@ dnl CPU_TYPE=ppc64
STD_EDITLINE=true
;;
aarch64*-*-linux*)
aarch64*-*-linux*)
MAKEFILE_PREFIX=linux_arm64
INSTALL_PREFIX=linux
PLATFORM=LINUX
@ -249,7 +249,7 @@ dnl CPU_TYPE=ppc64
libdir=/usr/lib64
;;
powerpc64le-*-linux*)
powerpc64le-*-linux*)
MAKEFILE_PREFIX=linux_powerpc64el
INSTALL_PREFIX=linux
PLATFORM=LINUX
@ -261,7 +261,7 @@ dnl CPU_TYPE=ppc64
libdir=/usr/lib64
;;
powerpc64-*-linux*)
powerpc64-*-linux*)
MAKEFILE_PREFIX=linux_powerpc64
INSTALL_PREFIX=linux
PLATFORM=LINUX
@ -525,11 +525,17 @@ AC_ARG_WITH(cross-build,
IS_CROSS=Y])
AC_SUBST(IS_CROSS)
TOMBUILD=N
TOMMATH_BUILD=N
AC_ARG_WITH(builtin-tommath,
[ --with-builtin-tommath build libtommath library from firebird tree],
[TOMBUILD=Y])
AC_SUBST(TOMBUILD)
[TOMMATH_BUILD=Y])
AC_SUBST(TOMMATH_BUILD)
TOMCRYPT_BUILD=N
AC_ARG_WITH(builtin-tomcrypt,
[ --with-builtin-tomcrypt build libtomcrypt library from firebird tree],
[TOMCRYPT_BUILD=Y])
AC_SUBST(TOMCRYPT_BUILD)
dnl Avoid dumb '-g -O2' autoconf's default
dnl Debugging information and optimization flags should be set in prefix.$platform file
@ -582,9 +588,10 @@ AC_ARG_ENABLE(lsb-build,
esac])
AC_SUBST(LSB_FLG)
if test "$LSB_FLG" = "Y"; then
CFLAGS="$CFLAGS --lsb-besteffort --lsb-shared-libs=fbclient:ib_util:tommath --lsb-target-version=4.1"
CXXFLAGS="$CXXFLAGS --lsb-besteffort --lsb-shared-libs=fbclient:ib_util:tommath --lsb-target-version=4.1"
AC_SUBST(TOMBUILD, Y)
CFLAGS="$CFLAGS --lsb-besteffort --lsb-shared-libs=fbclient:ib_util:tommath:tomcrypt --lsb-target-version=4.1"
CXXFLAGS="$CXXFLAGS --lsb-besteffort --lsb-shared-libs=fbclient:ib_util:tommath:tomcrypt --lsb-target-version=4.1"
AC_SUBST(TOMMATH_BUILD, Y)
AC_SUBST(TOMCRYPT_BUILD, Y)
AC_PATH_PROG(CC, lsbcc, "", [$PATH$PATH_SEPARATOR/opt/lsb/bin$PATH_SEPARATOR])
AC_PATH_PROG(CXX, lsbc++, "", [$PATH$PATH_SEPARATOR/opt/lsb/bin$PATH_SEPARATOR])
if test "x$CC" = "x" || test "x$CXX" = "x" ; then
@ -812,7 +819,7 @@ AC_CHECK_LIB(icuuc, main, ICU_OK=yes, AC_MSG_ERROR(ICU support not found - pleas
fi
dnl check for tommath presence
if test "$TOMBUILD" = "Y"; then
if test "$TOMMATH_BUILD" = "Y"; then
MATHLIB=-ltommath
else
AC_CHECK_HEADER(tommath.h,,
@ -825,6 +832,23 @@ else
fi
AC_SUBST(MATHLIB)
dnl check for tomcrypt presence
if test "$TOMCRYPT_BUILD" = "Y"; then
CRYPTLIB=-ltomcrypt
else
XE_SAVE_ENV()
CFLAGS="$CFLAGS -DLTC_NO_ASM"
AC_CHECK_HEADER(tomcrypt.h,,
AC_MSG_ERROR(Include file for tomcrypt not found - please install development tomcrypt package or use --with-builtin-tomcrypt))
XE_RESTORE_ENV()
XE_SAVE_ENV()
LIBS=
AC_CHECK_LIB(tomcrypt, sha1_init, CRYPTLIB=-ltomcrypt,
AC_MSG_ERROR(Library tomcrypt not found - please install development tomcrypt package or use --with-builtin-tomcrypt))
XE_RESTORE_ENV()
fi
AC_SUBST(CRYPTLIB)
dnl Check for libraries
AC_SEARCH_LIBS(dlopen, dl)
AC_CHECK_LIB(m, main)
@ -860,7 +884,7 @@ AC_COMPILE_IFELSE(
dnl check for va_copy() in stdarg.h
AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM([[#include <stdarg.h>
void vafun(const char* fmt, ...) {va_list par, par2; va_start(par, fmt); va_copy(par2, par); va_end(par2); va_end(par);}]],
void vafun(const char* fmt, ...) {va_list par, par2; va_start(par, fmt); va_copy(par2, par); va_end(par2); va_end(par);}]],
[[return 0;]])],
AC_DEFINE(HAVE_VA_COPY, 1, [Define this if va_copy() is defined in stdarg.h]))
@ -933,6 +957,7 @@ AC_CHECK_FUNCS(pthread_keycreate pthread_key_create)
AC_CHECK_FUNCS(llrint)
AC_CHECK_FUNCS(localtime_r)
AC_CHECK_FUNCS(gmtime_r)
AC_CHECK_FUNCS(ctime_r)
AC_CHECK_FUNCS(fchmod)
AC_CHECK_FUNCS(semtimedop)
AC_CHECK_FUNCS(fegetenv)
@ -1208,6 +1233,10 @@ dnl ### TEMP ### directories for generated .cpp, .o and .d by module name
mkdir -p temp/\$fb_tgt/\$src_dir
done
for src_dir in `ls -R -1 examples | grep : | tr -d : | tr "\n" " "`; do
mkdir -p temp/\$fb_tgt/\$src_dir
done
src/misc/writeBuildNum.sh createMakeVersion gen/Make.Version
dnl # sql files for UDF declarations
@ -1216,10 +1245,6 @@ dnl # sql files for UDF declarations
done
done
for src_dir in `ls -R -1 examples | grep : | tr -d : | tr "\n" " "`; do
mkdir -p temp/\$src_dir
done
dnl # rebuild version header if needed
./src/misc/writeBuildNum.sh rebuildHeader
@ -1369,7 +1394,7 @@ gen/make.shared.variables:${MAKE_SRC_DIR}/make.shared.variables
gen/make.shared.targets:${MAKE_SRC_DIR}/make.shared.targets
gen/Makefile:${MAKE_SRC_DIR}/Makefile.in
gen/examples/Makefile.examples:${MAKE_SRC_DIR}/Makefile.in.examples
gen/examples/Makefile.plugins_examples:${MAKE_SRC_DIR}/Makefile.in.plugins_examples
gen/Makefile.plugins_examples:${MAKE_SRC_DIR}/Makefile.in.plugins_examples
gen/Makefile.install:builds/install/arch-specific/${INSTALL_PREFIX}/Makefile.in
Makefile:Makefile.in
)

32
doc/README.incompatibilities.3to4.txt Normal file
View File

@ -0,0 +1,32 @@
********************************************************************************
LIST OF KNOWN INCOMPATIBILITIES
between versions 3.0 and 4.0
********************************************************************************
This document describes all the changes that make v4.0 incompatible in any way
as compared with the previous releases and hence could affect your databases and
applications.
Please read the below descriptions carefully before upgrading your software to
the new Firebird version.
Deprecating UDF
--------------------------
* Initial design of UDF always used to be security problem. The most dangerous
security holes when UDFs and external tables are used simultaneousky were
fixed in FB 1.5. But even after it incorrectly declared (using SQL statement
DECLARE EXTERNAL FUNCTION) UDF can easily cause various security issues like
server crash or execution of arbitrary code. Therefore UDFs are deprecated
in v.4. That means that UDFs can't be used with default configuration
(parameter "UdfAccess" set to "None") and all sample UDF libraries (ib_udf,
fbudf) are not distributed any more. Most of functions in that libraries
were replaced with builtin analogs in previous versions and therefore
already deprecated. A few remaining functions got safe replacement in UDR
library "udf_compat", namely div, frac, dow, sdow, getExactTimestampUTC and
isLeapYear. Users who still wish to use UDFs should set "UdfAccess" to
"Restrict <path-list>". If you never used to modify this parameter before
path-list is just UDF and resulting line in firebird.conf should be:
UdfAccess = Restrict UDF
Recommended long-term solution is replacing of UDF with UDR.

2452
doc/Using_OO_API.html
View File

File diff suppressed because it is too large Load Diff

48
doc/sql.extensions/README.builtin_functions.txt
View File

@ -265,7 +265,7 @@ CEIL | CEILING
--------------
Function:
Returns a value representing the smallest integer that is greater
Returns a value representing the smallest integer that is greater
than or equal to the input argument.
Format:
@ -429,12 +429,33 @@ Example:
select exp(x) from y;
---------
FIRST_DAY
---------
Function:
Returns a date/timestamp with the first day of the year/month/week of a given
date/timestamp value.
Format:
FIRST_DAY( OF { YEAR | MONTH | WEEK } FROM <date_or_timestamp> )
Notes:
1) The first day of the week is considered as Sunday, per the same rules of EXTRACT with WEEKDAY.
2) When a timestamp is passed the return value preserves the time part.
Example:
select first_day(of month from current_date) from rdb$database;
select first_day(of year from current_timestamp) from rdb$database;
select first_day(of week from date '2017-11-01') from rdb$database;
-----
FLOOR
-----
Function:
Returns a value representing the largest integer that is less
Returns a value representing the largest integer that is less
than or equal to the input argument.
Format:
@ -490,6 +511,27 @@ Example:
select hash(x using sha256) from y;
--------
LAST_DAY
--------
Function:
Returns a date/timestamp with the last day of the year/month/week of a given
date/timestamp value.
Format:
LAST_DAY( OF { YEAR | MONTH | WEEK } FROM <date_or_timestamp> )
Notes:
1) The last day of the week is considered as Saturday, per the same rules of EXTRACT with WEEKDAY.
2) When a timestamp is passed the return value preserves the time part.
Example:
select last_day(of month from current_date) from rdb$database;
select last_day(of year from current_timestamp) from rdb$database;
select last_day(of week from date '2017-11-01') from rdb$database;
----
LEFT
----
@ -802,7 +844,7 @@ SIGN
----
Function:
Returns 1, 0, or -1 depending on whether the input value is positive, zero or
Returns 1, 0, or -1 depending on whether the input value is positive, zero or
negative, respectively.
Format:

30
doc/sql.extensions/README.data_types
View File

@ -185,3 +185,33 @@ DECFLOAT (FB 4.0)
as a literal, instead you can use the equivalent in scientific notation: 1.1E-1022.
Similarly 10<1022 zeroes>0 can be presented as 1.0E1024.
Enhancement in precision of calculations with NUMERIC/DECIMAL (FB 4.0)
--------------
Function:
Maximum precision of NUMERIC and DECIMAL data types is increased to 34 digits.
Author:
Alex Peshkoff <peshkoff@mail.ru>
Syntax rules:
NUMERIC ( P {, N} )
DECIMAL ( P {, N} )
where P is precision (P <= 34, was limited prior with 18 digits) and N is optional number
of digits after decimal separator (as before).
Storage:
128-bit, format according to IEEE 754.
Example(s):
1. DECLARE VARIABLE VAR1 DECIMAL(25);
2. CREATE TABLE TABLE1 (FIELD1 NUMERIC(34, 17));
Note(s):
Numerics with precision less than 19 digits use SMALLINT, INTEGER, BIGINT or DOUBLE PRECISION
as base datatype depending upon number of digits and dialect. When precision is between 19 and
34 digits DECFLOAT(34) is used for it. Actual precision is always increased to 34 digits. For
complex calculations such digits are casted (internally, in trivial way) to DECFLOAT(34) and
the result of various math (log, exp, etc.) and aggregate functions using high precision
numeric argument is DECFLOAT(34).

3
doc/sql.extensions/README.user_management
View File

@ -108,4 +108,5 @@ Samples (suppose UserManager=Srp,Legacy_UserManager in firebird.conf):
Notice!
This feature highly depends upon user management plugin. Take into an account that some options
are ignored when using legacy user management plugin.
are ignored when using legacy user management plugin. For example attributes GID and UID are
uppercased (i.e. one gets 'GID' when enters 'gId') by legacy user manager, other - silently ignored.

67
doc/sql.extensions/README.window_functions.md
View File

@ -279,6 +279,73 @@ With `ROWS`, order expressions is not limited by number or types. In this case,
The frame syntax with `<window frame start>` specifies the start frame, with the end frame being `CURRENT ROW`.
When `ORDER BY` window clause is used but frame clause is omitted, it defaults to `RANGE BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW`. This fact makes the query below to produce "weird" behaviour for the "sum_salary" column. It sums from the partition start to the current key, instead of sum the whole partition.
```sql
select
id,
salary,
sum(salary) over (order by salary) sum_salary
from employee
order by salary;
```
| id | salary | sum_salary |
|---:|-------:|-----------:|
| 3 | 8.00 | 8.00 |
| 4 | 9.00 | 17.00 |
| 1 | 10.00 | 37.00 |
| 5 | 10.00 | 37.00 |
| 2 | 12.00 | 49.00 |
You can explicitely set a frame to sum the whole partition as following query:
```sql
select
id,
salary,
sum(salary) over (
order by salary
rows between unbounded preceding and unbounded following
) sum_salary
from employee
order by salary;
```
| id | salary | sum_salary |
|---:|-------:|-----------:|
| 3 | 8.00 | 49.00 |
| 4 | 9.00 | 49.00 |
| 1 | 10.00 | 49.00 |
| 5 | 10.00 | 49.00 |
| 2 | 12.00 | 49.00 |
While this query "fixes" the weird nature of the default frame clause, it produces a result similar to a simple `OVER ()` clause without `ORDER BY`.
We can use a range frame to compute the count of employees with salaries between his salary - 1 and his salary + 1 with this query:
```sql
select
id,
salary,
count(*) over (
order by salary
range between 1 preceding and 1 following
) range_count
from employee
order by salary;
```
| id | salary | range_count |
|---:|-------:|------------:|
| 3 | 8.00 | 2 |
| 4 | 9.00 | 4 |
| 1 | 10.00 | 3 |
| 5 | 10.00 | 3 |
| 2 | 12.00 | 1 |
Some window functions discard frames. `ROW_NUMBER`, `LAG` and `LEAD` always work as `ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW`. And `DENSE_RANK`, `RANK`, `PERCENT_RANK` and `CUME_DIST` always work as `RANGE BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW`.
`FIRST_VALUE`, `LAST_VALUE` and `NTH_VALUE` respect frames, but the `RANGE` unit works identically as `ROWS`.

510
examples/interfaces/11.batch.cpp Normal file
View File

@ -0,0 +1,510 @@
/*
* PROGRAM: Object oriented API samples.
* MODULE: 11.batch.cpp
* DESCRIPTION: A trivial sample of using Batch interface.
*
* Example for the following interfaces:
* IBatch - interface to work with FB pipes
*
* c++ 11.batch.cpp -lfbclient
*
* The contents of this file are subject to the Initial
* Developer's Public License Version 1.0 (the "License");
* you may not use this file except in compliance with the
* License. You may obtain a copy of the License at
* http://www.ibphoenix.com/main.nfs?a=ibphoenix&page=ibp_idpl.
*
* Software distributed under the License is distributed AS IS,
* WITHOUT WARRANTY OF ANY KIND, either express or implied.
* See the License for the specific language governing rights
* and limitations under the License.
*
* The Original Code was created by Alexander Peshkoff
* for the Firebird Open Source RDBMS project.
*
* Copyright (c) 2017 Alexander Peshkoff <peshkoff@mail.ru>
* and all contributors signed below.
*
* All Rights Reserved.
* Contributor(s): ______________________________________.
*/
#include "ifaceExamples.h"
#include <firebird/Message.h>
static IMaster* master = fb_get_master_interface();
// output error message to user
static void errPrint(IStatus* status)
{
char buf[256];
master->getUtilInterface()->formatStatus(buf, sizeof(buf), status);
fprintf(stderr, "%s\n", buf);
}
// align target to alignment boundary
template <typename T>
static inline T align(T target, uintptr_t alignment)
{
return (T) ((((uintptr_t) target) + alignment - 1) & ~(alignment - 1));
}
// append given message to buffer ptr
static void putMsg(unsigned char*& ptr, const void* from, unsigned size, unsigned alignment)
{
memcpy(ptr, from, size);
ptr += align(size, alignment);
}
// append blob header with BPB to buffer ptr
// return pointer to blob size field - prefilled with BPB size
static unsigned* putBlobHdr(unsigned char*& ptr, unsigned alignment, ISC_QUAD* id, unsigned bpbSize, const unsigned char* bpb)
{
ptr = align(ptr, alignment);
memcpy(ptr, id, sizeof(ISC_QUAD));
ptr += sizeof(ISC_QUAD);
unsigned* rc = reinterpret_cast<unsigned*>(ptr);
memcpy(ptr, &bpbSize, sizeof(unsigned));
ptr += sizeof(unsigned);
memcpy(ptr, &bpbSize, sizeof(unsigned));
ptr += sizeof(unsigned);
memcpy(ptr, bpb, bpbSize);
ptr += bpbSize;
return rc;
}
// append given blob to buffer ptr
static void putBlob(unsigned char*& ptr, const void* from, unsigned size, unsigned alignment, ISC_QUAD* id)
{
unsigned* sizePtr = putBlobHdr(ptr, alignment, id, 0, NULL);
memcpy(ptr, from, size);
*sizePtr += size;
ptr += size;
ptr = align(ptr, alignment);
}
// append given segment to buffer ptr
unsigned putSegment(unsigned char*& ptr, const char* testData)
{
ptr = align(ptr, IBatch::BLOB_SEGHDR_ALIGN);
unsigned short l = strlen(testData);
memcpy(ptr, &l, sizeof l);
ptr += sizeof l;
memcpy(ptr, testData, l);
ptr += l;
return align(l + sizeof l, IBatch::BLOB_SEGHDR_ALIGN);
}
// BatchCompletionState printer - prints all what we know about completed batch
static void print_cs(ThrowStatusWrapper& status, IBatchCompletionState* cs, IUtil* utl)
{
unsigned p = 0;
IStatus* s2 = NULL;
bool pr1 = false, pr2 = false;
// 1. Print per-message state info
unsigned upcount = cs->getSize(&status);
unsigned unk = 0, succ = 0;
for (p = 0; p < upcount; ++p)
{
int s = cs->getState(&status, p);
switch (s)
{
case IBatchCompletionState::EXECUTE_FAILED:
if (!pr1)
{
printf("Message Status\n", p);
pr1 = true;
}
printf("%5u Execute failed\n", p);
break;
case IBatchCompletionState::SUCCESS_NO_INFO:
++unk;
break;
default:
if (!pr1)
{
printf("Message Status\n", p);
pr1 = true;
}
printf("%5u Updated %d record(s)\n", p, s);
++succ;
break;
}
}
printf("Summary: total=%u success=%u success(but no update info)=%u\n", upcount, succ, unk);
// 2. Print detailed errors (if exist) for messages
s2 = master->getStatus();
for(p = 0; (p = cs->findError(&status, p)) != IBatchCompletionState::NO_MORE_ERRORS; ++p)
{
try
{
cs->getStatus(&status, s2, p);
char text[1024];
utl->formatStatus(text, sizeof(text) - 1, s2);
text[sizeof(text) - 1] = 0;
if (!pr2)
{
printf("\nDetailed errors status:\n", p);
pr2 = true;
}
printf("Message %u: %s\n", p, text);
}
catch (const FbException& error)
{
// handle error
fprintf(stderr, "\nError describing message %u\n", p);
errPrint(error.getStatus());
fprintf(stderr, "\n");
}
}
if (s2)
s2->dispose();
}
int main()
{
int rc = 0;
// set default password if none specified in environment
setenv("ISC_USER", "sysdba", 0);
setenv("ISC_PASSWORD", "masterkey", 0);
// With ThrowStatusWrapper passed as status interface FbException will be thrown on error
ThrowStatusWrapper status(master->getStatus());
// Declare pointers to required interfaces
IProvider* prov = master->getDispatcher();
IUtil* utl = master->getUtilInterface();
IAttachment* att = NULL;
ITransaction* tra = NULL;
IBatch* batch = NULL;
IBatchCompletionState* cs = NULL;
IXpbBuilder* pb = NULL;
unsigned char streamBuf[10240]; // big enough for demo
unsigned char* stream = NULL;
try
{
// attach employee db
att = prov->attachDatabase(&status, "employee", 0, NULL);
tra = att->startTransaction(&status, 0, NULL);
// cleanup
att->execute(&status, tra, 0, "delete from project where proj_id like 'BAT%'", SAMPLES_DIALECT,
NULL, NULL, NULL, NULL);
//
printf("\nPart 1. Simple messages. Adding one by one or by groups of messages.\n");
//
// Message to store in a table
FB_MESSAGE(Msg1, ThrowStatusWrapper,
(FB_VARCHAR(5), id)
(FB_VARCHAR(10), name)
) project1(&status, master);
project1.clear();
IMessageMetadata* meta = project1.getMetadata();
// sizes & alignments
unsigned mesAlign = meta->getAlignment(&status);
unsigned mesLength = meta->getMessageLength(&status);
unsigned char* streamStart = align(streamBuf, mesAlign);
// set batch parameters
pb = utl->getXpbBuilder(&status, IXpbBuilder::BATCH, NULL, 0);
// collect per-message statistics
pb->insertInt(&status, IBatch::TAG_RECORD_COUNTS, 1);
// create batch
const char* sqlStmt1 = "insert into project(proj_id, proj_name) values(?, ?)";
batch = att->createBatch(&status, tra, 0, sqlStmt1, SAMPLES_DIALECT, meta,
pb->getBufferLength(&status), pb->getBuffer(&status));
// fill batch with data record by record
project1->id.set("BAT11");
project1->name.set("SNGL_REC");
batch->add(&status, 1, project1.getData());
project1->id.set("BAT12");
project1->name.set("SNGL_REC2");
batch->add(&status, 1, project1.getData());
// execute it
cs = batch->execute(&status, tra);
print_cs(status, cs, utl);
// fill batch with data using many records at once
stream = streamStart;
project1->id.set("BAT13");
project1->name.set("STRM_REC_A");
putMsg(stream, project1.getData(), mesLength, mesAlign);
project1->id.set("BAT14");
project1->name.set("STRM_REC_B");
putMsg(stream, project1.getData(), mesLength, mesAlign);
project1->id.set("BAT15");
project1->name.set("STRM_REC_C");
putMsg(stream, project1.getData(), mesLength, mesAlign);
batch->add(&status, 3, streamStart);
stream = streamStart;
project1->id.set("BAT15"); // constraint violation
project1->name.set("STRM_REC_D");
putMsg(stream, project1.getData(), mesLength, mesAlign);
project1->id.set("BAT16");
project1->name.set("STRM_REC_E");
putMsg(stream, project1.getData(), mesLength, mesAlign);
batch->add(&status, 1, streamStart);
// execute it
cs = batch->execute(&status, tra);
print_cs(status, cs, utl);
// close batch
batch->release();
batch = NULL;
//
printf("\nPart 2. Simple BLOBs. Multiple errors return.\n");
//
// Message to store in a table
FB_MESSAGE(Msg2, ThrowStatusWrapper,
(FB_VARCHAR(5), id)
(FB_VARCHAR(10), name)
(FB_BLOB, desc)
) project2(&status, master);
project2.clear();
meta = project2.getMetadata();
mesAlign = meta->getAlignment(&status);
mesLength = meta->getMessageLength(&status);
streamStart = align(streamBuf, mesAlign);
// set batch parameters
pb->clear(&status);
// continue batch processing in case of errors in some messages
pb->insertInt(&status, IBatch::TAG_MULTIERROR, 1);
// enable blobs processing - IDs generated by firebird engine
pb->insertInt(&status, IBatch::TAG_BLOB_POLICY, IBatch::BLOB_ID_ENGINE);
// create batch
const char* sqlStmt2 = "insert into project(proj_id, proj_name, proj_desc) values(?, ?, ?)";
batch = att->createBatch(&status, tra, 0, sqlStmt2, SAMPLES_DIALECT, meta,
pb->getBufferLength(&status), pb->getBuffer(&status));
// fill batch with data
project2->id.set("BAT21");
project2->name.set("SNGL_BLOB");
batch->addBlob(&status, strlen(sqlStmt2), sqlStmt2, &project2->desc, 0, NULL);
batch->appendBlobData(&status, 1, "\n");
batch->appendBlobData(&status, strlen(sqlStmt1), sqlStmt1);
batch->add(&status, 1, project2.getData());
// execute it
cs = batch->execute(&status, tra);
print_cs(status, cs, utl);
// fill batch with data
project2->id.set("BAT22");
project2->name.set("SNGL_REC1");
batch->addBlob(&status, strlen(sqlStmt2), sqlStmt2, &project2->desc, 0, NULL);
batch->add(&status, 1, project2.getData());
project2->id.set("BAT22");
project2->name.set("SNGL_REC2"); // constraint violation
batch->addBlob(&status, 2, "r2", &project2->desc, 0, NULL);
batch->add(&status, 1, project2.getData());
project2->id.set("BAT23");
project2->name.set("SNGL_REC3");
batch->addBlob(&status, 2, "r3", &project2->desc, 0, NULL);
batch->add(&status, 1, project2.getData());
project2->id.set("BAT23"); // constraint violation
project2->name.set("SNGL_REC4");
batch->addBlob(&status, 2, "r4", &project2->desc, 0, NULL);
batch->add(&status, 1, project2.getData());
// execute it
cs = batch->execute(&status, tra);
print_cs(status, cs, utl);
// close batch
batch->release();
batch = NULL;
//
printf("\nPart 3. BLOB stream, including segmented BLOB.\n");
//
// use Msg2/project2/sqlStmt2 to store in a table
// set batch parameters
pb->clear(&status);
// enable blobs processing - blobs are placed in a stream
pb->insertInt(&status, IBatch::TAG_BLOB_POLICY, IBatch::BLOB_STREAM);
// create batch
batch = att->createBatch(&status, tra, 0, sqlStmt2, SAMPLES_DIALECT, meta,
pb->getBufferLength(&status), pb->getBuffer(&status));
unsigned blobAlign = batch->getBlobAlignment(&status);
// prepare blob IDs
ISC_QUAD v1={0,1}, v2={0,2}, v3={0,3};
// send messages to batch
project2->id.set("BAT31");
project2->name.set("STRM_BLB_A");
project2->desc = v1;
batch->add(&status, 1, project2.getData());
project2->id.set("BAT32");
project2->name.set("STRM_BLB_B");
project2->desc = v2;
batch->add(&status, 1, project2.getData());
project2->id.set("BAT33");
project2->name.set("STRM_BLB_C");
project2->desc = v3;
batch->add(&status, 1, project2.getData());
// prepare blobs in the stream buffer
const char* d1 = "1111111111111111111";
const char* d2 = "22222222222222222222";
const char* d3 = "33333333333333333333333333333333333333333333333333333";
stream = streamStart;
putBlob(stream, d1, strlen(d1), blobAlign, &v1);
putBlob(stream, d2, strlen(d2), blobAlign, &v2);
putBlob(stream, d3, strlen(d3), blobAlign, &v3);
batch->addBlobStream(&status, stream - streamStart, streamStart);
// Put segmented Blob in the stream
// add message
ISC_QUAD vSeg={0,10};
project2->id.set("BAT35");
project2->name.set("STRM_B_SEG");
project2->desc = vSeg;
batch->add(&status, 1, project2.getData());
// build BPB
pb->dispose();
pb = NULL;
pb = utl->getXpbBuilder(&status, IXpbBuilder::BPB, NULL, 0);
pb->insertInt(&status, isc_bpb_type, isc_bpb_type_segmented);
// make stream
stream = streamStart;
unsigned* size = putBlobHdr(stream, blobAlign, &vSeg, pb->getBufferLength(&status), pb->getBuffer(&status));
*size += putSegment(stream, d1);
*size += putSegment(stream, "\n");
*size += putSegment(stream, d2);
*size += putSegment(stream, "\n");
*size += putSegment(stream, d3);
// add stream to the batch
stream = align(stream, blobAlign);
batch->addBlobStream(&status, stream - streamStart, streamStart);
// execute batch
cs = batch->execute(&status, tra);
print_cs(status, cs, utl);
//
printf("\nPart 4. BLOB created using IBlob interface.\n");
//
// use Msg2/project2/sqlStmt2 to store in a table
// registerBlob() may be called in BLOB_STREAM batch, ID should be generated by user in this case
// also demonstrates execution of same batch multiple times
// create blob
ISC_QUAD realId;
IBlob* blob = att->createBlob(&status, tra, &realId, 0, NULL);
const char* text = "Blob created using traditional API";
blob->putSegment(&status, strlen(text), text);
blob->close(&status);
// add message
project2->id.set("BAT38");
project2->name.set("FRGN_BLB");
project2->desc = v1; // after execute may reuse IDs
batch->registerBlob(&status, &realId, &project2->desc);
batch->add(&status, 1, project2.getData());
// execute it
cs = batch->execute(&status, tra);
print_cs(status, cs, utl);
// cleanup
batch->release();
batch = NULL;
tra->commit(&status);
tra = NULL;
att->detach(&status);
att = NULL;
}
catch (const FbException& error)
{
// handle error
rc = 1;
errPrint(error.getStatus());
}
// release interfaces after error caught
if (cs)
cs->dispose();
if (batch)
batch->release();
if (tra)
tra->release();
if (att)
att->release();
// cleanup
if (pb)
pb->dispose();
status.dispose();
prov->release();
return rc;
}

2
extern/btyacc/main.c vendored
View File

@ -2,7 +2,7 @@
#include <signal.h>
#include <stdio.h>
#if defined(WIN32)
#if defined(_WIN32)
#include <io.h>
#else
#include <unistd.h>

28
extern/decNumber/msvc/decNumber_MSVC14.sln vendored Normal file
View File

@ -0,0 +1,28 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.31101.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "decNumber", "decNumber_MSVC14.vcxproj", "{BE4D2DDC-59A0-4CD7-848E-231E13785335}"
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
{BE4D2DDC-59A0-4CD7-848E-231E13785335}.Debug|Win32.ActiveCfg = Debug|Win32
{BE4D2DDC-59A0-4CD7-848E-231E13785335}.Debug|Win32.Build.0 = Debug|Win32
{BE4D2DDC-59A0-4CD7-848E-231E13785335}.Debug|x64.ActiveCfg = Debug|x64
{BE4D2DDC-59A0-4CD7-848E-231E13785335}.Debug|x64.Build.0 = Debug|x64
{BE4D2DDC-59A0-4CD7-848E-231E13785335}.Release|Win32.ActiveCfg = Release|Win32
{BE4D2DDC-59A0-4CD7-848E-231E13785335}.Release|Win32.Build.0 = Release|Win32
{BE4D2DDC-59A0-4CD7-848E-231E13785335}.Release|x64.ActiveCfg = Release|x64
{BE4D2DDC-59A0-4CD7-848E-231E13785335}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

267
extern/decNumber/msvc/decNumber_MSVC14.vcxproj vendored Normal file
View File

@ -0,0 +1,267 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.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>
<ItemGroup>
<ClCompile Include="..\decBasic.c">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\decCommon.c">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\decContext.c" />
<ClCompile Include="..\decDouble.c" />
<ClCompile Include="..\decimal128.c" />
<ClCompile Include="..\decimal32.c" />
<ClCompile Include="..\decimal64.c" />
<ClCompile Include="..\decNumber.c" />
<ClCompile Include="..\decPacked.c" />
<ClCompile Include="..\decQuad.c" />
<ClCompile Include="..\decSingle.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\decContext.h" />
<ClInclude Include="..\decDouble.h" />
<ClInclude Include="..\decDPD.h" />
<ClInclude Include="..\decimal128.h" />
<ClInclude Include="..\decimal32.h" />
<ClInclude Include="..\decimal64.h" />
<ClInclude Include="..\decNumber.h" />
<ClInclude Include="..\decNumberLocal.h" />
<ClInclude Include="..\decPacked.h" />
<ClInclude Include="..\decQuad.h" />
<ClInclude Include="..\decSingle.h" />
</ItemGroup>
<ItemGroup>
<Text Include="..\readme.txt" />
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectName>decNumber</ProjectName>
<ProjectGuid>{BE4D2DDC-59A0-4CD7-848E-231E13785335}</ProjectGuid>
<RootNamespace>decNumber</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v140_xp</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v140_xp</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
</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" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
</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" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\lib\$(Platform)\$(Configuration)\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\lib\$(Platform)\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\temp\$(Platform)\$(Configuration)\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\temp\$(Platform)\$(Configuration)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\lib\$(Platform)\$(Configuration)\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\lib\$(Platform)\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\temp\$(Platform)\$(Configuration)\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\temp\$(Platform)\$(Configuration)\</IntDir>
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">decnumber</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">decnumber</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">decnumber</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">decnumber</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<PrecompiledHeaderOutputFile>
</PrecompiledHeaderOutputFile>
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
<ObjectFileName>$(IntDir)</ObjectFileName>
<ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<PrecompiledHeaderFile>
</PrecompiledHeaderFile>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
<OutputFile>$(OutDir)\$(TargetFileName)</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>.\Debug/libtommath.bsc</OutputFile>
</Bscmake>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<PrecompiledHeaderOutputFile>
</PrecompiledHeaderOutputFile>
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
<ObjectFileName>$(IntDir)</ObjectFileName>
<ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<PrecompiledHeaderFile>
</PrecompiledHeaderFile>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
<OutputFile>$(OutDir)\$(TargetFileName)</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>.\Debug/libtommath.bsc</OutputFile>
</Bscmake>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeaderOutputFile>
</PrecompiledHeaderOutputFile>
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
<ObjectFileName>$(IntDir)</ObjectFileName>
<ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<PrecompiledHeaderFile>
</PrecompiledHeaderFile>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
<OutputFile>$(OutDir)\$(TargetFileName)</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>.\Release/libtommath.bsc</OutputFile>
</Bscmake>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeaderOutputFile>
</PrecompiledHeaderOutputFile>
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
<ObjectFileName>$(IntDir)</ObjectFileName>
<ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<PrecompiledHeaderFile>
</PrecompiledHeaderFile>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
<OutputFile>$(OutDir)\$(TargetFileName)</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>.\Release/libtommath.bsc</OutputFile>
</Bscmake>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

84
extern/decNumber/msvc/decNumber_MSVC14.vcxproj.filters vendored Normal file
View File

@ -0,0 +1,84 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClCompile Include="..\decBasic.c">
<Filter>Source files</Filter>
</ClCompile>
<ClCompile Include="..\decCommon.c">
<Filter>Source files</Filter>
</ClCompile>
<ClCompile Include="..\decContext.c">
<Filter>Source files</Filter>
</ClCompile>
<ClCompile Include="..\decDouble.c">
<Filter>Source files</Filter>
</ClCompile>
<ClCompile Include="..\decimal32.c">
<Filter>Source files</Filter>
</ClCompile>
<ClCompile Include="..\decimal64.c">
<Filter>Source files</Filter>
</ClCompile>
<ClCompile Include="..\decimal128.c">
<Filter>Source files</Filter>
</ClCompile>
<ClCompile Include="..\decNumber.c">
<Filter>Source files</Filter>
</ClCompile>
<ClCompile Include="..\decPacked.c">
<Filter>Source files</Filter>
</ClCompile>
<ClCompile Include="..\decSingle.c">
<Filter>Source files</Filter>
</ClCompile>
<ClCompile Include="..\decQuad.c">
<Filter>Source files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\decContext.h">
<Filter>Header files</Filter>
</ClInclude>
<ClInclude Include="..\decDouble.h">
<Filter>Header files</Filter>
</ClInclude>
<ClInclude Include="..\decDPD.h">
<Filter>Header files</Filter>
</ClInclude>
<ClInclude Include="..\decimal32.h">
<Filter>Header files</Filter>
</ClInclude>
<ClInclude Include="..\decimal64.h">
<Filter>Header files</Filter>
</ClInclude>
<ClInclude Include="..\decimal128.h">
<Filter>Header files</Filter>
</ClInclude>
<ClInclude Include="..\decNumber.h">
<Filter>Header files</Filter>
</ClInclude>
<ClInclude Include="..\decNumberLocal.h">
<Filter>Header files</Filter>
</ClInclude>
<ClInclude Include="..\decPacked.h">
<Filter>Header files</Filter>
</ClInclude>
<ClInclude Include="..\decQuad.h">
<Filter>Header files</Filter>
</ClInclude>
<ClInclude Include="..\decSingle.h">
<Filter>Header files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Text Include="..\readme.txt" />
</ItemGroup>
<ItemGroup>
<Filter Include="Source files">
<UniqueIdentifier>{638ba91b-1def-4094-a692-752b2ce6f461}</UniqueIdentifier>
</Filter>
<Filter Include="Header files">
<UniqueIdentifier>{ffbb5d93-e379-40ba-ab58-c62e9e20c810}</UniqueIdentifier>
</Filter>
</ItemGroup>
</Project>

5
extern/libtomcrypt/.gitignore vendored Normal file
View File

@ -0,0 +1,5 @@
lib/
temp/
*.o
*.l*
.libs/

1155
extern/libtomcrypt/Doxyfile vendored Normal file
View File

File diff suppressed because it is too large Load Diff

5
extern/libtomcrypt/LICENSE vendored Normal file
View File

@ -0,0 +1,5 @@
LibTomCrypt is public domain. As should all quality software be.
Tom St Denis

3
extern/libtomcrypt/README vendored Normal file
View File

@ -0,0 +1,3 @@
See doc/crypt.pdf

3
extern/libtomcrypt/TODO vendored Normal file
View File

@ -0,0 +1,3 @@
for 1.18
- document new ECC functions
- add test for new functions

20
extern/libtomcrypt/build.sh vendored Normal file
View File

@ -0,0 +1,20 @@
#!/bin/bash
echo "$1 ($2, $3)..."
make clean 1>/dev/null 2>/dev/null
echo -n "building..."
CFLAGS="$2 $CFLAGS $4" EXTRALIBS="$5" make -j4 -f $3 test tv_gen 1>gcc_1.txt 2>gcc_2.txt || (echo "build $1 failed see gcc_2.txt for more information" && cat gcc_2.txt && exit 1)
echo -n "testing..."
if [ -a test ] && [ -f test ] && [ -x test ]; then
((./test >test_std.txt 2>test_err.txt && ./tv_gen > tv.txt) && echo "$1 test passed." && echo "y" > testok.txt) || (echo "$1 test failed" && cat test_err.txt && exit 1)
if find *_tv.txt -type f 1>/dev/null 2>/dev/null ; then
for f in *_tv.txt; do if (diff --ignore-case $f notes/$f) then true; else (echo "tv_gen $f failed" && rm -f testok.txt && exit 1); fi; done
fi
fi
if [ -a testok.txt ] && [ -f testok.txt ]; then
exit 0
fi
exit 1
# $Source: /cvs/libtom/libtomcrypt/build.sh,v $
# $Revision: 1.9 $
# $Date: 2006/03/18 14:10:55 $

1571
extern/libtomcrypt/changes vendored Normal file
View File

File diff suppressed because it is too large Load Diff

6568
extern/libtomcrypt/crypt.tex vendored Normal file
View File

File diff suppressed because it is too large Load Diff

30
extern/libtomcrypt/filter.pl vendored Normal file
View File

@ -0,0 +1,30 @@
#!/usr/bin/perl
# we want to filter every between START_INS and END_INS out and then insert crap from another file (this is fun)
$dst = shift;
$ins = shift;
open(SRC,"<$dst");
open(INS,"<$ins");
open(TMP,">tmp.delme");
$l = 0;
while (<SRC>) {
if ($_ =~ /START_INS/) {
print TMP $_;
$l = 1;
while (<INS>) {
print TMP $_;
}
close INS;
} elsif ($_ =~ /END_INS/) {
print TMP $_;
$l = 0;
} elsif ($l == 0) {
print TMP $_;
}
}
close TMP;
close SRC;

11
extern/libtomcrypt/fixupind.pl vendored Normal file
View File

@ -0,0 +1,11 @@
open(IN,"<crypt.ind");
open(OUT,">crypt.ind.tmp");
$a = <IN>;
print OUT "$a\n\\addcontentsline{toc}{chapter}{Index}\n";
while (<IN>) {
print OUT $_;
}
close OUT;
close IN;
system("mv -f crypt.ind.tmp crypt.ind");

10
extern/libtomcrypt/genlist.sh vendored Normal file
View File

@ -0,0 +1,10 @@
#!/bin/bash
# aes_tab.o is a pseudo object as it's made from aes.o and MPI is optional
export a=`echo -n "src/ciphers/aes/aes_enc.o " ; find . -type f | sort | grep "[.]/src" | grep "[.]c" | grep -v "sha224" | grep -v "sha384" | grep -v "aes_tab" | grep -v "twofish_tab" | grep -v "whirltab" | grep -v "dh_sys" | grep -v "ecc_sys" | grep -v "mpi[.]c" | grep -v "sober128tab" | sed -e 'sE\./EE' | sed -e 's/\.c/\.o/' | xargs`
perl ./parsenames.pl OBJECTS "$a"
export a=`find . -type f | grep [.]/src | grep [.]h | sed -e 'se\./ee' | xargs`
perl ./parsenames.pl HEADERS "$a"
# $Source: /cvs/libtom/libtomcrypt/genlist.sh,v $
# $Revision: 1.4 $
# $Date: 2005/07/17 23:15:12 $

1634
extern/libtomcrypt/libtomcrypt.dsp vendored Normal file
View File

File diff suppressed because it is too large Load Diff

28
extern/libtomcrypt/libtomcrypt_MSVC12.sln vendored Normal file
View File

@ -0,0 +1,28 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.31101.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtomcrypt", "libtomcrypt_MSVC12.vcxproj", "{489B8EBF-E95A-4A1C-8041-082FA1C2F953}"
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
{489B8EBF-E95A-4A1C-8041-082FA1C2F953}.Debug|Win32.ActiveCfg = Debug|Win32
{489B8EBF-E95A-4A1C-8041-082FA1C2F953}.Debug|Win32.Build.0 = Debug|Win32
{489B8EBF-E95A-4A1C-8041-082FA1C2F953}.Debug|x64.ActiveCfg = Debug|x64
{489B8EBF-E95A-4A1C-8041-082FA1C2F953}.Debug|x64.Build.0 = Debug|x64
{489B8EBF-E95A-4A1C-8041-082FA1C2F953}.Release|Win32.ActiveCfg = Release|Win32
{489B8EBF-E95A-4A1C-8041-082FA1C2F953}.Release|Win32.Build.0 = Release|Win32
{489B8EBF-E95A-4A1C-8041-082FA1C2F953}.Release|x64.ActiveCfg = Release|x64
{489B8EBF-E95A-4A1C-8041-082FA1C2F953}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

177
extern/libtomcrypt/libtomcrypt_MSVC12.vcxproj vendored Normal file
View File

@ -0,0 +1,177 @@
<?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">
<ProjectName>libtomcrypt</ProjectName>
<ProjectGuid>{489B8EBF-E95A-4A1C-8041-082FA1C2F953}</ProjectGuid>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v120_xp</PlatformToolset>
</PropertyGroup>
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v120_xp</PlatformToolset>
</PropertyGroup>
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>lib\$(Platform)\$(Configuration)\</OutDir>
<IntDir>temp\$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental>false</LinkIncremental>
<TargetName>tomcrypt</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>lib\$(Platform)\$(Configuration)\</OutDir>
<IntDir>temp\$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental>true</LinkIncremental>
<TargetName>tomcrypt</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<OutDir>lib\$(Platform)\$(Configuration)\</OutDir>
<IntDir>temp\$(Platform)\$(Configuration)\</IntDir>
<TargetName>tomcrypt</TargetName>
<TargetExt>.lib</TargetExt>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<OutDir>lib\$(Platform)\$(Configuration)\</OutDir>
<IntDir>temp\$(Platform)\$(Configuration)\</IntDir>
<TargetName>tomcrypt</TargetName>
<TargetExt>.lib</TargetExt>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<StringPooling>
</StringPooling>
<FunctionLevelLinking>true</FunctionLevelLinking>
<SuppressStartupBanner>true</SuppressStartupBanner>
<WarningLevel>Level3</WarningLevel>
<AdditionalIncludeDirectories>src\headers;..\libtommath;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;LTM_DESC;WIN32;_LIB;LTC_SOURCE;USE_LTM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<IntrinsicFunctions>true</IntrinsicFunctions>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>true</OmitFramePointers>
</ClCompile>
<ResourceCompile>
<Culture>0x0409</Culture>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>.\Release\libtomcrypt.bsc</OutputFile>
</Bscmake>
<Lib>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<InlineFunctionExpansion>Default</InlineFunctionExpansion>
<Optimization>Disabled</Optimization>
<SuppressStartupBanner>true</SuppressStartupBanner>
<WarningLevel>Level3</WarningLevel>
<MinimalRebuild>true</MinimalRebuild>
<AdditionalIncludeDirectories>src\headers;..\libtommath;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;LTM_DESC;WIN32;_LIB;LTC_SOURCE;USE_LTM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
</ClCompile>
<ResourceCompile>
<Culture>0x0409</Culture>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>.\Debug\libtomcrypt.bsc</OutputFile>
</Bscmake>
<Lib>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<AdditionalIncludeDirectories>src\headers;..\libtommath;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;LTM_DESC;WIN32;_LIB;LTC_SOURCE;USE_LTM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<AdditionalIncludeDirectories>src\headers;..\libtommath;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;LTM_DESC;WIN32;_LIB;LTC_SOURCE;USE_LTM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>
</StringPooling>
<IntrinsicFunctions>true</IntrinsicFunctions>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>true</OmitFramePointers>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="src\hashes\md5.c" />
<ClCompile Include="src\hashes\sha1.c" />
<ClCompile Include="src\hashes\sha2\sha256.c" />
<ClCompile Include="src\hashes\sha2\sha512.c" />
<ClCompile Include="src\misc\crypt\crypt_argchk.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="src\headers\tomcrypt.h" />
<ClInclude Include="src\headers\tomcrypt_argchk.h" />
<ClInclude Include="src\headers\tomcrypt_cfg.h" />
<ClInclude Include="src\headers\tomcrypt_cipher.h" />
<ClInclude Include="src\headers\tomcrypt_custom.h" />
<ClInclude Include="src\headers\tomcrypt_hash.h" />
<ClInclude Include="src\headers\tomcrypt_macros.h" />
<ClInclude Include="src\headers\tomcrypt_misc.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

55
extern/libtomcrypt/libtomcrypt_MSVC12.vcxproj.filters vendored Normal file
View File

@ -0,0 +1,55 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="hashes">
<UniqueIdentifier>{d5e0c460-2f27-4e1c-92ac-ab37d6249ec3}</UniqueIdentifier>
</Filter>
<Filter Include="hashes\sha2">
<UniqueIdentifier>{67f933bf-5fdf-44f3-8827-eaa3b9a37156}</UniqueIdentifier>
</Filter>
<Filter Include="headers">
<UniqueIdentifier>{de9e0374-839a-4994-9bad-99ee2dbaf7ab}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\hashes\sha2\sha256.c">
<Filter>hashes\sha2</Filter>
</ClCompile>
<ClCompile Include="src\hashes\sha2\sha512.c">
<Filter>hashes\sha2</Filter>
</ClCompile>
<ClCompile Include="src\hashes\md5.c">
<Filter>hashes</Filter>
</ClCompile>
<ClCompile Include="src\hashes\sha1.c">
<Filter>hashes</Filter>
</ClCompile>
<ClCompile Include="src\misc\crypt\crypt_argchk.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="src\headers\tomcrypt.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="src\headers\tomcrypt_argchk.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="src\headers\tomcrypt_cfg.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="src\headers\tomcrypt_cipher.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="src\headers\tomcrypt_custom.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="src\headers\tomcrypt_hash.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="src\headers\tomcrypt_macros.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="src\headers\tomcrypt_misc.h">
<Filter>headers</Filter>
</ClInclude>
</ItemGroup>
</Project>

28
extern/libtomcrypt/libtomcrypt_MSVC14.sln vendored Normal file
View File

@ -0,0 +1,28 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.31101.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtomcrypt", "libtomcrypt_MSVC14.vcxproj", "{489B8EBF-E95A-4A1C-8041-082FA1C2F953}"
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
{489B8EBF-E95A-4A1C-8041-082FA1C2F953}.Debug|Win32.ActiveCfg = Debug|Win32
{489B8EBF-E95A-4A1C-8041-082FA1C2F953}.Debug|Win32.Build.0 = Debug|Win32
{489B8EBF-E95A-4A1C-8041-082FA1C2F953}.Debug|x64.ActiveCfg = Debug|x64
{489B8EBF-E95A-4A1C-8041-082FA1C2F953}.Debug|x64.Build.0 = Debug|x64
{489B8EBF-E95A-4A1C-8041-082FA1C2F953}.Release|Win32.ActiveCfg = Release|Win32
{489B8EBF-E95A-4A1C-8041-082FA1C2F953}.Release|Win32.Build.0 = Release|Win32
{489B8EBF-E95A-4A1C-8041-082FA1C2F953}.Release|x64.ActiveCfg = Release|x64
{489B8EBF-E95A-4A1C-8041-082FA1C2F953}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

177
extern/libtomcrypt/libtomcrypt_MSVC14.vcxproj vendored Normal file
View File

@ -0,0 +1,177 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.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">
<ProjectName>libtomcrypt</ProjectName>
<ProjectGuid>{489B8EBF-E95A-4A1C-8041-082FA1C2F953}</ProjectGuid>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v140_xp</PlatformToolset>
</PropertyGroup>
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v140_xp</PlatformToolset>
</PropertyGroup>
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>lib\$(Platform)\$(Configuration)\</OutDir>
<IntDir>temp\$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental>false</LinkIncremental>
<TargetName>tomcrypt</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>lib\$(Platform)\$(Configuration)\</OutDir>
<IntDir>temp\$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental>true</LinkIncremental>
<TargetName>tomcrypt</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<OutDir>lib\$(Platform)\$(Configuration)\</OutDir>
<IntDir>temp\$(Platform)\$(Configuration)\</IntDir>
<TargetName>tomcrypt</TargetName>
<TargetExt>.lib</TargetExt>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<OutDir>lib\$(Platform)\$(Configuration)\</OutDir>
<IntDir>temp\$(Platform)\$(Configuration)\</IntDir>
<TargetName>tomcrypt</TargetName>
<TargetExt>.lib</TargetExt>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<StringPooling>
</StringPooling>
<FunctionLevelLinking>true</FunctionLevelLinking>
<SuppressStartupBanner>true</SuppressStartupBanner>
<WarningLevel>Level3</WarningLevel>
<AdditionalIncludeDirectories>src\headers;..\libtommath;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;LTM_DESC;WIN32;_LIB;LTC_SOURCE;USE_LTM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<IntrinsicFunctions>true</IntrinsicFunctions>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>true</OmitFramePointers>
</ClCompile>
<ResourceCompile>
<Culture>0x0409</Culture>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>.\Release\libtomcrypt.bsc</OutputFile>
</Bscmake>
<Lib>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<InlineFunctionExpansion>Default</InlineFunctionExpansion>
<Optimization>Disabled</Optimization>
<SuppressStartupBanner>true</SuppressStartupBanner>
<WarningLevel>Level3</WarningLevel>
<MinimalRebuild>true</MinimalRebuild>
<AdditionalIncludeDirectories>src\headers;..\libtommath;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;LTM_DESC;WIN32;_LIB;LTC_SOURCE;USE_LTM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
</ClCompile>
<ResourceCompile>
<Culture>0x0409</Culture>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>.\Debug\libtomcrypt.bsc</OutputFile>
</Bscmake>
<Lib>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<AdditionalIncludeDirectories>src\headers;..\libtommath;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;LTM_DESC;WIN32;_LIB;LTC_SOURCE;USE_LTM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<AdditionalIncludeDirectories>src\headers;..\libtommath;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;LTM_DESC;WIN32;_LIB;LTC_SOURCE;USE_LTM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>
</StringPooling>
<IntrinsicFunctions>true</IntrinsicFunctions>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>true</OmitFramePointers>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="src\hashes\md5.c" />
<ClCompile Include="src\hashes\sha1.c" />
<ClCompile Include="src\hashes\sha2\sha256.c" />
<ClCompile Include="src\hashes\sha2\sha512.c" />
<ClCompile Include="src\misc\crypt\crypt_argchk.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="src\headers\tomcrypt.h" />
<ClInclude Include="src\headers\tomcrypt_argchk.h" />
<ClInclude Include="src\headers\tomcrypt_cfg.h" />
<ClInclude Include="src\headers\tomcrypt_cipher.h" />
<ClInclude Include="src\headers\tomcrypt_custom.h" />
<ClInclude Include="src\headers\tomcrypt_hash.h" />
<ClInclude Include="src\headers\tomcrypt_macros.h" />
<ClInclude Include="src\headers\tomcrypt_misc.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

55
extern/libtomcrypt/libtomcrypt_MSVC14.vcxproj.filters vendored Normal file
View File

@ -0,0 +1,55 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="hashes">
<UniqueIdentifier>{d5e0c460-2f27-4e1c-92ac-ab37d6249ec3}</UniqueIdentifier>
</Filter>
<Filter Include="hashes\sha2">
<UniqueIdentifier>{67f933bf-5fdf-44f3-8827-eaa3b9a37156}</UniqueIdentifier>
</Filter>
<Filter Include="headers">
<UniqueIdentifier>{de9e0374-839a-4994-9bad-99ee2dbaf7ab}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\hashes\sha2\sha256.c">
<Filter>hashes\sha2</Filter>
</ClCompile>
<ClCompile Include="src\hashes\sha2\sha512.c">
<Filter>hashes\sha2</Filter>
</ClCompile>
<ClCompile Include="src\hashes\md5.c">
<Filter>hashes</Filter>
</ClCompile>
<ClCompile Include="src\hashes\sha1.c">
<Filter>hashes</Filter>
</ClCompile>
<ClCompile Include="src\misc\crypt\crypt_argchk.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="src\headers\tomcrypt.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="src\headers\tomcrypt_argchk.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="src\headers\tomcrypt_cfg.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="src\headers\tomcrypt_cipher.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="src\headers\tomcrypt_custom.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="src\headers\tomcrypt_hash.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="src\headers\tomcrypt_macros.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="src\headers\tomcrypt_misc.h">
<Filter>headers</Filter>
</ClInclude>
</ItemGroup>
</Project>

Some files were not shown because too many files have changed in this diff Show More