mirror of
https://github.com/FirebirdSQL/firebird.git
synced 2025-01-22 20:03:02 +01:00
Version information is concentrated in src/misc/writeBuildNum.sh
This commit is contained in:
aafemt
parent
6a18a09d52
commit
793ce67c72
@ -27,7 +27,7 @@
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# $Id: Makefile.in.firebird,v 1.31 2003-03-17 12:05:48 eku Exp $
|
||||
# $Id: Makefile.in.firebird,v 1.32 2003-03-20 11:11:49 aafemt Exp $
|
||||
#
|
||||
|
||||
ROOT=..
|
||||
@ -169,11 +169,13 @@ firebird_boot: updateBuildNum boot_phase1 boot_phase2
|
||||
|
||||
.PHONY: updateBuildNum external_libraries
|
||||
|
||||
updateBuildNum : jrd/build_no.h
|
||||
updateBuildNum : jrd/build_no.h $(MAKE_ROOT)/Make.Version
|
||||
|
||||
jrd/build_no.h : misc/writeBuildNum.sh
|
||||
(cd ..; ./src/misc/writeBuildNum.sh rebuildHeader)
|
||||
|
||||
$(MAKE_ROOT)/Make.Version : misc/writeBuildNum.sh
|
||||
misc/writeBuildNum.sh createMakeVersion $@
|
||||
|
||||
|
||||
#
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# $Id: make.defaults,v 1.18 2003-03-12 12:39:56 eku Exp $
|
||||
# $Id: make.defaults,v 1.19 2003-03-20 11:11:49 aafemt Exp $
|
||||
#
|
||||
|
||||
|
||||
@ -39,7 +39,7 @@
|
||||
# prefix.xxx where xxx is the platform name using the form SH := bash
|
||||
# see the readme file with the Makefile.in files for more details.
|
||||
|
||||
|
||||
-include $(ROOT)/gen/Make.Version
|
||||
|
||||
#_____________________________________________________________________________
|
||||
|
||||
@ -50,8 +50,6 @@ RealFirebirdPath = @NEW_FIREBIRD_DIR@
|
||||
|
||||
FirebirdInstallPrefix = @prefix@
|
||||
CpuType=@CPU_TYPE@
|
||||
FirebirdVersion=@FIREBIRD_VERSION@
|
||||
PackageVersion=@FIREBIRD_PACKAGE_VERSION@
|
||||
|
||||
PLATFORM=@PLATFORM@
|
||||
ifeq (@FIREBIRD_ARCH_TYPE@,classic)
|
||||
@ -60,10 +58,6 @@ else
|
||||
ArchPrefix=SS
|
||||
endif
|
||||
|
||||
SharedLibraryName=@FIREBIRD_LIBGDS_SO@
|
||||
SharedLibrarySoName=@FIREBIRD_LIBGDS_SO_X_LNK@
|
||||
SharedLibraryBaseName=@FIREBIRD_LIBGDS_SO_LNK@
|
||||
|
||||
# link with readline libraries - set by configure
|
||||
EDITLINE_FLG=@EDITLINE_FLG@
|
||||
|
||||
@ -106,7 +100,14 @@ BLRTABLE = $(BIN)/blrtable$(EXEC_EXT)
|
||||
|
||||
|
||||
# The shared library name for the embedded (or classic) library
|
||||
# SD: This name is also hard-coded in src/install/.../linux/classic scripts.
|
||||
# Scold me, but I don't want library names to be in configure.in
|
||||
#
|
||||
|
||||
SharedLibraryName=libfbembed.${SHRLIB_EXT}.${FirebirdVersion}
|
||||
SharedLibrarySoName=libfbembed.${SHRLIB_EXT}.${MajorVer}
|
||||
SharedLibraryBaseName=libfbembed.${SHRLIB_EXT}
|
||||
|
||||
LIBFBEMBED_SO = $(LIB)/$(SharedLibraryName)
|
||||
LIBFBEMBED_SOBASENAME = $(LIB)/$(SharedLibrarySoName)
|
||||
LIBFBEMBED_SONAME = $(LIB)/$(SharedLibraryBaseName)
|
||||
|
||||
32
configure.in
32
configure.in
@ -1,4 +1,4 @@
|
||||
dnl $Id: configure.in,v 1.130 2003-03-13 15:46:34 alexpeshkoff Exp $
|
||||
dnl $Id: configure.in,v 1.131 2003-03-20 11:11:48 aafemt Exp $
|
||||
|
||||
dnl ############################# INITIALISATION ###############################
|
||||
|
||||
@ -496,23 +496,13 @@ esac
|
||||
|
||||
dnl ##################### DO NOT ADD ANY TESTS BELOW ###########################
|
||||
|
||||
dnl The following file defines the version number strings
|
||||
. ./src/misc/writeBuildNum.sh
|
||||
FIREBIRD_PACKAGE_VERSION="0.Beta4"
|
||||
|
||||
|
||||
FIREBIRD_LIBGDS_SO=libfbembed.$SHRLIB_EXT.${FIREBIRD_VERSION}
|
||||
FIREBIRD_LIBGDS_SO_LNK=libfbembed.$SHRLIB_EXT
|
||||
FIREBIRD_LIBGDS_SO_X_LNK=libfbembed.$SHRLIB_EXT.${MajorVer}
|
||||
|
||||
AC_SUBST(FIREBIRD_LIBGDS_SO)
|
||||
AC_SUBST(FIREBIRD_LIBGDS_SO_LNK)
|
||||
AC_SUBST(FIREBIRD_LIBGDS_SO_X_LNK)
|
||||
|
||||
AC_SUBST(SFIO_DIR)
|
||||
AC_SUBST(SFIO_FLAGS)
|
||||
AC_SUBST(SFIO_LDFLAGS)
|
||||
|
||||
dnl The following file defines the version number strings. Specially for install/uninstall routines
|
||||
. ./src/misc/writeBuildNum.sh
|
||||
|
||||
AC_SUBST(FIREBIRD_VERSION)
|
||||
AC_SUBST(FIREBIRD_PACKAGE_VERSION)
|
||||
AC_SUBST(FB_BUILD_NUM, $BuildNum)
|
||||
@ -567,8 +557,6 @@ mkdir -p gen/firebird/lib
|
||||
mkdir -p gen/firebird/misc
|
||||
mkdir -p gen/firebird/help
|
||||
|
||||
src/misc/writeBuildNum.sh rebuildHeader
|
||||
|
||||
mkdir -p gen/jrd/os
|
||||
mkdir -p gen/jrd/os/darwin
|
||||
mkdir -p gen/jrd/os/posix
|
||||
@ -776,18 +764,6 @@ gen/Makefile.extern.editline:${MAKE_SRC_DIR}/Makefile.in.extern.editline
|
||||
)
|
||||
|
||||
|
||||
dnl AC_DEFINE_UNQUOTED(FB_BUILD_TYPE, "$BuildType")
|
||||
dnl AC_DEFINE_UNQUOTED(FB_MAJOR_VER, "$MajorVer")
|
||||
dnl AC_DEFINE_UNQUOTED(FB_MINOR_VER, "$MinorVer")
|
||||
dnl AC_DEFINE_UNQUOTED(FB_REV_NO, "$RevNo")
|
||||
dnl AC_DEFINE_UNQUOTED(FB_BUILD_SUFFIX, "$BuildSuffix")
|
||||
dnl AC_DEFINE_UNQUOTED(PRODUCT_VER_STRING, "$PRODUCT_VER_STRING")
|
||||
dnl AC_DEFINE_UNQUOTED(FILE_VER_NUMBER, $FILE_VER_NUMBER)
|
||||
dnl AC_DEFINE_UNQUOTED(FILE_VER_STRING, "$FILE_VER_STRING")
|
||||
dnl AC_DEFINE_UNQUOTED(LICENSE_VER_STRING, "$FILE_VER_STRING")
|
||||
|
||||
|
||||
|
||||
dnl Print out the build configuration (the most interesting thing)
|
||||
echo
|
||||
echo
|
||||
|
||||
@ -27,15 +27,15 @@
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# $Id: Makefile.in,v 1.7 2002-11-16 02:17:14 skywalker Exp $
|
||||
# $Id: Makefile.in,v 1.8 2003-03-20 11:11:50 aafemt Exp $
|
||||
#
|
||||
ROOT=..
|
||||
|
||||
|
||||
|
||||
include $(ROOT)/gen/make.defaults
|
||||
include $(ROOT)/gen/make.platform
|
||||
include $(ROOT)/gen/make.rules
|
||||
include $(ROOT)/gen/make.defaults
|
||||
include $(ROOT)/gen/make.shared.variables
|
||||
|
||||
|
||||
@ -67,8 +67,7 @@ FirebirdBuildPrefix=$(GEN_ROOT)
|
||||
#export FirebirdInstallPrefix
|
||||
#export PackageVersion
|
||||
|
||||
BuildVersion=@FIREBIRD_VERSION@.@FB_BUILD_NUM@
|
||||
PackageVersion=@FIREBIRD_PACKAGE_VERSION@
|
||||
BuildVersion=$(FirebirdVersion).$(BuildNum)
|
||||
|
||||
Version=$(BuildVersion)-$(PackageVersion)
|
||||
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# $Id: makeInstallImage.sh.in,v 1.7 2003-02-10 18:23:17 skidder Exp $
|
||||
# $Id: makeInstallImage.sh.in,v 1.8 2003-03-20 11:11:51 aafemt Exp $
|
||||
#
|
||||
|
||||
# Script to copy install files from the build/transport area
|
||||
@ -150,9 +150,7 @@ copyFiles() {
|
||||
cp $BuiltFBDir/include/*.h $DestDir/include
|
||||
|
||||
|
||||
cp -f $BuiltFBDir/lib/@FIREBIRD_LIBGDS_SO@ $DestDir/lib/@FIREBIRD_LIBGDS_SO@
|
||||
ln -s @FIREBIRD_LIBGDS_SO@ $DestDir/lib/@FIREBIRD_LIBGDS_SO_LNK@
|
||||
ln -s @FIREBIRD_LIBGDS_SO@ $DestDir/lib/@FIREBIRD_LIBGDS_SO_X_LNK@
|
||||
cp -df $BuiltFBDir/lib/libfbembed.so* $DestDir/lib
|
||||
|
||||
# cp -f $BuiltFBDir/lib/gds.a /usr/lib/libgds.a
|
||||
cp -f $BuiltFBDir/lib/ib_util.so $DestDir/lib/libib_util.so
|
||||
@ -173,9 +171,10 @@ copyFiles() {
|
||||
|
||||
# Create links from /usr/lib to install area.
|
||||
|
||||
ln -s ../../$FBRootDir/lib/@FIREBIRD_LIBGDS_SO@ $TargetDir/usr/lib/@FIREBIRD_LIBGDS_SO@
|
||||
ln -s ../../$FBRootDir/lib/@FIREBIRD_LIBGDS_SO_LNK@ $TargetDir/usr/lib/@FIREBIRD_LIBGDS_SO_LNK@
|
||||
ln -s ../../$FBRootDir/lib/@FIREBIRD_LIBGDS_SO_X_LNK@ $TargetDir/usr/lib/@FIREBIRD_LIBGDS_SO_X_LNK@
|
||||
origDir=`pwd`
|
||||
cd $DestDir
|
||||
for i in lib/libfbembed.so*; do ln -s ../../$FBRootDir/$i $origDir/$TargetDir/usr/$i; done
|
||||
cd $origDir
|
||||
#ln -s ../../$FBRootDir/lib/libgds.a $TargetDir/usr/lib/libgds.a
|
||||
ln -s ../../$FBRootDir/lib/libib_util.so $TargetDir/usr/lib/libib_util.so
|
||||
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# $Id: postinstall.sh.in,v 1.5 2003-02-26 16:52:50 skidder Exp $
|
||||
# $Id: postinstall.sh.in,v 1.6 2003-03-20 11:11:51 aafemt Exp $
|
||||
#
|
||||
|
||||
# The post install script for Firebird Classic
|
||||
@ -647,12 +647,12 @@ createLinksForBackCompatibility() {
|
||||
|
||||
if [ ! -e /usr/lib/libgds.so ]
|
||||
then
|
||||
ln -s ../../$FBRootDir/lib/@FIREBIRD_LIBGDS_SO@ /usr/lib/libgds.so
|
||||
ln -s ../../$FBRootDir/lib/libfbembed.so /usr/lib/libgds.so
|
||||
fi
|
||||
|
||||
if [ ! -e /usr/lib/libgds.so.0 ]
|
||||
then
|
||||
ln -s ../../$FBRootDir/lib/@FIREBIRD_LIBGDS_SO_X_LNK@ /usr/lib/libgds.so.0
|
||||
ln -s ../../$FBRootDir/lib/libfbembed.so /usr/lib/libgds.so.0
|
||||
fi
|
||||
|
||||
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# $Id: preinstall.sh.in,v 1.2 2002-12-09 01:46:26 nmcc Exp $
|
||||
# $Id: preinstall.sh.in,v 1.3 2003-03-20 11:11:51 aafemt Exp $
|
||||
#
|
||||
|
||||
|
||||
@ -236,7 +236,7 @@ archivePriorInstallSystemFilesX() {
|
||||
fi
|
||||
done
|
||||
|
||||
for i in gds_pyxis.a gds.a @FIREBIRD_LIBGDS_SO@ libib_util.so libgds.a
|
||||
for i in gds_pyxis.a gds.a libfbembed.so.@FIREBIRD_VERSION@ libib_util.so libgds.a
|
||||
do
|
||||
DestFile=usr/lib/$i
|
||||
if [ -e $DestFile ]
|
||||
|
||||
@ -27,14 +27,14 @@
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# $Id: Makefile.in,v 1.5 2002-11-13 11:07:10 eku Exp $
|
||||
# $Id: Makefile.in,v 1.6 2003-03-20 11:11:52 aafemt Exp $
|
||||
#
|
||||
|
||||
ROOT=..
|
||||
|
||||
include $(ROOT)/gen/make.defaults
|
||||
include $(ROOT)/gen/make.platform
|
||||
include $(ROOT)/gen/make.rules
|
||||
include $(ROOT)/gen/make.defaults
|
||||
include $(ROOT)/gen/make.shared.variables
|
||||
|
||||
@SET_MAKE@
|
||||
@ -42,7 +42,7 @@ include $(ROOT)/gen/make.shared.variables
|
||||
|
||||
PGK_FILES=pkginfo prototype preinstall postinstall postremove
|
||||
PKG_DIR=$(RealFirebirdPath)/../install
|
||||
PKG_NAME=Firebird-@ARCH_TYPE_SUFFIX@-$(FirebirdVersion).@FB_BUILD_NUM@-$(PackageVersion)-SINIXZ.pkg
|
||||
PKG_NAME=Firebird-@ARCH_TYPE_SUFFIX@-$(FirebirdVersion).$(BuildNum)-$(PackageVersion)-SINIXZ.pkg
|
||||
|
||||
install package packages dist:
|
||||
@echo Making SINIX-Z package...
|
||||
|
||||
@ -3,14 +3,15 @@
|
||||
# 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.2985 2003-03-20 11:11:52 aafemt Exp $"
|
||||
BuildVersion="$Id: writeBuildNum.sh,v 1.2986 2003-03-20 11:11:52 aafemt Exp $"
|
||||
|
||||
BuildType=T
|
||||
MajorVer=1
|
||||
MinorVer=5
|
||||
RevNo=0
|
||||
BuildNum=2998
|
||||
BuildNum=2993
|
||||
BuildSuffix="Firebird 1.5 Beta 4"
|
||||
FIREBIRD_PACKAGE_VERSION=0.Beta4
|
||||
|
||||
FIREBIRD_VERSION="$MajorVer.$MinorVer.$RevNo"
|
||||
PRODUCT_VER_STRING="$MajorVer.$MinorVer.$RevNo.$BuildNum"
|
||||
@ -66,11 +67,40 @@ eof
|
||||
fi
|
||||
}
|
||||
|
||||
#______________________________________________________________________________
|
||||
# Routine to build a new gen/make.version file.
|
||||
|
||||
createMakeVersion() {
|
||||
|
||||
cat >$1 <<eof
|
||||
# FILE GENERATED BY src/misc/writeBuildNum.sh
|
||||
# *** DO NOT EDIT ***
|
||||
# TO CHANGE ANY INFORMATION IN HERE PLEASE
|
||||
# EDIT src/misc/writeBuildNum.sh
|
||||
# FORMAL BUILD NUMBER:$BuildNum
|
||||
|
||||
MajorVer = $MajorVer
|
||||
MinorVer = $MinorVer
|
||||
RevNo = $RevNo
|
||||
BuildNum = $BuildNum
|
||||
BuildType = $BuildType
|
||||
BuildSuffix = $BuildSuffix
|
||||
|
||||
PackageVersion=$FIREBIRD_PACKAGE_VERSION
|
||||
FirebirdVersion=$FIREBIRD_VERSION
|
||||
eof
|
||||
|
||||
}
|
||||
|
||||
if [ "$1" = "rebuildHeader" ]
|
||||
then
|
||||
rebuildHeaderFile
|
||||
elif [ "$1" = "createMakeVersion" ]
|
||||
then
|
||||
if [ -z "$2" ]
|
||||
then createMakeVersion gen/Make.Version
|
||||
else createMakeVersion "$2"
|
||||
fi
|
||||
elif [ "$1" = "--version" ]
|
||||
then
|
||||
echo ""
|
||||
|
||||
Loading…
Reference in New Issue
Block a user