[Firebird-checkins] CVS: interbase Configure.sh,NONE,1.1 Configure_SetupEnv.sh,NONE,1.1 README,NONE,1.1 setup_dirs,1.14,1.15

[Mark O. <sky...@us...>]

Update of /cvsroot/firebird/interbase
In directory usw-pr-cvs1:/tmp/cvs-serv16945

Modified Files:
	setup_dirs 
Added Files:
	Configure.sh Configure_SetupEnv.sh README 
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: 'Configure.sh'
***** Error reading new file: [Errno 2] No such file or directory: 'Configure_SetupEnv.sh'
--- NEW FILE ---

For platform specific help in building Firebird please look in the 
build_docs subdirectory.

If you need more information/assistance then check out the firebird web site at: 
http://firebird.sourceforge.net  

The main build newslist fir...@li... available as a
newsgroup from news:news.atkin.com and archives are available from the firebird
web site.

There are many other sources of information relating to Firebird around the web
suggested starting pounts are:

http://sourceforge.net/projects/firebird
http://www.interbase2000.org
http://www.ibphonix.com

Resources for Borland's Interbase(r) also usually will work with and applicable to 
Firebird as well http://www.borland.com/interbase.


Enjoy

The Firebird Crew

Index: setup_dirs
===================================================================
RCS file: /cvsroot/firebird/interbase/setup_dirs,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** setup_dirs	2000/12/08 16:59:30	1.14
--- setup_dirs	2001/04/17 02:41:42	1.15
***************
*** 1,26 ****
  #!/bin/sh
! # The contents of this file are subject to the Interbase Public
! # License Version 1.0 (the "License"); you may not use this file
! # except in compliance with the License. You may obtain a copy
! # of the License at http://www.Inprise.com/IPL.html
! #
! # Software distributed under the License is distributed on an
! # "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express
! # or implied. See the License for the specific language governing
! # rights and limitations under the License.
! #
! # The Original Code was created by Inprise Corporation
! # and its predecessors. Portions created by Inprise Corporation are
! # Copyright (C) Inprise Corporation.
! #
! # All Rights Reserved.
! # Contributor(s):
! #	Reed Mideke <rf...@cr...>
! #	______________________________________.
  #
  # $Id$
- # Revision 1.13  2000/12/08 16:18:20  fsg
- # Preliminary changes to get IB_BUILD_NO automatically
- # increased on commits.
  #
  # setup_dirs will create 'jrd/build_no.h' by a call to
--- 1,28 ----
  #!/bin/sh
! 
! #    The contents of this file are free software; you can redistribute it 
! #    and/or modify it under the terms of the Firebird Public Licence, 
! #    available at http://firebird.sourceforge.net/FBPL.html; either 
! #    version 1.0 of the License, or (at your option) any later version.
! #
! #    This program is distributed in the hope that it will be useful,
! #    but WITHOUT ANY WARRANTY; without even the implied warranty of
! #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
! #    Firebird Public License for more details.
! #
! #    This file was created by members of the firebird development team.  
! #    All individual contributions remain the Copyright (C) of those 
! #    individuals.  Contributors to this file are either listed here or
! #    can be obtained from a CVS history command.
! #
! #    All rights reserved.
! 
! #    Contributor(s):
! #       Tom Coleman TMC Systems <tco...@au...>
! #	    Reed Mideke <rf...@cr...>
! #       Mark O'Donohue <mar...@lu...>
! 
  #
  # $Id$
  #
  # setup_dirs will create 'jrd/build_no.h' by a call to
***************
*** 29,41 ****
  # will be increased automatically in the near future :-)
  #
! # I have changed 'jrd/iblicense.h' to use IB_BUILD_TYPE
! # from 'jrd/build_no.h'.
! # So all changes to version numbers, build types etc. can
! # now be done in 'builds_win32/original/build_no.ksh'.
  #
  #
! # Shell script to set up the InterBase directory structure
! # And now the super server directory structure  
! 
  
  
--- 31,50 ----
  # will be increased automatically in the near future :-)
  #
! # Shell script to set up the Firebird directory structure
  #
  #
! # + MasterSourceDirectory
! #    + interbase     - kit will be built here
! #
! # + refDatabases
! #    + jrd
! #       isc.gdb
! #       metadata.gdb
! #    + msgs
! #       msg.gdb
! #    + qli
! #       help.gdb
! #    + utilities
! #       rebuild.gdb
  
  
***************
*** 108,111 ****
--- 117,137 ----
  #------------------------------------------------------------------------
  #
+ # Build all the directories needed by super server.
+ 
+ buildSuperDirs() {
+     mkdir -p super/client 
+ 
+ # Now populate the directories super/* with symlinks to all the source
+ # files contained in the corresponding top-level directories.
+ 
+     for dir in alice burp dsql intl journal jrd lock register remote utilities wal
+       do
+         buildSuperDir $dir
+       done
+ }
+ 
+ 
+ #------------------------------------------------------------------------
+ #
  # Refresh a link, if it already exists delete it then recreate it
  # otherwise just create it.
***************
*** 161,164 ****
--- 187,223 ----
  
  #------------------------------------------------------------------------
+ # print usage for calling this script
+ 
+ printUsage() {
+     echo "usage is : ./setup_dirs [boot] [system] [DEV|PROD] [refDatabaseDir]"
+     echo ""
+     echo "where system = AIX|AP|AX|DELTA|DG|EPSON|HP700|HP800|HP9.0|"
+     echo "               HP10|IMP|MU|SCO|SGI|SOLARIS|SUN4|UNIXWARE|"
+     echo "               AIX_PPC|LINUX|FREEBSD|NETBSD"
+     echo ""
+     echo "default values are: noboot, uname -s, DEV, ./refDatabases"
+     echo ""
+ 
+ }
+ 
+ #------------------------------------------------------------------------
+ # workout the current OS system type on the machine we are running.
+ 
+ getDefaultSystemType() {
+     SystemName=`uname -s | tr [:lower:] [:upper:]`
+ 
+     case $SystemName in 
+     LINUX|FREEBSD|NETBSD) 
+        BuildHostType=$SystemName
+        ;;
+     IRIX*) 
+        BuildHostType=SGI
+        ;;
+     *)
+        BuildHostType=""
+        ;;
+     esac
+ }
+ #------------------------------------------------------------------------
  # Check initial variables required for build of interbase
  
***************
*** 193,197 ****
       echo ""
       echo "From env. variables:"
!      echo "INTERBASE    (installed database root) : $INTERBASE "
       echo "ISC_USER     (admin user)              : $ISC_USER"
       echo "ISC_PASSWORD (admin password)          : $ISC_PASSWORD"
--- 252,264 ----
       echo ""
       echo "From env. variables:"
! 
!      if [ "$BuildBootFlg" = "Yes" ]
!        then
!          echo "Boot build - Interbase not installed"
!          echo "INTERBASE    (target database root)    : $INTERBASE "
!      else
!          echo "INTERBASE    (installed database root) : $INTERBASE "
!      fi
! 
       echo "ISC_USER     (admin user)              : $ISC_USER"
       echo "ISC_PASSWORD (admin password)          : $ISC_PASSWORD"
***************
*** 205,208 ****
--- 272,355 ----
  }
  
+ 
+ #------------------------------------------------------------------------
+ # copy the boot .c files from the porting subdirectory into the
+ # build structure.
+ 
+ copyFilesFromPortingDir() {
+ 
+ 
+     if [ ! -d porting ]
+       then
+         echo "Unable to find the porting subdirectory for the boot build"
+         echo "Have you installed the firebird_boot kit?"
+         exit
+     fi
+     
+     for dir in `ls porting`
+       do
+          for portfile in `ls porting/$dir`
+            do
+ #              echo "copying porting/$dir/$portfile"
+               cp porting/$dir/$portfile $dir
+            done
+       done
+ }
+ 
+ 
+ #------------------------------------------------------------------------
+ # Build the interbase target dir, and fill it where required from the
+ # currently installed interbase build.
+ 
+ 
+ buildTargetInterbaseDirs() {
+ 
+     if [ -d interbase ] 
+       then
+         echo ""
+         echo ""
+         echo "*** Warning *** "
+         echo "    The installation target directory:"
+         echo "       `pwd`/interbase"
+         echo "    already exists, press return to delete this directory or ^C to abort."
+         echo "*** Warning *** "
+         echo "" 
+         AskQuestion "Press return to continue or ^C to abort"
+         rm -rf interbase
+         echo "Deleted."
+         echo ""
+     fi
+ 
+     mkdir interbase
+ 
+     cd interbase
+ 
+     mkdir bin
+     mkdir lib
+     mkdir help
+     mkdir UDF
+     mkdir -p examples/v3
+     mkdir -p examples/v4
+     mkdir -p examples/v5
+     mkdir include
+     mkdir intl
+ 
+     if [ $BuildBootFlg = "No" ]
+       then
+         cp $INTERBASE/interbase.msg .
+         cp $INTERBASE/isc4.gdb .
+         copyIfExists $INTERBASE/ib_license.dat .
+         cp $INTERBASE/bin/gpre bin
+         cp $INTERBASE/bin/gbak bin
+         copyIfExists $INTERBASE/bin/gds_lock_mgr bin
+         cp $INTERBASE/help/help.gdb help
+     fi
+ 
+     cd ..
+ 
+ 
+ }
+ 
+ 
  #== Main Program ========================================================
  
***************
*** 212,270 ****
  
  PATH=.:$PATH
  
- if [ $# != 3 ]
- then
-     echo 'Usage: setup_dirs {AIX   | AP      | AX   } {DEV}  master_source_dir '
-         echo '                  {DELTA | DG      | EPSON} {PROD}'
-         echo '                  {HP700 | HP800   | HP9.0 | HP10 }'
-         echo '                  {IMP   | MU      | SCO  }'
-         echo '                  {SGI   | SOLARIS | SUN4 }'
-         echo '                  {UNIXWARE | AIX_PPC | LINUX }'
-         echo '                  {FREEBSD | NETBSD}'
-         exit 1
- fi
- 
- export BuildHostType=$1
- export BuildBuildType=$2
- export MasterSourceDir=$3
  
- SYS_TYPE=$1
  
  checkVariables
  
! if [ "$1" = 'SUN4' -o "$1" = 'SUN3_4' -o "$1" = 'SUN386I' ]; then
      SYS_TYPE=SUNOS4
  fi
! if [ $1 = 'AX' -o $1 = 'AP' ]; then
      SYS_TYPE=APOLLO
  fi
! if [ $1 = 'SUN3_3' ]; then
      SYS_TYPE=SUNOS3
  fi
  #
  LOCK_HEADER=lock_header_shmem
! if [ $SYS_TYPE = 'SUNOS4' -o $1 = 'DG' -o $1 = 'SOLARIS' ]; then
      LOCK_HEADER=lock_header_mmap
  fi
  #
  
! echo "Creating jrd/build_no.h"
  sh builds_win32/original/build_no.ksh
  echo "- Setting up the superserver directory structure"
  echo ""
  
! mkdir -p super/client 
  
- # Now populate the directories super/* with symlinks to all the source
- # files contained in the corresponding top-level directories.
  
! for dir in alice burp dsql intl journal jrd lock register remote utilities wal
!   do
!     buildSuperDir $dir
!   done
  
- #
  refreshLink . source
  refreshLink builds/make.interbase make_kit
  refreshLink builds/original/build_kit build_kit
  refreshLink builds/original/set_prot set_prot
--- 359,480 ----
  
  PATH=.:$PATH
+ 
+ 
+ 
+ # Check for boot arg or help arg
+ 
+ BuildBootFlg="No"
+ 
+ if [ $# > 1 ]
+   then
+     if [ "$1" = "boot" ]
+       then
+         BuildBootFlg="Yes"
+         shift
+     fi
+     if [ "$1" = "help" ]
+       then
+         printUsage
+         exit
+     fi
+ fi
  
  
  
+ # Work out the default build parameters
+ BuildHostType=""
+ getDefaultSystemType
+ 
+ BuildBuildType="DEV"
+ MasterSourceDir="source/refDatabases"
+ 
+ export BuildHostType
+ export BuildBuildType
+ export MasterSourceDir
+ 
+ 
+ # Check the command line arguments
+ 
+ if [ $# -ge 1 ]
+   then
+     BuildHostType=$1
+ fi
+ if [ $# -ge 2 ]
+   then
+     BuildBuildType=$2
+ fi
+ if [ $# -ge 3 ]
+   then
+     MasterSourceDir=$3
+ fi
+ 
+ SYS_TYPE=$BuildHostType
+ 
+ 
+ if [ "$SYS_TYPE" = "" ]
+   then
+     echo "Unable to automatically determine the OS system type for the build"
+     echo "you will need to specify it manually"
+     echo ""
+     printUsage
+     exit
+ fi
+ 
  checkVariables
+ 
  
! # Some checking for old systems, 
! 
! if [ "$BuildHostType" = 'SUN4' -o "$BuildHostType" = 'SUN3_4' -o "$BuildHostType" = 'SUN386I' ]; then
      SYS_TYPE=SUNOS4
  fi
! if [ $BuildHostType = 'AX' -o $BuildHostType = 'AP' ]; then
      SYS_TYPE=APOLLO
  fi
! if [ $BuildHostType = 'SUN3_3' ]; then
      SYS_TYPE=SUNOS3
  fi
  #
  LOCK_HEADER=lock_header_shmem
! if [ $SYS_TYPE = 'SUNOS4' -o $BuildHostType = 'DG' -o $BuildHostType = 'SOLARIS' ]; then
      LOCK_HEADER=lock_header_mmap
  fi
  #
+ 
+ 
  
! # Here we ensure that the build_no version strings are automatically set to 
! # the correct current values ( thanks to Frank for this).
! 
! echo "- Setting build version strings in file jrd/build_no.h"
! echo ""
  sh builds_win32/original/build_no.ksh
+ 
+ 
+ 
+ 
+ # The boot build copies a number of already precompiled C files into
+ # the build structure.
+ 
+ if [ $BuildBootFlg = "Yes" ]
+   then
+     echo "- Copying boot files into build tree"
+     echo ""
+     copyFilesFromPortingDir
+ fi
+ 
+ 
  echo "- Setting up the superserver directory structure"
  echo ""
  
! buildSuperDirs
  
  
! # Refresh/create a few links
  
  refreshLink . source
+ 
  refreshLink builds/make.interbase make_kit
+ 
  refreshLink builds/original/build_kit build_kit
  refreshLink builds/original/set_prot set_prot
***************
*** 276,347 ****
  refreshLink builds/original/fetch_comp fetch_comp
  refreshLink builds/original/maketar maketar
  refreshLink builds/refresh refresh
  refreshLink builds/refresh.all refresh.all
  refreshLink builds/special_opt special_opt
  
! if [ $1 = 'SCO' ]; then
!         refreshLink builds/original/sco_ship sco_ship
  fi
  
  
- if [ $SYS_TYPE = 'LINUX' -o $SYS_TYPE = 'FREEBSD' -o $SYS_TYPE = 'NETBSD' ]
- then
- 		# TODO this does not belong in the linux/*bsd section
-         if [ -d interbase ] 
-           then
-             echo ""
-             echo ""
-             echo "*** Warning *** "
-             echo "    The installation target directory:"
-             echo "       `pwd`/interbase"
-             echo "    already exists, press return to delete this directory or ^C to abort."
-             echo "*** Warning *** "
-             echo "" 
-             AskQuestion "Press return to continue or ^C to abort"
-             rm -rf interbase
-             echo "Deleted."
-             echo ""
-         fi
-         mkdir interbase
-         cd interbase
-         cp $INTERBASE/interbase.msg .
-         cp $INTERBASE/isc4.gdb .
-         copyIfExists $INTERBASE/ib_license.dat .
-         mkdir bin
-         cp $INTERBASE/bin/gpre bin
-         cp $INTERBASE/bin/gbak bin
-         copyIfExists $INTERBASE/bin/gds_lock_mgr bin
-         mkdir lib
-         mkdir help
-         cp $INTERBASE/help/help.gdb help
-         mkdir UDF
-         mkdir -p examples/v5
-         mkdir include
- 		mkdir intl
-         cd ..
- 
-         cd jrd
-         refreshLink $MasterSourceDir/jrd/isc.gdb isc.gdb
-         refreshLink $MasterSourceDir/jrd/metadata.gdb yachts.gdb
-         cd ..
- 
-         cd super/jrd                                  # TMC 081100
-         refreshLink ../../jrd/yachts.gdb yachts.gdb   # TMC 081100
-         refreshLink ../../jrd/isc.gdb    isc.gdb      # FSG 090800
-         cd ../..                                      # TMC 081100 
  
  echo "- Creating messages link"
  echo ""
  
!         cd msgs
!         refreshLink $MasterSourceDir/msgs/msg.gdb msg.gdb
!         cd ..
!   # Link these to the ones we will build, so we can do -lgds and -lgds_pyxis
!         cd jrd
!         refreshLink source/interbase/lib/gds.so libgds.so
!         refreshLink source/interbase/lib/gds_pyxis.a libgds_pyxis.a
!         cd ..
  fi
  
  echo "- Setting up makefile and database links"
  echo ""
--- 486,550 ----
  refreshLink builds/original/fetch_comp fetch_comp
  refreshLink builds/original/maketar maketar
+ 
  refreshLink builds/refresh refresh
  refreshLink builds/refresh.all refresh.all
  refreshLink builds/special_opt special_opt
  
! 
! if [ $BuildHostType = 'SCO' ]
!   then
!     refreshLink builds/original/sco_ship sco_ship
  fi
  
  
  
+ # Build the empty target interbase directories 
+ 
+ buildTargetInterbaseDirs
+ 
+ 
+ # Update the metadata/isc links
+ cd jrd
+ refreshLink $MasterSourceDir/jrd/isc.gdb isc.gdb
+ refreshLink $MasterSourceDir/jrd/metadata.gdb yachts.gdb
+ cd ..
+ 
+ cd super/jrd                                  # TMC 081100
+ refreshLink ../../jrd/yachts.gdb yachts.gdb   # TMC 081100
+ refreshLink ../../jrd/isc.gdb    isc.gdb      # FSG 090800
+ cd ../..                                      # TMC 081100 
+ 
+ 
+ 
  echo "- Creating messages link"
  echo ""
  
! cd msgs
! refreshLink $MasterSourceDir/msgs/msg.gdb msg.gdb
! cd ..
! # Link these to the ones we will build, so we can do -lgds and -lgds_pyxis
! cd jrd
! refreshLink source/interbase/lib/gds.so libgds.so
! refreshLink source/interbase/lib/gds_pyxis.a libgds_pyxis.a
! cd ..
! 
! 
! if [ $BuildBootFlg = 'Yes' ]
!   then
! #
! #     INTERBASE in the level above is the source root directory
! #
!     touch interbase/interbase.msg
! 
!     cd interbase/lib
!     refreshLink gds.so libgds.so.1.0
!     refreshLink libgds.so.1.0 libgds.so.1
!     refreshLink libgds.so.1 libgds.so
!     refreshLink gds_pyxis.a libgds_pyxis.a
!     refreshLink gds.a libgds.a
!     cd ../..
  fi
  
+ 
  echo "- Setting up makefile and database links"
  echo ""
***************
*** 423,426 ****
--- 626,630 ----
  refreshLink source/jrd/yachts.gdb isql/yachts.lnk
  refreshLink source/builds/make.isql isql/makefile
+ 
  # Journal
  refreshLink .. journal/source
***************
*** 431,437 ****
--- 635,643 ----
  refreshLink $MasterSourceDir/journal/journal.gdb super/journal/journal.gdb
  refreshLink source/builds/make.journal_ss super/journal/makefile
+ 
  # Jrd
  refreshLink .. jrd/source
  refreshLink yachts.gdb jrd/yachts.lnk
+ refreshLink $MasterSourceDir/msgs/msg.gdb msgs/msg.gdb  # TMC 082100
  refreshLink source/msgs/msg.gdb jrd/msg.gdb   # TMC 081100
  refreshLink source/builds/make.jrd jrd/makefile
***************
*** 449,458 ****
  refreshLink source/builds/original/bind_csilib.apollo csv/bind_csilib
  refreshLink source/builds/original/bind_remotelib.apollo remote/bind_remotelib
! if [ $1 = 'DELTA' -o $1 = 'IMP' -o $1 = 'MU' -o $1 = 'NXT' -o $1 = 'SCO' -o $1 = 'UL' ]; then
      refreshLink source/interbase/lib/gds_b.a jrd/libgds_b.a
  else
      refreshLink gds_b.a jrd/libgds_b.a
  fi
! if [ $SYS_TYPE = 'SUNOS4' ]; then
      refreshLink source/interbase/lib/gdslib.so.1.0 jrd/libgdslib.so.1.0
      refreshLink source/interbase/lib/gdslib.so.0.1 jrd/libgdslib.so.0.1
--- 655,668 ----
  refreshLink source/builds/original/bind_csilib.apollo csv/bind_csilib
  refreshLink source/builds/original/bind_remotelib.apollo remote/bind_remotelib
! 
! if [ $BuildHostType = 'DELTA' -o $BuildHostType = 'IMP' -o $BuildHostType = 'MU' -o $BuildHostType = 'NXT' -o $BuildHostType = 'SCO' -o $BuildHostType = 'UL' ]
!   then
      refreshLink source/interbase/lib/gds_b.a jrd/libgds_b.a
  else
      refreshLink gds_b.a jrd/libgds_b.a
  fi
! 
! if [ $SYS_TYPE = 'SUNOS4' ]
!   then
      refreshLink source/interbase/lib/gdslib.so.1.0 jrd/libgdslib.so.1.0
      refreshLink source/interbase/lib/gdslib.so.0.1 jrd/libgdslib.so.0.1
***************
*** 460,471 ****
      refreshLink source/interbase/lib/gds_pyxis.a jrd/libgds_pyxis.a
  fi
! if [ $1 = 'AIX' -o $1 = 'AIX_PPC' -o $1 = 'DECOSF' -o $1 = 'SGI' ]; then
      refreshLink source/builds/original/bind_gds.generic jrd/gds.bind
      refreshLink source/builds/original/bind_gds5.generic jrd/gds5.bind
  fi
! if [ $1 = 'AIX' -o $1 = 'AIX_PPC' ]; then
      refreshLink source/interbase/lib/gdsshr.a jrd/libgdsshr.a
  fi
! if [ $1 = 'DG' ]; then
      refreshLink source/interbase/lib/gds.so.0 jrd/libgds.so.0
      refreshLink source/jrd/libgds.so.0 jrd/libgds.so
--- 670,693 ----
      refreshLink source/interbase/lib/gds_pyxis.a jrd/libgds_pyxis.a
  fi
! 
! if [ $BuildHostType = 'AIX' -o $BuildHostType = 'DECOSF' -o $BuildHostType = 'SGI' ]
!   then
      refreshLink source/builds/original/bind_gds.generic jrd/gds.bind
      refreshLink source/builds/original/bind_gds5.generic jrd/gds5.bind
  fi
! if [ $BuildHostType = 'AIX_PPC' ]
!   then
!    refreshLink source/builds/original/bind_gds.aix_ppc jrd/gds.bind
!    refreshLink source/builds/original/bind_gdsintl.aix_ppc intl/gdsintl.bind
! fi
! 
! 
! if [ $BuildHostType = 'AIX' -o $BuildHostType = 'AIX_PPC' ]
!   then
      refreshLink source/interbase/lib/gdsshr.a jrd/libgdsshr.a
  fi
! 
! if [ $BuildHostType = 'DG' ]
!   then
      refreshLink source/interbase/lib/gds.so.0 jrd/libgds.so.0
      refreshLink source/jrd/libgds.so.0 jrd/libgds.so
***************
*** 473,481 ****
      refreshLink source/interbase/lib/gds_pyxis.a jrd/libgds_pyxis.a
  fi
! if [ $1 = 'EPSON' -o $1 = 'DECOSF' -o $1 = 'UNIXWARE' -o $1 = 'M88K' ]; then
      refreshLink source/interbase/lib/gds.so.0 jrd/libgds.so.0
      refreshLink source/jrd/libgds.so.0 jrd/libgds.so
  fi
! if [ $1 = 'HP700' -o $1 = 'HP9.0' -o $1 = 'HP10' ]; then
      if [ -d super ]; then
         refreshLink source/builds/original/bind_gds.hp super/remote/gds.bind
--- 695,703 ----
      refreshLink source/interbase/lib/gds_pyxis.a jrd/libgds_pyxis.a
  fi
! if [ $BuildHostType = 'EPSON' -o $BuildHostType = 'DECOSF' -o $BuildHostType = 'UNIXWARE' -o $BuildHostType = 'M88K' ]; then
      refreshLink source/interbase/lib/gds.so.0 jrd/libgds.so.0
      refreshLink source/jrd/libgds.so.0 jrd/libgds.so
  fi
! if [ $BuildHostType = 'HP700' -o $BuildHostType = 'HP9.0' -o $BuildHostType = 'HP10' ]; then
      if [ -d super ]; then
         refreshLink source/builds/original/bind_gds.hp super/remote/gds.bind
***************
*** 487,491 ****
      refreshLink source/builds/original/bind_gds5.hp jrd/gds5.bind
  fi
! if [ $1 = 'SOLARIS' -o $1 = 'SGI' -o $1 = 'SCO_EV' ]; then
      refreshLink source/interbase/lib/gdsmt.so.1 jrd/libgdsmt.so.1
      refreshLink source/interbase/lib/gdsmt.so.0 jrd/libgdsmt.so.0
--- 709,713 ----
      refreshLink source/builds/original/bind_gds5.hp jrd/gds5.bind
  fi
! if [ $BuildHostType = 'SOLARIS' -o $BuildHostType = 'SGI' -o $BuildHostType = 'SCO_EV' ]; then
      refreshLink source/interbase/lib/gdsmt.so.1 jrd/libgdsmt.so.1
      refreshLink source/interbase/lib/gdsmt.so.0 jrd/libgdsmt.so.0
***************
*** 495,510 ****
      refreshLink source/interbase/lib/gds_pyxis.a jrd/libgds_pyxis.a
  fi
! if [ $1 = 'SCO' -o $1 = 'IMP' ]; then
      refreshLink source/interbase/lib/gds_s.a jrd/libgds_s.a
      refreshLink source/interbase/lib/gdsf_s.a jrd/libgdsf_s.a
!     if [ $1 = 'SCO' ]; then
          refreshLink source/interbase/lib/gds_pyxis.a jrd/libgds_pyxis.a
      fi
  fi
! if [ $1 = 'IMP' ]; then
      refreshLink source/builds/original/bind_gds_s.im jrd/gds_s.bind
      refreshLink source/builds/original/bind_gdsf_s.im jrd/gdsf_s.bind
  fi
! if [ $1 = 'SCO' ]; then
      refreshLink source/builds/original/bind_gds_s.sco jrd/gds_s.bind
      refreshLink source/builds/original/bind_gdsf_s.sco jrd/gdsf_s.bind
--- 717,732 ----
      refreshLink source/interbase/lib/gds_pyxis.a jrd/libgds_pyxis.a
  fi
! if [ $BuildHostType = 'SCO' -o $BuildHostType = 'IMP' ]; then
      refreshLink source/interbase/lib/gds_s.a jrd/libgds_s.a
      refreshLink source/interbase/lib/gdsf_s.a jrd/libgdsf_s.a
!     if [ $BuildHostType = 'SCO' ]; then
          refreshLink source/interbase/lib/gds_pyxis.a jrd/libgds_pyxis.a
      fi
  fi
! if [ $BuildHostType = 'IMP' ]; then
      refreshLink source/builds/original/bind_gds_s.im jrd/gds_s.bind
      refreshLink source/builds/original/bind_gdsf_s.im jrd/gdsf_s.bind
  fi
! if [ $BuildHostType = 'SCO' ]; then
      refreshLink source/builds/original/bind_gds_s.sco jrd/gds_s.bind
      refreshLink source/builds/original/bind_gdsf_s.sco jrd/gdsf_s.bind
***************
*** 546,549 ****
--- 768,772 ----
  refreshLink .. super/remote/source
  refreshLink source/builds/make.remote_ss super/remote/makefile
+ 
  # Super
  refreshLink . super/source
***************
*** 553,559 ****
  refreshLink builds/special_opt super/special_opt
  
! if [ $1 = "DG" ]; then
      refreshLink source/interbase/examples/v3/gds_blk_data.f testing/gds_blk_data.f
  fi
  # Utilities
  refreshLink .. utilities/source
--- 776,783 ----
  refreshLink builds/special_opt super/special_opt
  
! if [ $BuildHostType = "DG" ]; then
      refreshLink source/interbase/examples/v3/gds_blk_data.f testing/gds_blk_data.f
  fi
+ 
  # Utilities
  refreshLink .. utilities/source
***************
*** 567,570 ****
--- 791,795 ----
  refreshLink source/builds/make.utilities_ss super/utilities/makefile
  refreshLink $MasterSourceDir/utilities/rebuild.gdb super/utilities/rebuild.gdb
+ 
  # Wal
  refreshLink .. wal/source
***************
*** 572,577 ****
--- 797,804 ----
  refreshLink .. super/wal/source
  refreshLink source/builds/make.wal_ss super/wal/makefile
+ 
  # Builds
  refreshLink ../.. builds/original/source
+ 
  # System specific directories
  refreshLink .. builds/source
***************
*** 581,592 ****
  else
          refreshLink original/install.unix builds/install
!         if [ $1 = 'SUN3_3' ]; then
              refreshLink original/servers.isc builds/servers.isc
          fi
  fi
! if [ $1 = 'MU' -o $1 = 'UL' ]; then
      refreshLink original/inetd.conf.ultrix builds/inetd.conf.isc
  else
!         if [ $1 = 'IMP' -o $1 = 'SCO' -o $1 = 'EPSON' ]; then
              refreshLink original/inetd.conf.psx builds/inetd.conf.isc
          else
--- 808,820 ----
  else
          refreshLink original/install.unix builds/install
!         if [ $BuildHostType = 'SUN3_3' ]; then
              refreshLink original/servers.isc builds/servers.isc
          fi
  fi
! 
! if [ $BuildHostType = 'MU' -o $BuildHostType = 'UL' ]; then
      refreshLink original/inetd.conf.ultrix builds/inetd.conf.isc
  else
!         if [ $BuildHostType = 'IMP' -o $BuildHostType = 'SCO' -o $BuildHostType = 'EPSON' ]; then
              refreshLink original/inetd.conf.psx builds/inetd.conf.isc
          else
***************
*** 596,609 ****
  
  
  cd builds/original
  chmod +x setup_prots
  ./setup_prots
  
  # Save the production/development flag
! echo "$1" > .platform_type    
! cd ../..
! chmod +x setup_build
  
! ./setup_build $BuildBuildType 
  
  echo "- Directory setup is now complete!"
--- 824,867 ----
  
  
+ 
+ echo "- Setting up plaform specific makefiles"
+ echo ""
+ 
  cd builds/original
+ 
+ 
+ # sfx.interbase.boot has the modes required for a boot build so
+ # we need to replace the original one there.
+ 
+ if [ $BuildBootFlg = "Yes" ]
+   then
+     if [ ! -f noboot.sfx.interbase ]
+       then
+         cp sfx.interbase sfx.interbase.noboot
+     fi
+     cp boot.sfx.interbase sfx.interbase
+ fi
+ 
  chmod +x setup_prots
  ./setup_prots
  
  # Save the production/development flag
! 
! echo "$BuildHostType" > .platform_type    
! echo "$BuildBuildType" > .version_flg
! 
! ./platform $BuildHostType
! 
  
! # Restore the sfx.interbase file to stop problems with CVS 
! if [ $BuildBootFlg = "Yes" ]
!   then
!     if [ -f noboot.sfx.interbase ]
!       then
!         cp noboot.sfx.interbase sfx.interbase
!     fi
! fi
! 
! cd ../..
  
  echo "- Directory setup is now complete!"