diff --git a/builds/posix/postfix.darwin b/builds/posix/postfix.darwin index 6c57844b17..4e99dd3d32 100644 --- a/builds/posix/postfix.darwin +++ b/builds/posix/postfix.darwin @@ -1,4 +1,5 @@ # 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 @@ -18,9 +19,14 @@ # 2 Oct 2002, Nickolay Samofatov - Major Cleanup -darwin_setup_framework: FB_FW = ../gen/firebird/Firebird.framework -darwin_setup_framework: - -$(RM) -rf $(FB_FW) ../gen/firebird/Firebird.framework +FB_FW = ../gen/Release/Firebird.framework +ICU_VERS = icu54 +ICU_LOC = $(HOME)/$(ICU_VERS)/icu/source/lib/ + +all: framework otool + +framework darwin_setup_framework: + -$(RM) -rf $(FB_FW) ../gen/Release/Firebird.framework 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 @@ -29,20 +35,19 @@ darwin_setup_framework: ln -s Versions/Current/Libraries $(FB_FW)/Libraries ln -s A $(FB_FW)/Versions/Current ln -s ../../../include $(FB_FW)/Versions/A/Headers - ln -s ../../../lib/libfbembed.dylib $(FB_FW)/Versions/A/Firebird ln -s ../../../lib $(FB_FW)/Versions/A/Libraries - ln -s ../../../../../../firebird.msg \ + ln -s ../../../firebird.msg \ $(FB_FW)/Resources/English.lproj/var/firebird.msg ln -s ../../../../../../bin $(FB_FW)/Resources/English.lproj/var/bin ln -s ../../../../../../UDF $(FB_FW)/Resources/English.lproj/var/UDF ln -s ../../../../../../intl $(FB_FW)/Resources/English.lproj/var/intl ln -s ../../../../../../plugins $(FB_FW)/Resources/English.lproj/var/plugins - ln -s ../../../../../../security2.fdb \ - $(FB_FW)/Resources/English.lproj/var/security2.fdb + ln -s ../../../../../../security3.fdb \ + $(FB_FW)/Resources/English.lproj/var/security3.fdb ln -s ../../../../../../help $(FB_FW)/Resources/English.lproj/var/help -darwin_finish_cs_framework: FB_FW = ../gen/firebird/frameworks/FirebirdCS.framework -darwin_finish_cs_framework: +framework darwin_finish_framework: FB_FW = ../gen/Release/frameworks/Firebird3.framework +framework darwin_finish_framework: -$(RM) -rf $(FB_FW) mkdir -p $(FB_FW)/Versions/A/Resources/English.lproj/var mkdir -p $(FB_FW)/Versions/A/Libraries @@ -51,136 +56,115 @@ darwin_finish_cs_framework: ln -s Versions/Current/Resources $(FB_FW)/Resources ln -s Versions/Current/Libraries $(FB_FW)/Libraries ln -s A $(FB_FW)/Versions/Current - cp -r ../gen/firebird/include $(FB_FW)/Versions/A/Headers - cp ../gen/firebird/lib/libfbembed.dylib $(FB_FW)/Versions/A/Firebird - cp ../gen/firebird/lib/libfbclient.dylib $(FB_FW)/Versions/A/Libraries/libfbclient.dylib - 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 -r ../gen/Release/firebird/include $(FB_FW)/Versions/A/Headers + cp ../gen/Release/firebird/lib/libfbclient.dylib $(FB_FW)/Versions/A/Firebird + cp ../gen/Release/firebird/lib/libfbclient.dylib $(FB_FW)/Versions/A/Libraries/libfbclient.dylib + cp $(ICU_LOC)*.dylib ../gen/Release/firebird/lib/ + cp ../gen/Release/firebird/lib/libicudata.dylib $(FB_FW)/Versions/A/Libraries/libicudata.dylib + cp ../gen/Release/firebird/lib/libicui18n.dylib $(FB_FW)/Versions/A/Libraries/libicui18n.dylib + cp ../gen/Release/firebird/lib/libicuuc.dylib $(FB_FW)/Versions/A/Libraries/libicuuc.dylib + cp ../gen/Release/firebird/lib/libib_util.dylib $(FB_FW)/Versions/A/Libraries/libib_util.dylib + cp ../gen/Release/firebird/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/Release/firebird/UDF $(FB_FW)/Resources/English.lproj/var/UDF mkdir -p $(FB_FW)/Resources/English.lproj/var/intl - cp -r ../gen/firebird/intl/libfbintl.dylib \ + cp -r ../gen/Release/firebird/intl/libfbintl.dylib \ $(FB_FW)/Resources/English.lproj/var/intl/fbintl - cp ../builds/install/misc/fbintl.conf \ + cp ../gen/Release/firebird/intl/fbintl.conf \ $(FB_FW)/Resources/English.lproj/var/intl/fbintl.conf chmod a+rx $(FB_FW)/Resources/English.lproj/var/intl/fbintl - mkdir -p $(FB_FW)/Resources/English.lproj/var/plugins - cp ../gen/firebird/plugins/libfbtrace.dylib \ - $(FB_FW)/Resources/English.lproj/var/plugins/libfbtrace.dylib - cp -r ../gen/firebird/help $(FB_FW)/Resources/English.lproj/var/help - cp ../gen/firebird/security2.fdb $(FB_FW)/Resources/English.lproj/var + cp -r ../gen/Release/firebird/plugins \ + $(FB_FW)/Resources/English.lproj/var/plugins + cp -r ../gen/Release/firebird/help $(FB_FW)/Resources/English.lproj/var/help + cp ../gen/Release/firebird/security3.fdb $(FB_FW)/Resources/English.lproj/var mkdir -p $(FB_FW)/Resources/doc cp -r ../doc $(FB_FW)/Resources mkdir -p $(FB_FW)/Resources/examples - cp -r ../gen/firebird/examples $(FB_FW)/Resources + cp -r ../gen/Release/firebird/examples $(FB_FW)/Resources mkdir -p $(FB_FW)/Resources/bin + touch $(FB_FW)/Resources/SuperServer + chflags hidden $(FB_FW)/Resources/SuperServer 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/gfix $(FB_FW)/Resources/bin - cp ../gen/firebird/bin/gbak $(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/gdef $(FB_FW)/Resources/bin - cp ../gen/firebird/bin/qli $(FB_FW)/Resources/bin - cp ../gen/firebird/bin/fb_lock_print $(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/nbackup $(FB_FW)/Resources/bin - cp ../gen/firebird/bin/fbsvcmgr $(FB_FW)/Resources/bin - cp ../gen/firebird/bin/fbtracemgr $(FB_FW)/Resources/bin - cp ../gen/firebird/bin/fbguard $(FB_FW)/Resources/bin - cp ../gen/firebird/bin/fb_smp_server $(FB_FW)/Resources/bin - chmod +x ../builds/install/arch-specific/darwin/changeMultiConnectMode - cp ../builds/install/arch-specific/darwin/changeMultiConnectMode \ - $(FB_FW)/Resources/bin/changeMultiConnectMode.sh + cp ../gen/Release/firebird/bin/gfix $(FB_FW)/Resources/bin + cp ../gen/Release/firebird/bin/gbak $(FB_FW)/Resources/bin + cp ../gen/Release/firebird/bin/isql $(FB_FW)/Resources/bin + cp ../gen/Release/firebird/bin/gpre $(FB_FW)/Resources/bin + cp ../gen/Release/firebird/bin/qli $(FB_FW)/Resources/bin + cp ../gen/Release/firebird/bin/fb_lock_print $(FB_FW)/Resources/bin + cp ../gen/Release/firebird/bin/gsec $(FB_FW)/Resources/bin + cp ../gen/Release/firebird/bin/gstat $(FB_FW)/Resources/bin + cp ../gen/Release/firebird/bin/nbackup $(FB_FW)/Resources/bin + cp ../gen/Release/firebird/bin/fbguard $(FB_FW)/Resources/bin + cp ../gen/Release/firebird/bin/fbtracemgr $(FB_FW)/Resources/bin + cp ../gen/Release/firebird/bin/firebird $(FB_FW)/Resources/bin + chmod +x ../builds/install/arch-specific/darwin/changeServerMode + cp ../builds/install/arch-specific/darwin/changeServerMode \ + $(FB_FW)/Resources/bin/changeServerMode.sh 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 \ $(FB_FW)/Resources/Info.plist cp ../builds/install/arch-specific/darwin/launchd.org.firebird.gds.plist \ $(FB_FW)/Resources/org.firebird.gds.plist + cp ../builds/install/arch-specific/darwin/launchdcs.org.firebird.gds.plist \ + $(FB_FW)/Resources/cs.org.firebird.gds.plist cp ../builds/install/arch-specific/darwin/Readme.txt \ $(FB_FW)/Resources/Readme.txt cp ../builds/install/arch-specific/darwin/License.txt \ $(FB_FW)/Resources/License.txt - cp ../gen/install/misc/firebird.conf $(FB_FW)/Resources/English.lproj/var + cp ../gen/Release/firebird/firebird.conf $(FB_FW)/Resources/English.lproj/var cp ../builds/install/arch-specific/darwin/aliases.conf.in \ - $(FB_FW)/Resources/English.lproj/var/aliases.conf - cp ../src/utilities/ntrace/fbtrace.conf \ + $(FB_FW)/Resources/English.lproj/var/aliases.conf + cp ../gen/Release/firebird/fbtrace.conf \ $(FB_FW)/Resources/English.lproj/var/fbtrace.conf + cp ../gen/Release/firebird/plugins.conf \ + $(FB_FW)/Resources/English.lproj/var/plugins.conf + mkdir $(FB_FW)/Resources/English.lproj/var/misc + mkdir $(FB_FW)/Resources/English.lproj/var/misc/upgrade + cp -r ../src/misc/upgrade/v3.0 \ + $(FB_FW)/Resources/English.lproj/var/misc/upgrade -darwin_finish_ss_framework: FB_FW = ../gen/firebird/frameworks/FirebirdSS.framework -darwin_finish_ss_framework: - -$(RM) -rf $(FB_FW) - 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/Headers $(FB_FW)/Headers - ln -s Versions/Current/Resources $(FB_FW)/Resources - ln -s Versions/Current/Libraries $(FB_FW)/Libraries - ln -s A $(FB_FW)/Versions/Current - 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/Libraries/libfbclient.dylib - 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 \ - $(FB_FW)/Resources/English.lproj/var/firebird.msg - cp -r ../gen/firebird/UDF $(FB_FW)/Resources/English.lproj/var/UDF - mkdir -p $(FB_FW)/Resources/English.lproj/var/intl - cp -r ../gen/firebird/intl/libfbintl.dylib \ - $(FB_FW)/Resources/English.lproj/var/intl/fbintl - cp ../builds/install/misc/fbintl.conf \ - $(FB_FW)/Resources/English.lproj/var/intl/fbintl.conf - chmod a+rx $(FB_FW)/Resources/English.lproj/var/intl/fbintl - mkdir -p $(FB_FW)/Resources/English.lproj/var/plugins - cp ../gen/firebird/plugins/libfbtrace.dylib \ - $(FB_FW)/Resources/English.lproj/var/plugins/libfbtrace.dylib - cp -r ../gen/firebird/help $(FB_FW)/Resources/English.lproj/var/help - 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/examples - cp -r ../gen/firebird/examples $(FB_FW)/Resources - mkdir -p $(FB_FW)/Resources/bin - touch $(FB_FW)/Resources/.SuperServer - ln -s ../../bin $(FB_FW)/Resources/English.lproj/var/bin - cp ../gen/firebird/bin/fbserver $(FB_FW)/Resources/bin - cp ../gen/firebird/bin/fbguard $(FB_FW)/Resources/bin - cp ../gen/firebird/bin/gfix $(FB_FW)/Resources/bin - cp ../gen/firebird/bin/gbak $(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/fb_lock_print $(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/nbackup $(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/fbsvcmgr $(FB_FW)/Resources/bin - cp ../gen/firebird/bin/fbtracemgr $(FB_FW)/Resources/bin - 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 \ - $(FB_FW)/Resources/Info.plist - cp ../builds/install/arch-specific/darwin/launchdss.org.firebird.gds.plist \ - $(FB_FW)/Resources/org.firebird.gds.plist - cp ../builds/install/arch-specific/darwin/Readme.txt \ - $(FB_FW)/Resources/Readme.txt - cp ../gen/install/misc/firebird.conf $(FB_FW)/Resources/English.lproj/var - cp ../builds/install/arch-specific/darwin/aliases.conf.in \ - $(FB_FW)/Resources/English.lproj/var/aliases.conf - cp ../src/utilities/ntrace/fbtrace.conf \ - $(FB_FW)/Resources/English.lproj/var/fbtrace.conf -darwin_postbuild_target: package - @echo - @echo Build Successful!! - @echo - @echo You can find the installer packages in gen/firebird, and the raw - @echo frameworks in gen/firebird/frameworks +otool: bin lib plugins intl + +BINLOC=$(CURDIR)/Release/firebird/bin/ +LIBLOC=$(CURDIR)/Release/firebird/lib/ +PLUGLOC=$(CURDIR)/Release/firebird/plugins/ +UDRPLUGLOC=$(CURDIR)/Release/firebird/plugins/udr/ +INTLLOC=$(CURDIR)/Release/firebird/intl/ +OLDFBCLIENT=$(CURDIR)/Release/firebird/lib/libfbclient.dylib.3.0.3 +NEWFBCLIENT=/Library/Frameworks/Firebird.framework/Versions/A/Firebird + +otool: bin lib plugins intl + +bin: + + install_name_tool -change $(OLDFBCLIENT) $(NEWFBCLIENT) $(BINLOC)isql + install_name_tool -change $(OLDFBCLIENT) $(NEWFBCLIENT) $(BINLOC)gfix + install_name_tool -change $(OLDFBCLIENT) $(NEWFBCLIENT) $(BINLOC)gbak + install_name_tool -change $(OLDFBCLIENT) $(NEWFBCLIENT) $(BINLOC)gpre + install_name_tool -change $(OLDFBCLIENT) $(NEWFBCLIENT) $(BINLOC)qli + install_name_tool -change $(OLDFBCLIENT) $(NEWFBCLIENT) $(BINLOC)fb_lock_print + install_name_tool -change $(OLDFBCLIENT) $(NEWFBCLIENT) $(BINLOC)gsec + install_name_tool -change $(OLDFBCLIENT) $(NEWFBCLIENT) $(BINLOC)gstat + install_name_tool -change $(OLDFBCLIENT) $(NEWFBCLIENT) $(BINLOC)nbackup + install_name_tool -change $(OLDFBCLIENT) $(NEWFBCLIENT) $(BINLOC)fbguard + install_name_tool -change $(OLDFBCLIENT) $(NEWFBCLIENT) $(BINLOC)fbtracemgr + install_name_tool -change $(OLDFBCLIENT) $(NEWFBCLIENT) $(BINLOC)firebird +lib: + +# install_name_tool -id $(OLDFBCLIENT) $(NEWFBCLIENT) $(LIBLOC)libfbclient.dylib + +plugins: + + install_name_tool -change $(OLDFBCLIENT) $(NEWFBCLIENT) $(PLUGLOC)libCryptKeyHolder_example.dylib + install_name_tool -change $(OLDFBCLIENT) $(NEWFBCLIENT) $(PLUGLOC)libDbCrypt_example.dylib + install_name_tool -change $(OLDFBCLIENT) $(NEWFBCLIENT) $(PLUGLOC)libEngine12.dylib + install_name_tool -change $(OLDFBCLIENT) $(NEWFBCLIENT) $(PLUGLOC)libLegacy_Auth.dylib + install_name_tool -change $(OLDFBCLIENT) $(NEWFBCLIENT) $(PLUGLOC)libLegacy_UserManager.dylib + install_name_tool -change $(OLDFBCLIENT) $(NEWFBCLIENT) $(PLUGLOC)libSrp.dylib + install_name_tool -change $(OLDFBCLIENT) $(NEWFBCLIENT) $(PLUGLOC)libudr_engine.dylib + install_name_tool -change $(OLDFBCLIENT) $(NEWFBCLIENT) $(UDRPLUGLOC)libudrcpp_example.dylib + +intl: + + install_name_tool -change $(OLDFBCLIENT) $(NEWFBCLIENT) $(INTLLOC)libfbintl.dylib