[Firebird-checkins] CVS: interbase/firebird/bellardo/darwin FirebirdFramework.make,1.1,1.2 install,1.2,1.3

[John B. <bel...@us...>]

Update of /cvsroot/firebird/interbase/firebird/bellardo/darwin
In directory usw-pr-cvs1:/tmp/cvs-serv20803/firebird/bellardo/darwin

Modified Files:
	FirebirdFramework.make install 
Log Message:
Changes to the build system to allow Darwin classic to compile given other
platform constraints.  Also included changes to allow Darwin SS to compile.



Index: FirebirdFramework.make
===================================================================
RCS file: /cvsroot/firebird/interbase/firebird/bellardo/darwin/FirebirdFramework.make,v
retrieving revision 1.1
retrieving revision 1.2
diff -U3 -r1.1 -r1.2
--- FirebirdFramework.make	2001/05/24 00:55:17	1.1
+++ FirebirdFramework.make	2001/06/05 19:43:58	1.2
@@ -4,9 +4,7 @@
 RM=		rm
 SH=		/bin/sh
 
-$(FB_FW): classic_framework $(SUPER_SERVER)
-
-classic_framework:
+framework:
 	mkdir -p $(FB_FW)/Versions/A/Resources/English.lproj/var
 	$(CP) -r $(FB_BUILD)/include $(FB_FW)/Versions/A/Headers
 	-$(RM) -fr $(FB_FW)/Versions/A/Headers/CVS
@@ -35,10 +33,35 @@
 		$(FB_FW)/Resources/English.lproj/var
 	$(SH) -c 'unset INTERBASE; export DYLD_FRAMEWORK_PATH=$(FB_BUILD); sed "s/__VERSION__/`$(FB_BUILD)/bin/gpre -Z | sed \"s/gpre version //g\"`/g" source/firebird/bellardo/darwin/FrameworkInfo.plist > $(FB_FW)/Resources/Info.plist'
 
-super_targets:
+super_framework:
+	mkdir -p $(FB_FW)/Versions/A/Resources/English.lproj/var
+	$(CP) -r $(FB_BUILD)/include $(FB_FW)/Versions/A/Headers
+	-$(RM) -fr $(FB_FW)/Versions/A/Headers/CVS
+	$(CP) -r $(FB_BUILD)/bin $(FB_FW)/Versions/A/Resources/bin
+	$(CP) $(FB_BUILD)/interbase.msg \
+		$(FB_FW)/Versions/A/Resources/English.lproj/var
+	$(CP) -r $(FB_BUILD)/intl \
+ 		$(FB_FW)/Versions/A/Resources/English.lproj/var
+	$(CP) -r $(FB_BUILD)/help \
+ 		$(FB_FW)/Versions/A/Resources/English.lproj/var
+	-$(RM) -fr $(FB_FW)/Versions/A/Resources/bin/CVS
+	$(CP) -r $(FB_BUILD)/examples $(FB_FW)/Versions/A/Resources
 	$(CP) $(FB_BUILD)/lib/gds.dylib.1 $(FB_FW)/Versions/A/Firebird
+	-$(RM) -rf $(FB_FW)/Versions/A/Resources/examples/CVS
+	-$(RM) -rf $(FB_FW)/Versions/A/Resources/English.lproj/var/isc4.gdb
+	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
 	touch $(FB_FW)/Resources/.SuperServer
 	echo "DarwinSS.tar.gz" > $(FB_FW)/Resources/.installer_name
+	$(CP) $(FB_BUILD)/isc_config $(FB_BUILD)/inetd.conf.isc \
+		$(FB_BUILD)/services.isc $(FB_BUILD)/isc4.gdb \
+		source/firebird/bellardo/darwin/license.html \
+		source/firebird/bellardo/darwin/license.txt \
+		$(FB_FW)/Resources/English.lproj/var
+	$(SH) -c 'unset INTERBASE; export DYLD_FRAMEWORK_PATH=$(FB_BUILD); sed "s/__VERSION__/`$(FB_BUILD)/bin/gpre -Z | sed \"s/gpre version //g\"`/g" source/firebird/bellardo/darwin/FrameworkInfo.plist > $(FB_FW)/Resources/Info.plist'
 
 
 force:

Index: install
===================================================================
RCS file: /cvsroot/firebird/interbase/firebird/bellardo/darwin/install,v
retrieving revision 1.2
retrieving revision 1.3
diff -U3 -r1.2 -r1.3
--- install	2001/05/24 00:52:49	1.2
+++ install	2001/06/05 19:43:58	1.3
@@ -31,7 +31,7 @@
 	NEW_UID=`nigrep uid . /users | grep ":  uid " | awk '{ print $4 + 1 } ' | sort -n | tail -1`
 	niutil -create . /users/firebird
 	niutil -createprop . /users/firebird uid $NEW_UID
-	niutil -createprop . /users/firebird home /dev/null
+	niutil -createprop . /users/firebird home /Library/Frameworks/Firebird.framework
 	niutil -createprop . /users/firebird passwd "*"
 	niutil -createprop . /users/firebird expire 0
 	niutil -createprop . /users/firebird shell /bin/tcsh
@@ -104,6 +104,14 @@
     kill -HUP $INETPID
 fi
 
+if grep -x "localhost" /etc/hosts.equiv > /dev/null; then                
+else     
+    echo "localhost" >> /etc/hosts.equiv                
+fi    
+if grep -x "localhost.localdomain" /etc/hosts.equiv > /dev/null; then    
+else     
+    echo "localhost.localdomain" >> /etc/hosts.equiv    
+fi    
 
 ###
 # And last but not least, start the server