Update of /cvsroot/firebird/interbase/builds/original
In directory usw-pr-cvs1:/tmp/cvs-serv20803/builds/original
Modified Files:
prefix.darwin sfx.interbase sfx.lock sfx.utilities
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: prefix.darwin
===================================================================
RCS file: /cvsroot/firebird/interbase/builds/original/prefix.darwin,v
retrieving revision 1.4
retrieving revision 1.5
diff -U3 -r1.4 -r1.5
--- prefix.darwin 2001/05/28 16:50:40 1.4
+++ prefix.darwin 2001/06/05 19:43:58 1.5
@@ -111,7 +111,7 @@
LD_LIBS_J=
LD_OPTS= -dylib
LOCK_JRD_MISC=
-LOCK_MANAGER= manager
+LOCK_MANAGER=
MARION_DB= -d source/marion.gdb
MUISQL= muisql
#MUISQL_MU_LIB= -L /usr/gds.$(HOSTNAME)/qa_tools/lib -lmu
@@ -178,5 +178,6 @@
MSG_INSTALL_CMD= $(CP) source/interbase/interbase.msg source/interbase/Firebird.framework/Resources/English.lproj
CARBONCORE_DIR_FLAG= -F/System/Library/Frameworks/CoreServices.framework/Frameworks
+COREFOUNDATION_LINK= -framework CoreFoundation
# End of file prefix.darwin: $(VERSION) $(PLATFORM)
Index: sfx.interbase
===================================================================
RCS file: /cvsroot/firebird/interbase/builds/original/sfx.interbase,v
retrieving revision 1.11
retrieving revision 1.12
diff -U3 -r1.11 -r1.12
--- sfx.interbase 2001/05/24 04:11:11 1.11
+++ sfx.interbase 2001/06/05 19:43:58 1.12
@@ -57,10 +57,16 @@
# 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
+firebird: run_codes gds.h includes executables help msgs msgs_intl extlib $(POST_BUILD_TARGET) completed
-super_firebird: run_codes gds.h includes super_executables help msgs msgs_intl extlib completed
+super_firebird: run_codes gds.h includes super_executables help msgs msgs_intl extlib $(SS_POST_BUILD_TARGET) completed
+installer: $(PLATFORM_INSTALLER)
+ echo "Installer created"
+
+super_installer: $(SUPER_PLATFORM_INSTALLER)
+ echo "Super Installer created"
+
executables: alice burp dudley gpre miscFiles $(INTL) isql locks \
pyxis qli remote spit utilities \
$(SHARED_AM) $(LINKABLE_LIBS)
@@ -89,7 +95,7 @@
#added completed according to inprise tree
#FSG 093000
-completed: $(POST_BUILD_TARGET) force
+completed: force
$(QUIET_ECHO) "Build succeeded!"
alice gfix: gpre force
@@ -556,11 +562,8 @@
$(QUIET_ECHO) "Building REMOTE PIC OBJECTS..."
$(SH) '$(CD) source/remote; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="$(SYSTEM)" $(@F)'
-darwin_framework:
+darwin_installer_common: force
$(QUIET_ECHO) "Building Firebird Installer..."
- $(RM) -rf source/interbase/Firebird.framework
- $(MAKE) -f firebird/bellardo/darwin/FirebirdFramework.make \
- source/interbase/Firebird.framework
mkdir -p source/interbase/installer_tmp
$(MV) source/interbase/Firebird.framework source/interbase/installer_tmp
$(CP) source/firebird/bellardo/darwin/makefile \
@@ -570,10 +573,21 @@
ln -s ../.. source/interbase/installer_tmp/source
$(MAKE) -C source/interbase/installer_tmp install_package
$(RM) -rf source/interbase/installer_tmp
- $(QUIET_ECHO) "Building Firebird Framework..."
+ -$(RM) -rf source/interbase/Firebird.framework
+
+darwin_installer: darwin_installer_common darwin_framework
+super_darwin_installer: darwin_installer_common ss_darwin_framework
+
+darwin_framework: force
+ $(QUIET_ECHO) "Building Classic Firebird Framework..."
+ $(RM) -rf source/interbase/Firebird.framework
+ $(MAKE) -f firebird/bellardo/darwin/FirebirdFramework.make framework
+
+ss_darwin_framework: force
+ $(QUIET_ECHO) "Building Super Server Firebird Framework..."
$(RM) -rf source/interbase/Firebird.framework
$(MAKE) -f firebird/bellardo/darwin/FirebirdFramework.make \
- source/interbase/Firebird.framework
+ super_framework
# Note: So far this target is only available on Solaris
makedepend:
Index: sfx.lock
===================================================================
RCS file: /cvsroot/firebird/interbase/builds/original/sfx.lock,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -U3 -r1.1.1.1 -r1.2
--- sfx.lock 2000/08/03 20:42:51 1.1.1.1
+++ sfx.lock 2001/06/05 19:43:58 1.2
@@ -61,7 +61,8 @@
manager: manager.o lock.o divorce.o $(JRD_LINK2)
-$(RM) manager
$(CC) $(LINK_OPTS) manager.o lock.o divorce.o $(JRD_LINK2) \
- -o manager $(NSL_LIB) $(SCO_SOCKET_LIB) $(SO_THREAD_LIB)
+ -o manager $(NSL_LIB) $(SCO_SOCKET_LIB) $(SO_THREAD_LIB) \
+ $(COREFOUNDATION_LINK)
$(CHMOD_S7) manager
$(DROP) $(DROP_FLAGS)
$(MV) manager $(MANAGER)
Index: sfx.utilities
===================================================================
RCS file: /cvsroot/firebird/interbase/builds/original/sfx.utilities,v
retrieving revision 1.3
retrieving revision 1.4
diff -U3 -r1.3 -r1.4
--- sfx.utilities 2001/05/28 16:46:22 1.3
+++ sfx.utilities 2001/06/05 19:43:58 1.4
@@ -60,7 +60,8 @@
drop: drop.o dropv3.o $(JRD_LINK) $(LOCK_LINK)
-$(RM) drop
$(CC) $(LINK_OPTS) drop.o dropv3.o $(JRD_LINK) $(LOCK_LINK) \
- $(STDIO) -o drop $(SCO_SOCKET_LIB) $(SO_THREAD_LIB) $(NSL_LIB)
+ $(STDIO) -o drop $(SCO_SOCKET_LIB) $(SO_THREAD_LIB) $(NSL_LIB) \
+ $(COREFOUNDATION_LINK)
$(CHMOD_S7) drop
$(MV) drop $(DROP)
$(TOUCH) drop
|
