firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 00:03:02 +01:00
Code Issues

MacOS Port into HEAD

Browse Source
This commit is contained in:
paulbeach 2007-06-11 14:21:33 +00:00
parent 09a44c7626
commit 1644f2cb64
23 changed files with 842 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builds/install/arch-specific/darwin/FB.info
View File

@ -1,6 +1,6 @@
Title Firebird Database Title Firebird Database
Version 2.0.2 Version 2.1.0
Description Firebird 2.0.2 Description Firebird 2.1.0
DefaultLocation /tmp/install DefaultLocation /tmp/install
DeleteWarning DeleteWarning

45
builds/install/arch-specific/darwin/Makefile.in
View File

@ -6,7 +6,7 @@ include $(ROOT)/gen/make.platform
include $(ROOT)/gen/make.rules include $(ROOT)/gen/make.rules
include $(ROOT)/gen/make.shared.variables include $(ROOT)/gen/make.shared.variables
@SET_MAKE@
DIR = $(ROOT)/gen/firebird/installer_scratch DIR = $(ROOT)/gen/firebird/installer_scratch
@ -21,12 +21,13 @@ FB_VER_SUFFIX_SM:=$(shell cpp -DDARWIN -I. ../builds/install/arch-specific/darw
FB_VER_SUFFIX_M:=$(shell cpp -DDARWIN -I. ../builds/install/arch-specific/darwin/buildsuffix.c | tail -1 | sed -e 's/" "//g' -e 's/"//g' -e 's/Release Candidate/RC/') FB_VER_SUFFIX_M:=$(shell cpp -DDARWIN -I. ../builds/install/arch-specific/darwin/buildsuffix.c | tail -1 | sed -e 's/" "//g' -e 's/"//g' -e 's/Release Candidate/RC/')
FB_MAJOR_VERS:=$(shell cpp -DDARWIN -I. ../builds/install/arch-specific/darwin/majorvers.c | tail -1 | sed -e 's/" "//g' -e 's/"//g') FB_MAJOR_VERS:=$(shell cpp -DDARWIN -I. ../builds/install/arch-specific/darwin/majorvers.c | tail -1 | sed -e 's/" "//g' -e 's/"//g')
FB_MINOR_VERS:=$(shell cpp -DDARWIN -I. ../builds/install/arch-specific/darwin/minorvers.c | tail -1 | sed -e 's/" "//g' -e 's/"//g') FB_MINOR_VERS:=$(shell cpp -DDARWIN -I. ../builds/install/arch-specific/darwin/minorvers.c | tail -1 | sed -e 's/" "//g' -e 's/"//g')
FB_REV_NO:=$(shell cpp -DDARWIN -I. ../builds/install/arch-specific/darwin/revno.c | tail -1 | sed -e 's/" "//g' -e 's/"//g')
FB_BUILD_NO:=$(shell cpp -DDARWIN -I. ../builds/install/arch-specific/darwin/buildno.c | tail -1 | sed -e 's/" "//g' -e 's/"//g')
FB_PLATFORM:=$(shell uname -p) FB_PLATFORM:=$(shell uname -p)
package packages dist: package_@FIREBIRD_ARCH_TYPE@ package packages dist: package_@FIREBIRD_ARCH_TYPE@
#package packages dist: package_classic
package_classic package_embedded: INST_NM=Firebird-CS-$(FB_INST_VERS).$(FB_MINOR_VERS)-$(FB_PLATFORM) package_classic package_embedded: INST_NM=FirebirdCS-$(FB_MAJOR_VERS).$(FB_MINOR_VERS).$(FB_REV_NO)-$(FB_BUILD_NO)-$(FB_PLATFORM)
package_classic package_embedded: BLOCKSIZE=1048576 package_classic package_embedded: BLOCKSIZE=1048576
package_classic package_embedded: package_classic package_embedded:
-rm -rf $(DIR) -rm -rf $(DIR)
@ -45,6 +46,7 @@ package_classic package_embedded:
-e 's/_MFB_BUILD_SUFFIX_/$(FB_VER_SUFFIX_M)/g' \ -e 's/_MFB_BUILD_SUFFIX_/$(FB_VER_SUFFIX_M)/g' \
-e 's/_MAJOR_VERS_/$(FB_MAJOR_VERS)/g' \ -e 's/_MAJOR_VERS_/$(FB_MAJOR_VERS)/g' \
-e 's/_MINOR_VERS_/$(FB_MINOR_VERS)/g' \ -e 's/_MINOR_VERS_/$(FB_MINOR_VERS)/g' \
-e 's/_REV_NO_/$(FB_REV_NO)/g' \
../builds/install/arch-specific/darwin/Info.plist \ ../builds/install/arch-specific/darwin/Info.plist \
> $(DIR)/$(INST_NM).pkg/Contents/Info.plist > $(DIR)/$(INST_NM).pkg/Contents/Info.plist
sed -e 's/_FB_BUILD_SUFFIX_/$(FB_VER_SUFFIX)/g' \ sed -e 's/_FB_BUILD_SUFFIX_/$(FB_VER_SUFFIX)/g' \
@ -52,6 +54,7 @@ package_classic package_embedded:
-e 's/_MFB_BUILD_SUFFIX_/$(FB_VER_SUFFIX_M)/g' \ -e 's/_MFB_BUILD_SUFFIX_/$(FB_VER_SUFFIX_M)/g' \
-e 's/_MAJOR_VERS_/$(FB_MAJOR_VERS)/g' \ -e 's/_MAJOR_VERS_/$(FB_MAJOR_VERS)/g' \
-e 's/_MINOR_VERS_/$(FB_MINOR_VERS)/g' \ -e 's/_MINOR_VERS_/$(FB_MINOR_VERS)/g' \
-e 's/_REV_NO_/$(FB_REV_NO)/g' \
../builds/install/arch-specific/darwin/Description.plist \ ../builds/install/arch-specific/darwin/Description.plist \
> $(DIR)/$(INST_NM).pkg/Contents/Resources/Description.plist > $(DIR)/$(INST_NM).pkg/Contents/Resources/Description.plist
cp -r ../builds/install/arch-specific/darwin/Firebird.startupitem \ cp -r ../builds/install/arch-specific/darwin/Firebird.startupitem \
@ -87,9 +90,7 @@ package_classic package_embedded:
mv $(DIR)/$(INST_NM).pkg $(ROOT)/gen/firebird mv $(DIR)/$(INST_NM).pkg $(ROOT)/gen/firebird
rm -rf $(DIR) rm -rf $(DIR)
# cpp -DDARWIN -I. install/arch-specific/darwin/fullvers.c | tail -1 | sed -e 's/" "//g' -e 's/"//g' package_super package_server: INST_NM=FirebirdSS-$(FB_MAJOR_VERS).$(FB_MINOR_VERS).$(FB_REV_NO)-$(FB_BUILD_NO)-$(FB_PLATFORM)
package_super package_server: INST_NM=Firebird-SS-$(FB_INST_VERS)
package_super package_server: BLOCKSIZE=1048576 package_super package_server: BLOCKSIZE=1048576
package_super package_server: package_super package_server:
-rm -rf $(DIR) -rm -rf $(DIR)
@ -102,37 +103,39 @@ package_super package_server:
$(ROOT)/gen/firebird/frameworks/FirebirdSS.framework $(ROOT)/gen/firebird/frameworks/FirebirdSS.framework
mkdir -p $(DIR)/$(INST_NM).pkg/Contents/Resources mkdir -p $(DIR)/$(INST_NM).pkg/Contents/Resources
mv $(DIR)/Archive.* $(DIR)/$(INST_NM).pkg/Contents mv $(DIR)/Archive.* $(DIR)/$(INST_NM).pkg/Contents
cp install/arch-specific/darwin/PkgInfo $(DIR)/$(INST_NM).pkg/Contents cp ../builds/install/arch-specific/darwin/PkgInfo $(DIR)/$(INST_NM).pkg/Contents
sed -e 's/_FB_BUILD_SUFFIX_/$(FB_VER_SUFFIX)/g' \ sed -e 's/_FB_BUILD_SUFFIX_/$(FB_VER_SUFFIX)/g' \
-e 's/_SMFB_BUILD_SUFFIX_/$(FB_VER_SUFFIX_SM)/g' \ -e 's/_SMFB_BUILD_SUFFIX_/$(FB_VER_SUFFIX_SM)/g' \
-e 's/_MFB_BUILD_SUFFIX_/$(FB_VER_SUFFIX_M)/g' \ -e 's/_MFB_BUILD_SUFFIX_/$(FB_VER_SUFFIX_M)/g' \
-e 's/_MAJOR_VERS_/$(FB_MAJOR_VERS)/g' \ -e 's/_MAJOR_VERS_/$(FB_MAJOR_VERS)/g' \
-e 's/_MINOR_VERS_/$(FB_MINOR_VERS)/g' \ -e 's/_MINOR_VERS_/$(FB_MINOR_VERS)/g' \
install/arch-specific/darwin/Info.plist \ -e 's/_REV_NO_/$(FB_REV_NO)/g' \
../builds/install/arch-specific/darwin/Info.plist \
> $(DIR)/$(INST_NM).pkg/Contents/Info.plist > $(DIR)/$(INST_NM).pkg/Contents/Info.plist
sed -e 's/_FB_BUILD_SUFFIX_/$(FB_VER_SUFFIX)/g' \ sed -e 's/_FB_BUILD_SUFFIX_/$(FB_VER_SUFFIX)/g' \
-e 's/_SMFB_BUILD_SUFFIX_/$(FB_VER_SUFFIX_SM)/g' \ -e 's/_SMFB_BUILD_SUFFIX_/$(FB_VER_SUFFIX_SM)/g' \
-e 's/_MFB_BUILD_SUFFIX_/$(FB_VER_SUFFIX_M)/g' \ -e 's/_MFB_BUILD_SUFFIX_/$(FB_VER_SUFFIX_M)/g' \
-e 's/_MAJOR_VERS_/$(FB_MAJOR_VERS)/g' \ -e 's/_MAJOR_VERS_/$(FB_MAJOR_VERS)/g' \
-e 's/_MINOR_VERS_/$(FB_MINOR_VERS)/g' \ -e 's/_MINOR_VERS_/$(FB_MINOR_VERS)/g' \
install/arch-specific/darwin/Description.plist \ -e 's/_REV_NO_/$(FB_REV_NO)/g' \
../builds/install/arch-specific/darwin/Description.plist \
> $(DIR)/$(INST_NM).pkg/Contents/Resources/Description.plist > $(DIR)/$(INST_NM).pkg/Contents/Resources/Description.plist
cp install/arch-specific/darwin/installer_background.pdf \ cp ../builds/install/arch-specific/darwin/installer_background.pdf \
$(DIR)/$(INST_NM).pkg/Contents/Resources/background.pdf $(DIR)/$(INST_NM).pkg/Contents/Resources/background.pdf
cp install/arch-specific/darwin/install-script \ cp ../builds/install/arch-specific/darwin/install-script \
$(DIR)/$(INST_NM).pkg/Contents/Resources/postinstall $(DIR)/$(INST_NM).pkg/Contents/Resources/postinstall
cp -r install/arch-specific/darwin/Firebird.startupitem \ cp -r ../builds/install/arch-specific/darwin/Firebird.startupitem \
$(DIR)/$(INST_NM).pkg/Contents/Resources/StartupItem $(DIR)/$(INST_NM).pkg/Contents/Resources/StartupItem
rm -rf `find $(DIR)/$(INST_NM).pkg/Contents/Resources/StartupItem -name CVS` rm -rf `find $(DIR)/$(INST_NM).pkg/Contents/Resources/StartupItem -name CVS`
cp install/arch-specific/darwin/install-script \ cp ../builds/install/arch-specific/darwin/install-script \
$(DIR)/$(INST_NM).pkg/Contents/Resources/postupgrade $(DIR)/$(INST_NM).pkg/Contents/Resources/postupgrade
cp install/arch-specific/darwin/preinstall-script \ cp ../builds/install/arch-specific/darwin/preinstall-script \
$(DIR)/$(INST_NM).pkg/Contents/Resources/preinstall $(DIR)/$(INST_NM).pkg/Contents/Resources/preinstall
cp install/arch-specific/darwin/preupgrade-script \ cp ../builds/install/arch-specific/darwin/preupgrade-script \
$(DIR)/$(INST_NM).pkg/Contents/Resources/preupgrade $(DIR)/$(INST_NM).pkg/Contents/Resources/preupgrade
chmod a+rx $(DIR)/$(INST_NM).pkg/Contents/Resources/pre* chmod a+rx $(DIR)/$(INST_NM).pkg/Contents/Resources/pre*
chmod a+rx $(DIR)/$(INST_NM).pkg/Contents/Resources/post* chmod a+rx $(DIR)/$(INST_NM).pkg/Contents/Resources/post*
cp install/arch-specific/darwin/*.txt \ cp ../builds/install/arch-specific/darwin/*.txt \
$(DIR)/$(INST_NM).pkg/Contents/Resources $(DIR)/$(INST_NM).pkg/Contents/Resources
ln -s ../Archive.bom $(DIR)/$(INST_NM).pkg/Contents/Resources/$(INST_NM).bom ln -s ../Archive.bom $(DIR)/$(INST_NM).pkg/Contents/Resources/$(INST_NM).bom
ln -s ../Archive.pax.gz \ ln -s ../Archive.pax.gz \
@ -150,18 +153,16 @@ package_super package_server:
mv $(DIR)/$(INST_NM).pkg $(ROOT)/gen/firebird mv $(DIR)/$(INST_NM).pkg $(ROOT)/gen/firebird
rm -rf $(DIR) rm -rf $(DIR)
# cpp -DDARWIN -I. install/arch-specific/darwin/fullvers.c | tail -1 | sed -e 's/" "//g' -e 's/"//g'
install: install_@FIREBIRD_ARCH_TYPE@ #install: install_@FIREBIRD_ARCH_TYPE@
install_super install_server: install_super install_server:
installer -verbose -dumplog -pkg \ installer -verbose -dumplog -pkg \
`pwd`/$(ROOT)/gen/firebird/Firebird-SS-$(FB_INST_VERS).pkg -target / `pwd`/$(ROOT)/gen/firebird/Firebird-SS-$(FB_INST_VERS).$(FB_MINOR_VERS)-$(FB_PLATFORM).pkg -target /
install_embedded install_classic: install_classic install_serverc:
installer -verbose -dumplog -pkg \ installer -verbose -dumplog -pkg \
`pwd`/$(ROOT)/gen/firebird/Firebird-CS-$(FB_INST_VERS).pkg -target / `pwd`/$(ROOT)/gen/firebird/Firebird-CS-$(FB_INST_VERS).$*FB_MINOR_VERS)-$(FB_PLATFORM)..pkg -target /
darwin_installer_common: force darwin_installer_common: force
$(QUIET_ECHO) "Building Firebird Installer..." $(QUIET_ECHO) "Building Firebird Installer..."

2
builds/install/arch-specific/darwin/buildno.c Normal file
View File

@ -0,0 +1,2 @@
#include "../../../../src/jrd/license.h"
FB_BUILD_NO

2
builds/install/arch-specific/darwin/fullvers.c
View File

@ -1,2 +1,2 @@
#include "jrd/license.h" #include "../../../../src/jrd/license.h"
FB_VERSION FB_VERSION

105
builds/install/arch-specific/darwin/install-script
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# #
# $Id: install-script,v 1.2 2007-03-09 10:32:41 paulbeach Exp $ # $Id: install-script,v 1.3 2007-06-11 14:21:13 paulbeach Exp $
# #
# Script args: # Script args:
# $0: full path to script # $0: full path to script
@ -9,11 +9,12 @@
# $3: ????? Path to install Volume???? # $3: ????? Path to install Volume????
# $4: ????? # $4: ?????
FB_FW="$2/Firebird.framework" FB_FW="/Library/Frameworks/Firebird.framework"
FB_RES="$FB_FW/Versions/A/Resources" FB_RES="$FB_FW/Versions/A/Resources"
INST_RES="$FB_RES/installer_files" INST_RES="$FB_RES/installer_files"
# Install and start sysv semaphores # Install and start sysv semaphores
echo "Install and start sysv semaphores"
if test `uname -r | sed -e 's/\.[0-9]*//g'` -lt 6; then if test `uname -r | sed -e 's/\.[0-9]*//g'` -lt 6; then
if [ -e "SysV Semaphores" ]; then if [ -e "SysV Semaphores" ]; then
mkdir -p /Library/StartupItems mkdir -p /Library/StartupItems
@ -28,6 +29,7 @@ fi
# #
# #
# Start with the service entry # Start with the service entry
echo "Start with the service entry"
if niutil -list . /services/gds_db 2&>1 /dev/null ; then if niutil -list . /services/gds_db 2&>1 /dev/null ; then
echo -n echo -n
else else
@ -38,6 +40,7 @@ fi
# Now for the group. If the firebird group already exists, remember the # Now for the group. If the firebird group already exists, remember the
# id if we need it to create the firebird user # id if we need it to create the firebird user
echo "Create the Firebird group"
if niutil -list . /groups/firebird 2&>1 /dev/null; then if niutil -list . /groups/firebird 2&>1 /dev/null; then
NEW_GID=`niutil -readprop . /groups/firebird gid` NEW_GID=`niutil -readprop . /groups/firebird gid`
else else
@ -49,6 +52,7 @@ else
fi fi
# Now create the firebird user # Now create the firebird user
echo "Create the Firebird user"
if niutil -list . /users/firebird 2&>1 /dev/null; then if niutil -list . /users/firebird 2&>1 /dev/null; then
echo -n echo -n
else else
@ -64,31 +68,19 @@ else
niutil -createprop . /users/firebird realname "Firebird SQL Database" niutil -createprop . /users/firebird realname "Firebird SQL Database"
fi fi
# set the permissions correctly
if [ -f "$FB_FW/Versions/A/Resources/.SuperServer" ]; then
echo -n
#else
$FB_FW/Resources/bin/fbmgr.bin -shut -user sysdba -password masterkey
rm -rf /System/Library/StartupItems/Firebird
fi
# Shutdown any existing servers # Shutdown any existing servers
echo "Shutdown any existing servers"
if [ -x /sbin/service ]; then if [ -x /sbin/service ]; then
service firebird stop service firebird stop
fi fi
# Install the framework # Install the framework
# mkdir -p /Library/Frameworks echo "Install the framework"
# cp -r Firebird.framework $FB_FW
#ln -s ../../bin $FB_FW/Versions/A/Resources/English.lproj/var/bin; \
#ln -s Versions/Current/Headers $FB_FW/Headers
#ln -s Versions/Current/Resources $FB_FW/Resources
#ln -s Versions/Current/Firebird $FB_FW/Firebird
#ln -s A $FB_FW/Versions/Current
chown -R firebird "$FB_FW" chown -R firebird "$FB_FW"
chgrp -R firebird "$FB_FW" chgrp -R firebird "$FB_FW"
# set the permissions correctly # set the permissions correctly
echo "Set the permissions correctly"
if [ -f "$FB_FW/Versions/A/Resources/.SuperServer" ]; then if [ -f "$FB_FW/Versions/A/Resources/.SuperServer" ]; then
chmod 777 "$FB_FW/Resources/English.lproj/var" chmod 777 "$FB_FW/Resources/English.lproj/var"
chmod 777 "$FB_FW/Resources/English.lproj/var/security2.fdb" chmod 777 "$FB_FW/Resources/English.lproj/var/security2.fdb"
@ -98,36 +90,30 @@ else
chmod 777 "$FB_FW/Resources/English.lproj/var/security2.fdb" chmod 777 "$FB_FW/Resources/English.lproj/var/security2.fdb"
chmod 777 "$FB_FW/Resources/English.lproj/var/help/help.fdb" chmod 777 "$FB_FW/Resources/English.lproj/var/help/help.fdb"
# chmod a+s "$FB_FW/Resources/bin/gds_drop" chmod a+s "$FB_FW/Resources/bin/gds_drop"
chmod a+s "$FB_FW/Resources/bin/fb_lock_mgr" chmod a+s "$FB_FW/Resources/bin/fb_lock_mgr"
chmod a+s "$FB_FW/Resources/bin/fb_inet_server" chmod a+s "$FB_FW/Resources/bin/fb_inet_server"
# chown root "$FB_FW/Resources/bin/gds_drop" chown root "$FB_FW/Resources/bin/gds_drop"
chown root "$FB_FW/Resources/bin/fb_lock_mgr" chown root "$FB_FW/Resources/bin/fb_lock_mgr"
chown root "$FB_FW/Resources/bin/fb_inet_server" chown root "$FB_FW/Resources/bin/fb_inet_server"
fi fi
# Install the startup item # Install the startup item
echo "Install the startup item"
if [ -f "$FB_FW/Versions/A/Resources/.SuperServer" ]; then if [ -f "$FB_FW/Versions/A/Resources/.SuperServer" ]; then
if [ -e "$INST_RES/Firebird.startup" ]; then if [ -e "$INST_RES/Firebird.startup" ]; then
# mkdir -p /Library/StartupItems rm -rf /Library/StartupItems/Firebird
rm -rf /System/Library/StartupItems/Firebird cp -r "$INST_RES/Firebird" /Library/StartupItems/Firebird
cp -r "$INST_RES/Firebird.startup" /System/Library/StartupItems/Firebird
fi fi
else else
rm -rf /System/Library/StartupItems/Firebird rm -rf /Library/StartupItems/Firebird
fi fi
# Install FBConsole
#if [ -e FBConsole.app ]; then
# mkdir -p /Applications
# cp -r FBConsole.app /Applications
#fi
# #
# Add gds_db to the services file, if available # Add gds_db to the services file, if available
# #
echo "Add gds_db to the services file"
HUPNEEDED='n' # Relevant to Classic only HUPNEEDED='n' # Relevant to Classic only
if [ -f /etc/services ]; then if [ -f /etc/services ]; then
grep -s gds_db /etc/services > /dev/null 2>&1 grep -s gds_db /etc/services > /dev/null 2>&1
@ -144,7 +130,8 @@ if [ -f /etc/inetd.conf ]; then
cp /etc/inetd.conf /etc/inetd.conf.fbsave cp /etc/inetd.conf /etc/inetd.conf.fbsave
fi fi
# Remove all traces of CS first # Remove all traces of Classic first
echo "Remove all traces of Classic first"
if [ -f /etc/inetd.conf ]; then if [ -f /etc/inetd.conf ]; then
grep -s gds_db /etc/inetd.conf > /dev/null 2>&1 grep -s gds_db /etc/inetd.conf > /dev/null 2>&1
if test $? != 0 ; then if test $? != 0 ; then
@ -159,12 +146,30 @@ if [ -f /etc/xinetd.d/firebird ]; then
HUPNEEDED='y' HUPNEEDED='y'
fi fi
# Install ourselves in the correct place # Install ourselves in the correct place - SuperServer
echo "Install ourselves in the correct place"
if [ -f "$FB_FW/Versions/A/Resources/.SuperServer" ]; then if [ -f "$FB_FW/Versions/A/Resources/.SuperServer" ]; then
cp -r $1/Contents/Resources/StartupItem /System/Library/StartupItems/Firebird cp -r $1/Contents/Resources/StartupItem /Library/StartupItems/Firebird
fi
# Install ourselves in the correct place - Classic
# inetd.d - older versions of MacOS
if [ -f //var/run/inted.pid -a -d /etc/inetd.d ]; then
if [ -f /etc/inetd.conf ]; then
echo "gds_db stream tcp nowait root $FB_FW/Resources/bin/fb_inet_server fb_inet_server" > /etc/.fb.inetd.conf.entry
cat /etc/inetd.conf /etc/.fb.inetd.conf.entry > /etc/.interbase.temp.install.inetd.conf
mv /etc/.interbase.temp.install.inetd.conf /etc/inetd.conf
rm -f /etc/.fb.inetd.conf.entry
HUPNEEDED='y'
fi
fi
# xinetd.d - Classic default
if [ -f "$FB_FW/Versions/A/Resources/.SuperServer" ]; then
echo -n
else else
if [ -f /var/run/xinetd.pid -a -d /etc/xinetd.d ]; then cat > /etc/xinetd.d/firebird <<EOF
cat > /etc/xinetd.d/firebird <<EOF
service gds_db service gds_db
{ {
disable = no disable = no
@ -172,25 +177,19 @@ service gds_db
wait = no wait = no
user = firebird user = firebird
EOF EOF
echo "server = $FB_RES/bin/fb_inet_server" >> /etc/xinetd.d/firebird echo "server = $FB_FW/Resources/bin/fb_inet_server" >> /etc/xinetd.d/firebird
cat >> /etc/xinetd.d/firebird << EOF cat >> /etc/xinetd.d/firebird << EOF
groups = yes groups = yes
} }
EOF EOF
HUPNEEDED='y' HUPNEEDED='y'
else
if [ -f /etc/inetd.conf ]; then
echo "gds_db stream tcp nowait root $FB_FW/Resources/bin/fb_inet_server fb_inet_server" > /etc/.fb.inetd.conf.entry
cat /etc/inetd.conf /etc/.fb.inetd.conf.entry > /etc/.interbase.temp.install.inetd.conf
mv /etc/.interbase.temp.install.inetd.conf /etc/inetd.conf
rm -f /etc/.fb.inetd.conf.entry
HUPNEEDED='y'
fi
fi
fi fi
# Placeholder for launchd
# Make sure the hosts.equiv files are set correctly # Make sure the hosts.equiv files are set correctly
echo "Make sure hosts.equiv files are set correctly"
cp /etc/hosts.equiv /etc/hosts.equiv.fbsave cp /etc/hosts.equiv /etc/hosts.equiv.fbsave
if grep -x "localhost" /etc/hosts.equiv > /dev/null; then if grep -x "localhost" /etc/hosts.equiv > /dev/null; then
echo -n echo -n
@ -203,15 +202,15 @@ else
echo "localhost.localdomain" >> /etc/hosts.equiv echo "localhost.localdomain" >> /etc/hosts.equiv
fi fi
# Install the saved security database, if any # Install the saved security database, if any
if test -f /tmp/fb-security-database-update.fdb; then echo "Install the saved security database"
mv -f /tmp/fb-security-database-update.fdb "$FB_RES/English.lproj/var/security2.fdb" if test -f /tmp/fb-security-database-update2.fdb; then
rm -f /tmp/fb-security-database-update.fdb mv -f /tmp/fb-security-database-update2.fdb "$FB_RES/English.lproj/var/security2.fdb"
rm -f /tmp/fb-security-database-update2.fdb
fi fi
# Tell inetd/xinetd to reload their configuration files. # Tell inetd/xinetd to reload their configuration files.
echo "Tell inetd/xinetd to reload configuration files"
if [ "$HUPNEEDED" = 'y' ] if [ "$HUPNEEDED" = 'y' ]
then then
#INETPID=`ps -axe | grep inetd | awk '{print $1}'` #INETPID=`ps -axe | grep inetd | awk '{print $1}'`
@ -225,10 +224,8 @@ then
fi fi
fi fi
###
# And last but not least, start the server # And last but not least, start the server
if [ -f "$FB_FW/Versions/A/Resources/.SuperServer" ]; then if [ -f "$FB_FW/Versions/A/Resources/.SuperServer" ]; then
#echo Starting Firebird Database Server /Library/StartupItems/Firebird/Firebird start
/System/Library/StartupItems/Firebird/Firebird start
fi fi

21
builds/install/arch-specific/darwin/preupgrade-script
View File

@ -7,21 +7,24 @@
# $3: ????? Path to install Volume???? # $3: ????? Path to install Volume????
# $4: ????? # $4: ?????
FB_FW="/Library/Frameworks/Firebird.framework"
if test -f "$2/Firebird.framework/Versions/A/Resources/English.lproj/var/isc4.gdb"; then if test -f "$FB_FW/Versions/A/Resources/English.lproj/var/isc4.gdb"; then
mv -f "$2/Firebird.framework/Versions/A/Resources/English.lproj/var/isc4.gdb" /tmp/fb-security-database-update.fdb mv -f "$FB_FW/Versions/A/Resources/English.lproj/var/isc4.gdb" /tmp/fb-security-database-update.fdb
fi fi
if test -f "$2/Firebird.framework/Versions/A/Resources/English.lproj/var/isc4.fdb"; then if test -f "$FB_FW/Versions/A/Resources/English.lproj/var/isc4.fdb"; then
mv -f "$2/Firebird.framework/Versions/A/Resources/English.lproj/var/isc4.fdb" /tmp/fb-security-database-update.fdb mv -f "$FB_FW/Versions/A/Resources/English.lproj/var/isc4.fdb" /tmp/fb-security-database-update.fdb
fi fi
if test -f "$2/Firebird.framework/Versions/A/Resources/English.lproj/var/security.fdb"; then if test -f "$FB_FW/Versions/A/Resources/English.lproj/var/security.fdb"; then
mv -f "$2/Firebird.framework/Versions/A/Resources/English.lproj/var/security.fdb" /tmp/fb-security-database-update.fdb mv -f "$FB_FW/Versions/A/Resources/English.lproj/var/security.fdb" /tmp/fb-security-database-update.fdb
fi
if test -f "$FB_FW/Versions/A/Resources/English.lproj/var/security2.fdb"; then
mv -f "$FB_FW/Versions/A/Resources/English.lproj/var/security2.fdb" /tmp/fb-security-database-update2.fdb
fi fi
if [ -f /Library/StartupItems/Firebird/Firebird ]; then if [ -f /Library/StartupItems/Firebird/Firebird ]; then
/Library/StartupItems/Firebird/Firebird stop /Library/StartupItems/Firebird/Firebird stop
fi fi
rm -rf "$2/Firebird.framework"
rm -rf "$FB_FW/Firebird.framework"
rm -rf /Library/StartupItems/Firebird rm -rf /Library/StartupItems/Firebird
exit 0 exit 0

2
builds/install/arch-specific/darwin/revno.c Normal file
View File

@ -0,0 +1,2 @@
#include "../../../../src/jrd/license.h"
FB_REV_NO

6
builds/posix/Makefile.in.firebird
View File

@ -338,7 +338,7 @@ otherfiles: misc_files
.PHONY: embed_gpre embed_util .PHONY: embed_gpre embed_util
classic_targets: $(PLAT_CLASSIC_PRE_TARGET) libfbembed inet_server embed_gfix embed_gbak embed_isql \ classic_targets: $(PLAT_CLASSIC_PRE_TARGET) libfbembed inet_server embed_gfix embed_gbak embed_isql \
embed_gpre embed_util embed_gdef embed_qli embed_fbudf libfbclient embed_gpre embed_util embed_gdef embed_qli embed_fbudf libfbclient $(PLAT_CLASSIC_POST_TARGET)
libfbembed: libfbembed:
$(MAKE) -f $(GEN_ROOT)/Makefile.libfbembed $@ $(MAKE) -f $(GEN_ROOT)/Makefile.libfbembed $@
@ -375,8 +375,8 @@ embed_fbudf:
.PHONY: fbserver .PHONY: fbserver
.PHONY: libfbclient client_gfix client_gbak client_isql client_gpre client_util client_fbudf .PHONY: libfbclient client_gfix client_gbak client_isql client_gpre client_util client_fbudf
super_targets: fbserver libfbclient client_gfix client_gbak client_gsec\ super_targets: $(PLAT_SUPER_PRE_TARGET) fbserver libfbclient client_gfix client_gbak client_gsec\
client_isql client_gpre client_util client_fbudf client_gdef client_qli client_isql client_gpre client_util client_fbudf client_gdef client_qli $(PLAT_SUPER_POST_TRAGET)
fbserver: fbserver:
$(MAKE) -f $(GEN_ROOT)/Makefile.fbserver $@ $(MAKE) -f $(GEN_ROOT)/Makefile.fbserver $@

2
builds/posix/Makefile.in.libfbclient
View File

@ -111,7 +111,7 @@ endif
$(LIBFBCLIENT_SO): $(FBCLIENT_Objects) $(LIBFBCLIENT_SO): $(FBCLIENT_Objects)
ifeq ($(PLATFORM),DARWIN) ifeq ($(PLATFORM),DARWIN)
$(LIB_LINK) $(LINK_FIREBIRD_SYMBOLS) $(LIB_LINK_OPTIONS) $(LIB_LINK_IMPLIB) \ $(LIB_LINK) $(LINK_FIREBIRD_CLIENT_SYMBOLS) $(LIB_LINK_OPTIONS) $(LIB_LINK_IMPLIB) \
$(LIB_CLIENT_LINK_OPTIONS) $(LIB_LINK_SONAME) \ $(LIB_CLIENT_LINK_OPTIONS) $(LIB_LINK_SONAME) \
-o $@ $^ $(SO_LINK_LIBS) @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ -o $@ $^ $(SO_LINK_LIBS) @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
else else

2
builds/posix/Makefile.in.libfbembed
View File

@ -63,7 +63,7 @@ libfbembed : $(LIBFBEMBED_SONAME)
$(LIBFBEMBED_SO): $(LIBFBEMBED_Objects) $(SERVER_Objects) $(COMMON_Objects) $(LIBFBEMBED_SO): $(LIBFBEMBED_Objects) $(SERVER_Objects) $(COMMON_Objects)
ifeq ($(PLATFORM),DARWIN) ifeq ($(PLATFORM),DARWIN)
$(LIB_LINK) $(LINK_FIREBIRD_SYMBOLS) $(LIB_LINK_OPTIONS) \ $(LIB_LINK) $(LINK_FIREBIRD_EMBED_SYMBOLS) $(LIB_LINK_OPTIONS) \
$(LIB_EMBED_LINK_OPTIONS) $(LIB_LINK_SONAME) \ $(LIB_EMBED_LINK_OPTIONS) $(LIB_LINK_SONAME) \
-o $@ $^ -L$(LIB) $(LIB_GUI) $(SO_LINK_LIBS) $(ICU_LIBS) -o $@ $^ -L$(LIB) $(LIB_GUI) $(SO_LINK_LIBS) $(ICU_LIBS)
else else

2
builds/posix/Makefile.in.static.gbak
View File

@ -58,8 +58,6 @@ gbak_static : $(GBAK_STATIC)
$(GBAK_STATIC) : $(GBAKSTATIC_Objects) $(COMMON_Objects) $(LIBFBSTATIC_A) $(GBAK_STATIC) : $(GBAKSTATIC_Objects) $(COMMON_Objects) $(LIBFBSTATIC_A)
$(CXX) $(LINK_OPTS) $^ -o $@ -L$(LIB) $(LINK_LIBS) $(ICU_LIBS) $(CXX) $(LINK_OPTS) $^ -o $@ -L$(LIB) $(LINK_LIBS) $(ICU_LIBS)
# Darwin may need this link as well
#$(COREFOUNDATION_LINK)
include $(ROOT)/gen/make.shared.targets include $(ROOT)/gen/make.shared.targets

24
builds/posix/fbintl.darwin.vers Normal file
View File

@ -0,0 +1,24 @@
#
# Version script to hide private symbols from Firebird libraries
# This version to support the MacOSX Linker
#
# The contents of this file are subject to the Initial
# Developer's 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.firebirdsql.org
#
# Software distributed under the License is distributed AS IS,
# WITHOUT WARRANTY OF ANY KIND, either express or implied.
# See the License for the specific language governing rights
# and limitations under the License.
#
# This code was created by Paul Beach, IBPhoenix
# based on code created by Nickolay Samofatov
# for the Firebird Open Source RDBMS project.
#
# All Rights Reserved.
# Contributor(s): ______________________________________.
_LD_lookup_charset
_LD_lookup_texttype

338
builds/posix/firebird.darwin.client.vers Normal file
View File

@ -0,0 +1,338 @@
#
# Version script to hide private symbols from Firebird libraries
# This version to support the MacOSX Linker
#
# The contents of this file are subject to the Initial
# Developers 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.firebirdsql.org/
#
# 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.
#
# This Code was created by Paul Beach, IBPhoenix
# based on original code created by Inprise and Nickolay Somofatov
# based on firebird.vers (Nickolay Samofatov) and fbclient.def (Inprise)
#
# All Rights Reserved.
# Contributor(s): ______________________________________.
#-------------------
# PRIVATE INTERFACE
#-------------------
_gds__alloc
_gds__attach_database
_gds__blob_info
_gds__blob_size
_gds__cancel_blob
_gds__cancel_events
_gds__close
_gds__close_blob
_gds__commit_retaining
_gds__commit_transaction
_gds__compile_request
_gds__compile_request2
_gds__create_blob
_gds__create_blob2
_gds__create_database
_gds__database_cleanup
_gds__database_info
_gds__ddl
_gds__declare
_gds__decode
_gds__decode_date
_gds__describe
_gds__describe_bind
_gds__detach_database
_gds__disable_subsystem
_gds__dsql_finish
_gds__edit
_gds__enable_subsystem
_gds__encode
_gds__encode_date
_gds__event_block
_gds__event_counts
_gds__event_wait
_gds__execute
_gds__execute_immediate
_gds__fetch
_gds__free
_gds__ftof
_gds__get_prefix
_gds__get_segment
_gds__get_slice
_gds__interprete
_gds__log
_gds__log_status
_gds__map_blobs
_gds__msg_close
_gds__msg_format
_gds__msg_lookup
_gds__msg_open
_gds__msg_put
_gds__open
_gds__open_blob
_gds__open_blob2
_gds__parse_bpb
_gds__prefix
_gds__prefix_lock
_gds__prefix_msg
_gds__prepare
_gds__prepare_transaction
_gds__prepare_transaction2
_gds__print_blr
_gds__print_status
_gds__put_error
_gds__put_segment
_gds__put_slice
_gds__qtoq
_gds__que_events
_gds__receive
_gds__reconnect_transaction
_gds__register_cleanup
_gds__release_request
_gds__request_info
_gds__rollback_transaction
_gds__seek_blob
_gds__send
_gds__set_debug
_gds__sqlcode
_gds__start_and_send
_gds__start_multiple
_gds__start_request
_gds__start_transaction
_gds__temp_file
_gds__thread_enable
_gds__thread_enter
_gds__thread_exit
_gds__thread_start
_gds__to_sqlda
_gds__transaction_cleanup
_gds__transaction_info
_gds__unregister_cleanup
_gds__unwind_request
_gds__validate_lib_path
_gds__vax_integer
_gds__version
_gds__vtof
_gds__vtov
_gds__default_printer
_gds__alloc_debug
_gds_alloc_flag_unfreed
_gds_alloc_report
_perf_format
_perf_get_info
_perf_report
#----------------------------
# PUBLIC INTERFACE, i.e. API
#----------------------------
# Array functions
_isc_array_gen_sdl
_isc_array_get_slice
_isc_array_lookup_bounds
_isc_array_lookup_desc
_isc_array_put_slice
_isc_array_set_desc
_isc_get_slice
_isc_put_slice
# BLOB functions
_isc_blob_default_desc
_isc_blob_gen_bpb
_isc_blob_info
_isc_blob_lookup_desc
_isc_blob_set_desc
_isc_cancel_blob
_isc_close_blob
_isc_create_blob
_isc_create_blob2
_isc_get_segment
_isc_open_blob
_isc_open_blob2
_isc_put_segment
# Database functions
_isc_attach_database
_isc_create_database
_isc_database_info
_isc_detach_database
_isc_drop_database
_isc_expand_dpb
_isc_modify_dpb
_isc_version
_isc_get_client_major_version
_isc_get_client_minor_version
_isc_get_client_version
# Conversion functions
_isc_decode_date
_isc_decode_sql_date
_isc_decode_sql_time
_isc_decode_timestamp
_isc_encode_date
_isc_encode_sql_date
_isc_encode_sql_time
_isc_encode_timestamp
_isc_portable_integer
_isc_vax_integer
# DSQL functions
_isc_dsql_allocate_statement
_isc_dsql_alloc_statement2
_isc_dsql_describe
_isc_dsql_describe_bind
_isc_dsql_execute
_isc_dsql_execute2
_isc_dsql_execute_m
_isc_dsql_execute2_m
_isc_dsql_execute_immediate
_isc_dsql_exec_immed2
_isc_dsql_execute_immediate_m
_isc_dsql_exec_immed2_m
_isc_dsql_exec_immed3_m
_isc_dsql_fetch
_isc_dsql_fetch_a
_isc_dsql_fetch_m
_isc_dsql_finish
_isc_dsql_free_statement
_isc_dsql_insert
_isc_dsql_insert_m
_isc_dsql_prepare
_isc_dsql_prepare_m
_isc_dsql_release
_isc_dsql_set_cursor_name
_isc_dsql_sql_info
# ESQL functions
_isc_embed_dsql_close
_isc_embed_dsql_declare
_isc_embed_dsql_describe
_isc_embed_dsql_describe_bind
_isc_embed_dsql_execute
_isc_embed_dsql_execute2
_isc_embed_dsql_execute_immed
_isc_embed_dsql_exec_immed2
_isc_embed_dsql_fetch
_isc_embed_dsql_fetch_a
_isc_embed_dsql_insert
_isc_embed_dsql_open
_isc_embed_dsql_open2
_isc_embed_dsql_prepare
_isc_embed_dsql_release
# Error-handling functions
_isc_interprete
_fb_interpret
_isc_print_sqlerror
_isc_print_status
_isc_sqlcode
_isc_sql_interprete
# Event functions
_isc_cancel_events
_isc_event_block
_isc_event_counts
_isc_que_events
_isc_wait_for_event
# Security functions
_isc_add_user
_isc_delete_user
_isc_modify_user
# Services functions
_isc_service_attach
_isc_service_detach
_isc_service_query
_isc_service_start
# Transaction control functions
_isc_commit_retaining
_isc_commit_transaction
_isc_prepare_transaction
_isc_prepare_transaction2
_isc_rollback_retaining
_isc_rollback_transaction
_isc_start_multiple
_isc_start_transaction
_isc_transaction_info
# Other functions
_isc_compile_request
_isc_compile_request2
_isc_ddl
_isc_prepare
_isc_receive
_isc_reconnect_transaction
_isc_release_request
_isc_request_info
_isc_seek_blob
_isc_send
_isc_start_and_send
_isc_start_request
_isc_transact_request
_isc_unwind_request
# Other SQL functions
_isc_close
_isc_declare
_isc_describe
_isc_describe_bind
_isc_execute
_isc_execute_immediate
_isc_fetch
_isc_fetch_a
_isc_open
# Other BLOB functions
_BLOB_close
_BLOB_display
_BLOB_dump
_BLOB_edit
_BLOB_get
_BLOB_load
_BLOB_open
_BLOB_put
_BLOB_text_dump
_BLOB_text_load
_Bopen
# Other misc functions
_isc_ftof
_isc_free
_isc_print_blr
_isc_qtoq
_isc_set_debug
_isc_to_sqlda
_isc_vtof
_isc_vtov
#-----------------
# OTHER FUNCTIONS
#-----------------
_CVT_move
_KEYWORD_stringIsAToken
_KEYWORD_getTokens

341
builds/posix/firebird.darwin.embed.vers Normal file
View File

@ -0,0 +1,341 @@
#
# Version script to hide private symbols from Firebird libraries
# This version to support the MacOSX Linker
#
# The contents of this file are subject to the Initial
# Developers 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.firebirdsql.org/
#
# 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.
#
# This Code was created by Paul Beach, IBPhoenix
# based on original code created by Inprise and Nickolay Somofatov
# based on firebird.vers (Nickolay Samofatov) and fbclient.def (Inprise)
#
# All Rights Reserved.
# Contributor(s): ______________________________________.
_server_main
#-------------------
# PRIVATE INTERFACE
#-------------------
_gds__alloc
_gds__attach_database
_gds__blob_info
_gds__blob_size
_gds__cancel_blob
_gds__cancel_events
_gds__close
_gds__close_blob
_gds__commit_retaining
_gds__commit_transaction
_gds__compile_request
_gds__compile_request2
_gds__create_blob
_gds__create_blob2
_gds__create_database
_gds__database_cleanup
_gds__database_info
_gds__ddl
_gds__declare
_gds__decode
_gds__decode_date
_gds__describe
_gds__describe_bind
_gds__detach_database
_gds__disable_subsystem
_gds__dsql_finish
_gds__edit
_gds__enable_subsystem
_gds__encode
_gds__encode_date
_gds__event_block
_gds__event_counts
_gds__event_wait
_gds__execute
_gds__execute_immediate
_gds__fetch
_gds__free
_gds__ftof
_gds__get_prefix
_gds__get_segment
_gds__get_slice
_gds__interprete
_gds__log
_gds__log_status
_gds__map_blobs
_gds__msg_close
_gds__msg_format
_gds__msg_lookup
_gds__msg_open
_gds__msg_put
_gds__open
_gds__open_blob
_gds__open_blob2
_gds__parse_bpb
_gds__prefix
_gds__prefix_lock
_gds__prefix_msg
_gds__prepare
_gds__prepare_transaction
_gds__prepare_transaction2
_gds__print_blr
_gds__print_status
_gds__put_error
_gds__put_segment
_gds__put_slice
_gds__qtoq
_gds__que_events
_gds__receive
_gds__reconnect_transaction
_gds__register_cleanup
_gds__release_request
_gds__request_info
_gds__rollback_transaction
_gds__seek_blob
_gds__send
_gds__set_debug
_gds__sqlcode
_gds__start_and_send
_gds__start_multiple
_gds__start_request
_gds__start_transaction
_gds__temp_file
_gds__thread_enable
_gds__thread_enter
_gds__thread_exit
_gds__thread_start
_gds__to_sqlda
_gds__transaction_cleanup
_gds__transaction_info
_gds__unregister_cleanup
_gds__unwind_request
_gds__validate_lib_path
_gds__vax_integer
_gds__version
_gds__vtof
_gds__vtov
_gds__default_printer
_gds__alloc_debug
_gds_alloc_flag_unfreed
_gds_alloc_report
_perf_format
_perf_get_info
_perf_report
#----------------------------
# PUBLIC INTERFACE, i.e. API
#----------------------------
# Array functions
_isc_array_gen_sdl
_isc_array_get_slice
_isc_array_lookup_bounds
_isc_array_lookup_desc
_isc_array_put_slice
_isc_array_set_desc
_isc_get_slice
_isc_put_slice
# BLOB functions
_isc_blob_default_desc
_isc_blob_gen_bpb
_isc_blob_info
_isc_blob_lookup_desc
_isc_blob_set_desc
_isc_cancel_blob
_isc_close_blob
_isc_create_blob
_isc_create_blob2
_isc_get_segment
_isc_open_blob
_isc_open_blob2
_isc_put_segment
# Database functions
_isc_attach_database
_isc_create_database
_isc_database_info
_isc_detach_database
_isc_drop_database
_isc_expand_dpb
_isc_modify_dpb
_isc_version
_isc_get_client_major_version
_isc_get_client_minor_version
_isc_get_client_version
# Conversion functions
_isc_decode_date
_isc_decode_sql_date
_isc_decode_sql_time
_isc_decode_timestamp
_isc_encode_date
_isc_encode_sql_date
_isc_encode_sql_time
_isc_encode_timestamp
_isc_portable_integer
_isc_vax_integer
# DSQL functions
_isc_dsql_allocate_statement
_isc_dsql_alloc_statement2
_isc_dsql_describe
_isc_dsql_describe_bind
_isc_dsql_execute
_isc_dsql_execute2
_isc_dsql_execute_m
_isc_dsql_execute2_m
_isc_dsql_execute_immediate
_isc_dsql_exec_immed2
_isc_dsql_execute_immediate_m
_isc_dsql_exec_immed2_m
_isc_dsql_exec_immed3_m
_isc_dsql_fetch
_isc_dsql_fetch_a
_isc_dsql_fetch_m
_isc_dsql_finish
_isc_dsql_free_statement
_isc_dsql_insert
_isc_dsql_insert_m
_isc_dsql_prepare
_isc_dsql_prepare_m
_isc_dsql_release
_isc_dsql_set_cursor_name
_isc_dsql_sql_info
# ESQL functions
_isc_embed_dsql_close
_isc_embed_dsql_declare
_isc_embed_dsql_describe
_isc_embed_dsql_describe_bind
_isc_embed_dsql_execute
_isc_embed_dsql_execute2
_isc_embed_dsql_execute_immed
_isc_embed_dsql_exec_immed2
_isc_embed_dsql_fetch
_isc_embed_dsql_fetch_a
_isc_embed_dsql_insert
_isc_embed_dsql_open
_isc_embed_dsql_open2
_isc_embed_dsql_prepare
_isc_embed_dsql_release
# Error-handling functions
_isc_interprete
_fb_interpret
_isc_print_sqlerror
_isc_print_status
_isc_sqlcode
_isc_sql_interprete
# Event functions
_isc_cancel_events
_isc_event_block
_isc_event_counts
_isc_que_events
_isc_wait_for_event
# Security functions
_isc_add_user
_isc_delete_user
_isc_modify_user
# Services functions
_isc_service_attach
_isc_service_detach
_isc_service_query
_isc_service_start
# Transaction control functions
_isc_commit_retaining
_isc_commit_transaction
_isc_prepare_transaction
_isc_prepare_transaction2
_isc_rollback_retaining
_isc_rollback_transaction
_isc_start_multiple
_isc_start_transaction
_isc_transaction_info
# Other functions
_isc_compile_request
_isc_compile_request2
_isc_ddl
_isc_prepare
_isc_receive
_isc_reconnect_transaction
_isc_release_request
_isc_request_info
_isc_seek_blob
_isc_send
_isc_start_and_send
_isc_start_request
_isc_transact_request
_isc_unwind_request
# Other SQL functions
_isc_close
_isc_declare
_isc_describe
_isc_describe_bind
_isc_execute
_isc_execute_immediate
_isc_fetch
_isc_fetch_a
_isc_open
# Other BLOB functions
_BLOB_close
_BLOB_display
_BLOB_dump
_BLOB_edit
_BLOB_get
_BLOB_load
_BLOB_open
_BLOB_put
_BLOB_text_dump
_BLOB_text_load
_Bopen
# Other misc functions
_isc_ftof
_isc_free
_isc_print_blr
_isc_qtoq
_isc_set_debug
_isc_to_sqlda
_isc_vtof
_isc_vtov
#-----------------
# OTHER FUNCTIONS
#-----------------
_CVT_move
_KEYWORD_stringIsAToken
_KEYWORD_getTokens

4
builds/posix/make.defaults
View File

@ -88,7 +88,11 @@ IsProdTypeBuild = @PROD_BUILD_FLG@
# release with debug and optimization # release with debug and optimization
ifeq ($(PLATFORM),DARWIN)
FirebirdInstallPrefix =
else
FirebirdInstallPrefix = @prefix@ FirebirdInstallPrefix = @prefix@
endif
CpuType=@CPU_TYPE@ CpuType=@CPU_TYPE@
PLATFORM=@PLATFORM@ PLATFORM=@PLATFORM@

36
builds/posix/postfix.darwin
View File

@ -15,7 +15,7 @@
# All Rights Reserved. # All Rights Reserved.
# Contributor(s): ______________________________________. # Contributor(s): ______________________________________.
# Start of file prefix.darwin: $(VERSION) DARWIN # Start of file prefix.darwin: $(VERSION) DARWIN
#$Id: postfix.darwin,v 1.2 2007-03-09 10:32:48 paulbeach Exp $ #$Id: postfix.darwin,v 1.3 2007-06-11 14:21:17 paulbeach Exp $
# 2 Oct 2002, Nickolay Samofatov - Major Cleanup # 2 Oct 2002, Nickolay Samofatov - Major Cleanup
@ -40,10 +40,8 @@ darwin_setup_framework:
ln -s ../../../../../../security2.fdb \ ln -s ../../../../../../security2.fdb \
$(FB_FW)/Resources/English.lproj/var/security2.fdb $(FB_FW)/Resources/English.lproj/var/security2.fdb
ln -s ../../../../../../help $(FB_FW)/Resources/English.lproj/var/help ln -s ../../../../../../help $(FB_FW)/Resources/English.lproj/var/help
#sed "s/__VERSION__/`$(VERS_UTIL)`/g" source/firebird/bellardo/darwin/FrameworkInfo.plist > source/interbase/Firebird.framework/Resources/Info.plist
darwin_finish_cs_framework: FB_FW = ../gen/firebird/frameworks/FirebirdCS.framework darwin_finish_cs_framework: FB_FW = ../gen/firebird/frameworks/FirebirdCS.framework
#darwin_finish_cs_framework: extlib
darwin_finish_cs_framework: darwin_finish_cs_framework:
-$(RM) -rf $(FB_FW) -$(RM) -rf $(FB_FW)
mkdir -p $(FB_FW)/Versions/A/Resources/English.lproj/var mkdir -p $(FB_FW)/Versions/A/Resources/English.lproj/var
@ -71,9 +69,8 @@ darwin_finish_cs_framework:
cp -r ../gen/firebird/help $(FB_FW)/Resources/English.lproj/var/help cp -r ../gen/firebird/help $(FB_FW)/Resources/English.lproj/var/help
cp ../gen/firebird/security2.fdb $(FB_FW)/Resources/English.lproj/var cp ../gen/firebird/security2.fdb $(FB_FW)/Resources/English.lproj/var
mkdir -p $(FB_FW)/Resources/doc mkdir -p $(FB_FW)/Resources/doc
ln -s ../../doc $(FB_FW)/Resources/English.lproj/var/doc ln -s ../../doc $(FB_FW)/Resources/doc
cp -r ../doc $(FB_FW)/Resources cp -r ../doc $(FB_FW)/Resources
cp ../gen/firebird/security2.fdb $(FB_FW)/Resources/English.lproj/var
mkdir -p $(FB_FW)/Resources/bin mkdir -p $(FB_FW)/Resources/bin
ln -s ../../bin $(FB_FW)/Resources/English.lproj/var/bin ln -s ../../bin $(FB_FW)/Resources/English.lproj/var/bin
cp ../gen/firebird/bin/fb_inet_server $(FB_FW)/Resources/bin cp ../gen/firebird/bin/fb_inet_server $(FB_FW)/Resources/bin
@ -91,22 +88,27 @@ darwin_finish_cs_framework:
cp ../gen/firebird/bin/gstat $(FB_FW)/Resources/bin cp ../gen/firebird/bin/gstat $(FB_FW)/Resources/bin
cp ../gen/firebird/bin/nbackup $(FB_FW)/Resources/bin cp ../gen/firebird/bin/nbackup $(FB_FW)/Resources/bin
#cp -r ../gen/firebird/examples $(FB_FW)/Resources/examples #cp -r ../gen/firebird/examples $(FB_FW)/Resources/examples
cp ../src/extlib/ib_udf.sql $(FB_FW)/Resources/examples cp ../src/extlib/ib_udf.sql $(FB_FW)/Resources/English.lproj/var/UDF
cp ../src/extlib/fbudf/fbudf.sql $(FB_FW)/Resources/English.lproj/var/UDF
cp ../builds/install/arch-specific/darwin/FrameworkInfo.plist \ cp ../builds/install/arch-specific/darwin/FrameworkInfo.plist \
$(FB_FW)/Resources/Info.plist $(FB_FW)/Resources/Info.plist
cp ../gen/firebird/misc/firebird.conf $(FB_FW)/Resources/English.lproj/var cp ../gen/firebird/misc/firebird.conf $(FB_FW)/Resources/English.lproj/var
#sed "s/__VERSION__/`$(VERS_UTIL)`/g" source/firebird/bellardo/darwin/FrameworkInfo.plist > source/interbase/Firebird.framework/Resources/Info.plist
darwin_finish_ss_framework: FB_FW = ../gen/firebird/frameworks/FirebirdSS.framework darwin_finish_ss_framework: FB_FW = ../gen/firebird/frameworks/FirebirdSS.framework
darwin_finish_ss_framework: extlib
-$(RM) -rf $(FB_FW) -$(RM) -rf $(FB_FW)
mkdir -p $(FB_FW)/Versions/A/Resources/English.lproj/var mkdir -p $(FB_FW)/Versions/A/Resources/English.lproj/var
mkdir -p $(FB_FW)/Versions/A/Libraries
ln -s Versions/Current/Firebird $(FB_FW)/Firebird ln -s Versions/Current/Firebird $(FB_FW)/Firebird
ln -s Versions/Current/Headers $(FB_FW)/Headers ln -s Versions/Current/Headers $(FB_FW)/Headers
ln -s Versions/Current/Resources $(FB_FW)/Resources ln -s Versions/Current/Resources $(FB_FW)/Resources
ln -s Versions/Current/Libraries $(FB_FW)/Libraries
ln -s A $(FB_FW)/Versions/Current ln -s A $(FB_FW)/Versions/Current
cp -r ../gen/firebird/include $(FB_FW)/Versions/A/Headers cp -r ../gen/firebird/include $(FB_FW)/Versions/A/Headers
cp ../gen/firebird/lib/libfbclient.dylib $(FB_FW)/Versions/A/Firebird cp ../gen/firebird/lib/libfbclient.dylib $(FB_FW)/Versions/A/Firebird
cp ../gen/firebird/lib/libicudata.dylib $(FB_FW)/Versions/A/Libraries/libicudata.dylib
cp ../gen/firebird/lib/libicui18n.dylib $(FB_FW)/Versions/A/Libraries/libicui18n.dylib
cp ../gen/firebird/lib/libicuuc.dylib $(FB_FW)/Versions/A/Libraries/libicuuc.dylib
cp ../gen/firebird/lib/libib_util.dylib $(FB_FW)/Versions/A/Libraries/libib_util.dylib
cp ../gen/firebird/firebird.msg \ cp ../gen/firebird/firebird.msg \
$(FB_FW)/Resources/English.lproj/var/firebird.msg $(FB_FW)/Resources/English.lproj/var/firebird.msg
cp -r ../gen/firebird/UDF $(FB_FW)/Resources/English.lproj/var/UDF cp -r ../gen/firebird/UDF $(FB_FW)/Resources/English.lproj/var/UDF
@ -117,7 +119,10 @@ darwin_finish_ss_framework: extlib
$(FB_FW)/Resources/English.lproj/var/intl/fbintl.conf $(FB_FW)/Resources/English.lproj/var/intl/fbintl.conf
chmod a+rx $(FB_FW)/Resources/English.lproj/var/intl/fbintl.dylib chmod a+rx $(FB_FW)/Resources/English.lproj/var/intl/fbintl.dylib
cp -r ../gen/firebird/help $(FB_FW)/Resources/English.lproj/var/help cp -r ../gen/firebird/help $(FB_FW)/Resources/English.lproj/var/help
cp ../gen/firebird/security.fdb $(FB_FW)/Resources/English.lproj/var cp ../gen/firebird/security2.fdb $(FB_FW)/Resources/English.lproj/var
mkdir -p $(FB_FW)/Resources/doc
ln -s ../../doc $(FB_FW)/Resources/doc
cp -r ../doc $(FB_FW)/Resources
mkdir -p $(FB_FW)/Resources/bin mkdir -p $(FB_FW)/Resources/bin
touch $(FB_FW)/Resources/.SuperServer touch $(FB_FW)/Resources/.SuperServer
ln -s ../../bin $(FB_FW)/Resources/English.lproj/var/bin ln -s ../../bin $(FB_FW)/Resources/English.lproj/var/bin
@ -129,18 +134,19 @@ darwin_finish_ss_framework: extlib
cp ../gen/firebird/bin/isql $(FB_FW)/Resources/bin cp ../gen/firebird/bin/isql $(FB_FW)/Resources/bin
cp ../gen/firebird/bin/gpre $(FB_FW)/Resources/bin cp ../gen/firebird/bin/gpre $(FB_FW)/Resources/bin
cp ../gen/firebird/bin/fb_lock_print $(FB_FW)/Resources/bin cp ../gen/firebird/bin/fb_lock_print $(FB_FW)/Resources/bin
cp ../gen/firebird/bin/gds_drop $(FB_FW)/Resources/bin #cp ../gen/firebird/bin/gds_drop $(FB_FW)/Resources/bin
cp ../gen/firebird/bin/gds_relay $(FB_FW)/Resources/bin #cp ../gen/firebird/bin/gds_relay $(FB_FW)/Resources/bin
cp ../gen/firebird/bin/gsec $(FB_FW)/Resources/bin cp ../gen/firebird/bin/gsec $(FB_FW)/Resources/bin
cp ../gen/firebird/bin/gstat $(FB_FW)/Resources/bin cp ../gen/firebird/bin/gstat $(FB_FW)/Resources/bin
cp ../gen/firebird/bin/nbackup $(FB_FW)/Resources/bin
cp ../gen/firebird/bin/qli $(FB_FW)/Resources/bin cp ../gen/firebird/bin/qli $(FB_FW)/Resources/bin
cp ../gen/firebird/bin/gdef $(FB_FW)/Resources/bin cp ../gen/firebird/bin/gdef $(FB_FW)/Resources/bin
#cp -r ../gen/firebird/examples/v5 $(FB_FW)/Resources/examples #cp -r ../gen/firebird/examples $(FB_FW)/Resources/examples
cp ../src/extlib/ib_udf.sql $(FB_FW)/Resources/examples cp ../src/extlib/ib_udf.sql $(FB_FW)/Resources/examples
cp install/arch-specific/darwin/FrameworkInfo.plist \ cp ../src/extlib/fbudf/fbudf.sql $(FB_FW)/Resources/English.lproj/var/UDF
cp ../builds/install/arch-specific/darwin/FrameworkInfo.plist \
$(FB_FW)/Resources/Info.plist $(FB_FW)/Resources/Info.plist
cp install/misc/firebird.conf $(FB_FW)/Resources/English.lproj/var cp ../gen/firebird/misc/firebird.conf $(FB_FW)/Resources/English.lproj/var
#sed "s/__VERSION__/`$(VERS_UTIL)`/g" source/firebird/bellardo/darwin/FrameworkInfo.plist > source/interbase/Firebird.framework/Resources/Info.plist
darwin_postbuild_target: package darwin_postbuild_target: package
@echo @echo

15
builds/posix/prefix.darwin
View File

@ -31,14 +31,15 @@ CLIENT_UTIL_TARGETS=gds_drop gstat gsec fbguard fbmgr_bin nbackup fb_lock_print
Physical_IO_Module=os/posix/unix.cpp Physical_IO_Module=os/posix/unix.cpp
PLATFORM_PATH=os/darwin PLATFORM_PATH=os/darwin
FirebirdInstallPrefix =
LIB_LINK=g++
LINK_OPTS:= LINK_OPTS:=
LIB_BUNDLE_OPTIONS:=$(LD_FLAGS) -bundle -flat_namespace -undefined suppress LIB_BUNDLE_OPTIONS:=$(LD_FLAGS) -bundle -flat_namespace -undefined suppress
LIB_LINK_OPTIONS:=$(LD_FLAGS) -dynamiclib -flat_namespace LIB_LINK_OPTIONS:=$(LD_FLAGS) -dynamiclib -flat_namespace
LIB_LINK_SONAME:=-current_version 2.0.0 -compatibility_version 2.0.0 -seg1addr 0x30000000 LIB_LINK_SONAME:=-current_version 2.1.0 -compatibility_version 2.1.0 -seg1addr 0x30000000
LIB_LINK_MAPFILE:=-unexported_symbols_list LIB_LINK_MAPFILE:=-Wl,-exported_symbols_list,
LINK_FIREBIRD_EMBED_SYMBOLS=$(LIB_LINK_MAPFILE)$(ROOT)/builds/posix/firebird.darwin.embed.vers
LINK_FIREBIRD_CLIENT_SYMBOLS=$(LIB_LINK_MAPFILE)$(ROOT)/builds/posix/firebird.darwin.client.vers
LINK_FBINTL_SYMBOLS=$(LIB_LINK_MAPFILE)$(ROOT)/builds/posix/fbintl.vers
LIB_LINK_RPATH:=-install_name /Firebird.framework/Versions/A/Libraries/ LIB_LINK_RPATH:=-install_name /Firebird.framework/Versions/A/Libraries/
LIB_EMBED_LINK_OPTIONS:= -install_name Firebird.framework/Versions/A/Firebird LIB_EMBED_LINK_OPTIONS:= -install_name Firebird.framework/Versions/A/Firebird
@ -48,7 +49,7 @@ FBEMBED_LINK:=-F../gen/firebird -framework Firebird -L$(LIB) -lfbembed
PLAT_CLASSIC_PRE_TARGET=darwin_setup_framework PLAT_CLASSIC_PRE_TARGET=darwin_setup_framework
PLAT_CLASSIC_POST_TARGET=darwin_finish_cs_framework PLAT_CLASSIC_POST_TARGET=darwin_finish_cs_framework
#PLAT_SUPER_PRE_TARGET=darwin_setup_framework PLAT_SUPER_PRE_TARGET=darwin_setup_framework
#PLAT_SUPER_POST_TRAGET=darwin_finish_ss_framework PLAT_SUPER_POST_TRAGET=darwin_finish_ss_framework
PLATFORM_POSTBUILD_TARGET=darwin_postbuild_target PLATFORM_POSTBUILD_TARGET=darwin_postbuild_target

2
src/common/classes/locks.h
View File

@ -139,6 +139,7 @@ public:
} }
}; };
#ifndef DARWIN
class Spinlock { class Spinlock {
private: private:
pthread_spinlock_t spinlock; pthread_spinlock_t spinlock;
@ -160,6 +161,7 @@ public:
system_call_failed::raise("pthread_spin_unlock"); system_call_failed::raise("pthread_spin_unlock");
} }
}; };
#endif //DARWIN
#endif //SOLARIS_MT #endif //SOLARIS_MT

2
src/include/firebird.h
View File

@ -88,7 +88,7 @@ using namespace NAMESPACE;
#define USE_POSIX_THREADS #define USE_POSIX_THREADS
#endif #endif
#ifdef SUPERCLIENT #ifdef SUPERCLIENT
#if defined(LINUX) || defined(FREEBSD) #if defined(LINUX) || defined(FREEBSD) || defined (DARWIN)
/* The following ifdef was added to build thread safe gds shared /* The following ifdef was added to build thread safe gds shared
library on linux platform. It seems the gdslib works now (20020220) library on linux platform. It seems the gdslib works now (20020220)
with thread enabled applications. Anyway, more tests should be with thread enabled applications. Anyway, more tests should be

2
src/jrd/common.h
View File

@ -279,7 +279,7 @@ static inline int sinixz_sigaction(int sig, const struct sinixz_sigaction *act,
#endif #endif
#ifdef i386 #ifdef i386
#define I386 #define I386
#define IMPLEMENTATION isc_info_db_imp_darwin_x86 /* 70 */ #define IMPLEMENTATION isc_info_db_impl_darwin_x86 /* 70 */
#endif #endif
#define IEEE #define IEEE
#define QUADCONST(n) (n##LL) #define QUADCONST(n) (n##LL)

4
src/jrd/flu.cpp
View File

@ -107,7 +107,7 @@ namespace {
// always try to use module "as is" // always try to use module "as is"
{MOD_SUFFIX, "", false}, {MOD_SUFFIX, "", false},
#ifdef HP10 #ifdef HPUX
{MOD_SUFFIX, ".sl", true}, {MOD_SUFFIX, ".sl", true},
#endif #endif
@ -117,7 +117,7 @@ namespace {
#endif #endif
#ifdef DARWIN #ifdef DARWIN
{MOD_SUFFIX, ".so", true}, {MOD_SUFFIX, ".dylib", true},
#endif #endif
}; };

3
src/jrd/isc_file.cpp
View File

@ -235,12 +235,12 @@ namespace {
bool ok() const { return this->mnt_cnt > 0; } bool ok() const { return this->mnt_cnt > 0; }
#else #else
bool ok() const { return mtab.ok(); } bool ok() const { return mtab.ok(); }
#endif /*DARWIN*/
bool get(); bool get();
tstring node, /* remote server name */ tstring node, /* remote server name */
mount, /* local mount point */ mount, /* local mount point */
path; /* path on remote server */ path; /* path on remote server */
}; };
#endif // DARWIN
#endif //NO_NFS #endif //NO_NFS
} // anonymous namespace } // anonymous namespace
@ -258,7 +258,6 @@ static bool get_full_path(const tstring&, tstring&);
#endif #endif
#ifdef hpux #ifdef hpux
/* RITTER - added HP11 to the pre-processor condition below */
#if !(defined HP10 || defined HP11) #if !(defined HP10 || defined HP11)
static bool get_server(tstring&, tstring&); static bool get_server(tstring&, tstring&);
#endif #endif

2
src/jrd/license.h
View File

@ -136,7 +136,7 @@
#ifdef i386 #ifdef i386
#define FB_PLATFORM "UI" /* Darwin/Intel */ #define FB_PLATFORM "UI" /* Darwin/Intel */
#endif #endif
#ifdef powerpc #if defined (DARWIN) && defined (_powerpc_)
#define FB_PLATFORM "UP" /* Darwin/PowerPC */ #define FB_PLATFORM "UP" /* Darwin/PowerPC */
#endif #endif
#endif #endif