diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index dcb09ef928..c2c28ef988 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -230,6 +230,7 @@ jobs: cd builds\win32 call run_all.bat JUSTBUILD call run_tests.bat + ren %FB_OUTPUT_DIR% output - name: Build (Windows, Docker) if: startsWith(matrix.os, 'windows-') && matrix.docker @@ -270,19 +271,20 @@ jobs: name: firebird-macos path: gen/artifacts - - name: Upload (Windows x64) - if: startsWith(matrix.os, 'windows-') && !matrix.docker && matrix.platform == 'x64' + - name: Clean output (Windows) + if: startsWith(matrix.os, 'windows-') + shell: cmd + run: | + del output\*_test.exe /s + del output\lib\*.exp /s + del output\*.log /s + + - name: Upload (Windows) + if: startsWith(matrix.os, 'windows-') && !matrix.docker uses: actions/upload-artifact@main with: name: firebird-windows-vs-${{ env.VS_VERSION }}-x64 - path: output_x64 - - - name: Upload (Windows x86) - if: startsWith(matrix.os, 'windows-') && !matrix.docker && matrix.platform == 'x86' - uses: actions/upload-artifact@main - with: - name: firebird-windows-vs-${{ env.VS_VERSION }}-x86 - path: output_win32 + path: output - name: Upload (Windows, Docker) if: startsWith(matrix.os, 'windows-') && matrix.docker diff --git a/builds/install/arch-specific/win32/BuildExecutableInstall.bat b/builds/install/arch-specific/win32/BuildExecutableInstall.bat index 30dd8b9b48..b6a1463d43 100644 --- a/builds/install/arch-specific/win32/BuildExecutableInstall.bat +++ b/builds/install/arch-specific/win32/BuildExecutableInstall.bat @@ -458,7 +458,7 @@ for /R %FB_OUTPUT_DIR% %%W in ( *.txt *.conf *.sql *.c *.cpp *.hpp *.h *.bat *.p :: Forcefully disable delayed expansion because of exclamation marks in 7z switches setlocal DisableDelayedExpansion -set SKIP_FILES=-x!installation_readme.txt +set SKIP_FILES=-x!*.log -x!*.exp -x!*_test.exe -x!installation_readme.txt if "%FBBUILD_SHIP_PDB%" == "ship_pdb" ( set FBBUILD_ZIPFILE=%FBBUILD_INSTALL_IMAGES%\Firebird-%FBBUILD_FILE_ID%-pdb%FBBUILD_FILENAME_SUFFIX%.zip diff --git a/builds/install/arch-specific/win32/FirebirdInstall.iss b/builds/install/arch-specific/win32/FirebirdInstall.iss index f988c1aa42..80c67e64a2 100644 --- a/builds/install/arch-specific/win32/FirebirdInstall.iss +++ b/builds/install/arch-specific/win32/FirebirdInstall.iss @@ -397,7 +397,7 @@ Filename: {app}\instreg.exe; Parameters: "install "; StatusMsg: {cm:instreg}; Mi Filename: {app}\instclient.exe; Parameters: "install fbclient"; StatusMsg: {cm:instclientCopyFbClient}; MinVersion: {#MinVer}; Components: ClientComponent; Flags: runminimized; Check: CopyFBClientLib; Filename: {app}\instclient.exe; Parameters: "install gds32"; StatusMsg: {cm:instclientGenGds32}; MinVersion: {#MinVer}; Components: ClientComponent; Flags: runminimized; Check: CopyGds32 #if PlatformTarget == "x64" -Filename: {app}\WOW64\instclient.exe; Parameters: "install fbclient"; StatusMsg: {cm:instclientCopyFbClient}; MinVersion: {#MinVer}; Components: ClientComponent; Flags: runminimized 32bit; Check: CopyFBClientLib; +Filename: {app}\WOW64\instclient.exe; Parameters: "install fbclient"; StatusMsg: {cm:instclientCopyFbClient}; MinVersion: {#MinVer}; Components: ClientComponent; Flags: runminimized 32bit; Check: CopyFBClientLib Filename: {app}\WOW64\instclient.exe; Parameters: "install gds32"; StatusMsg: {cm:instclientGenGds32}; MinVersion: {#MinVer}; Components: ClientComponent; Flags: runminimized 32bit; Check: CopyGds32 #endif @@ -500,10 +500,10 @@ Source: {#FilesDir}\icuin??.dll; DestDir: {app}; Components: ClientComponent; Fl Source: {#FilesDir}\icudt??.dll; DestDir: {app}; Components: ClientComponent; Flags: sharedfile ignoreversion Source: {#FilesDir}\icudt*.dat; DestDir: {app}; Components: ClientComponent; Flags: sharedfile ignoreversion #if PlatformTarget == "x64" -Source: {#WOW64Dir}\icuuc??.dll; DestDir: {app}\WOW64; Components: ClientComponent; Flags: sharedfile ignoreversion -Source: {#WOW64Dir}\icuin??.dll; DestDir: {app}\WOW64; Components: ClientComponent; Flags: sharedfile ignoreversion -Source: {#WOW64Dir}\icudt??.dll; DestDir: {app}\WOW64; Components: ClientComponent; Flags: sharedfile ignoreversion -Source: {#WOW64Dir}\icudt*.dat; DestDir: {app}\WOW64; Components: ClientComponent; Flags: sharedfile ignoreversion +Source: {#WOW64Dir}\icuuc??.dll; DestDir: {app}\WOW64; Components: ClientComponent; Flags: sharedfile ignoreversion {#SkipFileIfDevStatus} +Source: {#WOW64Dir}\icuin??.dll; DestDir: {app}\WOW64; Components: ClientComponent; Flags: sharedfile ignoreversion {#SkipFileIfDevStatus} +Source: {#WOW64Dir}\icudt??.dll; DestDir: {app}\WOW64; Components: ClientComponent; Flags: sharedfile ignoreversion {#SkipFileIfDevStatus} +Source: {#WOW64Dir}\icudt*.dat; DestDir: {app}\WOW64; Components: ClientComponent; Flags: sharedfile ignoreversion {#SkipFileIfDevStatus} #endif #if PlatformTarget =="Win32" @@ -512,7 +512,7 @@ Source: {#FilesDir}\fbrmclib.dll; DestDir: {app}; Components: ServerComponent; F Source: {#FilesDir}\zlib1.dll; DestDir: {app}; Components: ClientComponent; Flags: sharedfile ignoreversion #if PlatformTarget == "x64" -Source: {#WOW64Dir}\zlib1.dll; DestDir: {app}\WOW64; Components: ClientComponent; Flags: sharedfile ignoreversion +Source: {#WOW64Dir}\zlib1.dll; DestDir: {app}\WOW64; Components: ClientComponent; Flags: sharedfile ignoreversion {#SkipFileIfDevStatus} #endif ;Rules for installation of MS runtimes are simplified with MSVC10 @@ -549,7 +549,7 @@ Source: {#FilesDir}\doc\sql.extensions\*.*; DestDir: {app}\doc\sql.extensions; C 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; +Source: {#FilesDir}\lib\*.lib; DestDir: {app}\lib; Components: DevAdminComponent; Flags: ignoreversion; #if PlatformTarget == "x64" Source: {#WOW64Dir}\lib\*.lib; DestDir: {app}\WOW64\lib; Components: DevAdminComponent; Flags: ignoreversion {#SkipFileIfDevStatus} #endif @@ -566,7 +566,7 @@ Source: {#FilesDir}\plugins\chacha.dll; DestDir: {app}\plugins; Components: Clie Source: {#FilesDir}\plugins\*.conf; DestDir: {app}\plugins; Components: ServerComponent; Flags: ignoreversion; Source: {#FilesDir}\plugins\udr\*.*; DestDir: {app}\plugins\udr; Components: ServerComponent; Flags: ignoreversion; #if PlatformTarget == "x64" -Source: {#WOW64Dir}\plugins\chacha*.dll; DestDir: {app}\WOW64\plugins; Components: ClientComponent; Flags: ignoreversion; +Source: {#WOW64Dir}\plugins\chacha*.dll; DestDir: {app}\WOW64\plugins; Components: ClientComponent; Flags: ignoreversion {#SkipFileIfDevStatus}; #endif Source: {#FilesDir}\misc\*.*; DestDir: {app}\misc; Components: ServerComponent; Flags: ignoreversion createallsubdirs recursesubdirs ; @@ -588,7 +588,7 @@ Source: {#FilesDir}\gfix.pdb; DestDir: {app}; Components: DevAdminComponent; Source: {#FilesDir}\isql.pdb; DestDir: {app}; Components: ClientComponent; Source: {#FilesDir}\plugins\*.pdb; DestDir: {app}\plugins; Components: ServerComponent; #if PlatformTarget == "x64" -Source: {#WOW64Dir}\fbclient.pdb; DestDir: {app}\WOW64; Components: ClientComponent; +Source: {#WOW64Dir}\fbclient.pdb; DestDir: {app}\WOW64; Components: ClientComponent; Flags: {#SkipFileIfDevStatus}; #endif #endif diff --git a/builds/win32/create_msgs.bat b/builds/win32/create_msgs.bat index 984fbb15a6..064d8d1ada 100644 --- a/builds/win32/create_msgs.bat +++ b/builds/win32/create_msgs.bat @@ -2,14 +2,14 @@ @call setenvvar.bat @if errorlevel 1 (goto :END) -@if not defined FB_BIN_DIR (@call set_build_target.bat %*) +@if not defined FB_BOOT_BIN_DIR (@call set_build_target.bat %*) @echo Building build_msg (%FB_OBJ_DIR%)... @call compile.bat builds\win32\%VS_VER%\FirebirdBoot build_msg_%FB_TARGET_PLATFORM%.log build_msg @if errorlevel 1 (goto :END) @echo Building message file... -@%FB_BIN_DIR%\build_msg -f %FB_GEN_DB_DIR%\firebird.msg -c %FB_OUTPUT_DIR%\include\firebird\impl\iberror_c.h +@%FB_BOOT_BIN_DIR%\build_msg -f %FB_GEN_DB_DIR%\firebird.msg -c %FB_OUTPUT_DIR%\include\firebird\impl\iberror_c.h @copy %FB_GEN_DIR%\firebird.msg %FB_BIN_DIR% > nul :END diff --git a/builds/win32/gen_helper.nmake b/builds/win32/gen_helper.nmake index 07f201e29f..d2a7729f88 100644 --- a/builds/win32/gen_helper.nmake +++ b/builds/win32/gen_helper.nmake @@ -49,7 +49,7 @@ $(RPL_GREP): $(RPL_GREP_SRC) $(FB_GEN_DIR)\iberror.pas: $(ERR_CONSTS_PAS) $(FB_ROOT_PATH)\src\include\firebird\impl\msg\*.h compile.bat builds\win32\%VS_VER%\FirebirdBoot build_msg_%FB_TARGET_PLATFORM%.log build_msg - %FB_BIN_DIR%\build_msg -p $(FB_GEN_DIR)\iberror_codes.pas + %FB_BOOT_BIN_DIR%\build_msg -p $(FB_GEN_DIR)\iberror_codes.pas copy $(ERR_CONSTS_PAS) $(FB_GEN_DIR)\iberror.pas type $(FB_GEN_DIR)\iberror_codes.pas >> $(FB_GEN_DIR)\iberror.pas diff --git a/builds/win32/make_all.bat b/builds/win32/make_all.bat index 7a3f626c0a..facf459e3f 100644 --- a/builds/win32/make_all.bat +++ b/builds/win32/make_all.bat @@ -8,7 +8,7 @@ set ERRLEV=0 :: verify that boot was run before -@if not exist %FB_GEN_DIR%\firebird.msg (goto :HELP_BOOT & goto :EOF) +@if not exist %FB_BIN_DIR%\firebird.msg (goto :HELP_BOOT & goto :EOF) @call set_build_target.bat %* @@ -30,16 +30,6 @@ if errorlevel 1 call :ERROR build failed - see make_all_%FB_TARGET_PLATFORM%.log ::=========== :MOVE -@echo Copying files to output -@set FB_OUTPUT_DIR=%FB_ROOT_PATH%\output_%FB_TARGET_PLATFORM% -@del %FB_ROOT_PATH%\temp\%FB_OBJ_DIR%\firebird\*.exp 2>nul -@del %FB_ROOT_PATH%\temp\%FB_OBJ_DIR%\firebird\*.lib 2>nul -@rmdir /q /s %FB_OUTPUT_DIR% 2>nul - -:: short delay to let OS complete actions by rmdir above -@timeout 1 >nul - -@mkdir %FB_OUTPUT_DIR% 2>nul @mkdir %FB_OUTPUT_DIR%\intl 2>nul @mkdir %FB_OUTPUT_DIR%\tzdata 2>nul @mkdir %FB_OUTPUT_DIR%\doc 2>nul @@ -51,22 +41,9 @@ if errorlevel 1 call :ERROR build failed - see make_all_%FB_TARGET_PLATFORM%.log @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 -@del %FB_OUTPUT_DIR%\*_test.exe >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\tzdata\* %FB_OUTPUT_DIR%\tzdata >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 - -for %%v in (gpre_boot build_msg) do ( -@del %FB_OUTPUT_DIR%\%%v.* 2>nul -) :: Firebird.conf, etc -@copy %FB_GEN_DIR%\firebird.msg %FB_OUTPUT_DIR%\ > nul @copy %FB_ROOT_PATH%\builds\install\misc\firebird.conf %FB_OUTPUT_DIR%\firebird.conf >nul @copy %FB_ROOT_PATH%\builds\install\misc\databases.conf %FB_OUTPUT_DIR%\databases.conf >nul @copy %FB_ROOT_PATH%\builds\install\misc\fbintl.conf %FB_OUTPUT_DIR%\intl\ >nul @@ -94,7 +71,7 @@ copy %FB_ROOT_PATH%\src\include\ibase.h %FB_OUTPUT_DIR%\include > nul copy %FB_ROOT_PATH%\src\include\iberror.h %FB_OUTPUT_DIR%\include > nul :: New API headers -xcopy %FB_ROOT_PATH%\src\include\firebird %FB_OUTPUT_DIR%\include\firebird /e > nul +xcopy /y %FB_ROOT_PATH%\src\include\firebird %FB_OUTPUT_DIR%\include\firebird /e > nul :: UDR copy %FB_ROOT_PATH%\src\extlib\*.sql %FB_OUTPUT_DIR%\plugins\udr > nul diff --git a/builds/win32/make_boot.bat b/builds/win32/make_boot.bat index 033142dd02..8b05c9705f 100644 --- a/builds/win32/make_boot.bat +++ b/builds/win32/make_boot.bat @@ -17,6 +17,12 @@ set ERRLEV=0 ::=========== :MAIN @echo. + +@echo Cleaning output directory +@rmdir /S /Q "%FB_OUTPUT_DIR%" 2>nul +:: short delay to let OS complete actions by rmdir above +@timeout 1 >nul + @echo Creating directories :: Create the directory hierarchy. for %%v in ( alice auth burp dsql gpre isql jrd misc msgs examples yvalve utilities) do ( @@ -28,6 +34,7 @@ for %%v in ( alice auth burp dsql gpre isql jrd misc msgs examples yvalve utilit @mkdir %FB_GEN_DIR%\gpre\std 2>nul @mkdir %FB_OUTPUT_DIR%\include\firebird\impl 2>nul +@mkdir %FB_OUTPUT_DIR%\tzdata 2>nul call :interfaces if "%ERRLEV%"=="1" goto :END @@ -59,16 +66,13 @@ call :gpre_boot if "%ERRLEV%"=="1" goto :END ::======= -@echo Preprocessing the source files needed to build gbak, gpre and isql... +@echo Preprocessing the source files needed to build gpre and isql... @call preprocess.bat BOOT ::======= call :engine if "%ERRLEV%"=="1" goto :END -call :gbak -if "%ERRLEV%"=="1" goto :END - call :gpre if "%ERRLEV%"=="1" goto :END @@ -77,22 +81,13 @@ if "%ERRLEV%"=="1" goto :END @copy %FB_ROOT_PATH%\builds\install\misc\firebird.conf %FB_BIN_DIR%\firebird.conf -:: Copy ICU and zlib both to Debug and Release configurations - -@call set_build_target.bat %* RELEASE +:: Copy ICU and zlib to the output directory @mkdir %FB_BIN_DIR% @copy %FB_ROOT_PATH%\extern\icu\icudt???.dat %FB_BIN_DIR% >nul 2>&1 @copy %FB_ICU_SOURCE_BIN%\*.dll %FB_BIN_DIR% >nul 2>&1 +@copy %FB_ROOT_PATH%\extern\icu\tzdata-extract\* %FB_OUTPUT_DIR%\tzdata >nul 2>&1 @copy %FB_ROOT_PATH%\extern\zlib\%FB_TARGET_PLATFORM%\*.dll %FB_BIN_DIR% >nul 2>&1 -@call set_build_target.bat %* DEBUG -@mkdir %FB_BIN_DIR% -@copy %FB_ROOT_PATH%\extern\icu\icudt???.dat %FB_BIN_DIR% >nul 2>&1 -@copy %FB_ICU_SOURCE_BIN%\*.dll %FB_BIN_DIR% >nul 2>&1 -@copy %FB_ROOT_PATH%\extern\zlib\%FB_TARGET_PLATFORM%\*.dll %FB_BIN_DIR% >nul 2>&1 - -@call set_build_target.bat %* - ::======= @call :databases @@ -233,15 +228,6 @@ goto :EOF if errorlevel 1 call :boot2 engine @goto :EOF -::=================== -:: BUILD gbak -:gbak -@echo. -@echo Building gbak (%FB_OBJ_DIR%)... -@call compile.bat builds\win32\%VS_VER%\Firebird gbak_%FB_TARGET_PLATFORM%.log EXEs\gbak -if errorlevel 1 call :boot2 gbak -@goto :EOF - ::=================== :: BUILD gpre :gpre @@ -296,6 +282,10 @@ goto :EOF @"%FB_BIN_DIR%\isql" -q %FB_GEN_DB_DIR%/dbs/security5.fdb -i %FB_ROOT_PATH%\src\dbs\security.sql @copy %FB_GEN_DIR%\dbs\security5.fdb %FB_GEN_DIR%\dbs\security.fdb > nul +@echo Creating metadata.fdb... +@echo create database '%FB_GEN_DB_DIR%/dbs/metadata.fdb'; | "%FB_BIN_DIR%\isql" -q -sqldialect 1 +@copy %FB_GEN_DIR%\dbs\metadata.fdb %FB_GEN_DIR%\dbs\yachts.lnk > nul + @call create_msgs.bat db @goto :EOF diff --git a/builds/win32/make_examples.bat b/builds/win32/make_examples.bat index e2e20f86c8..e5e96b1c97 100644 --- a/builds/win32/make_examples.bat +++ b/builds/win32/make_examples.bat @@ -131,7 +131,6 @@ copy %FB_ROOT_PATH%\examples\package\* %FB_OUTPUT_DIR%\examples\package > nul copy %FB_ROOT_PATH%\examples\stat\* %FB_OUTPUT_DIR%\examples\stat > nul copy %FB_ROOT_PATH%\examples\udf\* %FB_OUTPUT_DIR%\examples\udf > nul copy %FB_ROOT_PATH%\examples\udr\* %FB_OUTPUT_DIR%\examples\udr > nul -copy %FB_ROOT_PATH%\temp\%FB_OBJ_DIR%\firebird\plugins\udr\*.dll %FB_OUTPUT_DIR%\plugins\udr >nul copy %FB_ROOT_PATH%\examples\prebuilt\%FB_OBJ_DIR%\bin\*.exe %FB_OUTPUT_DIR%\examples\prebuilt\bin > nul copy %FB_ROOT_PATH%\examples\prebuilt\%FB_OBJ_DIR%\plugins\*.dll %FB_OUTPUT_DIR%\examples\prebuilt\plugins > nul diff --git a/builds/win32/make_icu.bat b/builds/win32/make_icu.bat index 2f9f610b7d..e8494b6965 100644 --- a/builds/win32/make_icu.bat +++ b/builds/win32/make_icu.bat @@ -14,8 +14,8 @@ if errorlevel 1 call :ERROR build failed - see make_icu_%FB_TARGET_PLATFORM%.log for details @echo Extracting tzdata -mkdir %FB_ROOT_PATH%\temp\%FB_OBJ_DIR%\firebird\tzdata -unzip -o %FB_ROOT_PATH%\extern\icu\tzdata\le.zip -d %FB_ROOT_PATH%\temp\%FB_OBJ_DIR%\firebird\tzdata +mkdir %FB_OUTPUT_DIR%\tzdata +unzip -o %FB_ROOT_PATH%\extern\icu\tzdata\le.zip -d %FB_ROOT_PATH%\extern\icu\tzdata-extract @goto :EOF diff --git a/builds/win32/msvc15/chacha.vcxproj b/builds/win32/msvc15/chacha.vcxproj index 976f851c2e..13a415efc3 100644 --- a/builds/win32/msvc15/chacha.vcxproj +++ b/builds/win32/msvc15/chacha.vcxproj @@ -104,10 +104,10 @@ AllRules.ruleset - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\ + ..\..\..\output_$(PlatformName)\plugins\ + ..\..\..\output_$(PlatformName)\plugins\ + ..\..\..\output_$(PlatformName)\plugins\ + ..\..\..\output_$(PlatformName)\plugins\ diff --git a/builds/win32/msvc15/common_test.vcxproj b/builds/win32/msvc15/common_test.vcxproj index ee0766f883..775335ad5a 100644 --- a/builds/win32/msvc15/common_test.vcxproj +++ b/builds/win32/msvc15/common_test.vcxproj @@ -104,10 +104,10 @@ AllRules.ruleset - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ + ..\..\..\output_$(PlatformName)\ + ..\..\..\output_$(PlatformName)\ + ..\..\..\output_$(PlatformName)\ + ..\..\..\output_$(PlatformName)\ @@ -206,4 +206,4 @@ - \ No newline at end of file + diff --git a/builds/win32/msvc15/engine.vcxproj b/builds/win32/msvc15/engine.vcxproj index 029028aef2..4385dffa95 100644 --- a/builds/win32/msvc15/engine.vcxproj +++ b/builds/win32/msvc15/engine.vcxproj @@ -151,10 +151,10 @@ engine13 engine13 engine13 - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\ + ..\..\..\output_$(PlatformName)\plugins\ + ..\..\..\output_$(PlatformName)\plugins\ + ..\..\..\output_$(PlatformName)\plugins\ + ..\..\..\output_$(PlatformName)\plugins\ true diff --git a/builds/win32/msvc15/engine_test.vcxproj b/builds/win32/msvc15/engine_test.vcxproj index ce6642d2ec..5a07b67559 100644 --- a/builds/win32/msvc15/engine_test.vcxproj +++ b/builds/win32/msvc15/engine_test.vcxproj @@ -104,10 +104,10 @@ AllRules.ruleset - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ + ..\..\..\output_$(PlatformName)\ + ..\..\..\output_$(PlatformName)\ + ..\..\..\output_$(PlatformName)\ + ..\..\..\output_$(PlatformName)\ @@ -237,4 +237,4 @@ - \ No newline at end of file + diff --git a/builds/win32/msvc15/fb_lock_print.vcxproj b/builds/win32/msvc15/fb_lock_print.vcxproj index 4a67d26247..223bcae116 100644 --- a/builds/win32/msvc15/fb_lock_print.vcxproj +++ b/builds/win32/msvc15/fb_lock_print.vcxproj @@ -103,10 +103,10 @@ AllRules.ruleset - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ + ..\..\..\output_$(PlatformName)\ + ..\..\..\output_$(PlatformName)\ + ..\..\..\output_$(PlatformName)\ + ..\..\..\output_$(PlatformName)\ diff --git a/builds/win32/msvc15/fbguard.vcxproj b/builds/win32/msvc15/fbguard.vcxproj index a6c392774f..84701b8722 100644 --- a/builds/win32/msvc15/fbguard.vcxproj +++ b/builds/win32/msvc15/fbguard.vcxproj @@ -103,10 +103,10 @@ AllRules.ruleset - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ + ..\..\..\output_$(PlatformName)\ + ..\..\..\output_$(PlatformName)\ + ..\..\..\output_$(PlatformName)\ + ..\..\..\output_$(PlatformName)\ diff --git a/builds/win32/msvc15/fbrmclib.vcxproj b/builds/win32/msvc15/fbrmclib.vcxproj index fb9c76449c..dc4ad8357f 100644 --- a/builds/win32/msvc15/fbrmclib.vcxproj +++ b/builds/win32/msvc15/fbrmclib.vcxproj @@ -59,10 +59,10 @@ AllRules.ruleset - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\ + ..\..\..\output_$(PlatformName)\ + ..\..\..\output_$(PlatformName)\ + ..\..\..\output_$(PlatformName)\bin\ + ..\..\..\output_$(PlatformName)\bin\ diff --git a/builds/win32/msvc15/fbserver.vcxproj b/builds/win32/msvc15/fbserver.vcxproj index 51cdba3a05..cec2190b17 100644 --- a/builds/win32/msvc15/fbserver.vcxproj +++ b/builds/win32/msvc15/fbserver.vcxproj @@ -103,10 +103,10 @@ AllRules.ruleset - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ + ..\..\..\output_$(PlatformName)\ + ..\..\..\output_$(PlatformName)\ + ..\..\..\output_$(PlatformName)\ + ..\..\..\output_$(PlatformName)\ firebird firebird firebird diff --git a/builds/win32/msvc15/fbsvcmgr.vcxproj b/builds/win32/msvc15/fbsvcmgr.vcxproj index f0359b0996..d6cf7122e2 100644 --- a/builds/win32/msvc15/fbsvcmgr.vcxproj +++ b/builds/win32/msvc15/fbsvcmgr.vcxproj @@ -103,10 +103,10 @@ AllRules.ruleset - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ + ..\..\..\output_$(PlatformName)\ + ..\..\..\output_$(PlatformName)\ + ..\..\..\output_$(PlatformName)\ + ..\..\..\output_$(PlatformName)\ diff --git a/builds/win32/msvc15/fbtrace.vcxproj b/builds/win32/msvc15/fbtrace.vcxproj index b47e95904f..532c33859a 100644 --- a/builds/win32/msvc15/fbtrace.vcxproj +++ b/builds/win32/msvc15/fbtrace.vcxproj @@ -103,10 +103,10 @@ AllRules.ruleset - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\ + ..\..\..\output_$(PlatformName)\plugins\ + ..\..\..\output_$(PlatformName)\plugins\ + ..\..\..\output_$(PlatformName)\plugins\ + ..\..\..\output_$(PlatformName)\plugins\ diff --git a/builds/win32/msvc15/fbtracemgr.vcxproj b/builds/win32/msvc15/fbtracemgr.vcxproj index 9ee22a6ec3..f341d95433 100644 --- a/builds/win32/msvc15/fbtracemgr.vcxproj +++ b/builds/win32/msvc15/fbtracemgr.vcxproj @@ -105,10 +105,10 @@ AllRules.ruleset - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ + ..\..\..\output_$(PlatformName)\ + ..\..\..\output_$(PlatformName)\ + ..\..\..\output_$(PlatformName)\ + ..\..\..\output_$(PlatformName)\ diff --git a/builds/win32/msvc15/gbak.vcxproj b/builds/win32/msvc15/gbak.vcxproj index 2ac340738d..74e3b98c43 100644 --- a/builds/win32/msvc15/gbak.vcxproj +++ b/builds/win32/msvc15/gbak.vcxproj @@ -103,10 +103,10 @@ AllRules.ruleset - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ + ..\..\..\output_$(PlatformName)\ + ..\..\..\output_$(PlatformName)\ + ..\..\..\output_$(PlatformName)\ + ..\..\..\output_$(PlatformName)\ diff --git a/builds/win32/msvc15/gfix.vcxproj b/builds/win32/msvc15/gfix.vcxproj index 1ccf23fee2..e48788f726 100644 --- a/builds/win32/msvc15/gfix.vcxproj +++ b/builds/win32/msvc15/gfix.vcxproj @@ -104,10 +104,10 @@ AllRules.ruleset - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ + ..\..\..\output_$(PlatformName)\ + ..\..\..\output_$(PlatformName)\ + ..\..\..\output_$(PlatformName)\ + ..\..\..\output_$(PlatformName)\ diff --git a/builds/win32/msvc15/gpre.vcxproj b/builds/win32/msvc15/gpre.vcxproj index 1b6c19fb42..6f9c91677b 100644 --- a/builds/win32/msvc15/gpre.vcxproj +++ b/builds/win32/msvc15/gpre.vcxproj @@ -104,10 +104,10 @@ AllRules.ruleset - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ + ..\..\..\output_$(PlatformName)\ + ..\..\..\output_$(PlatformName)\ + ..\..\..\output_$(PlatformName)\ + ..\..\..\output_$(PlatformName)\ diff --git a/builds/win32/msvc15/gsec.vcxproj b/builds/win32/msvc15/gsec.vcxproj index 1d647ba359..c933a7c9a5 100644 --- a/builds/win32/msvc15/gsec.vcxproj +++ b/builds/win32/msvc15/gsec.vcxproj @@ -103,10 +103,10 @@ AllRules.ruleset - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ + ..\..\..\output_$(PlatformName)\ + ..\..\..\output_$(PlatformName)\ + ..\..\..\output_$(PlatformName)\ + ..\..\..\output_$(PlatformName)\ diff --git a/builds/win32/msvc15/gsplit.vcxproj b/builds/win32/msvc15/gsplit.vcxproj index 56849087c0..8abed21f15 100644 --- a/builds/win32/msvc15/gsplit.vcxproj +++ b/builds/win32/msvc15/gsplit.vcxproj @@ -104,10 +104,10 @@ AllRules.ruleset - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ + ..\..\..\output_$(PlatformName)\ + ..\..\..\output_$(PlatformName)\ + ..\..\..\output_$(PlatformName)\ + ..\..\..\output_$(PlatformName)\ diff --git a/builds/win32/msvc15/gstat.vcxproj b/builds/win32/msvc15/gstat.vcxproj index 82322a05d9..2327df541a 100644 --- a/builds/win32/msvc15/gstat.vcxproj +++ b/builds/win32/msvc15/gstat.vcxproj @@ -103,10 +103,10 @@ AllRules.ruleset - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ + ..\..\..\output_$(PlatformName)\ + ..\..\..\output_$(PlatformName)\ + ..\..\..\output_$(PlatformName)\ + ..\..\..\output_$(PlatformName)\ diff --git a/builds/win32/msvc15/ib_util.vcxproj b/builds/win32/msvc15/ib_util.vcxproj index 37f38a2a9c..0e8156c85a 100644 --- a/builds/win32/msvc15/ib_util.vcxproj +++ b/builds/win32/msvc15/ib_util.vcxproj @@ -107,10 +107,10 @@ AllRules.ruleset - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ + ..\..\..\output_$(PlatformName)\ + ..\..\..\output_$(PlatformName)\ + ..\..\..\output_$(PlatformName)\ + ..\..\..\output_$(PlatformName)\ @@ -132,6 +132,7 @@ Windows + $(OutDir)\lib\$(TargetName)_ms.lib @@ -155,6 +156,7 @@ MachineX64 Windows + $(OutDir)\lib\$(TargetName)_ms.lib @@ -175,6 +177,7 @@ Windows + $(OutDir)\lib\$(TargetName)_ms.lib @@ -195,6 +198,7 @@ MachineX64 Windows + $(OutDir)\lib\$(TargetName)_ms.lib diff --git a/builds/win32/msvc15/instclient.vcxproj b/builds/win32/msvc15/instclient.vcxproj index 56a56073f0..0350a7260d 100644 --- a/builds/win32/msvc15/instclient.vcxproj +++ b/builds/win32/msvc15/instclient.vcxproj @@ -104,10 +104,10 @@ AllRules.ruleset - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ + ..\..\..\output_$(PlatformName)\ + ..\..\..\output_$(PlatformName)\ + ..\..\..\output_$(PlatformName)\ + ..\..\..\output_$(PlatformName)\ diff --git a/builds/win32/msvc15/instreg.vcxproj b/builds/win32/msvc15/instreg.vcxproj index c94037af44..b67b1fe6da 100644 --- a/builds/win32/msvc15/instreg.vcxproj +++ b/builds/win32/msvc15/instreg.vcxproj @@ -104,10 +104,10 @@ AllRules.ruleset - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ + ..\..\..\output_$(PlatformName)\ + ..\..\..\output_$(PlatformName)\ + ..\..\..\output_$(PlatformName)\ + ..\..\..\output_$(PlatformName)\ diff --git a/builds/win32/msvc15/instsvc.vcxproj b/builds/win32/msvc15/instsvc.vcxproj index 58091aeb62..dc6be2cfc8 100644 --- a/builds/win32/msvc15/instsvc.vcxproj +++ b/builds/win32/msvc15/instsvc.vcxproj @@ -104,10 +104,10 @@ AllRules.ruleset - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ + ..\..\..\output_$(PlatformName)\ + ..\..\..\output_$(PlatformName)\ + ..\..\..\output_$(PlatformName)\ + ..\..\..\output_$(PlatformName)\ diff --git a/builds/win32/msvc15/intl.vcxproj b/builds/win32/msvc15/intl.vcxproj index 9ac780a85a..a37f37291f 100644 --- a/builds/win32/msvc15/intl.vcxproj +++ b/builds/win32/msvc15/intl.vcxproj @@ -107,10 +107,10 @@ AllRules.ruleset - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\intl\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\intl\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\intl\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\intl\ + ..\..\..\output_$(PlatformName)\intl\ + ..\..\..\output_$(PlatformName)\intl\ + ..\..\..\output_$(PlatformName)\intl\ + ..\..\..\output_$(PlatformName)\intl\ fbintl fbintl fbintl @@ -132,7 +132,6 @@ comctl32.lib;ws2_32.lib;mpr.lib;version.lib;%(AdditionalDependencies) - ..\..\..\temp\$(Platform)\$(Configuration)\firebird\$(ProjectName)\fb$(ProjectName).dll ../../../extern/icu/$(Platform)/$(Configuration)/lib;%(AdditionalLibraryDirectories) false @@ -156,7 +155,6 @@ comctl32.lib;ws2_32.lib;mpr.lib;version.lib;%(AdditionalDependencies) - ..\..\..\temp\$(Platform)\$(Configuration)\firebird\$(ProjectName)\fb$(ProjectName).dll ../../../extern/icu/$(Platform)/$(Configuration)/lib;%(AdditionalLibraryDirectories) false @@ -179,7 +177,6 @@ comctl32.lib;ws2_32.lib;mpr.lib;version.lib;%(AdditionalDependencies) - ..\..\..\temp\$(Platform)\$(Configuration)\firebird\$(ProjectName)\fb$(ProjectName).dll ../../../extern/icu/$(Platform)/release/lib;%(AdditionalLibraryDirectories) false @@ -200,7 +197,6 @@ comctl32.lib;ws2_32.lib;mpr.lib;version.lib;%(AdditionalDependencies) - ..\..\..\temp\$(Platform)\$(Configuration)\firebird\$(ProjectName)\fb$(ProjectName).dll ../../../extern/icu/$(Platform)/release/lib;%(AdditionalLibraryDirectories) false diff --git a/builds/win32/msvc15/isql.vcxproj b/builds/win32/msvc15/isql.vcxproj index 7d7669cbf7..b22e52bfb7 100644 --- a/builds/win32/msvc15/isql.vcxproj +++ b/builds/win32/msvc15/isql.vcxproj @@ -104,10 +104,10 @@ AllRules.ruleset - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ + ..\..\..\output_$(PlatformName)\ + ..\..\..\output_$(PlatformName)\ + ..\..\..\output_$(PlatformName)\ + ..\..\..\output_$(PlatformName)\ diff --git a/builds/win32/msvc15/legacy_auth.vcxproj b/builds/win32/msvc15/legacy_auth.vcxproj index 42a9602629..4659e95b4b 100644 --- a/builds/win32/msvc15/legacy_auth.vcxproj +++ b/builds/win32/msvc15/legacy_auth.vcxproj @@ -103,10 +103,10 @@ AllRules.ruleset - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\ + ..\..\..\output_$(PlatformName)\plugins\ + ..\..\..\output_$(PlatformName)\plugins\ + ..\..\..\output_$(PlatformName)\plugins\ + ..\..\..\output_$(PlatformName)\plugins\ diff --git a/builds/win32/msvc15/legacy_usermanager.vcxproj b/builds/win32/msvc15/legacy_usermanager.vcxproj index 2eecaaff5a..c53a39f41c 100644 --- a/builds/win32/msvc15/legacy_usermanager.vcxproj +++ b/builds/win32/msvc15/legacy_usermanager.vcxproj @@ -103,10 +103,10 @@ AllRules.ruleset - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\ + ..\..\..\output_$(PlatformName)\plugins\ + ..\..\..\output_$(PlatformName)\plugins\ + ..\..\..\output_$(PlatformName)\plugins\ + ..\..\..\output_$(PlatformName)\plugins\ diff --git a/builds/win32/msvc15/nbackup.vcxproj b/builds/win32/msvc15/nbackup.vcxproj index 8d1ccd9970..6d935aca3e 100644 --- a/builds/win32/msvc15/nbackup.vcxproj +++ b/builds/win32/msvc15/nbackup.vcxproj @@ -103,10 +103,10 @@ AllRules.ruleset - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ + ..\..\..\output_$(PlatformName)\ + ..\..\..\output_$(PlatformName)\ + ..\..\..\output_$(PlatformName)\ + ..\..\..\output_$(PlatformName)\ diff --git a/builds/win32/msvc15/srp.vcxproj b/builds/win32/msvc15/srp.vcxproj index 665f9bdd2c..bf0567bc44 100644 --- a/builds/win32/msvc15/srp.vcxproj +++ b/builds/win32/msvc15/srp.vcxproj @@ -104,10 +104,10 @@ AllRules.ruleset - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\ + ..\..\..\output_$(PlatformName)\plugins\ + ..\..\..\output_$(PlatformName)\plugins\ + ..\..\..\output_$(PlatformName)\plugins\ + ..\..\..\output_$(PlatformName)\plugins\ diff --git a/builds/win32/msvc15/udf_compat.vcxproj b/builds/win32/msvc15/udf_compat.vcxproj index 445a0583b1..60eb38b62c 100644 --- a/builds/win32/msvc15/udf_compat.vcxproj +++ b/builds/win32/msvc15/udf_compat.vcxproj @@ -103,10 +103,10 @@ AllRules.ruleset - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\udr\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\udr\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\udr\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\udr\ + ..\..\..\output_$(PlatformName)\plugins\udr\ + ..\..\..\output_$(PlatformName)\plugins\udr\ + ..\..\..\output_$(PlatformName)\plugins\udr\ + ..\..\..\output_$(PlatformName)\plugins\udr\ true diff --git a/builds/win32/msvc15/udr_engine.vcxproj b/builds/win32/msvc15/udr_engine.vcxproj index 7ecaa80407..f8a6c378b5 100644 --- a/builds/win32/msvc15/udr_engine.vcxproj +++ b/builds/win32/msvc15/udr_engine.vcxproj @@ -107,10 +107,10 @@ AllRules.ruleset - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\ + ..\..\..\output_$(PlatformName)\plugins\ + ..\..\..\output_$(PlatformName)\plugins\ + ..\..\..\output_$(PlatformName)\plugins\ + ..\..\..\output_$(PlatformName)\plugins\ @@ -125,7 +125,6 @@ comctl32.lib;ws2_32.lib;mpr.lib;version.lib;%(AdditionalDependencies) - ..\..\..\temp\$(Platform)\$(Configuration)\firebird\plugins\$(ProjectName).dll ..\defs\plugin.def false @@ -145,7 +144,6 @@ comctl32.lib;ws2_32.lib;mpr.lib;version.lib;%(AdditionalDependencies) - ..\..\..\temp\$(Platform)\$(Configuration)\firebird\plugins\$(ProjectName).dll ..\defs\plugin.def false @@ -169,7 +167,6 @@ comctl32.lib;ws2_32.lib;mpr.lib;version.lib;%(AdditionalDependencies) - ..\..\..\temp\$(Platform)\$(Configuration)\firebird\plugins\$(ProjectName).dll ..\defs\plugin.def false @@ -192,7 +189,6 @@ comctl32.lib;ws2_32.lib;mpr.lib;version.lib;%(AdditionalDependencies) - ..\..\..\temp\$(Platform)\$(Configuration)\firebird\plugins\$(ProjectName).dll ..\defs\plugin.def false diff --git a/builds/win32/msvc15/udrcpp_example.vcxproj b/builds/win32/msvc15/udrcpp_example.vcxproj index 83326c59d6..c448ff193c 100644 --- a/builds/win32/msvc15/udrcpp_example.vcxproj +++ b/builds/win32/msvc15/udrcpp_example.vcxproj @@ -109,16 +109,16 @@ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\udr\ + ..\..\..\output_$(PlatformName)\plugins\udr\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\udr\ + ..\..\..\output_$(PlatformName)\plugins\udr\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\udr\ + ..\..\..\output_$(PlatformName)\plugins\udr\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\udr\ + ..\..\..\output_$(PlatformName)\plugins\udr\ @@ -133,7 +133,7 @@ comctl32.lib;ws2_32.lib;mpr.lib;version.lib;%(AdditionalDependencies) - ..\..\..\temp\$(Platform)\$(Configuration)\firebird\plugins\udr\$(ProjectName).dll + $(OutDir)$(TargetName)$(TargetExt) false @@ -154,7 +154,7 @@ comctl32.lib;ws2_32.lib;mpr.lib;version.lib;%(AdditionalDependencies) - ..\..\..\temp\$(Platform)\$(Configuration)\firebird\plugins\udr\$(ProjectName).dll + $(OutDir)$(TargetName)$(TargetExt) false @@ -179,7 +179,7 @@ comctl32.lib;ws2_32.lib;mpr.lib;version.lib;%(AdditionalDependencies) - ..\..\..\temp\$(Platform)\$(Configuration)\firebird\plugins\udr\$(ProjectName).dll + $(OutDir)$(TargetName)$(TargetExt) false @@ -203,7 +203,7 @@ comctl32.lib;ws2_32.lib;mpr.lib;version.lib;%(AdditionalDependencies) - ..\..\..\temp\$(Platform)\$(Configuration)\firebird\plugins\udr\$(ProjectName).dll + $(OutDir)$(TargetName)$(TargetExt) false diff --git a/builds/win32/msvc15/yvalve.vcxproj b/builds/win32/msvc15/yvalve.vcxproj index b73b2889c7..8ba5a117e9 100644 --- a/builds/win32/msvc15/yvalve.vcxproj +++ b/builds/win32/msvc15/yvalve.vcxproj @@ -171,10 +171,10 @@ fbclient fbclient fbclient - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ - ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\ + ..\..\..\output_$(PlatformName)\ + ..\..\..\output_$(PlatformName)\ + ..\..\..\output_$(PlatformName)\ + ..\..\..\output_$(PlatformName)\ true @@ -189,6 +189,7 @@ ..\defs\firebird.def ws2_32.lib;mpr.lib;%(AdditionalDependencies) Windows + $(OutDir)\lib\$(TargetName)_ms.lib @@ -203,6 +204,7 @@ ..\defs\firebird.def ws2_32.lib;mpr.lib;%(AdditionalDependencies) Windows + $(OutDir)\lib\$(TargetName)_ms.lib @@ -220,6 +222,7 @@ ..\defs\firebird.def ws2_32.lib;mpr.lib;%(AdditionalDependencies) Windows + $(OutDir)\lib\$(TargetName)_ms.lib @@ -236,6 +239,7 @@ ..\defs\firebird.def ws2_32.lib;mpr.lib;%(AdditionalDependencies) Windows + $(OutDir)\lib\$(TargetName)_ms.lib diff --git a/builds/win32/preprocess.bat b/builds/win32/preprocess.bat index ec1c46f2cd..49293d65fd 100644 --- a/builds/win32/preprocess.bat +++ b/builds/win32/preprocess.bat @@ -54,12 +54,12 @@ goto :EOF ::=========== :BOOT_PROCESS @echo. -@set GPRE=%FB_BIN_DIR%\gpre_boot -lang_internal +@set GPRE=%FB_BOOT_BIN_DIR%\gpre_boot -lang_internal @for %%i in (backup, restore, OdsDetection) do @call :PREPROCESS burp %%i -ocxx -m @for %%i in (extract, isql, show) do @call :PREPROCESS isql %%i -ocxx @for %%i in (dba) do @call :PREPROCESS utilities/gstat %%i -@set GPRE=%FB_BIN_DIR%\gpre_boot +@set GPRE=%FB_BOOT_BIN_DIR%\gpre_boot @for %%i in (alice_meta) do @call :PREPROCESS alice %%i @for %%i in (array, blob) do @call :PREPROCESS yvalve %%i @for %%i in (metd, DdlNodes, PackageNodes) do @call :PREPROCESS dsql %%i -gds_cxx diff --git a/builds/win32/set_build_target.bat b/builds/win32/set_build_target.bat index ba27fac14f..35889ff625 100644 --- a/builds/win32/set_build_target.bat +++ b/builds/win32/set_build_target.bat @@ -12,7 +12,8 @@ for %%v in ( %* ) do ( ) set FB_OBJ_DIR=%FB_TARGET_PLATFORM%\%FB_CONFIG% -set FB_BIN_DIR=%FB_ROOT_PATH%\temp\%FB_OBJ_DIR%\firebird\ +set FB_BOOT_BIN_DIR=%FB_ROOT_PATH%\temp\%FB_OBJ_DIR%\firebird +set FB_BIN_DIR=%FB_ROOT_PATH%\output_%FB_TARGET_PLATFORM% @echo Executed %0 @echo. diff --git a/examples/dbcrypt/msvc/DbCryptApp_MSVC15.vcxproj b/examples/dbcrypt/msvc/DbCryptApp_MSVC15.vcxproj index e5007f05b3..9bb2f63f9c 100644 --- a/examples/dbcrypt/msvc/DbCryptApp_MSVC15.vcxproj +++ b/examples/dbcrypt/msvc/DbCryptApp_MSVC15.vcxproj @@ -110,8 +110,8 @@ Console - ..\..\..\temp\$(Platform)\$(Configuration)\yvalve\ - fbclient.lib;%(AdditionalDependencies) + ..\..\..\output_$(Platform)\lib\ + fbclient_ms.lib;%(AdditionalDependencies) @@ -125,8 +125,8 @@ Console - ..\..\..\temp\$(Platform)\$(Configuration)\yvalve\ - fbclient.lib;%(AdditionalDependencies) + ..\..\..\output_$(Platform)\lib\ + fbclient_ms.lib;%(AdditionalDependencies) @@ -144,8 +144,8 @@ Console true true - ..\..\..\temp\$(Platform)\$(Configuration)\yvalve\ - fbclient.lib;%(AdditionalDependencies) + ..\..\..\output_$(Platform)\lib\ + fbclient_ms.lib;%(AdditionalDependencies) @@ -163,8 +163,8 @@ Console true true - ..\..\..\temp\$(Platform)\$(Configuration)\yvalve\ - fbclient.lib;%(AdditionalDependencies) + ..\..\..\output_$(Platform)\lib\ + fbclient_ms.lib;%(AdditionalDependencies) diff --git a/extern/icu/.gitignore b/extern/icu/.gitignore index fe570806bb..1b2dd8dd91 100644 --- a/extern/icu/.gitignore +++ b/extern/icu/.gitignore @@ -3,6 +3,7 @@ include/ lib/ Win32/ x64/ +tzdata-extract/ icudt63l.dat icudt63l_empty.dat license.html