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

Cleanup - no more separate classic/super builds support

Browse Source
This commit is contained in:
alexpeshkoff 2012-06-07 11:43:41 +00:00
parent ad9966b3cd
commit 292cf70723
18 changed files with 40 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
builds/install/arch-specific/aix/Makefile.in
View File

@ -63,12 +63,12 @@ BuildVersion=$(FirebirdVersion).$(BuildNum)
Version=$(BuildVersion)-$(PackageVersion)
# This means something like: FirebirdCS-2.0.0-1.i386.tar
TarDir= Firebird$(ArchPrefix)-$(Version).$(CpuType)
TarFile=Firebird$(ArchPrefix)-$(Version).$(CpuType).tar
DepotFile=Firebird$(ArchPrefix)-$(Version).$(CpuType).depot
RPMFile=Firebird$(ArchPrefix)-$(Version).$(CpuType).rpm
DebugDir=Firebird$(ArchPrefix)-debuginfo-$(Version).$(CpuType)
DebugFile=Firebird$(ArchPrefix)-debuginfo-$(Version).$(CpuType).tar
TarDir= Firebird-$(Version).$(CpuType)
TarFile=Firebird-$(Version).$(CpuType).tar
DepotFile=Firebird-$(Version).$(CpuType).depot
RPMFile=Firebird-$(Version).$(CpuType).rpm
DebugDir=Firebird-debuginfo-$(Version).$(CpuType)
DebugFile=Firebird-debuginfo-$(Version).$(CpuType).tar
PkgSrcDir=$(InstallRoot)/$(ArchType)
ScriptDir=$(GEN_ROOT)/install/scripts/

2
builds/install/arch-specific/aix/classic/rpmheader.txt.in
View File

@ -1,5 +1,5 @@
Summary: Firebird Relational Database Server and Client tools.
Name: Firebird@ARCH_TYPE_SUFFIX@
Name: Firebird
Version: @FIREBIRD_VERSION@.@FB_BUILD_NUM@
Release: @FIREBIRD_PACKAGE_VERSION@
License: Distributable

4
builds/install/arch-specific/aix/misc/postinstall.sh.in
View File

@ -62,7 +62,7 @@ fi
fixFilePermissions
# Install script in /etc/init.d (exact location is distro dependent)
installInitdScript @FIREBIRD_ARCH_TYPE@
installInitdScript
# Create libgds.so links
createLinksForBackCompatibility
@ -77,7 +77,7 @@ updateInetdServiceEntry
resetInetdServer
# start the db server so we can change the password
startService @FIREBIRD_ARCH_TYPE@
startService
# Change sysdba password
changeDBAPassword

2
builds/install/arch-specific/aix/misc/tarmaininstall.sh.in
View File

@ -52,7 +52,7 @@ Version="$BuildVersion-$PackageVersion.$CpuType"
cat <<EOF
Firebird @FIREBIRD_ARCH_TYPE@ $Version Installation
Firebird $Version Installation
EOF

2
builds/install/arch-specific/aix/misc/tarmainuninstall.sh.in
View File

@ -50,7 +50,7 @@ Version="$BuildVersion-$PackageVersion.$CpuType"
cat <<EOF
Firebird @FIREBIRD_ARCH_TYPE@ $Version Uninstall program
Firebird $Version Uninstall program
Are you sure you want to proceed?

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

@ -56,7 +56,7 @@ addLibs() {
rm -f $libTarget
touch $libTarget
for i in posixLibrary.sh @FIREBIRD_ARCH_TYPE@Library.sh freebsdLibrary.sh
for i in posixLibrary.sh freebsdLibrary.sh
do
echo "# $i" >>$libTarget
cat $libSdir/$i >>$libTarget

14
builds/install/arch-specific/hpux/Makefile.in
View File

@ -73,14 +73,14 @@ Version=$(BuildVersion)-$(PackageVersion)
# This means something like: FirebirdCS-2.0.0-1.i386.tar
TarDir= Firebird$(ArchPrefix)-$(Version).$(CpuType)
TarFile=Firebird$(ArchPrefix)-$(Version).$(CpuType).tar
TarDir= Firebird-$(Version).$(CpuType)
TarFile=Firebird-$(Version).$(CpuType).tar
TgzFile=$(TarFile).gz
DepotFile=Firebird$(ArchPrefix)-$(Version).$(CpuType).depot
RPMFile=Firebird$(ArchPrefix)-$(Version).$(CpuType).rpm
#DebugDir=Firebird$(ArchPrefix)-debuginfo-$(Version).$(CpuType)
#DebugFile=Firebird$(ArchPrefix)-debuginfo-$(Version).$(CpuType).tar
psfFile=firebird$(ArchPrefix).psf
DepotFile=Firebird-$(Version).$(CpuType).depot
RPMFile=Firebird-$(Version).$(CpuType).rpm
#DebugDir=Firebird-debuginfo-$(Version).$(CpuType)
#DebugFile=Firebird-debuginfo-$(Version).$(CpuType).tar
psfFile=firebird.psf
PkgSrcDir=$(InstallRoot)/$(ArchType)
ScriptDir=$(GEN_ROOT)/install/scripts/

2
builds/install/arch-specific/hpux/classic/tarmainInstall.sh.in
View File

@ -50,7 +50,7 @@ Version="$BuildVersion-$PackageVersion.$CpuType"
cat <<EOF
Firebird @FIREBIRD_ARCH_TYPE@ $Version Installation
Firebird $Version Installation
EOF

2
builds/install/arch-specific/hpux/classic/tarmainUninstall.sh.in
View File

@ -50,7 +50,7 @@ Version="$BuildVersion-$PackageVersion.$CpuType"
cat <<EOF
Firebird @FIREBIRD_ARCH_TYPE@ $Version Uninstall program
Firebird $Version Uninstall program
Are you sure you want to proceed?

8
builds/install/arch-specific/linux/Makefile.in
View File

@ -53,10 +53,10 @@ Version=$(BuildVersion)-$(PackageVersion)
# This means something like: FirebirdCS-2.0.0-1.i386.tar.gz
TarDir= Firebird$(ArchPrefix)-$(Version).$(CpuType)
TarFile=Firebird$(ArchPrefix)-$(Version).$(CpuType).tar.gz
DebugDir=Firebird$(ArchPrefix)-debuginfo-$(Version).$(CpuType)
DebugFile=Firebird$(ArchPrefix)-debuginfo-$(Version).$(CpuType).tar.gz
TarDir= Firebird-$(Version).$(CpuType)
TarFile=Firebird-$(Version).$(CpuType).tar.gz
DebugDir=Firebird-debuginfo-$(Version).$(CpuType)
DebugFile=Firebird-debuginfo-$(Version).$(CpuType).tar.gz
PkgSrcDir=$(InstallRoot)/$(ArchType)

4
builds/install/arch-specific/linux/misc/postinstall.sh.in
View File

@ -44,7 +44,7 @@ fi
fixFilePermissions
# Install script in /etc/init.d (exact location is distro dependent)
installInitdScript @FIREBIRD_ARCH_TYPE@
installInitdScript
# Create libgds.so links
createLinksForBackCompatibility
@ -62,4 +62,4 @@ setDBAPassword
resetInetdServer
# start the RDBMS server
startService @FIREBIRD_ARCH_TYPE@
startService

2
builds/install/arch-specific/linux/misc/tarMainUninstall.sh.in
View File

@ -39,7 +39,7 @@ if [ ! -z "$InteractiveInstall" ]
then
cat <<EOF
Firebird @FIREBIRD_ARCH_TYPE@ $Version Uninstall program
Firebird $Version Uninstall program
Are you sure you want to proceed?

2
builds/install/arch-specific/solaris/CS/pkginfo.in
View File

@ -1,5 +1,5 @@
PKG="Firebird2"
NAME="Firebird2 Relational Database Server @ARCH_TYPE_SUFFIX@"
NAME="Firebird2 Relational Database Server"
ARCH="@CPU_TYPE@"
VERSION="@FIREBIRD_VERSION@"
LOAD="@FIREBIRD_PACKAGE_VERSION@"

2
builds/install/arch-specific/solaris/Makefile.in
View File

@ -40,7 +40,7 @@ include $(ROOT)/gen/make.shared.variables
PGK_FILES=pkginfo prototype preinstall postinstall postremove
PKG_DIR=$(GEN_ROOT)/install
PKG_NAME=Firebird@ARCH_TYPE_SUFFIX@-$(FirebirdVersion).$(BuildNum)-$(PackageVersion)-Solaris10-@CPU_TYPE@.pkg
PKG_NAME=Firebird-$(FirebirdVersion).$(BuildNum)-$(PackageVersion)-Solaris10-@CPU_TYPE@.pkg
GCC_PKG_NAME=Firebird-libgcc-Solaris10-@CPU_TYPE@.pkg
install package packages dist:

2
builds/install/arch-specific/solaris/SS/pkginfo.in
View File

@ -1,5 +1,5 @@
PKG="Firebird2"
NAME="Firebird2 Relational Database Server @ARCH_TYPE_SUFFIX@"
NAME="Firebird2 Relational Database Server"
ARCH="@CPU_TYPE@"
VERSION="@FIREBIRD_VERSION@"
LOAD="@FIREBIRD_PACKAGE_VERSION@"

2
builds/install/arch-specific/solx86gcc/Makefile.in
View File

@ -40,7 +40,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).$(BuildNum)-$(PackageVersion)-SolX86.pkg
PKG_NAME=Firebird-$(FirebirdVersion).$(BuildNum)-$(PackageVersion)-SolX86.pkg
LGCC_PKG_NAME=LibGCC-3.x.FB-runtime-SolX86.pkg
install package packages dist:

7
builds/posix/make.defaults
View File

@ -99,14 +99,7 @@ RTTI_FLAG:= -fno-rtti
IsDeveloper = @DEVEL_FLG@
CpuType=@CPU_TYPE@
PLATFORM=@PLATFORM@
ifeq (@FIREBIRD_ARCH_TYPE@,classic)
ArchPrefix=CS
else
ArchPrefix=SS
endif
SFIO_EXAMPLES=@SFIO_EXAMPLES@
# link with readline libraries - set by configure

35
configure.in
View File

@ -438,20 +438,6 @@ AC_DEFINE(CASE_SENSITIVITY, true, [Define this if paths are case sensitive])
dnl Some controllable options
FIREBIRD_ARCH_TYPE=classic
AC_ARG_ENABLE(superserver,
[ --enable-superserver build SuperServer architecture (default=no)],
[case "$enableval" in
yes) FIREBIRD_ARCH_TYPE=super;;
no) FIREBIRD_ARCH_TYPE=classic;;
*) AC_MSG_ERROR(bad value '${enableval}' for --enable-superserver);;
esac])
AC_SUBST(FIREBIRD_ARCH_TYPE)
case $FIREBIRD_ARCH_TYPE in
super) AC_SUBST(ARCH_TYPE_SUFFIX,SS);;
classic) AC_SUBST(ARCH_TYPE_SUFFIX,CS);;
esac
AC_ARG_ENABLE(developer,
[ --enable-developer use developer mode rules (default=no)],
@ -1142,7 +1128,7 @@ case "$PLATFORM" in
mkdir -p gen/install/scripts
mkdir -p gen/install/misc])
INSTALL_SRC_DIR=builds/install/arch-specific/linux/${FIREBIRD_ARCH_TYPE}
INSTALL_SRC_DIR=builds/install/arch-specific/linux
AC_CONFIG_FILES([
gen/install/makeInstallImage.sh:builds/install/arch-specific/linux/misc/makeInstallImage.sh.in
gen/install/misc/firebird.xinetd:builds/install/arch-specific/linux/misc/firebird.xinetd.in
@ -1159,7 +1145,7 @@ case "$PLATFORM" in
;;
HPUX)
HP_INSTALL_SRC_DIR=builds/install/arch-specific/hpux/${FIREBIRD_ARCH_TYPE}
HP_INSTALL_SRC_DIR=builds/install/arch-specific/hpux
AC_CONFIG_FILES([gen/install/makeinstallImage.sh:${HP_INSTALL_SRC_DIR}/makeinstallImage.sh.in
gen/firebirdCS.psf:${HP_INSTALL_SRC_DIR}/firebirdCS.psf.in
gen/firebird/bin/preInstall.sh:${HP_INSTALL_SRC_DIR}/preInstall.sh.in
@ -1177,7 +1163,7 @@ case "$PLATFORM" in
;;
AIX)
AIX_INSTALL_SRC_DIR=builds/install/arch-specific/aix/${FIREBIRD_ARCH_TYPE}
AIX_INSTALL_SRC_DIR=builds/install/arch-specific/aix
AC_CONFIG_FILES([gen/install/scripts/rpmheader.aix.txt:${AIX_INSTALL_SRC_DIR}/rpmheader.txt.in
gen/install/scripts/rpmfiles.aix.txt:${AIX_INSTALL_SRC_DIR}/rpmfiles.txt.in
gen/install/makeInstallImage.aix.sh:${AIX_INSTALL_SRC_DIR}/makeInstallImage.sh.in
@ -1212,11 +1198,11 @@ case "$PLATFORM" in
solx86|SOLARIS)
AC_CONFIG_FILES([gen/install/Pkginfo:builds/install/arch-specific/solaris/${ARCH_TYPE_SUFFIX}/pkginfo.in
gen/install/prototype.main:builds/install/arch-specific/solaris/${ARCH_TYPE_SUFFIX}/prototype.in
gen/install/Preinstall:builds/install/arch-specific/solaris/${ARCH_TYPE_SUFFIX}/preinstall.in
gen/install/Postinstall:builds/install/arch-specific/solaris/${ARCH_TYPE_SUFFIX}/postinstall.in
gen/install/Postremove:builds/install/arch-specific/solaris/${ARCH_TYPE_SUFFIX}/postremove.in
AC_CONFIG_FILES([gen/install/Pkginfo:builds/install/arch-specific/solaris/pkginfo.in
gen/install/prototype.main:builds/install/arch-specific/solaris/prototype.in
gen/install/Preinstall:builds/install/arch-specific/solaris/preinstall.in
gen/install/Postinstall:builds/install/arch-specific/solaris/postinstall.in
gen/install/Postremove:builds/install/arch-specific/solaris/postremove.in
gen/install/prototypelg:builds/install/arch-specific/solaris/libgcc/prototypelg.in
gen/install/pkginfolg:builds/install/arch-specific/solaris/libgcc/pkginfolg.in
],[chmod a+x gen/install/Pre* gen/install/Post* 2>/dev/null])
@ -1277,11 +1263,6 @@ echo
echo The Firebird2 package has been configured with the following options:
echo
case $FIREBIRD_ARCH_TYPE in
super) echo " Architecture : SuperServer";;
classic) echo " Architecture : ClassicServer";;
esac
case $DEVEL_FLG in
Y) echo " Developer mode : enabled";;
N) echo " Developer mode : disabled";;