Tcl/Tk Newversion

	modified:   util/src/TclTk/Makefile

diff --git a/util/src/TclTk/Makefile b/util/src/TclTk/Makefile
index e23925f..a3b6d55 100755 (executable)
--- a/util/src/TclTk/Makefile
+++ b/util/src/TclTk/Makefile
@@ -6,62 +6,114 @@ SHELL=/bin/ksh
 
 include ${EOS_HOME}/src/Config/${EOS_HOST}.inc
 
-TCLVERSION=8.4.5
-TKVERSION=8.4.5
+### TCL
+TCLVERSION=8.6.4
+TCLNAME=tcl$(TCLVERSION)
+TCLWHERE=http://sourceforge.net/projects/tcl/files/Tcl/8.6.4/tcl864-src.zip/download
+#TCLVERSION=8.5.18
+#TCLNAME=tcl$(TCLVERSION)
+#TCLWHERE=http://sourceforge.net/projects/tcl/files/Tcl/8.5.18/tcl8518-src.zip/download
+
+### TK 
+TKVERSION=8.6.4
+TKNAME=tk$(TCLVERSION)
+TKWHERE=http://sourceforge.net/projects/tcl/files/Tcl/8.6.4/tk864-src.zip/download
+#TKVERSION=8.5.18
+#TKNAME=tk$(TCLVERSION)
+#TKWHERE=http://sourceforge.net/projects/tcl/files/Tcl/8.5.18/tk8518-src.zip/download
+
+### TCLLIB
+TCLLIBVERSION=1.17
+TCLLIBNAME=tcllib-$(TCLLIBVERSION)
+TCLLIBWHERE=http://sourceforge.net/projects/tcllib/files/tcllib/$(TCLLIBVERSION/$(TCLLIBNAME).zip/download 
+
+### BLT
+BLTVERSION=2.5.3
+BLTNAME=blt-src-$(BLTVERSION)
+BLTNAMEDIR=blt2.5
+BLTWHERE=http://sourceforge.net/projects/wize/files/$(BLTNAME).zip/download
+
+#TCLVERSION=8.4.5
+#TKVERSION=8.4.5
 #TCLVERSION=8.5.8
 #TKVERSION=8.5.8
-TKIMGVERSION=1.4
-BLTVERSION=2.4z
+#TKIMGVERSION=1.4
+#BLTVERSION=2.4z
+
+
+
+### VTK
 #VTKVERSION1=Nighty
 #VTKVERSION=5.4.2
-VTKVERSION0=6.2
-VTKVERSION=$(VTKVERSION0).0
+#VTKVERSION=6.2.0
+VTKVERSION=6.3.0
 VTKNAME=VTK-$(VTKVERSION)
-VTKWHERE=http://www.vtk.org/files/release/$(VTKVERSION0)/$(VTKNAME).tar.gz
+VTKWHERE=http://www.vtk.org/files/release/6.3/
+#VTKWHERE=http://www.vtk.org/files/release/6.2/
 
-check:  TclInit TkInit TkImgInit BLTInit VTKInit
+check:  TclCheck TkCheck TcllibCheck TkImgCheck BLTCheck VTKCheck
 
-config: TclConfig TkConfig TkImgInit BLTConfig VTKConfig
+config: TclConfig TkConfig TkImgCheck BLTConfig VTKConfig
 
 all: Tcl Tk TkImg BLT VTK
 
 clean: TclClean TkClean TkImgClean BLTClean VTKClean
 
-TclInit::
-       @ln -s ../../src/TclTk/tcl$(TCLVERSION)-src.tar.gz .
-       @gzip -dc tcl$(TCLVERSION)-src.tar.gz | tar xvf - 
+cleanAll: TclCleanAll TkCleanAll TkImgCleanAll BLTCleanAll VTKCleanAll
 
-TkInit::
-       @ln -s ../../src/TclTk/tk$(TKVERSION)-src.tar.gz .
-       @gzip -dc tk$(TKVERSION)-src.tar.gz | tar xvf - 
+TclCheck::
+       #@ln -s ../../src/TclTk/tcl$(TCLVERSION)-src.tar.gz .
+       #@gzip -dc tcl$(TCLVERSION)-src.tar.gz | tar xvf - 
+       curl -L $(TCLWHERE) > $(TCLNAME)-src.zip
+       unzip $(TCLNAME)-src.zip
 
-TkImgInit::
+TkCheck::
+       #@ln -s ../../src/TclTk/tk$(TKVERSION)-src.tar.gz .
+       #@gzip -dc tk$(TKVERSION)-src.tar.gz | tar xvf - 
+       curl -L $(TKWHERE) > $(TKNAME)-src.tar.gz
+       unzip $(TKNAME)-src.tar.gz
+
+TkImgCheck::
        @ln -s ../../src/TclTk/tkimg$(TKIMGVERSION).tar.gz .
        @gzip -dc tkimg$(TKIMGVERSION)tar.gz | tar xvf - 
 
-BLTInit::
-       @ln -s ../../src/TclTk/BLT$(BLTVERSION).tar.gz .
-       @gzip -dc BLT$(BLTVERSION).tar.gz | tar xvf - 
-
-VTKInit::
+BLTCheck::
+       #@ln -s ../../src/TclTk/BLT$(BLTVERSION).tar.gz .
+       #@gzip -dc BLT$(BLTVERSION).tar.gz | tar xvf - 
+       curl -L $(BLTWHERE) > $(BLTNAME).zip
+       unzip $(BLTNAME).zip
+
+TcllibCheck::
+       curl -L $(TCLLIBWHERE) > $(TCLLIBNAME).zip
+       unzip $(TCLLIBNAME).zip
+
+VTKCheck::
+       #@ln -s ../../src/TclTk/vtk$(VTKVERSION)-src-unix.tgz .
+       #@gzip -dc vtk$(VTKVERSION)-src-unix.tgz | tar xvf - 
+       #@ln -s ../../src/TclTk/vtk$(VTKVERSION1)Src.tar.gz .
+       #@gzip -dc vtk$(VTKVERSION1)Src.tar.gz | tar xvf - 
        #@ln -s ../../src/TclTk/vtk-$(VTKVERSION).tar.gz .
        #@gzip -dc vtk-$(VTKVERSION).tar.gz | tar xvf - 
-       curl -O $(VTKWHERE)
-       tar xvzf $(VTKNAME).tar.gz
+       #curl -O $(VTKWHERE)/$(VTKNAME).tar.gz
+       #tar xvzf $(VTKNAME).tar.gz
+       curl -O $(VTKWHERE)/$(VTKNAME).zip
+       unzip $(VTKNAME).zip
 
 TclConfig::
        @cd tcl$(TCLVERSION)/unix ; \
        $(MAKE) clean ; \
        ./configure --prefix=${EOS_HOME}/util/$(OSTYPE) \
-                           --enable-shared \
-                               --enable-gcc
+                           --enable-shared --enable-symbol \
+                               --enable-gcc --disable-threads
 
 TkConfig::
        @cd tk$(TKVERSION)/unix  ; \
        $(MAKE) clean; \
        ./configure --prefix=${EOS_HOME}/util/$(OSTYPE) \
                                --with-tcl=../../tcl$(TCLVERSION)/unix \
-                               --enable-gcc --with-libtiff
+                               --enable-gcc --with-libtiff --enable-symbol --enable-shared \
+                               --with-x --x-libraries=/opt/X11/lib --x-includes=/opt/X11/include --with-gnu-ld
+
 TkImgConfig::
        @cd tkimg$(TKIMGVERSION)  ; \ $(MAKE) clean; \
        ./configure --prefix=${EOS_HOME}/util/$(OSTYPE) \
@@ -69,7 +121,17 @@ TkImgConfig::
                                --with-tk=${EOS_HOME}/util/src$(OSTYPE)/TclTk/tk$(TKVERSION)/unix  \
 
 BLTConfig::
-       @cd blt$(BLTVERSION); \
+       cd $(BLTNAMEDIR); \
+       ./configure --prefix=${EOS_HOME}/util/$(OSTYPE) \
+                               --with-tcl=../tcl$(TCLVERSION)/unix \
+                               --with-tk=../tk$(TKVERSION)/unix  \
+                               --enable-jpeg=${EOS_HOME}/util/$(OSTYPE) \
+                               --enable-shared \
+                               --enable-gcc \
+                               --with-x --x-libraries=/opt/X11/lib --x-includes=/opt/X11/include --with-gnu-ld
+
+TcllibConfig::
+       @cd $(TCLLIBNAME); \
        $(MAKE) clean ; \
        ./configure --prefix=${EOS_HOME}/util/$(OSTYPE) \
                                --with-tcl=../tcl$(TCLVERSION)/unix \
@@ -117,10 +179,16 @@ TkImg::
 
 
 BLT::
-       @cd blt$(BLTVERSION); \
+       @cd $(BLTNAMEDIR); \
        $(MAKE) install  ; \
+       cp generic/bltOldConfig.h ${EOS_HOME}/util/$(OSTYPE)/include/ ; \
        # $(MAKE) INSTALL=${EOS_HOME}/sbin/eosinstall install 
 
+
+Tcllib::
+       @cd $(TCLLIBNAME); \
+       $(MAKE) install  ; \
+
 VTK::
        cd VTK ; \
        $(MAKE)   ; \
@@ -131,15 +199,31 @@ TclClean::
        @cd tcl$(TCLVERSION)/unix ; \
        $(MAKE) distclean 
 
+TclCleanAll::
+       @rm -rf tcl$(TCLVERSION) ; 
+       @rm tcl$(TCLVERSION)-src.tar.gz ;
+
 TkClean::
        @cd tk$(TKVERSION)/unix  ; \
        $(MAKE) distclean
 
+TkCleanAll::
+       @rm -rf tk$(TKVERSION) ; 
+       @rm $(TKNAME)-src.tar.gz ; 
+
 
 BLTClean::
        @cd blt$(BLTVERSION); \
        $(MAKE) distclean
 
+TcllibClean::
+       @cd $(TCLLIBNAME); \
+       $(MAKE) clean
+
+TcllibCleanAll::
+       @rm -rf $(TCLLIBNAME)
+       @rm -f  $(TCLLIBNAME).zip 
+
 VTKClean::
        cd vtk$(VTKVERSION) ; \
        $(MAKE) distclean