mirror of
https://github.com/FirebirdSQL/firebird.git
synced 2025-01-23 08:03:04 +01:00
Roll back deployment with static linking of ms runtimes
This commit is contained in:
paul_reeves
parent
bfb85ebce0
commit
8d9c89f4e1
@ -88,7 +88,6 @@ set FBBUILD_PROD_STATUS=PROD) || type %FB_ROOT_PATH%\src\jrd\build_no.h | findst
|
||||
set FBBUILD_PROD_STATUS=PROD) || type %FB_ROOT_PATH%\src\jrd\build_no.h | findstr /I "Final" > nul && (
|
||||
set FBBUILD_PROD_STATUS=PROD)
|
||||
|
||||
|
||||
::End of SET_PARAMS
|
||||
::-----------------
|
||||
@goto :EOF
|
||||
@ -113,22 +112,22 @@ if not DEFINED FB_EXTERNAL_DOCS (
|
||||
|
||||
sed --version | findstr version > nul
|
||||
@if %ERRORLEVEL% GEQ 1 (
|
||||
call :ERROR Could not locate sed
|
||||
goto :EOF
|
||||
call :ERROR Could not locate sed
|
||||
goto :EOF
|
||||
) else (@echo o sed found.)
|
||||
|
||||
if %FBBUILD_ZIP_PACK% EQU 1 (
|
||||
if not defined SEVENZIP (
|
||||
call :ERROR SEVENZIP environment variable is not defined.
|
||||
@goto :EOF
|
||||
call :ERROR SEVENZIP environment variable is not defined.
|
||||
@goto :EOF
|
||||
) else (@echo o Compression utility found.)
|
||||
)
|
||||
|
||||
|
||||
if %FBBUILD_ISX_PACK% EQU 1 (
|
||||
if NOT DEFINED INNO5_SETUP_PATH (
|
||||
call :ERROR INNO5_SETUP_PATH variable not defined
|
||||
@goto :EOF
|
||||
call :ERROR INNO5_SETUP_PATH variable not defined
|
||||
@goto :EOF
|
||||
) else (@echo o Inno Setup found at %INNO5_SETUP_PATH%.)
|
||||
)
|
||||
|
||||
@ -190,29 +189,24 @@ del %temp%.\b$?.txt
|
||||
:: (You may need to download and extract the
|
||||
:: vcredist stuff to your MSDevDir for this to work with MSVC6.
|
||||
:: MSVC7 requires the Framework SDK v1.1 to be installed.
|
||||
:: MSVC8 is currently set to link statically, removing the need to copy the
|
||||
:: runtimes otherwise we also need to deploy vcredist.exe so as to support
|
||||
:: installing the client lib in the <Sys> dir. For now the dummy define
|
||||
:: FB_DYN_LIB is used to comment out this code section.
|
||||
:: MSVC8 should be installed with redistributable packages.
|
||||
::=====================
|
||||
if not exist %FB_OUTPUT_DIR%\system32 (mkdir %FB_OUTPUT_DIR%\system32)
|
||||
@if DEFINED MSDevDir (
|
||||
@if %MSVC_VERSION% EQU 6 (
|
||||
@copy "%MSDevDir%\vcredist\msvcrt.dll" %FB_OUTPUT_DIR%\bin\ > nul
|
||||
@copy "%MSDevDir%\vcredist\msvcp%MSVC_VERSION%0.dll" %FB_OUTPUT_DIR%\bin\ > nul
|
||||
@copy "%MSDevDir%\vcredist\msvcrt.dll" %FB_OUTPUT_DIR%\bin\ > nul
|
||||
@copy "%MSDevDir%\vcredist\msvcp%MSVC_VERSION%0.dll" %FB_OUTPUT_DIR%\bin\ > nul
|
||||
)
|
||||
) else (
|
||||
if %MSVC_VERSION% EQU 8 (
|
||||
if defined FB_DYN_LIB (
|
||||
@copy "%VCINSTALLDIR%\redist\%PROCESSOR_ARCHITECTURE%\Microsoft.VC80.CRT\msvcp%MSVC_VERSION%?.dll" %FB_OUTPUT_DIR%\bin\ > nul
|
||||
@copy "%VCINSTALLDIR%\redist\%PROCESSOR_ARCHITECTURE%\Microsoft.VC80.CRT\msvcr%MSVC_VERSION%?.dll" %FB_OUTPUT_DIR%\bin\ > nul
|
||||
@copy "%VCINSTALLDIR%\redist\%PROCESSOR_ARCHITECTURE%\Microsoft.VC80.CRT\Microsoft.VC80.CRT.manifest" %FB_OUTPUT_DIR%\bin\ > nul
|
||||
)
|
||||
@copy "%VCINSTALLDIR%\redist\%PROCESSOR_ARCHITECTURE%\Microsoft.VC80.CRT\msvcp%MSVC_VERSION%?.dll" %FB_OUTPUT_DIR%\bin\ > nul
|
||||
@copy "%VCINSTALLDIR%\redist\%PROCESSOR_ARCHITECTURE%\Microsoft.VC80.CRT\msvcr%MSVC_VERSION%?.dll" %FB_OUTPUT_DIR%\bin\ > nul
|
||||
@copy "%VCINSTALLDIR%\redist\%PROCESSOR_ARCHITECTURE%\Microsoft.VC80.CRT\Microsoft.VC80.CRT.manifest" %FB_OUTPUT_DIR%\bin\ > nul
|
||||
) else (
|
||||
if %MSVC_VERSION% EQU 7 (
|
||||
@copy "%FrameworkSDKDir%\bin\msvcp%MSVC_VERSION%?.dll" %FB_OUTPUT_DIR%\bin\ > nul
|
||||
@copy "%FrameworkSDKDir%\bin\msvcr%MSVC_VERSION%?.dll" %FB_OUTPUT_DIR%\bin\ > nul
|
||||
)
|
||||
if %MSVC_VERSION% EQU 7 (
|
||||
@copy "%FrameworkSDKDir%\bin\msvcp%MSVC_VERSION%?.dll" %FB_OUTPUT_DIR%\bin\ > nul
|
||||
@copy "%FrameworkSDKDir%\bin\msvcr%MSVC_VERSION%?.dll" %FB_OUTPUT_DIR%\bin\ > nul
|
||||
)
|
||||
)
|
||||
)
|
||||
@if %ERRORLEVEL% GEQ 1 ( (call :ERROR Copying MSVC runtime library failed with error %ERRORLEVEL% ) & (goto :EOF))
|
||||
@ -247,11 +241,11 @@ if "%PROCESSOR_ARCHITECTURE%"=="x86" (
|
||||
@if "%FBBUILD_SHIP_PDB%"=="ship_pdb" (
|
||||
@echo Copying pdb files...
|
||||
for %%v in ( fbembed fb_inet_server fbserver fbclient ) do (
|
||||
@copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\%%v\%%v.pdb %FB_OUTPUT_DIR%\bin > nul
|
||||
@if %ERRORLEVEL% GEQ 1 (
|
||||
call :ERROR Copying %%v.pdb files failed
|
||||
goto :EOF
|
||||
)
|
||||
@copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\%%v\%%v.pdb %FB_OUTPUT_DIR%\bin > nul
|
||||
@if %ERRORLEVEL% GEQ 1 (
|
||||
call :ERROR Copying %%v.pdb files failed
|
||||
goto :EOF
|
||||
)
|
||||
)
|
||||
)
|
||||
:: @copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\firebird\bin\*.pdb %FB_OUTPUT_DIR%\bin > nul
|
||||
@ -270,16 +264,16 @@ if "%PROCESSOR_ARCHITECTURE%"=="x86" (
|
||||
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
|
||||
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
|
||||
call :ERROR Copying %FB_ROOT_PATH%\src\extlib\%%v failed with error %ERRORLEVEL%
|
||||
goto :EOF
|
||||
)
|
||||
)
|
||||
|
||||
@ -324,7 +318,7 @@ mkdir %FB_OUTPUT_DIR%\misc\upgrade\ib_udf 2>nul
|
||||
|
||||
:: Add license
|
||||
for %%v in (IPLicense.txt IDPLicense.txt ) do (
|
||||
@copy %FB_ROOT_PATH%\builds\install\misc\%%v %FB_OUTPUT_DIR%\%%v > nul
|
||||
@copy %FB_ROOT_PATH%\builds\install\misc\%%v %FB_OUTPUT_DIR%\%%v > nul
|
||||
)
|
||||
|
||||
:: And readme
|
||||
@ -335,15 +329,15 @@ echo Setting .txt filetype to ascii docs.
|
||||
for /R %FB_OUTPUT_DIR%\doc %%v in (.) do (
|
||||
pushd %%v
|
||||
for /F %%W in ( 'dir /B /A-D' ) do (
|
||||
if /I "%%~xW" NEQ ".txt" (
|
||||
if /I "%%~xW" NEQ ".pdf" (
|
||||
if /I "%%~xW" NEQ ".htm" (
|
||||
if /I "%%~xW" NEQ ".html" (
|
||||
ren %%W %%W.txt
|
||||
)
|
||||
)
|
||||
)
|
||||
)
|
||||
if /I "%%~xW" NEQ ".txt" (
|
||||
if /I "%%~xW" NEQ ".pdf" (
|
||||
if /I "%%~xW" NEQ ".htm" (
|
||||
if /I "%%~xW" NEQ ".html" (
|
||||
ren %%W %%W.txt
|
||||
)
|
||||
)
|
||||
)
|
||||
)
|
||||
)
|
||||
popd
|
||||
)
|
||||
@ -424,9 +418,9 @@ mkdir %FB_OUTPUT_DIR%\misc\upgrade\metadata 2>nul
|
||||
:: Make sure that qli's help.fdb is available
|
||||
::===============================================
|
||||
@if not exist %FB_OUTPUT_DIR%\help\help.fdb (
|
||||
(@echo Copying help.fdb for qli support)
|
||||
(@copy %FB_GEN_DIR%\dbs\help.fdb %FB_OUTPUT_DIR%\help\help.fdb > nul)
|
||||
(@if %ERRORLEVEL% GEQ 1 ( (call :ERROR Could not copy qli help database ) & (goto :EOF)))
|
||||
(@echo Copying help.fdb for qli support)
|
||||
(@copy %FB_GEN_DIR%\dbs\help.fdb %FB_OUTPUT_DIR%\help\help.fdb > nul)
|
||||
(@if %ERRORLEVEL% GEQ 1 ( (call :ERROR Could not copy qli help database ) & (goto :EOF)))
|
||||
)
|
||||
|
||||
::End of GBAK_SEC_DB
|
||||
@ -440,8 +434,8 @@ mkdir %FB_OUTPUT_DIR%\misc\upgrade\metadata 2>nul
|
||||
:: in builds\win32 by build_msg.bat. Copying from there to output dir
|
||||
::=================================================================
|
||||
@if not exist %FB_OUTPUT_DIR%\firebird.msg (
|
||||
(@copy %FB_GEN_DIR%\firebird.msg %FB_OUTPUT_DIR%\firebird.msg > nul)
|
||||
(@if %ERRORLEVEL% GEQ 1 ( (call :ERROR Could not copy firebird.msg ) & (goto :EOF)))
|
||||
(@copy %FB_GEN_DIR%\firebird.msg %FB_OUTPUT_DIR%\firebird.msg > nul)
|
||||
(@if %ERRORLEVEL% GEQ 1 ( (call :ERROR Could not copy firebird.msg ) & (goto :EOF)))
|
||||
)
|
||||
|
||||
::End of FB_MSG
|
||||
@ -468,15 +462,15 @@ 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 (bin doc doc\sql.extensions help include intl lib udf misc misc\upgrade misc\upgrade\ib_udf misc\upgrade\security misc\upgrade\metadata system32 ) 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
|
||||
@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
|
||||
)
|
||||
|
||||
@if %FB2_EXAMPLES% equ 1 for %%v in (examples examples\api examples\dyn examples\empbuild examples\include examples\stat examples\udf examples\build_win32 ) 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
|
||||
@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
|
||||
)
|
||||
|
||||
|
||||
@ -509,16 +503,16 @@ goto :EOF
|
||||
::=======
|
||||
if %FBBUILD_ZIP_PACK% EQU 0 goto :EOF
|
||||
if "%FBBUILD_SHIP_PDB%" == "ship_pdb" (
|
||||
if exist %FBBUILD_INSTALL_IMAGES%\Firebird-%FBBUILD_FILE_ID%.zip (
|
||||
@del %FBBUILD_INSTALL_IMAGES%\Firebird-%FBBUILD_FILE_ID%_pdb.zip
|
||||
)
|
||||
set FBBUILD_ZIPFILE=%FBBUILD_INSTALL_IMAGES%\Firebird-%FBBUILD_FILE_ID%_pdb.zip
|
||||
if exist %FBBUILD_INSTALL_IMAGES%\Firebird-%FBBUILD_FILE_ID%.zip (
|
||||
@del %FBBUILD_INSTALL_IMAGES%\Firebird-%FBBUILD_FILE_ID%_pdb.zip
|
||||
)
|
||||
set FBBUILD_ZIPFILE=%FBBUILD_INSTALL_IMAGES%\Firebird-%FBBUILD_FILE_ID%_pdb.zip
|
||||
|
||||
) else (
|
||||
if exist %FBBUILD_INSTALL_IMAGES%\Firebird-%FBBUILD_FILE_ID%.zip (
|
||||
@del %FBBUILD_INSTALL_IMAGES%\Firebird-%FBBUILD_FILE_ID%.zip
|
||||
)
|
||||
set FBBUILD_ZIPFILE=%FBBUILD_INSTALL_IMAGES%\Firebird-%FBBUILD_FILE_ID%.zip
|
||||
if exist %FBBUILD_INSTALL_IMAGES%\Firebird-%FBBUILD_FILE_ID%.zip (
|
||||
@del %FBBUILD_INSTALL_IMAGES%\Firebird-%FBBUILD_FILE_ID%.zip
|
||||
)
|
||||
set FBBUILD_ZIPFILE=%FBBUILD_INSTALL_IMAGES%\Firebird-%FBBUILD_FILE_ID%.zip
|
||||
)
|
||||
|
||||
@%SEVENZIP%\7z.exe a -r -tzip -mx9 %FBBUILD_ZIPFILE% %FBBUILD_ZIP_PACK_ROOT%\*.*
|
||||
@ -566,7 +560,7 @@ if "%FBBUILD_SHIP_PDB%"=="ship_pdb" (
|
||||
|
||||
:: Add license
|
||||
for %%v in (IPLicense.txt IDPLicense.txt ) do (
|
||||
@copy %FB_ROOT_PATH%\builds\install\misc\%%v %FBBUILD_EMB_PACK_ROOT%\%%v > nul
|
||||
@copy %FB_ROOT_PATH%\builds\install\misc\%%v %FBBUILD_EMB_PACK_ROOT%\%%v > nul
|
||||
)
|
||||
|
||||
:: And readme
|
||||
@ -607,9 +601,9 @@ goto :EOF
|
||||
setlocal
|
||||
set TIMESTRING=0%PRODUCT_VER_STRING:~0,1%:0%PRODUCT_VER_STRING:~2,1%:0%PRODUCT_VER_STRING:~4,1%
|
||||
@if /I "%BUILDTYPE%"=="release" (
|
||||
(@echo Touching release build files with %TIMESTRING% timestamp) & (touch -s -D -t%TIMESTRING% %FB_OUTPUT_DIR%\*.*)
|
||||
(if %FBBUILD_EMB_PACK% EQU 1 (@echo Touching release build files with %TIMESTRING% timestamp) & (touch -s -D -t%TIMESTRING% %FB_ROOT_PATH%\emb_pack\*.*) )
|
||||
(if %FBBUILD_ZIP_PACK% EQU 1 (@echo Touching release build files with %TIMESTRING% timestamp) & (touch -s -D -t%TIMESTRING% %FB_ROOT_PATH%\zip_pack\*.*) )
|
||||
(@echo Touching release build files with %TIMESTRING% timestamp) & (touch -s -D -t%TIMESTRING% %FB_OUTPUT_DIR%\*.*)
|
||||
(if %FBBUILD_EMB_PACK% EQU 1 (@echo Touching release build files with %TIMESTRING% timestamp) & (touch -s -D -t%TIMESTRING% %FB_ROOT_PATH%\emb_pack\*.*) )
|
||||
(if %FBBUILD_ZIP_PACK% EQU 1 (@echo Touching release build files with %TIMESTRING% timestamp) & (touch -s -D -t%TIMESTRING% %FB_ROOT_PATH%\zip_pack\*.*) )
|
||||
)
|
||||
endlocal
|
||||
::End of TOUCH_ALL
|
||||
@ -685,6 +679,8 @@ 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
|
||||
|
||||
@ -262,7 +262,7 @@ hu.BeveledLabel=Magyar
|
||||
it.BeveledLabel=Italiano
|
||||
pl.BeveledLabel=Polski
|
||||
pt.BeveledLabel=Português
|
||||
;ru.BeveledLabel=<0420><0443><0441><0441><043A><0438><0439>
|
||||
;ru.BeveledLabel=Ðóññêèé
|
||||
si.BeveledLabel=Slovenski
|
||||
#endif
|
||||
|
||||
@ -361,7 +361,7 @@ Name: {group}\Firebird Server; Filename: {app}\bin\fbserver.exe; Parameters: -a;
|
||||
Name: {group}\Firebird Guardian; Filename: {app}\bin\fbguard.exe; Parameters: -a; Flags: runminimized; MinVersion: 4.0,4.0; Check: InstallGuardianIcon; IconIndex: 1; Components: ServerComponent\SuperServerComponent; Comment: Run Firebird Super Server (with guardian)
|
||||
Name: {group}\Firebird ISQL Tool; Filename: {app}\bin\isql.exe; WorkingDir: {app}; MinVersion: 4.0,4.0; Comment: {cm:RunISQL}
|
||||
Name: {group}\Firebird 2.1.0 Release Notes; Filename: {app}\doc\Firebird_v2.1.0.ReleaseNotes.pdf; MinVersion: 4.0,4.0; Comment: {#MyAppName} {cm:ReleaseNotes}
|
||||
Name: {group}\Firebird 2.0.1 Release Notes; Filename: {app}\doc\Firebird_v2.0.1.ReleaseNotes.pdf; MinVersion: 4.0,4.0; Comment: {#MyAppName} {cm:ReleaseNotes}
|
||||
Name: {group}\Firebird 2.0.3 Release Notes; Filename: {app}\doc\Firebird_v2.0.1.ReleaseNotes.pdf; MinVersion: 4.0,4.0; Comment: {#MyAppName} {cm:ReleaseNotes}
|
||||
Name: {group}\Firebird 1.5.4 Release Notes; Filename: {app}\doc\Firebird_v1.5.4.ReleaseNotes.pdf; MinVersion: 4.0,4.0; Comment: {#MyAppName} {cm:ReleaseNotes}
|
||||
Name: {group}\Firebird 2.0 Quick Start Guide; Filename: {app}\doc\Firebird-2.0-QuickStart.pdf; MinVersion: 4.0,4.0; Comment: {#MyAppName}
|
||||
Name: "{group}\After Installation"; Filename: "{app}\doc\After_Installation.url"; Comment: "New User? Here's a quick guide to what you should do next."
|
||||
@ -436,7 +436,7 @@ Source: {#FilesDir}\bin\icudt30.dll; DestDir: {app}\bin; Components: ServerCompo
|
||||
#if msvc_version == 6
|
||||
Source: {#FilesDir}\bin\msvcrt.dll; DestDir: {app}\bin; Components: ClientComponent;
|
||||
Source: {#FilesDir}\bin\msvcrt.dll; DestDir: {sys}; Components: ClientComponent; Flags: sharedfile onlyifdoesntexist uninsneveruninstall;
|
||||
#elif msvc_version == 7
|
||||
#elif msvc_version >= 7
|
||||
Source: {#FilesDir}\bin\msvcr{#msvc_version}?.dll; DestDir: {app}\bin; Components: ClientComponent; Flags: sharedfile;
|
||||
Source: {#FilesDir}\bin\msvcr{#msvc_version}?.dll; DestDir: {sys}; Components: ClientComponent; Flags: sharedfile uninsneveruninstall;
|
||||
Source: {#FilesDir}\bin\msvcp{#msvc_version}?.dll; DestDir: {app}\bin; Components: ClientComponent; Flags: sharedfile;
|
||||
@ -450,8 +450,7 @@ Source: {#WOW64Dir}\bin\msvcp{#msvc_version}?.dll; DestDir: {syswow64}; Componen
|
||||
#endif
|
||||
#endif
|
||||
#if msvc_version = 8
|
||||
;While we experiment with static linking we won't need this manifest.
|
||||
;Source: {#FilesDir}\bin\Microsoft.VC80.CRT.manifest; DestDir: {app}\bin; Components: ClientComponent; Flags: sharedfile;
|
||||
Source: {#FilesDir}\bin\Microsoft.VC80.CRT.manifest; DestDir: {app}\bin; Components: ClientComponent; Flags: sharedfile;
|
||||
#endif
|
||||
;Docs
|
||||
Source: {#ScriptsDir}\installation_scripted.txt; DestDir: {app}\doc; Components: DevAdminComponent; Flags: skipifsourcedoesntexist ignoreversion
|
||||
|
||||
Loading…
Reference in New Issue
Block a user