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

Minor updates to the Win32 build scripts. Disable intlbuild in make_examples. Update Win32 readmes.

Browse Source
This commit is contained in:
paul_reeves 2005-07-12 12:36:12 +00:00
parent cd4634b3ab
commit c919586c8f
8 changed files with 90 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,9 +32,13 @@ set FBBUILD_ZIP_PACK=0
set FBBUILD_ISX_PACK=0
set FBBUILD_EMB_PACK=0
:: Hard code our package number - it only needs to be changed if the
:: kit is repackaged but the engine is not rebuilt
:: Set our package number at 0 and increment every
:: time we rebuild in a single session
if not defined FBBUILD_PACKAGE_NUMBER (
set FBBUILD_PACKAGE_NUMBER=0
) else (
set /A FBBUILD_PACKAGE_NUMBER+=1
)
:: See what we have on the command line
::for %%v in ( %1 %2 %3 %4 %5 ) do (

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

@ -16,7 +16,7 @@ o Requesting New Features
Introduction
============
Welcome to the second Alpha release of Firebird 2.0.
Welcome to the third Alpha release of Firebird 2.0.
Intended Users
@ -31,6 +31,10 @@ notes first.
o DO NOT install this version if you have never used
Firebird before. Use Firebird v1.5.2 instead.
o If you have been testing earlier Alpha releases
please make sure you read the installation readme and the
release notes.
Features in this release (all platforms)
========================================

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

@ -1,15 +1,16 @@
Firebird Database Server 2.0 ALPHA 2
Firebird Database Server 2.0 ALPHA 3
==================================================
** IMPORTANT **
See note below regarding installation over
older versions of Firebird
The ODS has changed. See the notes below regarding
the new ODS and installation over older versions
of Firebird.
** ********* **
This document is a guide to installing this package of
Firebird 2.0 Alpha 2 on the Win32 platform. These notes
Firebird 2.0 Alpha 3 on the Win32 platform. These notes
refer to the installation package itself, rather than
Firebird 2.0 in general.
@ -18,7 +19,8 @@ Contents
--------
o Before installation
o Installing on systems with older versions of Firebird
o New ODS 11.0
o Installation on systems with Firebird 1.5
o Installing on systems with Firebird 2.0
o New features of the installer
o Known installation problems
@ -33,11 +35,28 @@ Before installation
It is recommended that you UNINSTALL all previous
versions of Firebird or InterBase before installing
this package.
this package. It is especially important to verify that
fbclient.dll and gds32.dll are removed from <system32>.
Installation on systems with older version of Firebird
------------------------------------------------------
New ODS 11.0
------------
Alpha 3 features a new ODS 11.0 which is wholly
incompatible with the ODS 11.0 used by the previous
alpha releases.
If you are installing Alpha 3 for the first time and
you already have a Firebird 2 alpha installed it is
recommended that you install into a fresh directory.
This is because an uninstall will preserve the existing
security2 database. However this older version uses
an incompatible ODS so you will be unable to connect to
the server.
Installation on systems with Firebird 1.5
-----------------------------------------
The security database has been changed. The new
database is called security2.fdb and uses a
@ -54,13 +73,15 @@ in misc/upgrade/security/. A future test release will
address the issue of user migration more fully.
Installing on systems with Firebird 2.0
Installing on systems with Firebird 2.0
---------------------------------------
The installer cannot automatically detect if a
Firebird 2.0 Alpha 1 or Alpha 2 server is running.
Therefore you will receive no warning until the
installer attempts to overwrite an active file.
In addition to the ODS change please note that the
installer cannot automatically detect if a
Firebird 2.0 Alpha 1,2 or 3 server is running
as a service. Therefore you will receive no warning
until the installer attempts to overwrite an active
file.
New features of the installer

3
builds/win32/make_all.bat
View File

@ -2,7 +2,8 @@
set ERRLEV=0
:: Set env vars
@if "%FB2_EMBED_BOOT%" equ "1" (
if not DEFINED FB2_EMBED_BOOT (set FB2_EMBED_BOOT=1)
@if %FB2_EMBED_BOOT% equ 1 (
@call setenvvar2.bat
) else (
@call setenvvar.bat

49
builds/win32/make_examples.bat
View File

@ -2,7 +2,12 @@
:: Set env vars
if not DEFINED FB2_EMBED_BOOT (set FB2_EMBED_BOOT=1)
@if %FB2_EMBED_BOOT% equ 1 (
@call setenvvar2.bat
) else (
@call setenvvar.bat
)
@if errorlevel 1 (goto :EOF)
:: verify that prepare was run before
@ -44,20 +49,34 @@
@copy /y %ROOT_PATH%\examples\empbuild\*.inp %ROOT_PATH%\gen\examples\ > nul
@echo.
@echo Creating empbuild.fdb
:: Here we must use cd because isql does not have an option to set a base directory
@cd %ROOT_PATH%\gen\examples
@del empbuild.fdb 2> nul
@del intlbuild.fdb 2> nul
@%ROOT_PATH%\gen\examples\isql -i empbld.sql
@%ROOT_PATH%\gen\examples\isql -i intlbld.sql
@cd %ROOT_PATH%\builds\win32
@echo Creating empbuild.fdb...
@echo.
@del empbuild.fdb 2> nul
@%ROOT_PATH%\gen\examples\isql -i empbld.sql
if defined FB2_INTLEMP (
@echo Creating intlbuild.fdb...
@echo.
@del intlbuild.fdb 2> nul
@%ROOT_PATH%\gen\examples\isql -i intlbld.sql
)
@cd %ROOT_PATH%\builds\win32
@echo.
@echo preprocessing empbuild.e and intlbld.e
@echo path = %DB_PATH%/gen/examples
@%ROOT_PATH%\gen\gpre_static -r -m -n -z %ROOT_PATH%\examples\empbuild\empbuild.e %ROOT_PATH%\gen\examples\empbuild.c -b %SERVER_NAME%:%DB_PATH%/gen/examples/
@%ROOT_PATH%\gen\gpre_static -r -m -n -z %ROOT_PATH%\examples\empbuild\intlbld.e %ROOT_PATH%\gen\examples\intlbld.c -b %SERVER_NAME%:%DB_PATH%/gen/examples/
@echo Preprocessing empbuild.e...
@echo.
@%ROOT_PATH%\gen\gpre_embed.exe -r -m -n -z %ROOT_PATH%\examples\empbuild\empbuild.e %ROOT_PATH%\gen\examples\empbuild.c -b %SERVER_NAME%:%DB_PATH%/gen/examples/
if defined FB2_INTLEMP (
@echo Preprocessing intlbld.e...
@echo.
@%ROOT_PATH%\gen\gpre_embed.exe -r -m -n -z %ROOT_PATH%\examples\empbuild\intlbld.e %ROOT_PATH%\gen\examples\intlbld.c -b %SERVER_NAME%:%DB_PATH%/gen/examples/
)
@goto :EOF
::===========
@ -82,9 +101,9 @@ if "%VS_VER%"=="msvc6" (
if "%VS_VER%"=="msvc6" (
@msdev %ROOT_PATH%\builds\win32\%VS_VER%\Firebird2.dsw /MAKE "empbuild - Win32 Debug" "intlbld - Win32 Debug" %CLEAN% /OUT examples.log
) else (
@devenv %ROOT_PATH%\builds\win32\%VS_VER%\Firebird2.sln %CLEAN% debug /project empbuild /OUT empbuild.log
@devenv %ROOT_PATH%\builds\win32\%VS_VER%\Firebird2_Examples.sln %CLEAN% debug /project empbuild /OUT empbuild.log
if defined FB2_INTLEMP (
@devenv %ROOT_PATH%\builds\win32\%VS_VER%\Firebird2.sln %CLEAN% debug /project intlbuild /OUT intlbld.log
@devenv %ROOT_PATH%\builds\win32\%VS_VER%\Firebird2_Examples.sln %CLEAN% debug /project intlbuild /OUT intlbld.log
)
)
@goto :EOF
@ -138,10 +157,11 @@ if "%VS_VER%"=="msvc6" (
:: and empbuild.exe uses isql
@cd %ROOT_PATH%\gen\examples
@del %ROOT_PATH%\gen\examples\employee.fdb 2>nul
@del %ROOT_PATH%\gen\examples\intlemp.fdb 2>nul
@%ROOT_PATH%\gen\examples\empbuild.exe %DB_PATH%/gen/examples/employee.fdb
if defined FB2_INTLEMP (
@echo Building intlemp.fdb
@del %ROOT_PATH%\gen\examples\intlemp.fdb 2>nul
@del isql.tmp 2>nul
@echo s;intlemp.fdb;%SERVER_NAME%:%ROOT_PATH%\gen\examples\intlemp.fdb;g > isql.tmp
@%ROOT_PATH%\gen\examples\intlbuild.exe %DB_PATH%/gen/examples/intlemp.fdb
@ -156,7 +176,9 @@ if defined FB2_INTLEMP (
@copy %ROOT_PATH%\gen\examples\employee.fdb %ROOT_PATH%\output\examples\empbuild\ > nul
if defined FB2_INTLEMP (
if exist %ROOT_PATH%\gen\examples\intlemp.fdb (
@copy %ROOT_PATH%\gen\examples\intlemp.fdb %ROOT_PATH%\output\examples\empbuild\ > nul
)
)
@goto :EOF
@ -175,7 +197,6 @@ if defined FB2_INTLEMP (
@echo.
@goto :EOF
:ERROR
::====
@echo.

4
builds/win32/make_icu.bat
View File

@ -11,9 +11,9 @@ if DEFINED VS71COMNTOOLS (
)
@echo.
set FB2_EMBED_BOOT=1
if not DEFINED FB2_EMBED_BOOT (set FB2_EMBED_BOOT=1)
:: Set env vars
@if "%FB2_EMBED_BOOT%" equ "1" (
@if %FB2_EMBED_BOOT% equ 1 (
@call setenvvar2.bat
) else (
@call setenvvar.bat

4
src/jrd/isc_version.h
View File

@ -17,7 +17,7 @@
* Contributor(s): ______________________________________.
*/
#define ISC_FILE_VER_STRING "WI-T6.3.3.10834"
#define ISC_FILE_VER_NUMBER 6, 3, 3, 10834
#define ISC_FILE_VER_STRING "WI-T6.3.3.11245"
#define ISC_FILE_VER_NUMBER 6, 3, 3, 11245
#define ISC_MAJOR_VER "6"
#define ISC_MINOR_VER "3"

8
src/misc/writeBuildNum.sh
View File

@ -3,13 +3,13 @@
# This file is used both to rebuild the header file and to set the
# environment variables on the config call
BuildVersion="$Id: writeBuildNum.sh,v 1.11393 2005-07-12 12:36:08 paul_reeves Exp $"
BuildVersion="$Id: writeBuildNum.sh,v 1.11394 2005-07-12 12:36:12 paul_reeves Exp $"
BuildType=T
MajorVer=2
MinorVer=0
RevNo=0
BuildNum=11247
BuildNum=11245
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
@ -19,7 +19,7 @@ BuildSuffix="Firebird 2.0 $SuffixKind $SuffixVer"
FIREBIRD_PACKAGE_VERSION=$SuffixKind$SuffixVer
PRODUCT_VER_STRING="$MajorVer.$MinorVer.$RevNo.$BuildNum"
else
# Special builds (dayly snapshots, etc)
# Special builds (daily snapshots, etc)
BuildSuffix="Firebird 2.0 $SPECIAL_BUILD_SUFFIX"
FIREBIRD_PACKAGE_VERSION=$SPECIAL_BUILD_SUFFIX
PRODUCT_VER_STRING="$MajorVer.$MinorVer.$RevNo.$BuildNum-$SPECIAL_BUILD_SUFFIX"
@ -93,7 +93,7 @@ cat >$1 <<eof
MajorVer = $MajorVer
MinorVer = $MinorVer
RevNo = $RevNo
BuildNum=11247
BuildNum=11245
BuildType = $BuildType
BuildSuffix = $BuildSuffix