mirror of
https://github.com/FirebirdSQL/firebird.git
synced 2025-01-22 17:23:03 +01:00
A few changes to the install routine.
This commit is contained in:
skywalker
parent
73591b7d17
commit
76e36d0b32
4
configure
vendored
4
configure
vendored
@ -2228,6 +2228,9 @@ esac
|
||||
|
||||
|
||||
|
||||
SERVER_ARCHITECTURE_TYPE=classic
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -2447,6 +2450,7 @@ s%@RANLIB@%$RANLIB%g
|
||||
s%@YACC@%$YACC%g
|
||||
s%@CPP@%$CPP%g
|
||||
s%@PLATFORM@%$PLATFORM%g
|
||||
s%@SERVER_ARCHITECTURE_TYPE@%$SERVER_ARCHITECTURE_TYPE%g
|
||||
|
||||
CEOF
|
||||
EOF
|
||||
|
||||
@ -50,6 +50,14 @@ esac
|
||||
|
||||
AC_SUBST(PLATFORM)
|
||||
|
||||
SERVER_ARCHITECTURE_TYPE=classic
|
||||
#SERVER_ARCHITECTURE_TYPE=super
|
||||
AC_SUBST(SERVER_ARCHITECTURE_TYPE)
|
||||
|
||||
PROD_BUILD_FLG=
|
||||
#PROD_BUILD_FLG=Y
|
||||
AC_SUBST(PROD_BUILD_FLG)
|
||||
|
||||
AC_OUTPUT_COMMANDS([mkdir -p gen/csv])
|
||||
AC_OUTPUT_COMMANDS([mkdir -p gen/dudley])
|
||||
AC_OUTPUT_COMMANDS([mkdir -p gen/isql])
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# $Id: Makefile.in,v 1.1 2001-08-01 07:59:14 skywalker Exp $
|
||||
# $Id: Makefile.in,v 1.2 2001-08-02 07:03:59 skywalker Exp $
|
||||
#
|
||||
|
||||
ROOT=../..
|
||||
@ -73,40 +73,26 @@ SuperSrcDir=$(InstallRoot)/super
|
||||
LastClassicInstallFlg=.classicinstallflg
|
||||
LastSuperInstallFlg=.superinstallflg
|
||||
|
||||
install:
|
||||
@echo "you need to make a choice here "
|
||||
@echo "make target"
|
||||
@echo ""
|
||||
@echo "Firebird classic targets:"
|
||||
@echo "runclassicinstall - install classic from build tree"
|
||||
@echo "classicpackages - build tar and rpm install files"
|
||||
@echo "classictarfile - build tar install file"
|
||||
@echo "classicrpmfile - build redhat rpm install file"
|
||||
@echo ""
|
||||
@echo "Firebird super targets:"
|
||||
@echo "runsuperinstall - install super from build tree"
|
||||
@echo "superpackages - build tar and rpm install files"
|
||||
@echo "supertarfile - build tar install file"
|
||||
@echo "superrpmfile - build redhat rpm install file"
|
||||
@echo ""
|
||||
|
||||
all2: CSrpmscript SSrpmscript csinstall ssinstall
|
||||
|
||||
|
||||
classicpackages: classictarfile classicrpmfile
|
||||
install: runclassicinstall
|
||||
|
||||
runclassicinstall: $(LastClassicInstallFlg)
|
||||
|
||||
|
||||
classictarfile: runclassicinstall $(ClassicTarFile)
|
||||
|
||||
classicrpmfile: runclassicinstall $(ClassicRPMFile)
|
||||
|
||||
|
||||
$(LastClassicInstallFlg) : $(BIN)/gsec
|
||||
sh $(InstallRoot)/classic/CSTarInstall.sh
|
||||
touch $(LastClassicInstallFlg)
|
||||
|
||||
|
||||
|
||||
runsuperinstall: $(LastSuperInstallFlg)
|
||||
|
||||
$(LastSuperInstallFlg) : interbase/bin/gsec
|
||||
sh $(InstallRoot)/super/SSTarInstall.sh
|
||||
touch $(LastSuperInstallFlg)
|
||||
|
||||
|
||||
|
||||
|
||||
$(ClassicTarFile) : csinstall runclassicinstall
|
||||
mv csinstall install
|
||||
tar -czf $(ClassicTarFile) install
|
||||
@ -118,9 +104,20 @@ $(ClassicRPMFile): CSrpmscript
|
||||
cp $(RedhatPackageDir)/$(ClassicRPMFile) .
|
||||
|
||||
|
||||
|
||||
|
||||
#__ for ron ________
|
||||
|
||||
classicpackages: classictarfile classicrpmfile
|
||||
|
||||
|
||||
classictarfile: runclassicinstall $(ClassicTarFile)
|
||||
|
||||
classicrpmfile: runclassicinstall $(ClassicRPMFile)
|
||||
|
||||
|
||||
superpackages: supertarfile superrpmfile
|
||||
|
||||
runsuperinstall: $(LastSuperInstallFlg)
|
||||
|
||||
|
||||
supertarfile: runsuperinstall $(SuperTarFile)
|
||||
@ -128,9 +125,6 @@ supertarfile: runsuperinstall $(SuperTarFile)
|
||||
superrpmfile: runsuperinstall $(SuperRPMFile)
|
||||
|
||||
|
||||
$(LastSuperInstallFlg) : interbase/bin/gsec
|
||||
sh $(InstallRoot)/super/SSTarInstall.sh
|
||||
touch $(LastSuperInstallFlg)
|
||||
|
||||
$(SuperTarFile) : ssinstall runsuperinstall
|
||||
mv ssinstall install
|
||||
|
||||
@ -91,17 +91,6 @@ if [ -e firebird ]
|
||||
|
||||
( $ScriptsSrcDir/classic/CSpreinstall.sh )
|
||||
|
||||
cp $ScriptsSrcDir/misc/README interbase
|
||||
|
||||
for i in CSchangeRunUser.sh CSrestoreRootRunUser.sh changeDBAPassword.sh
|
||||
do
|
||||
cp $ScriptsSrcDir/misc/$i interbase/bin/$i
|
||||
chmod ugo=rx interbase/bin/$i
|
||||
done
|
||||
|
||||
mkdir -p interbase/misc
|
||||
cp $ScriptsSrcDir/misc/firebird.xinetd interbase/misc
|
||||
|
||||
($ScriptsSrcDir/classic/CSinstall.sh)
|
||||
|
||||
($ScriptsSrcDir/classic/CSpostinstall.sh)
|
||||
|
||||
@ -215,7 +215,8 @@ checkForRPMInstall() {
|
||||
|
||||
#= Main Pre ================================================================
|
||||
|
||||
IBRootDir=/opt/interbase
|
||||
INSTALLDIR=%prefix%
|
||||
IBRootDir=$INSTALLDIR/firebird
|
||||
IBBin=$IBRootDir/bin
|
||||
ArchiveDateTag=`date +"%Y%m%d_%H%M"`
|
||||
ArchiveMainFile="${IBRootDir}_${ArchiveDateTag}.tar.gz"
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# $Id: Makefile.in.firebird,v 1.2 2001-07-31 18:34:05 skywalker Exp $
|
||||
# $Id: Makefile.in.firebird,v 1.3 2001-08-02 07:03:59 skywalker Exp $
|
||||
#
|
||||
|
||||
ROOT=..
|
||||
@ -320,6 +320,70 @@ rebuild_codes :
|
||||
|
||||
|
||||
|
||||
|
||||
#___________________________________________________________________________
|
||||
# Install generic files.
|
||||
|
||||
CLASSIC_MiscFiles = firebird.xinetd
|
||||
SUPER_MiscFiles = firebird.init.d.generic firebird.init.d.mandrake README
|
||||
|
||||
INSTALL_MiscFiles = $(addprefix $(FIREBIRD)/misc/, $(CLASSIC_MiscFiles))
|
||||
#INSTALL_MiscFiles = $(addprefix $(FIREBIRD)/misc/, $(SUPER_MiscFiles))
|
||||
|
||||
|
||||
misc_files : $(INSTALL_MiscFiles)
|
||||
|
||||
|
||||
$(FIREBIRD)/misc/% :: $(SRC_ROOT)/install/misc/%
|
||||
$(CP) $^ $@
|
||||
|
||||
|
||||
|
||||
#___________________________________________________________________________
|
||||
#
|
||||
|
||||
CLASSIC_ScriptFiles = CSchangeRunUser.sh CSrestoreRootRunUser.sh changeDBAPassword.sh
|
||||
SUPER_ScriptFiles = SSchangeRunUser.sh SSrestoreRootRunUser.sh changeDBAPassword.sh
|
||||
|
||||
|
||||
INSTALL_ScriptFiles = $(addprefix $(BIN)/, $(CLASSIC_ScriptFiles))
|
||||
#INSTALL_ScriptFiles = $(addprefix $(BIN)/, $(SUPER_ScriptFiles))
|
||||
|
||||
|
||||
script_files : $(INSTALL_ScriptFiles)
|
||||
|
||||
|
||||
$(BIN)/% :: $(SRC_ROOT)/install/classic/%
|
||||
$(CP) $^ $@
|
||||
chmod ugo=rx $@
|
||||
|
||||
$(BIN)/% :: $(SRC_ROOT)/install/super/%
|
||||
$(CP) $^ $@
|
||||
chmod ugo=rx $@
|
||||
|
||||
$(BIN)/% :: $(SRC_ROOT)/install/misc/%
|
||||
$(CP) $^ $@
|
||||
chmod ugo=rx $@
|
||||
|
||||
# Just a note that some of the script files (xinetd/firebird etc) need to h
|
||||
# have their paths changed in their shell scripts.
|
||||
#___________________________________________________________________________
|
||||
#
|
||||
|
||||
|
||||
|
||||
installx:
|
||||
$(MAKE) -C install $@
|
||||
|
||||
installclassic:
|
||||
$(SRC_ROOT)/install/classic/CSpreinstall.sh
|
||||
# $(SRC_ROOT)/install/classic/CSinstall.sh
|
||||
# $(SRC_ROOT)/install/classic/CSpostinstall.sh
|
||||
|
||||
builddist:
|
||||
$(MAKE) -C install $@
|
||||
|
||||
|
||||
#___________________________________________________________________________
|
||||
# This one needs some more work.
|
||||
|
||||
@ -1114,8 +1178,8 @@ superMiscFiles: force
|
||||
mkdir -p source/interbase/misc
|
||||
$(CP) firebird/skywalker/install/misc/firebird.init.d.* source/interbase/misc
|
||||
|
||||
install: force
|
||||
make -f firebird/skywalker/install/Makefile install
|
||||
#install: force
|
||||
# make -f firebird/skywalker/install/Makefile install
|
||||
|
||||
runclassicinstall: force
|
||||
make -f firebird/skywalker/install/Makefile runclassicinstall
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# $Id: make.defaults,v 1.3 2001-08-01 08:11:52 skywalker Exp $
|
||||
# $Id: make.defaults,v 1.4 2001-08-02 07:03:59 skywalker Exp $
|
||||
#
|
||||
|
||||
|
||||
@ -43,6 +43,8 @@
|
||||
|
||||
#_____________________________________________________________________________
|
||||
|
||||
SERVER_ARCH_TYPE = @SERVER_ARCHITECTURE_TYPE@
|
||||
INSTALL_PREFIX = @prefix@
|
||||
|
||||
# Default programs and tools to be used in the build process
|
||||
|
||||
@ -72,10 +74,6 @@ EXEC_EXT=
|
||||
|
||||
#_____________________________________________________________________________
|
||||
|
||||
# Final targets
|
||||
|
||||
INSTALLDIR=@prefix@
|
||||
|
||||
|
||||
# From jrd
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user