diff -rupN -x CVS -x *.tar.gz -x dpkg -I \$Id: darwin-TclBI/ChangeLog ../../anoncvs.opensource.apple.com/tcl/ChangeLog --- darwin-TclBI/ChangeLog Thu Jan 1 10:00:00 1970 +++ ../../anoncvs.opensource.apple.com/tcl/ChangeLog Sun May 1 06:39:12 2005 @@ -0,0 +1,352 @@ +2005-02-28 16:28 tpeterso + + * Makefile, tcl_ext/Makefile: Merge 4011013 and 4023370. + +2005-02-27 04:07 tpeterso + + * Makefile (PR-4011013): Munge docs dir. Bug #: 4011013 + +2005-02-26 11:24 tpeterso + + * tcl_ext/Makefile (PR-4023370): Nuke tclsqlite. Bug #: 4023370 + +2005-01-08 02:00 jkh + + * tk/tk.diff: Integrate Bug #: 3944034 + +2005-01-08 01:03 jkh + + * tk/tk.diff (PR-3944034): Add Tk dynamic loadable patch Bug #: + 3944034 + +2005-01-05 23:59 tpeterso + + * tk/Makefile: Merge 3874198, 3908113. + +2005-01-05 01:25 tpeterso + + * tk/Makefile (PR-3908113): Remove wish from /Developer Bug #: + 3908113 + +2004-09-14 22:38 tpeterso + + * tcl/Makefile, tk/Makefile: Merge 3580186 (fixes symlinks) Bug #: + 3580186 Submitted by: toby Reviewed by: emoy + +2004-09-14 02:59 tpeterso + + * tcl/Makefile, tk/Makefile (PR-3580186a): Fix symlinks, really + this time. Bug #: 3580186 + +2004-09-14 02:23 tpeterso + + * tcl/Makefile (PR-3580186): Ooops, wrong location. Bug #: 3580186 + +2004-09-14 02:11 tpeterso + + * tcl/Makefile (PR-3580186): Fix absolute symlinks. Bug #: 3580186 + +2004-09-05 08:27 emoy + + * tcl_ext/tclAE/Makefile: Build failure fix: remove + $(DSTROOT)/System/Library/Tcl/._tclAE2.0 + +2004-09-03 20:01 tpeterso + + * tcl_ext/tclodbc/: Makefile, tclodbc.diff: Build fix Bug #: + 3171542 + +2004-08-20 18:39 tpeterso + + * Makefile, tcl.plist, tcl/Makefile, tcl/Makefile.fetch, + tcl/fix_tclConfig.sh, tcl/tcl.tar.gz, tcl_ext/Fetch.make, + tcl_ext/Makefile, tcl_ext/Makefile.fetch, tcl_ext/TEA.make, + tcl_ext/bwidget/Makefile, tcl_ext/bwidget/Makefile.fetch, + tcl_ext/bwidget/bwidget.diff, tcl_ext/bwidget/bwidget.tar.gz, + tcl_ext/expect/Makefile, tcl_ext/expect/Makefile.fetch, + tcl_ext/expect/expect.diff, tcl_ext/expect/expect.tar.gz, + tcl_ext/incrtcl/Makefile, tcl_ext/incrtcl/Makefile.fetch, + tcl_ext/incrtcl/Makefile.iwidgets, tcl_ext/incrtcl/incrTcl.diff, + tcl_ext/incrtcl/incrTcl.tar.gz, tcl_ext/incrtcl/iwidgets.diff, + tcl_ext/incrtcl/iwidgets.tar.gz, tcl_ext/memchan/Makefile, + tcl_ext/memchan/Makefile.fetch, tcl_ext/memchan/memchan.diff, + tcl_ext/memchan/memchan.tar.gz, tcl_ext/mk4tcl/Makefile, + tcl_ext/mk4tcl/Makefile.fetch, tcl_ext/mk4tcl/metakit.diff, + tcl_ext/mk4tcl/metakit.tar.gz, tcl_ext/quicktimetcl/Makefile, + tcl_ext/quicktimetcl/Makefile.fetch, + tcl_ext/quicktimetcl/quicktimetcl.diff, + tcl_ext/quicktimetcl/quicktimetcl.tar.gz, tcl_ext/snack/Makefile, + tcl_ext/snack/Makefile.fetch, tcl_ext/snack/snack.diff, + tcl_ext/snack/snack.tar.gz, tcl_ext/tbcload/Makefile, + tcl_ext/tbcload/Makefile.fetch, tcl_ext/tbcload/tbcload.tar.gz, + tcl_ext/tclAE/Makefile, tcl_ext/tclAE/Makefile.fetch, + tcl_ext/tclAE/TclAE.diff, tcl_ext/tclAE/TclAE.tar.gz, + tcl_ext/tclapplescript/Makefile, + tcl_ext/tclapplescript/Makefile.fetch, + tcl_ext/tclapplescript/tclapplescript.diff, + tcl_ext/tclapplescript/tclapplescript.tar.gz, + tcl_ext/tcllib/Makefile, tcl_ext/tcllib/Makefile.fetch, + tcl_ext/tcllib/tcllib.tar.gz, tcl_ext/tclodbc/Makefile, + tcl_ext/tclodbc/Makefile.fetch, tcl_ext/tclodbc/tclodbc.diff, + tcl_ext/tclodbc/tclodbc.tar.gz, tcl_ext/tclresource/Makefile, + tcl_ext/tclresource/Makefile.fetch, + tcl_ext/tclresource/tclresource.diff, + tcl_ext/tclresource/tclresource.tar.gz, tcl_ext/tclsoap/Makefile, + tcl_ext/tclsoap/Makefile.fetch, tcl_ext/tclsoap/tclsoap.tar.gz, + tcl_ext/tclvfs/Makefile, tcl_ext/tclvfs/Makefile.fetch, + tcl_ext/tclvfs/tclvfs.tar.gz, tcl_ext/tclx/Makefile, + tcl_ext/tclx/Makefile.fetch, tcl_ext/tclx/tclx.tar.gz, + tcl_ext/tclxml/Libxml2xslt.make, tcl_ext/tclxml/Makefile, + tcl_ext/tclxml/Makefile.fetch, tcl_ext/tclxml/Makefile.tcldom, + tcl_ext/tclxml/Makefile.tcldomxml, + tcl_ext/tclxml/Makefile.tclexpat, + tcl_ext/tclxml/Makefile.tclxslt, tcl_ext/tclxml/tcldom.diff, + tcl_ext/tclxml/tcldom.tar.gz, tcl_ext/tclxml/tclxml.diff, + tcl_ext/tclxml/tclxml.tar.gz, tcl_ext/tclxml/tclxslt.diff, + tcl_ext/tclxml/tclxslt.tar.gz, tcl_ext/tdom/Makefile, + tcl_ext/tdom/Makefile.fetch, tcl_ext/tdom/Makefile.tnc, + tcl_ext/tdom/tdom.tar.gz, tcl_ext/thread/Makefile, + tcl_ext/thread/Makefile.fetch, tcl_ext/thread/thread.tar.gz, + tcl_ext/tkimg/Makefile, tcl_ext/tkimg/Makefile.fetch, + tcl_ext/tkimg/tkimg.diff, tcl_ext/tkimg/tkimg.tar.gz, + tcl_ext/tklib/Makefile, tcl_ext/tklib/Makefile.fetch, + tcl_ext/tklib/tklib.tar.gz, tcl_ext/tktable/Makefile, + tcl_ext/tktable/Makefile.fetch, tcl_ext/tktable/tktable.tar.gz, + tcl_ext/tktreectrl/Makefile, tcl_ext/tktreectrl/Makefile.fetch, + tcl_ext/tktreectrl/tktreectrl.diff, + tcl_ext/tktreectrl/tktreectrl.tar.gz, tcl_ext/tls/Makefile, + tcl_ext/tls/Makefile.fetch, tcl_ext/tls/tls.tar.gz, + tcl_ext/trf/Makefile, tcl_ext/trf/Makefile.fetch, + tcl_ext/trf/trf.diff, tcl_ext/trf/trf.tar.gz, + tcl_ext/xotcl/Makefile, tcl_ext/xotcl/Makefile.fetch, + tcl_ext/xotcl/xotcl.diff, tcl_ext/xotcl/xotcl.tar.gz, + tk/Makefile, tk/Makefile.fetch, tk/fix_tkConfig.sh, + tk/tcltk-man2html.tcl, tk/tk.diff, tk/tk.tar.gz: Merge new and + improved Tcl distribution. Bug #: 3171542 Submitted by: toby + Reviewed by: jkh + +2004-08-19 01:56 tpeterso + + * tcl_ext/: Makefile, trf/Makefile (PR-3171542): Minor build fix. + Bug #: Submitted by: Reviewed by: + +2004-08-18 03:45 tpeterso + + * tcl/Makefile (PR-3171542): Add a flag required for some + conformance work. Bug #: 3171542 + +2004-08-16 22:41 tpeterso + + * Makefile (PR-3171542): Tiny build fix to Makefile Bug #: 3171542 + Submitted by: Reviewed by: + +2004-08-16 18:50 tpeterso + + * tcl_ext/: bwidget/Makefile, bwidget/Makefile.fetch, + bwidget/bwidget.diff, bwidget/bwidget.tar.gz, expect/Makefile, + expect/Makefile.fetch, expect/expect.diff, expect/expect.tar.gz, + incrtcl/Makefile, incrtcl/Makefile.fetch, + incrtcl/Makefile.iwidgets, incrtcl/incrTcl.diff, + incrtcl/incrTcl.tar.gz, incrtcl/iwidgets.diff, + incrtcl/iwidgets.tar.gz, memchan/Makefile, + memchan/Makefile.fetch, memchan/memchan.diff, + memchan/memchan.tar.gz, mk4tcl/Makefile, mk4tcl/Makefile.fetch, + mk4tcl/metakit.diff, mk4tcl/metakit.tar.gz, + quicktimetcl/Makefile, quicktimetcl/Makefile.fetch, + quicktimetcl/quicktimetcl.diff, quicktimetcl/quicktimetcl.tar.gz, + snack/Makefile, snack/Makefile.fetch, snack/snack.diff, + snack/snack.tar.gz, tbcload/Makefile, tbcload/Makefile.fetch, + tbcload/tbcload.tar.gz, tclAE/Makefile, tclAE/Makefile.fetch, + tclAE/TclAE.diff, tclAE/TclAE.tar.gz, tclapplescript/Makefile, + tclapplescript/Makefile.fetch, + tclapplescript/tclapplescript.diff, + tclapplescript/tclapplescript.tar.gz, tcllib/Makefile, + tcllib/Makefile.fetch, tcllib/tcllib.tar.gz, tclodbc/Makefile, + tclodbc/Makefile.fetch, tclodbc/tclodbc.diff, + tclodbc/tclodbc.tar.gz, tclresource/Makefile, + tclresource/Makefile.fetch, tclresource/tclresource.diff, + tclresource/tclresource.tar.gz, tclsoap/Makefile, + tclsoap/Makefile.fetch, tclsoap/tclsoap.tar.gz, tclvfs/Makefile, + tclvfs/Makefile.fetch, tclvfs/tclvfs.tar.gz, tclx/Makefile, + tclx/Makefile.fetch, tclx/tclx.tar.gz, tclxml/Libxml2xslt.make, + tclxml/Makefile, tclxml/Makefile.fetch, tclxml/Makefile.tcldom, + tclxml/Makefile.tcldomxml, tclxml/Makefile.tclexpat, + tclxml/Makefile.tclxslt, tclxml/tcldom.diff, + tclxml/tcldom.tar.gz, tclxml/tclxml.diff, tclxml/tclxml.tar.gz, + tclxml/tclxslt.diff, tclxml/tclxslt.tar.gz, tdom/Makefile, + tdom/Makefile.fetch, tdom/Makefile.tnc, tdom/tdom.tar.gz, + thread/Makefile, thread/Makefile.fetch, thread/thread.tar.gz, + tkimg/Makefile, tkimg/Makefile.fetch, tkimg/tkimg.diff, + tkimg/tkimg.tar.gz, tklib/Makefile, tklib/Makefile.fetch, + tklib/tklib.tar.gz, tktable/Makefile, tktable/Makefile.fetch, + tktable/tktable.tar.gz, tktreectrl/Makefile, + tktreectrl/Makefile.fetch, tktreectrl/tktreectrl.diff, + tktreectrl/tktreectrl.tar.gz, tls/Makefile, tls/Makefile.fetch, + tls/tls.tar.gz, trf/Makefile, trf/Makefile.fetch, trf/trf.diff, + trf/trf.tar.gz, xotcl/Makefile, xotcl/Makefile.fetch, + xotcl/xotcl.diff, xotcl/xotcl.tar.gz (PR-3171542): Merge the rest + of Tcl+BI, hopefully. + +2004-08-16 18:49 tpeterso + + * tcl_ext/: Fetch.make, Makefile, Makefile.fetch, TEA.make + (PR-3171542): Merge more Tcl+BI stuff. Bug 3171542 + +2004-08-16 18:45 tpeterso + + * Makefile, tcl.plist (PR-3171542): More Tcl! Bug #: 3171542 + Submitted by: Reviewed by: + +2004-08-16 18:45 tpeterso + + * tk/: Makefile, Makefile.fetch, fix_tkConfig.sh, + tcltk-man2html.tcl, tk.diff, tk.tar.gz (PR-3171542): Bring in Tk. + Bug #: 3171542 Submitted by: Reviewed by: + +2004-08-16 18:44 tpeterso + + * tcl/: Makefile, Makefile.fetch, fix_tclConfig.sh, tcl.tar.gz + (PR-3171542): Merge Tcl+BI stuff. Bug #: 3171542 Submitted by: + Reviewed by: + diff -rupN -x CVS -x *.tar.gz -x dpkg -I \$Id: darwin-TclBI/Makefile ../../anoncvs.opensource.apple.com/tcl/Makefile --- darwin-TclBI/Makefile Fri Jul 30 10:03:08 2004 +++ ../../anoncvs.opensource.apple.com/tcl/Makefile Sun May 1 05:29:16 2005 @@ -1,97 +1,68 @@ ## -# Testing wrapper Makefile for Darwin wrapped tcl & extensions -# fetches sources, builds and installs all projects into DSTROOT -# does not require Tcl.framework to be installed in /System/Library/Frameworks +# Makefile for tcl ## -# Daniel A. Steffen -## - -core = tcl tk -ext = tcl_ext - -### - -# define UseCvs=1 to retrieve project sources from CVS, -# instead of download them as a tarball -UseCvs = 0 -# define SUDO=sudo to install projects as root -SUDO ?= +Project = tcl -# define DO_CLEAN=1 to clean projects after building & installing -DO_CLEAN = +include $(MAKEFILEPATH)/CoreOS/ReleaseControl/Common.make -# define DO_WIPE=1 to remove and reftch sources before building -DO_WIPE = +## Build settings ## -### +TCL_DSTROOT = $(if $(DSTROOT),$(DSTROOT),/tmp/tcl/Release) +TCL_FRAMEWORK_DIR = $(TCL_DSTROOT)/$(NSDEFAULTLOCATION)/Library/Frameworks +TCLSH = $(TCL_DSTROOT)/usr/bin/tclsh +WISH = $(TCL_DSTROOT)/usr/bin/wish NSDEFAULTLOCATION = /System -# dir where build products and default destroot go -TMP_DIR = /tmp/TclBI - MAKE_ARGS = VERBOSE=YES NSDEFAULTLOCATION=$(NSDEFAULTLOCATION) \ TclFramework=$(TCL_FRAMEWORK_DIR)/Tcl.framework Tclsh=$(TCLSH) \ TkFramework=$(TCL_FRAMEWORK_DIR)/Tk.framework Wish=$(WISH) \ $(if $(UseCvs),UseCvs=$(UseCvs)) -MAKE_INSTALL_ARGS = -MAKE_EXT_ARGS = RC_ARCHS=ppc RC_ppc=YES -MAKE_EXT_INSTALL_ARGS = +core = tcl tk +ext = tcl_ext +all = $(core) $(ext) -EXTRA_MAKE_ARGS = -EXTRA_MAKE_INSTALL_ARGS = +## targets ## -TCL_DSTROOT = $(if $(DSTROOT),$(DSTROOT),/tmp/tcl/Release) -TCL_FRAMEWORK_DIR = $(TCL_DSTROOT)/$(NSDEFAULTLOCATION)/Library/Frameworks -TCLSH = $(TCL_DSTROOT)/usr/bin/tclsh -WISH = $(TCL_DSTROOT)/usr/bin/wish +.PHONY: $(all) -ifdef TMP_DIR -ifndef OBJROOT -MAKE_ARGS += OBJROOT='$(TMP_DIR)/Build/$$(ProjectName)' -endif -ifndef SYMROOT -MAKE_ARGS += SYMROOT='$(TMP_DIR)/Debug/$$(ProjectName)' -endif -ifndef DSTROOT -MAKE_ARGS += DSTROOT='$(TMP_DIR)/Release' -TCL_DSTROOT = $(TMP_DIR)/Release -endif -endif - -### - -all = $(core) $(ext) -meta = all core ext -$(meta): - $(MAKE) $($@) - -.PHONY: $(all) $(meta) - -### - -ifeq ($(SUDO),) -MAKE_INSTALL_ARGS += Install_User=$(shell id -un) Install_Group=$(shell id -gn) -endif - -$(core): Make_Args = $(MAKE_ARGS) $(EXTRA_MAKE_ARGS) -$(core): Make_Install_Args = $(MAKE_INSTALL_ARGS) $(EXTRA_MAKE_INSTALL_ARGS) -$(ext): Make_Args = $(MAKE_ARGS) $(MAKE_EXT_ARGS) $(EXTRA_MAKE_ARGS) -$(ext): Make_Install_Args = $(MAKE_INSTALL_ARGS) $(MAKE_EXT_INSTALL_ARGS) $(EXTRA_MAKE_INSTALL_ARGS) +## installsrc ## -### +install_source:: + @echo "Extracting $(Project)..." + for subdir in $(all) ; do \ + $(MAKE) -C $(SRCROOT)/$${subdir} -f Makefile.fetch fetch SRCROOT=$(SRCROOT)/$${subdir}; \ + done + $(CHMOD) a+x $(SRCROOT)/tcl_ext/expect/expect/install-sh + $(CHMOD) a+x $(SRCROOT)/tcl_ext/expect/expect/mkinstalldirs + $(CHMOD) a+x $(SRCROOT)/tcl_ext/incrtcl/incrTcl/config/install-sh + $(CHMOD) a+x $(SRCROOT)/tcl_ext/tclAE/TclAE/Build/Resources/macRoman2utf8.tcl -$(all): -ifdef DO_WIPE - $(MAKE) -C $@ -f Makefile.fetch wipe $(Make_Args) -endif - $(MAKE) -C $@ -f Makefile.fetch fetch $(Make_Args) - $(MAKE) -C $@ $(Make_Args) - $(SUDO) $(MAKE) -C $@ install $(Make_Args) $(Make_Install_Args) -ifdef DO_CLEAN - $(MAKE) -C $@ clean $(Make_Args) -endif +## install ## -### +install:: $(all) install-plist munge-docs + +$(all): + $(_v) $(MAKE) -C $@ install $(MAKE_ARGS) \ + SRCROOT=$(SRCROOT)/$@ \ + OBJROOT=$(OBJROOT)/$@ \ + SYMROOT=$(SYMROOT)/$@ \ + DSTROOT=$(DSTROOT) + +OSV = $(DSTROOT)/usr/local/OpenSourceVersions +OSL = $(DSTROOT)/usr/local/OpenSourceLicenses + +install-plist: + $(MKDIR) $(OSV) + $(INSTALL_FILE) $(SRCROOT)/$(Project).plist $(OSV)/$(Project).plist + $(MKDIR) $(OSL) + $(INSTALL_FILE) $(SRCROOT)/tcl/tcl/license.terms $(OSL)/tcl.txt + $(INSTALL_FILE) $(SRCROOT)/tk/tk/license.terms $(OSL)/tk.txt + +munge-docs: + $(MKDIR) "$(DSTROOT)$(SYSTEM_DEVELOPER_TOOLS_DOC_DIR)" + $(MV) "$(DSTROOT)/Developer/Documentation/DeveloperTools/Tcl" \ + "$(DSTROOT)$(SYSTEM_DEVELOPER_TOOLS_DOC_DIR)" + $(RMDIR) "$(DSTROOT)/Developer/Documentation" diff -rupN -x CVS -x *.tar.gz -x dpkg -I \$Id: darwin-TclBI/tcl/Makefile ../../anoncvs.opensource.apple.com/tcl/tcl/Makefile --- darwin-TclBI/tcl/Makefile Thu Jul 22 07:47:13 2004 +++ ../../anoncvs.opensource.apple.com/tcl/tcl/Makefile Wed Sep 15 08:38:34 2004 @@ -17,6 +17,7 @@ Extra_Environment = INSTALL_PATH="$( MANDIR="$(MANDIR)" INSTALL_MANPAGES=1 \ DOCDIR="$(DocDir)" MKLINKS_FLAGS="$(MkLinks_Flags)" Extra_LD_Flags = -prebind +Extra_CC_Flags = -DTCL_IO_TRACK_OS_FOR_DRIVER_WITH_BAD_BLOCKING AfterInstall = extra-int-headers links old-tcllib include $(MAKEFILEPATH)/CoreOS/ReleaseControl/Common.make @@ -52,15 +53,15 @@ extra-int-headers: links: $(_v) $(INSTALL_DIRECTORY) "$(DSTROOT)$(USRLIBDIR)" - $(_v) $(LN) -fs "$(FmwkDir)/Tcl" "$(DSTROOT)$(USRLIBDIR)/libtcl$(Version).dylib" + $(_v) $(LN) -fs "../..$(FmwkDir)/Tcl" "$(DSTROOT)/usr/lib/libtcl$(Version).dylib" $(_v) $(LN) -fs "libtcl$(Version).dylib" "$(DSTROOT)$(USRLIBDIR)/libtcl.dylib" - $(_v) $(LN) -fs $(foreach f,$(LibItems),"$(FmwkDir)/$(f)") "$(DSTROOT)$(USRLIBDIR)" + $(_v) $(LN) -fs $(foreach f,$(LibItems),"../..$(FmwkDir)/$(f)") "$(DSTROOT)/usr/lib" $(_v) $(INSTALL_DIRECTORY) "$(DSTROOT)$(USRINCLUDEDIR)" - $(_v) $(LN) -fs $(foreach f,$(HeaderItems),"$(FmwkDir)/Headers/$(f)") \ - "$(DSTROOT)$(USRINCLUDEDIR)" + $(_v) $(LN) -fs $(foreach f,$(HeaderItems),"../..$(FmwkDir)/Headers/$(f)") \ + "$(DSTROOT)/usr/include" # Install compat sym links for private headers in /usr/local/include (3198305) $(_v) $(INSTALL_DIRECTORY) "$(DSTROOT)/usr/local/include" - $(_v) $(LN) -fs $(foreach f,$(PrivateHeaderItems),"$(FmwkDir)/PrivateHeaders/$(f)") \ + $(_v) $(LN) -fs $(foreach f,$(PrivateHeaderItems),"../../..$(FmwkDir)/PrivateHeaders/$(f)") \ "$(DSTROOT)/usr/local/include/" # Move tclsh.1 to tclsh$(Version).1 and # link tclsh.1 to tclsh$(Version).1 (2853545) @@ -98,6 +99,7 @@ install:: $(Fmwk) $(_v) $(FIND) $(DSTROOT) $(Find_Cruft) | $(XARGS) $(RMDIR) $(_v) $(MAKE) $(AfterInstall) $(_v)- $(CHOWN) -R $(Install_User):$(Install_Group) $(DSTROOT) + SYMROOT="$(SYMROOT)" DSTROOT="$(DSTROOT)" $(SRCROOT)/fix_tclConfig.sh almostclean:: @echo "Cleaning $(Project)..." diff -rupN -x CVS -x *.tar.gz -x dpkg -I \$Id: darwin-TclBI/tcl/fix_tclConfig.sh ../../anoncvs.opensource.apple.com/tcl/tcl/fix_tclConfig.sh --- darwin-TclBI/tcl/fix_tclConfig.sh Thu Jan 1 10:00:00 1970 +++ ../../anoncvs.opensource.apple.com/tcl/tcl/fix_tclConfig.sh Sat Aug 21 04:39:17 2004 @@ -0,0 +1,5 @@ +#!/bin/sh + +TCL_CONFIG_SH=${DSTROOT}/System/Library/Frameworks/Tcl.framework/Versions/8.4/tclConfig.sh +sed -e "s|-arch [^ ]*||g" ${TCL_CONFIG_SH} > ${SYMROOT}/tclConfig.sh +cp ${SYMROOT}/tclConfig.sh ${TCL_CONFIG_SH} diff -rupN -x CVS -x *.tar.gz -x dpkg -I \$Id: darwin-TclBI/tcl.plist ../../anoncvs.opensource.apple.com/tcl/tcl.plist --- darwin-TclBI/tcl.plist Thu Jan 1 10:00:00 1970 +++ ../../anoncvs.opensource.apple.com/tcl/tcl.plist Sun May 1 05:29:16 2005 @@ -0,0 +1,35 @@ + + + + OpenSourceProject + tcl + OpenSourceVersion + 8.4.7 + OpenSourceWebsiteURL + http://tcl.tk/ + OpenSourceURL + http://tcltkaqua.sourceforge.net/darwin-TclBI/tcl/tcl.tar.gz + OpenSourceMD5 + 07e256e21bd0d05887770318b540c36f + OpenSourceLicense + Other + OpenSourceLicenseFile + tcl.txt + + + OpenSourceProject + tk + OpenSourceVersion + 8.4.7 + OpenSourceWebsiteURL + http://tcl.tk/ + OpenSourceURL + http://tcltkaqua.sourceforge.net/darwin-TclBI/tk/tk.tar.gz + OpenSourceMD5 + b86b0db1c28723e6d3139e88250353a6 + OpenSourceLicense + Other + OpenSourceLicenseFile + tk.txt + + diff -rupN -x CVS -x *.tar.gz -x dpkg -I \$Id: darwin-TclBI/tcl_ext/Fetch.make ../../anoncvs.opensource.apple.com/tcl/tcl_ext/Fetch.make --- darwin-TclBI/tcl_ext/Fetch.make Sat Jul 24 00:18:30 2004 +++ ../../anoncvs.opensource.apple.com/tcl/tcl_ext/Fetch.make Sat Aug 21 04:39:28 2004 @@ -64,20 +64,8 @@ CURL ?= /usr/bin/curl fetch:: $(SRCROOT)/$(Project) $(SRCROOT)/$(Project): -ifeq ($(UseCvs),1) -ifdef CvsPass -# for anonymous pserver access, enter empty password entry into .cvspass file if needed -ifeq ($(CvsUser),) - @if ! $(GREP) -q $(CvsRoot) $(CvsPass); then \ - echo "$(CvsRoot) A" >> $(CvsPass); fi -endif -endif - $(_v) cd $(SRCROOT) && $(Cvs) -d$(CvsRoot) $(CvsCheckout) -else - $(_v) cd $(SRCROOT) && $(UrlFetch) $(Url) -o $(Project)$(UrlExt) $(_v) cd $(SRCROOT) && $(UrlExtract) $(Project)$(UrlExt) && \ if [ ! -d $(Project) ]; then $(MV) $(ExtractedDir) $(Project); fi -endif $(_v) if [ -e $(CURDIR)/$(Project).diff ]; then \ cd $(SRCROOT)/$(Project) && $(PATCH) -Np0 < $(CURDIR)/$(Project).diff; fi ifdef Configure @@ -88,4 +76,4 @@ wipe:: cd $(SRCROOT) && $(RMDIR) $(Project) -.PHONY: fetch wipe \ No newline at end of file +.PHONY: fetch wipe diff -rupN -x CVS -x *.tar.gz -x dpkg -I \$Id: darwin-TclBI/tcl_ext/Makefile ../../anoncvs.opensource.apple.com/tcl/tcl_ext/Makefile --- darwin-TclBI/tcl_ext/Makefile Thu Jul 22 10:51:43 2004 +++ ../../anoncvs.opensource.apple.com/tcl/tcl_ext/Makefile Tue Mar 1 03:28:40 2005 @@ -4,23 +4,16 @@ # Daniel A. Steffen ## -Project = tcl_ext -UserType = Developer -ToolType = Libraries - -include $(MAKEFILEPATH)/CoreOS/ReleaseControl/Common.make -include TEA.make - subprojects = tcllib thread tclx tclvfs expect incrtcl \ - xotcl tbcload memchan trf mk4tcl \ + xotcl tbcload memchan mk4tcl \ tls tdom tclxml tclsoap \ - tclodbc tclsqlite \ + tclodbc \ tclapplescript tclresource tclAE \ - tklib bwidget tktable tkimg tktreectrl \ + tklib bwidget tktable tkimg trf tktreectrl \ snack quicktimetcl # use mpexpand/doctools in tcllib sources to avoid depending on tcllib being installed -Tcllib_Environment = MPEXPAND='$(Tclsh) $(SRCROOT)/tcllib/tcllib/modules/doctools/mpexpand' \ +Tcllib_Environment = MPEXPAND='/usr/bin/tclsh $(SRCROOT)/tcllib/tcllib/modules/doctools/mpexpand' \ TCLLIBPATH='$(SRCROOT)/tcllib/tcllib/modules/doctools \ $(SRCROOT)/tcllib/tcllib/modules/textutil' diff -rupN -x CVS -x *.tar.gz -x dpkg -I \$Id: darwin-TclBI/tcl_ext/incrtcl/Makefile.iwidgets ../../anoncvs.opensource.apple.com/tcl/tcl_ext/incrtcl/Makefile.iwidgets --- darwin-TclBI/tcl_ext/incrtcl/Makefile.iwidgets Thu Jul 22 02:05:47 2004 +++ ../../anoncvs.opensource.apple.com/tcl/tcl_ext/incrtcl/Makefile.iwidgets Sat Aug 21 04:39:29 2004 @@ -7,6 +7,7 @@ # Project info Project = iwidgets +Extra_CC_Flags = -fno-common Extra_Configure_Flags = $(TEA_Configure_Flags) Extra_Environment = $(TEA_Environment) Extra_Install_Flags = INSTALL_ROOT=$(DSTROOT) diff -rupN -x CVS -x *.tar.gz -x dpkg -I \$Id: darwin-TclBI/tcl_ext/memchan/memchan.diff ../../anoncvs.opensource.apple.com/tcl/tcl_ext/memchan/memchan.diff --- darwin-TclBI/tcl_ext/memchan/memchan.diff Thu Jan 1 10:00:00 1970 +++ ../../anoncvs.opensource.apple.com/tcl/tcl_ext/memchan/memchan.diff Sat Aug 21 04:39:30 2004 @@ -0,0 +1,11 @@ +--- Makefile.in.orig 2004-08-11 15:12:37.000000000 -0700 ++++ Makefile.in 2004-08-11 15:12:48.000000000 -0700 +@@ -313,7 +313,7 @@ + $($(PACKAGE)stub_LIB_FILE): $($(PACKAGE)stub_OBJECTS) + -rm -f $($(PACKAGE)stub_LIB_FILE) + ${MAKE_STUB_LIB} +- $(RANLIB) $($(PACKAGE)stub_LIB_FILE) ++ ranlib $($(PACKAGE)stub_LIB_FILE) + + #======================================================================== + # We need to enumerate the list of .c to .o lines here. diff -rupN -x CVS -x *.tar.gz -x dpkg -I \$Id: darwin-TclBI/tcl_ext/mk4tcl/metakit.diff ../../anoncvs.opensource.apple.com/tcl/tcl_ext/mk4tcl/metakit.diff --- darwin-TclBI/tcl_ext/mk4tcl/metakit.diff Thu Jan 1 10:00:00 1970 +++ ../../anoncvs.opensource.apple.com/tcl/tcl_ext/mk4tcl/metakit.diff Sat Aug 21 04:39:31 2004 @@ -0,0 +1,11 @@ +--- unix/configure.orig 2004-08-11 18:10:01.000000000 -0700 ++++ unix/configure 2004-08-11 18:10:21.000000000 -0700 +@@ -5702,7 +5702,7 @@ + # cross-compilation, but unfortunately the echo tests do not + # yet detect zsh echo's removal of \ escapes. Also zsh mangles + # `"' quotes if we put them in here... so don't! +- archive_cmds='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs && $CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib ${lib}-master.o $deplibs$linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)' ++ archive_cmds='$CC ${RC_CFLAGS} -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs && $CC ${RC_CFLAGS} $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib ${lib}-master.o $deplibs$linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)' + # We need to add '_' to the symbols in $export_symbols first + #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols' + hardcode_direct=yes diff -rupN -x CVS -x *.tar.gz -x dpkg -I \$Id: darwin-TclBI/tcl_ext/snack/snack.diff ../../anoncvs.opensource.apple.com/tcl/tcl_ext/snack/snack.diff --- darwin-TclBI/tcl_ext/snack/snack.diff Sat Jul 31 01:51:31 2004 +++ ../../anoncvs.opensource.apple.com/tcl/tcl_ext/snack/snack.diff Sat Aug 21 04:39:31 2004 @@ -34,3 +34,13 @@ diff -rup orig/snack/unix/configure.in s ;; *) AFLAG="-DOTHER" +--- unix/Makefile.in.orig 2004-08-11 16:22:10.000000000 -0700 ++++ unix/Makefile.in 2004-08-11 16:22:17.000000000 -0700 +@@ -167,6 +167,7 @@ + + stublib: ${OBJSNST} + ar cr libsnackstub${VERSION}.a ${OBJSNST} ++ ranlib libsnackstub${VERSION}.a + + editversion: ${OBJSN} + if test "$(TCL_VERSION)" != "8.4"; then\ diff -rupN -x CVS -x *.tar.gz -x dpkg -I \$Id: darwin-TclBI/tcl_ext/tclAE/Makefile ../../anoncvs.opensource.apple.com/tcl/tcl_ext/tclAE/Makefile --- darwin-TclBI/tcl_ext/tclAE/Makefile Sat Jul 24 00:42:52 2004 +++ ../../anoncvs.opensource.apple.com/tcl/tcl_ext/tclAE/Makefile Sun Sep 5 18:27:08 2004 @@ -13,7 +13,7 @@ Extra_Environment = GCC_VERSION=3.x INSTALL_ROOT="$(SYMROOT)/Deployment.build/" Extra_Install_Flags = INSTALL_ROOT="$(DSTROOT)$(TclExtLibDir)/" -AfterInstall = install-doc fix-owner +AfterInstall = install-doc fix-owner kill-appledouble TEA_UseXcode = YES @@ -27,3 +27,6 @@ install-doc: $(_v) $(INSTALL_DIRECTORY) "$(DSTROOT)/$(TclExtHtmlDir)/style" $(_v) $(INSTALL_FILE) "$(Docs)"/*.html "$(DSTROOT)/$(TclExtHtmlDir)" $(_v) $(INSTALL_FILE) "$(Docs)"/style/* "$(DSTROOT)/$(TclExtHtmlDir)"/style + +kill-appledouble: + -rm -f $(DSTROOT)/System/Library/Tcl/._tclAE2.0 Binary files darwin-TclBI/tcl_ext/tclAE/TclAE.diff and ../../anoncvs.opensource.apple.com/tcl/tcl_ext/tclAE/TclAE.diff differ diff -rupN -x CVS -x *.tar.gz -x dpkg -I \$Id: darwin-TclBI/tcl_ext/tclodbc/Makefile ../../anoncvs.opensource.apple.com/tcl/tcl_ext/tclodbc/Makefile --- darwin-TclBI/tcl_ext/tclodbc/Makefile Thu Jul 22 09:23:33 2004 +++ ../../anoncvs.opensource.apple.com/tcl/tcl_ext/tclodbc/Makefile Sat Sep 4 06:01:12 2004 @@ -9,7 +9,7 @@ Project = tclodbc ProjectName = TclODBC Extra_Configure_Flags = $(TEA_Configure_Flags) -Extra_LD_Flags = -L$(TclFramework) +Extra_LD_Flags = -L$(TclFramework) -framework Carbon Extra_Environment = SHLIB_LD='g++ -dynamiclib $${LDFLAGS}' \ $(TEA_Environment) Extra_Install_Flags = DOC_FILES= SAMPLE_FILES= MISC_FILES= diff -rupN -x CVS -x *.tar.gz -x dpkg -I \$Id: darwin-TclBI/tcl_ext/tclodbc/tclodbc.diff ../../anoncvs.opensource.apple.com/tcl/tcl_ext/tclodbc/tclodbc.diff --- darwin-TclBI/tcl_ext/tclodbc/tclodbc.diff Wed Jun 2 15:21:26 2004 +++ ../../anoncvs.opensource.apple.com/tcl/tcl_ext/tclodbc/tclodbc.diff Sat Sep 4 06:01:12 2004 @@ -513,7 +513,16 @@ diff -u -p -r1.4 tclodbc.hxx #endif #include "tclobj.hxx" -@@ -128,8 +130,7 @@ extern "C" { +@@ -119,6 +121,8 @@ extern "C" { + // ODBC INCLUDES + // + ++/* set _WCHAR_T so sqltypes.h is happy (until 3779905 is fixed) */ ++#define _WCHAR_T + extern "C" { + #ifdef HAVE_IODBC // Using the free IODBC driver + /* I am not sure what version this is... +@@ -128,8 +132,7 @@ extern "C" { /* iODBC 2.12 */ #include #include diff -rupN -x CVS -x *.tar.gz -x dpkg -I \$Id: darwin-TclBI/tcl_ext/tclsqlite/Makefile ../../anoncvs.opensource.apple.com/tcl/tcl_ext/tclsqlite/Makefile --- darwin-TclBI/tcl_ext/tclsqlite/Makefile Thu Jul 22 10:14:33 2004 +++ ../../anoncvs.opensource.apple.com/tcl/tcl_ext/tclsqlite/Makefile Thu Jan 1 10:00:00 1970 @@ -1,60 +0,0 @@ -## -# Makefile for tclsqlite -## -# Daniel A. Steffen -## - -# Project info -Project = sqlite -ProjectName = tclsqlite - -Extra_Configure_Flags = $(TEA_Configure_Flags) -Extra_Environment = TCL_FLAGS="-I$(TclHeaders) -DUSE_TCL_STUBS" $(TEA_Environment) - -GnuNoBuild = YES -GnuNoInstall = YES - -AfterInstall = strip install-doc fix-owner - -# include TEA Tcl extension build support -include ../TEA.make - -TclExtDir = $(ProjectName) -Sqlite_Prefix = $(Install_Prefix) -Dylib_Targets = config.h sqlite.h parse.h opcodes.h $(ProjectName).lo -Dylib_Objects = $(BuildDirectory)/.libs/$(ProjectName).o -Dylib_Binary = $(BuildDirectory)/$(ProjectName).dylib -Dylib_LD_Flags = -dynamiclib -Dylib_LD_Libraries = -L$(Sqlite_Prefix)/lib -lsqlite -L$(TclFramework) \ - $(shell source "$(TclFramework)/tclConfig.sh" \ - && eval echo $${TCL_STUB_LIB_SPEC}) - -build:: - @echo "Building $(Project)..." - -build:: $(Dylib_Objects) - $(_v) $(MAKE) "$(Dylib_Binary)" \ - CC_Excecutable="$(Dylib_Binary)" \ - CC_Objects="$(Dylib_Objects)" \ - Extra_LD_Flags="$(Dylib_LD_Flags)" \ - Extra_LD_Libraries="$(Dylib_LD_Libraries)" - -$(Dylib_Objects): - $(_v) $(MAKE) -C $(BuildDirectory) $(Environment) $(Dylib_Targets) - -install:: - @echo "Installing $(Project)..." - $(_v) $(INSTALL_DIRECTORY) "$(DSTROOT)$(TclExtLibDir)/$(ProjectName)" - $(_v) $(INSTALL_DYLIB) "$(Dylib_Binary)" "$(DSTROOT)$(TclExtLibDir)/$(ProjectName)" - $(_v) umask $(Install_Mask) ; \ - echo pkg_mkIndex \"$(DSTROOT)$(TclExtLibDir)/$(ProjectName)\" | "$(Tclsh)" - $(_v) $(FIND) $(DSTROOT) $(Find_Cruft) | $(XARGS) $(RMDIR) -ifdef AfterInstall - $(_v) $(MAKE) $(AfterInstall) -endif - -install-doc: - $(_v) $(INSTALL_DIRECTORY) "$(DSTROOT)/$(TclExtHtmlDir)" - $(_v) umask $(Install_Mask) ; \ - "$(Tclsh)" "$(Sources)/www/$(ProjectName).tcl" > \ - "$(DSTROOT)/$(TclExtHtmlDir)/$(ProjectName).html" diff -rupN -x CVS -x *.tar.gz -x dpkg -I \$Id: darwin-TclBI/tcl_ext/tclsqlite/Makefile.fetch ../../anoncvs.opensource.apple.com/tcl/tcl_ext/tclsqlite/Makefile.fetch --- darwin-TclBI/tcl_ext/tclsqlite/Makefile.fetch Fri Jul 2 11:05:20 2004 +++ ../../anoncvs.opensource.apple.com/tcl/tcl_ext/tclsqlite/Makefile.fetch Thu Jan 1 10:00:00 1970 @@ -1,12 +0,0 @@ -## -# Makefile.fetch for tclsqlite -## -# Daniel A. Steffen -## - -include Makefile ../Fetch.make - -CvsTag = -r version_2 -D '2004-06-09 23:21:00 UTC' -Release = 2.8.14 -UrlBase = http://www.sqlite.org -CvsServer = www.sqlite.org:/$(Project) diff -rupN -x CVS -x *.tar.gz -x dpkg -I \$Id: darwin-TclBI/tcl_ext/trf/Makefile ../../anoncvs.opensource.apple.com/tcl/tcl_ext/trf/Makefile --- darwin-TclBI/tcl_ext/trf/Makefile Thu Jul 22 09:17:23 2004 +++ ../../anoncvs.opensource.apple.com/tcl/tcl_ext/trf/Makefile Sat Aug 21 04:39:39 2004 @@ -8,7 +8,7 @@ Project = trf ProjectName = Trf -Extra_Configure_Flags = $(TEA_Configure_Flags) +Extra_Configure_Flags = $(TEA_Configure_Flags) --with-zlibtcl=$(DSTROOT)/usr/lib Extra_CC_Flags = -fno-common Extra_LD_Flags = -L$(TclFramework) Extra_Environment = AM_CPPFLAGS='-I/usr/include/openssl \ diff -rupN -x CVS -x *.tar.gz -x dpkg -I \$Id: darwin-TclBI/tk/Makefile ../../anoncvs.opensource.apple.com/tcl/tk/Makefile --- darwin-TclBI/tk/Makefile Wed Jul 28 11:39:29 2004 +++ ../../anoncvs.opensource.apple.com/tcl/tk/Makefile Thu Jan 6 10:59:34 2005 @@ -16,7 +16,7 @@ Extra_Environment = DYLIB_INSTALL_PA MANDIR="$(MANDIR)" INSTALL_MANPAGES=1 \ DOCDIR="$(DocDir)" MKLINKS_FLAGS="$(MkLinks_Flags)" \ TCL_FRAMEWORK_DIR="$(TclFrameworkDir)" TCLSH_DIR="$(TclshDir)" \ - TCLTKMAN2HTML="$(TclTkMan2Html)" + TCLTKMAN2HTML="$(TclTkMan2Html)" LDFLAGS="" AfterInstall = extra-int-headers links include $(MAKEFILEPATH)/CoreOS/ReleaseControl/Common.make @@ -57,24 +57,23 @@ extra-int-headers: links: $(_v) $(INSTALL_DIRECTORY) "$(DSTROOT)$(USRLIBDIR)" - $(_v) $(LN) -fs "$(FmwkDir)/$(ProjectName)" "$(DSTROOT)$(USRLIBDIR)/libtk$(Version).dylib" + $(_v) $(LN) -fs "../..$(FmwkDir)/$(ProjectName)" "$(DSTROOT)/usr/lib/libtk$(Version).dylib" $(_v) $(LN) -fs "libtk$(Version).dylib" "$(DSTROOT)$(USRLIBDIR)/libtk.dylib" - $(_v) $(LN) -fs $(foreach f,$(LibItems),"$(FmwkDir)/$(f)") "$(DSTROOT)$(USRLIBDIR)" + $(_v) $(LN) -fs $(foreach f,$(LibItems),"../..$(FmwkDir)/$(f)") "$(DSTROOT)/usr/lib" $(_v) $(INSTALL_DIRECTORY) "$(DSTROOT)$(USRINCLUDEDIR)" - $(_v) $(LN) -fs $(foreach f,$(HeaderItems),"$(FmwkDir)/Headers/$(f)") \ - "$(DSTROOT)$(USRINCLUDEDIR)" + $(_v) $(LN) -fs $(foreach f,$(HeaderItems),"../..$(FmwkDir)/Headers/$(f)") \ + "$(DSTROOT)/usr/include" # Install compat sym links for private headers in /usr/local/include $(_v) $(INSTALL_DIRECTORY) "$(DSTROOT)/usr/local/include" - $(_v) $(LN) -fs $(foreach f,$(PrivateHeaderItems),"$(FmwkDir)/PrivateHeaders/$(f)") \ + $(_v) $(LN) -fs $(foreach f,$(PrivateHeaderItems),"../../..$(FmwkDir)/PrivateHeaders/$(f)") \ "$(DSTROOT)/usr/local/include/" -# make "Wish Shell.app" in $(AppInstallDir) a symlink to wish inside framework - $(_v) $(RMDIR) "$(DSTROOT)/$(AppInstallDir)/$(Wish)" - $(_v) $(LN) -s "$(FmwkDir)/Resources/$(Wish)" "$(DSTROOT)/$(AppInstallDir)" # Move wish.1 to wish$(Version).1 and link wish.1 to wish$(Version).1 $(_v) $(MV) "$(DSTROOT)$(MANDIR)/man1/wish.1$(Manpage_Suffix)" \ "$(DSTROOT)$(MANDIR)/man1/wish$(Version).1$(Manpage_Suffix)" $(_v) $(LN) -fs "wish$(Version).1$(Manpage_Suffix)" \ "$(DSTROOT)$(MANDIR)/man1/wish.1$(Manpage_Suffix)" +# Remove /Developer/Applications (3908113) + $(_v) $(RMDIR) $(DSTROOT)$(NSDEVELOPERAPPSDIR) ### diff -rupN -x CVS -x *.tar.gz -x dpkg -I \$Id: darwin-TclBI/tk/fix_tkConfig.sh ../../anoncvs.opensource.apple.com/tcl/tk/fix_tkConfig.sh --- darwin-TclBI/tk/fix_tkConfig.sh Thu Jan 1 10:00:00 1970 +++ ../../anoncvs.opensource.apple.com/tcl/tk/fix_tkConfig.sh Sat Aug 21 04:39:41 2004 @@ -0,0 +1,10 @@ +#!/bin/sh + +BOGUS_SRCROOT=${SRCROOT//tcl/tk} +BOGUS_OBJROOT=${OBJROOT//tcl/tk} +TK_CONFIG_SH=${DSTROOT}/System/Library/Frameworks/Tk.framework/Versions/8.4/tkConfig.sh + +sed -e "s|${BOGUS_SRCROOT}|${SRCROOT}|" \ + -e "s|${BOGUS_OBJROOT}|${SYMROOT}|" \ + ${TK_CONFIG_SH} > ${SYMROOT}/tkConfig.sh +cp ${SYMROOT}/tkConfig.sh ${TK_CONFIG_SH}