From: Mark O. <sky...@us...> - 2001-04-17 02:41:45
|
Update of /cvsroot/firebird/interbase/builds/original In directory usw-pr-cvs1:/tmp/cvs-serv16945/builds/original Modified Files: buildRefDatabases build_kit prefix.linux sfx.interbase sfx.pyxis Added Files: boot.sfx.interbase Log Message: This contains a new build process which incorperates a boot build enabling Firebird to be built without a prior version being installed. Fixed examples so thay are built as part of the build process. Integrated the "install" and "packaging" build targets into the main make process. ***** Error reading new file: [Errno 2] No such file or directory: 'boot.sfx.interbase' Index: buildRefDatabases =================================================================== RCS file: /cvsroot/firebird/interbase/builds/original/buildRefDatabases,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** buildRefDatabases 2000/08/21 21:12:08 1.3 --- buildRefDatabases 2001/04/17 02:41:42 1.4 *************** *** 1,14 **** #!/bin/sh printUsage() { ! echo "usage is : 'buildRefDatabases'" ! echo " or : 'buildRefDatabases <destDir>'" ! echo " or : 'buildRefDatabases <srcDir> <destDir>'" echo "" echo "usually as:" echo "sh builds/original/buildRefDatabases" echo "from the main interbase source directory" ! echo "where defaults are srcDir=. and destDir=../refDatabases" echo "" } --- 1,16 ---- #!/bin/sh + # This file builds the reference databases for both the boot build + # and the normal builds. printUsage() { ! echo "usage is : 'buildRefDatabases [boot]'" ! echo " or : 'buildRefDatabases [boot] <destDir>'" ! echo " or : 'buildRefDatabases [boot] <srcDir> <destDir>'" echo "" echo "usually as:" echo "sh builds/original/buildRefDatabases" echo "from the main interbase source directory" ! echo "where defaults are srcDir=. and destDir=./refDatabases" echo "" } *************** *** 30,57 **** export IBBin=$INTERBASE/bin ! echo "" ! echo "" ! echo "" ! echo "- Firebird - Reference database build ------------------------" ! echo "" ! echo "Parameters :" ! echo "" ! echo "INTERBASE (installed database root) : $INTERBASE " ! echo "Source code dir root : $IBSrc" ! echo "Dest root dir where to build ref db's : $IBRefDir" ! echo "" ! echo "ISC_USER (admin user) : $ISC_USER" ! echo "ISC_PASSWORD (admin password) : $ISC_PASSWORD" ! echo "" ! echo "If you wish to have different values please set them before running" ! echo "this script" ! echo "usage is : 'buildRefDatabases'" ! echo " or : 'buildRefDatabases <destDir>'" ! echo " or : 'buildRefDatabases <srcDir> <destDir>'" ! echo "" ! echo "--------------------------------------------------------------" ! echo "" ! AskQuestion "Press return to continue" --- 32,60 ---- export IBBin=$INTERBASE/bin + # This has become a more core activity of the build process and prompting + # or confirmation is not required since it is always done. ! # echo "" ! # echo "" ! # echo "" ! # echo "- Firebird - Reference database build ------------------------" ! # echo "" ! # echo "Parameters :" ! # echo "" ! # echo "BootBuildFlg (build using boot kit ) : $BootBuildFlg " ! # echo "INTERBASE (installed database root) : $INTERBASE " ! # echo "Source code dir root : $IBSrc" ! # echo "Dest root dir where to build ref db's : $IBRefDir" ! # echo "" ! # echo "ISC_USER (admin user) : $ISC_USER" ! # echo "ISC_PASSWORD (admin password) : $ISC_PASSWORD" ! # echo "" ! # echo "If you wish to have different values please set them before running" ! # echo "this script" ! # echo "usage is : 'buildRefDatabases [boot]'" ! # echo " or : 'buildRefDatabases [boot] <destDir>'" ! # echo " or : 'buildRefDatabases [boot] <srcDir> <destDir>'" ! # echo "" ! # AskQuestion "Press return to continue" *************** *** 107,111 **** --- 110,134 ---- } + #-------------------------------------------------------------------- + # Build the databases needed for a Firebird boot build + + buildBootStdDatabases() { + echo "- building boot std databases" + + # boot make will create this if it does not exist + # (cd jrd; touch metadata.gdb) + + # boot make will create this if it does not exist + # touch msgs/msg.gdb + # boot make will create this if it does not exist + # touch qli/help.gdb + + touch pyxis/forms.gdb + + touch utilities/rebuild.gdb + } + + #-------------------------------------------------------------------- # Build the standard examples *************** *** 182,188 **** if [ -d $IBRefDir ] then - echo "** Warning ** - The reference directory $IBRefDir already exists" - AskQuestion "Press return to delete it and continue or ^C to abort" - rm -rf $IBRefDir fi --- 205,208 ---- *************** *** 197,224 **** # Check parameters - if [ $# = 0 ] - then - export IBSrc=`pwd` - export IBRefDir=../refDatabases ! elif [ $# = 1 ] ! then ! export IBSrc=`pwd` ! export IBRefDir=$1 ! elif [ $# = 2 ] ! then ! export IBSrc=$1 ! export IBRefDir=$2 ! else ! printUsage ! exit fi ! checkVariables createRefDir --- 217,246 ---- # Check parameters ! # Check for boot build. ! BootBuildFlg="No" ! if [ $# > 0 ] ! then ! if [ "$1" = "boot" ] ! then ! BootBuildFlg="Yes" ! shift ! fi ! if [ "$1" = "noprompt" ] ! then ! doNotPromptUser="Yes" ! fi fi ! # Now check the rest of the parameters + export IBSrc=`pwd` + export IBRefDir=refDatabases + checkVariables + createRefDir *************** *** 226,232 **** mkdir -p msgs qli jrd utilities example4 example5 examples pyxis ! buildStdDatabases ! buildExampleDatabases ! #buildExample4Databases ! buildExample5Databases --- 248,261 ---- mkdir -p msgs qli jrd utilities example4 example5 examples pyxis + + if [ $BootBuildFlg = "Yes" ] + then + buildBootStdDatabases + else + buildStdDatabases + buildExampleDatabases + #buildExample4Databases + buildExample5Databases + fi ! cd $IBSrc \ No newline at end of file Index: build_kit =================================================================== RCS file: /cvsroot/firebird/interbase/builds/original/build_kit,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** build_kit 2000/12/14 19:49:10 1.4 --- build_kit 2001/04/17 02:41:42 1.5 *************** *** 80,92 **** #Build superserver if directory source/super exists if [ $2 = SUPER ]; then ! GDS_SUPER="super_targets" ! export GDS_SUPER ! fi ! if [ $# = 2 ]; then ! $MAKE -f ./make_kit interbase SYSTEM=$1 SUPER_SERVER="$GDS_SUPER" else ! $MAKE -f ./make_kit interbase CFLAGS="$3" SYSTEM=$1 SUPER_SERVER="$GDS_SUPER" fi ! # STATUS=$? --- 80,98 ---- #Build superserver if directory source/super exists if [ $2 = SUPER ]; then ! make super_firebird else ! make firebird fi ! ! #if [ $2 = SUPER ]; then ! # GDS_SUPER="super_targets" ! # export GDS_SUPER ! #fi ! #if [ $# = 2 ]; then ! # $MAKE -f ./make_kit interbase SYSTEM=$1 SUPER_SERVER="$GDS_SUPER" ! #else ! # $MAKE -f ./make_kit interbase CFLAGS="$3" SYSTEM=$1 SUPER_SERVER="$GDS_SUPER" ! #fi ! STATUS=$? Index: prefix.linux =================================================================== RCS file: /cvsroot/firebird/interbase/builds/original/prefix.linux,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** prefix.linux 2000/12/08 16:59:31 1.7 --- prefix.linux 2001/04/17 02:41:42 1.8 *************** *** 32,36 **** PROD_DEBUG_OBJECTS= nodebug.o ! PROD_SHRLIB_DIR= PROD_VERSION_FLAG= -DPROD_BUILD PROD_CFLAGS= -O3 -m486 -fpic -DFLINTSTONE --- 32,36 ---- PROD_DEBUG_OBJECTS= nodebug.o ! PROD_SHRLIB_DIR= -Lsource/jrd -Lsource/interbase/lib PROD_VERSION_FLAG= -DPROD_BUILD PROD_CFLAGS= -O3 -m486 -fpic -DFLINTSTONE *************** *** 38,42 **** DEV_DEBUG_OBJECTS= grammar.o dbg.o dbt.o dmp.o ! DEV_SHRLIB_DIR= -Lsource/jrd DEV_VERSION_FLAG= -DDEV_BUILD DEV_CFLAGS= -ggdb --- 38,42 ---- DEV_DEBUG_OBJECTS= grammar.o dbg.o dbt.o dmp.o ! DEV_SHRLIB_DIR= -Lsource/jrd -Lsource/interbase/lib DEV_VERSION_FLAG= -DDEV_BUILD DEV_CFLAGS= -ggdb *************** *** 45,49 **** SHRLIB_DIR= $($(VERSION)_SHRLIB_DIR) VERSION_FLAG= $($(VERSION)_VERSION_FLAG) ! CFLAGS_COMMON= $($(VERSION)_CFLAGS) -DLINUX -Wall -fwritable-strings CFLAGS= $(CFLAGS_COMMON) $(SUPER_FLAG) PIC_J_CFLAGS= $(CFLAGS_COMMON) -DPIPE_IS_SHRLIB -fPIC --- 45,49 ---- SHRLIB_DIR= $($(VERSION)_SHRLIB_DIR) VERSION_FLAG= $($(VERSION)_VERSION_FLAG) ! CFLAGS_COMMON= $($(VERSION)_CFLAGS) -DLINUX -Wall -fwritable-strings -I$(INTERBASE)/include CFLAGS= $(CFLAGS_COMMON) $(SUPER_FLAG) PIC_J_CFLAGS= $(CFLAGS_COMMON) -DPIPE_IS_SHRLIB -fPIC *************** *** 52,56 **** UDF_CFLAGS= -fPIC -mieee-fp UDF_LFLAGS= -shared ! UDF_SHRLIBS= -lgds -lm -lc -mieee-fp -ldl -lcrypt --- 52,56 ---- UDF_CFLAGS= -fPIC -mieee-fp UDF_LFLAGS= -shared ! UDF_SHRLIBS= -L$(INTERBASE)/lib -lgds -lm -lc -mieee-fp -ldl -lcrypt *************** *** 103,107 **** JRD_P_MISC_OBJECTS= source/jrd/sun_ftn.bin source/jrd/nodebug.bin LANG_OBJECTS= ada.o ftn.o cob.o ! LANGUAGES= cc cxx ada sun_ada microfocus_cob make16 gdl1 sun_ftn LD_LIBS= -lc LD_LIBS_J= -lc --- 103,107 ---- JRD_P_MISC_OBJECTS= source/jrd/sun_ftn.bin source/jrd/nodebug.bin LANG_OBJECTS= ada.o ftn.o cob.o ! LANGUAGES= cc cxx ada microfocus_cob make16 gdl1 sun_ftn LD_LIBS= -lc LD_LIBS_J= -lc *************** *** 172,175 **** --- 172,179 ---- V3PRINTER= source/lock/printv3.o + + # Forces library build for linux TMC 082100 + PYXIS_LIBRARY= libpyxis.a + # End of file prefix.linux: $(VERSION) $(PLATFORM) Index: sfx.interbase =================================================================== RCS file: /cvsroot/firebird/interbase/builds/original/sfx.interbase,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** sfx.interbase 2001/01/07 17:24:24 1.9 --- sfx.interbase 2001/04/17 02:41:42 1.10 *************** *** 16,19 **** --- 16,28 ---- # Contributor(s): ______________________________________. + + + #== WARNING ============================================================== + # + # IF YOU CHANGE THIS FILE YOU MUST REVIEW both: + # sfx.interbase and boot.sfx.interbase files + # + #========================================================================= + EXTERNAL_OBJECTS= $(CSI_OBJS) dsql_objects lock.o $(PYXIS_OBJECTS) rem_objects $(INTL) wal_objects EXTERNAL_P_OBJECTS= $(CSI_P_OBJS) dsql_p_objects lock.bin $(PYXIS_P_OBJS) rem_p_objects $(INTL_P_OBJS) wal_p_objects *************** *** 35,39 **** CMP= cmp ! CODES=/netapp/apps/isc/bin/codes # removed examples 03-Aug-00 TMC --- 44,48 ---- CMP= cmp ! CODES=source/jrd/codes # removed examples 03-Aug-00 TMC *************** *** 42,46 **** #added completed according to inprise tree #FSG 093000 ! interbase: run_codes gds.h includes executables help msgs msgs_intl extlib completed # Run the codes program, thus generating codes.h, iberror.h, etc --- 51,76 ---- #added completed according to inprise tree #FSG 093000 ! ! # The only difference between firebird and super_firebird is the executables ! # target and in there super just had one more target "super_targets". The ! # difference used to be done via a parameter passed into this makefile, but ! # I've put the change here to reduce the complexity of the build script files. ! # MOD 07-Apr-2001. ! ! firebird: run_codes gds.h includes executables help msgs msgs_intl extlib completed ! ! super_firebird: run_codes gds.h includes super_executables help msgs msgs_intl extlib completed ! ! executables: alice burp dudley gpre miscFiles $(INTL) isql locks \ ! pyxis qli remote spit utilities \ ! $(SHARED_AM) $(LINKABLE_LIBS) ! ! super_executables: alice burp dudley gpre superMiscFiles $(INTL) isql locks \ ! super_targets pyxis qli remote spit utilities \ ! $(SHARED_AM) $(LINKABLE_LIBS) ! ! super_targets: s_run_codes s_alice s_burp s_dba s_security_c super_client super_server super_utils ! ! # Run the codes program, thus generating codes.h, iberror.h, etc *************** *** 54,65 **** # build and isn't used for V4 anyway. # 1995-June-7 David Schnepper - # removed pyxis 3-Aug-00 TMC - executables: alice burp dudley gpre install $(INTL) isql locks \ - $(SUPER_SERVER) pyxis qli remote spit utilities \ - $(SHARED_AM) $(LINKABLE_LIBS) - - super_targets: s_run_codes s_alice s_burp s_dba s_security_c super_client super_server super_utils #added completed according to inprise tree #FSG 093000 --- 84,91 ---- # build and isn't used for V4 anyway. # 1995-June-7 David Schnepper + + #added completed according to inprise tree #FSG 093000 *************** *** 333,344 **** $(SH) '$(CD) source/remote; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="$(SYSTEM)" inet_server.a' - install: force - $(QUIET_ECHO) "Building miscellaneous install files..." - $(CP) source/$(SYSTEM)/install source/interbase - -$(CP) source/$(SYSTEM)/servers.isc source/interbase - $(CP) source/$(SYSTEM)/inetd.conf.isc source/interbase - $(CP) source/$(SYSTEM)/original/services.isc source/interbase - -$(CP) source/$(SYSTEM)/sys.conf.isc source/interbase - intl: force $(QUIET_ECHO) "Building INTL..." --- 359,362 ---- *************** *** 610,613 **** --- 628,685 ---- jrd/yachts.gdb \ msgs/msg.gdb + + + + # The installations need to find a better and possibly linux + # specific home. The tar installs should probably work with + # other unix type of systems. + + # I have seperated super and classic out since I needed different + # files in each case. + + miscFiles: force + $(QUIET_ECHO) "Building miscellaneous install files..." + mkdir -p source/interbase/misc + $(CP) source/$(SYSTEM)/install source/interbase + -$(CP) source/$(SYSTEM)/servers.isc source/interbase + $(CP) source/$(SYSTEM)/inetd.conf.isc source/interbase + $(CP) source/$(SYSTEM)/original/services.isc source/interbase + -$(CP) source/$(SYSTEM)/sys.conf.isc source/interbase + $(CP) firebird/skywalker/install/misc/firebird.xinetd source/interbase/misc + + superMiscFiles: force + $(QUIET_ECHO) "Building miscellaneous install files..." + $(CP) source/$(SYSTEM)/install source/interbase + -$(CP) source/$(SYSTEM)/servers.isc source/interbase + $(CP) source/$(SYSTEM)/inetd.conf.isc source/interbase + $(CP) source/$(SYSTEM)/original/services.isc source/interbase + -$(CP) source/$(SYSTEM)/sys.conf.isc source/interbase + 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 + + runclassicinstall: force + make -f firebird/skywalker/install/Makefile runclassicinstall + + classicpackages: force + make -f firebird/skywalker/install/Makefile classicpackages + + classictarfile: force + make -f firebird/skywalker/install/Makefile classictarfile + + classicrpmfile: force + make -f firebird/skywalker/install/Makefile classicrpmfile + + + superpackages: force + make -f firebird/skywalker/install/Makefile superpackages + + supertarfile: force + make -f firebird/skywalker/install/Makefile supertarfile + + superrpmfile: force + make -f firebird/skywalker/install/Makefile superrpmfile Index: sfx.pyxis =================================================================== RCS file: /cvsroot/firebird/interbase/builds/original/sfx.pyxis,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** sfx.pyxis 2000/08/11 14:33:56 1.3 --- sfx.pyxis 2001/04/17 02:41:42 1.4 *************** *** 26,29 **** --- 26,32 ---- LIBPYXIS= source/interbase/lib/gds_pyxis.a + # Forces library build for boot TMC 082100 + PYXIS_LIBRARY= libpyxis.a + JRD_LINK= |