Updated the toplevel makefile.

This should probably be replaced with a configure script that initializes
the basic tree to perform an 8.5 build. In the meantime, this fixes it
to just download and setup the current 8.5.8 release.

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>

diff --git a/Makefile b/Makefile
index 2c45a47ebdda94f23e90845e44069f3ea5b75bcb..a20d012aaebef6ef4b2bdc0d98e225b5605c882a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,45 +1,22 @@
-TCL_URL        = http://prdownloads.sourceforge.net/tcl/
-TK_URL = http://prdownloads.sourceforge.net/tcl/
+# Initial setup of kitgen for building tclkit.
+#
+#  usage: make tars
+#         make largs
+#
+# Once setup, read the notes and use config.sh to adjust your build.
 
-TCL_CVS   =":pserver:anonymous@tcl.cvs.sourceforge.net/cvsroot/tcl"
-TK_CVS    =":pserver:anonymous@tktoolkit.cvs.sourceforge.net/cvsroot/tktoolkit"
-VFS_CVS   =":pserver:anonymous@tclvfs.cvs.sourceforge.net/cvsroot/tclvfs"
-ZLIB_CVS  =":pserver:anonymous@tkimg.cvs.sourceforge.net/cvsroot/tkimg"
-ITCL_CVS  =":pserver:anonymous@incrtcl.cvs.sourceforge.net/cvsroot/incrtcl"
-VQTCL_SVN ="http://tclkit.googlecode.com/svn/trunk/vqtcl"
-MK_SVN    ="svn://svn.equi4.com/metakit/trunk"
+URL    = http://prdownloads.sourceforge.net/tcl
 
 unspecified-target:
 
-checkout:
-       mkdir 8.x && cd 8.x && \
-         cvs -qz6 -d$(VFS_CVS) co -d vfs tclvfs && \
-         cvs -qz6 -d$(ZLIB_CVS) co -d zlib tkimg/libz && \
-         cvs -qz6 -d$(TCL_CVS) co thread && \
-         cvs -qz6 -d$(ITCL_CVS) co -d itcl incrTcl/itcl && \
-         svn checkout $(VQTCL_SVN) vqtcl && \
-         svn checkout $(MK_SVN) mk
-       mkdir 8.4 && cd 8.4 && \
-         cvs -qz6 -d$(TCL_CVS) co -r core-8-4-branch tcl && \
-         cvs -qz6 -d$(TK_CVS) co -r core-8-4-branch tk
-       mkdir 8.5 && cd 8.5 && \
-         cvs -qz6 -d$(TCL_CVS) co -r core-8-5-branch tcl && \
-         cvs -qz6 -d$(TK_CVS) co -r core-8-5-branch tk
-
 tars:
-       mkdir 8.x && cd 8.x && \
-         wget -q $(TAR_URL)/vfs.tar.gz && tar xfz vfs.tar.gz && \
-         wget -q $(TAR_URL)/zlib.tar.gz && tar xfz zlib.tar.gz && \
-         wget -q $(TAR_URL)/vqtcl.tgz && tar xfz vqtcl.tgz && \
-         rm *gz && mv vfs tclvfs
-       mkdir 8.4 && cd 8.4 && \
-         wget -q $(TCL_URL)/tcl8.4.19-src.tar.gz && tar xfz tcl8.4.19-src.tar.gz && \
-         wget -q $(TK_URL)/tk8.4.19-src.tar.gz && tar xfz tk8.4.19-src.tar.gz && \
-         rm *gz
-       mkdir 8.5 && cd 8.5 && \
-         wget -q $(TCL_URL)/tcl8.5.6-src.tar.gz && tar xfz tcl8.5.6-src.tar.gz && \
-         wget -q $(TK_URL)/tk8.5.6-src.tar.gz && tar xfz tk8.5.6-src.tar.gz && \
-         rm *gz
+       [ -d 8.5 ] || mkdir 8.5
+       [ -f tcl8.5.8-src.tar.gz ] || wget -q $(URL)/tcl8.5.8-src.tar.gz
+       tar -C 8.5 -xzf tcl8.5.8-src.tar.gz
+       [ -f tk8.5.8-src.tar.gz ] || wget -q $(URL)/tk8.5.8-src.tar.gz
+       tar -C 8.5 -xzf tk8.5.8-src.tar.gz
+       ln -sf tcl8.5.8  8.5/tcl
+       ln -sf tk8.5.8   8.5/tk
 
 configs:
        sh config.sh 8.4/base-std
@@ -58,11 +35,4 @@ base tidy:
 all clean distclean tclkit-cli tclkit-dyn tclkit-gui:
        for i in 8*/kit-*/Makefile; do (cd `dirname $$i`; $(MAKE) $@); done
 
-# this is not for general use, due to the custom script and hard-wired paths
-docs:
-       markdown-tm 'Kitgen - Tclkit Lite executable builder' \
-         <README >~/Sites/www.equi4.com/kitgen.html
-       markdown-tm 'Swisskit - a big single-file Tcl/Tk for Mac OS X' \
-         <README.swisskit >~/Sites/www.equi4.com/swisskit.html
-
-.PHONY: all base tidy clean distclean small large docs tars configs
+.PHONY: all base tidy clean distclean small large tars configs