Changeset 195


Ignore:
Timestamp:
May 22, 2014, 1:18:03 PM (10 years ago)
Author:
demin
Message:

add Tktable and registry, update tcllib, sqlite and zlib

Location:
trunk/kitgen
Files:
2 added
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/kitgen/Makefile

    r175 r195  
    1 GSL_URL    = http://ftp.gnu.org/gnu/gsl/gsl-1.15.tar.gz
    2 TDOM_URL   = http://github.com/downloads/tDOM/tdom/tDOM-0.8.3.tgz
    3 ZLIB_URL   = http://downloads.sourceforge.net/project/libpng/zlib/1.2.7/zlib-1.2.7.tar.gz
    4 XOTCL_URL  = http://downloads.sourceforge.net/project/xotcl/xotcl/1.6.7/xotcl-1.6.7.tar.gz
    5 SQLITE_URL = http://www.sqlite.org/sqlite-autoconf-3071401.tar.gz
    6 LIBUSB_URL = http://heanet.dl.sourceforge.net/project/libusb/libusb-0.1%20%28LEGACY%29/0.1.12/libusb-0.1.12.tar.gz
     1TDOM_URL    = http://github.com/downloads/tDOM/tdom/tDOM-0.8.3.tgz
     2TCLLIB_URL  = http://github.com/tcltk/tcllib/archive/tcllib_1_16.tar.gz -O tcllib_1_16.tar.gz
     3ZLIB_URL    = http://heanet.dl.sourceforge.net/project/libpng/zlib/1.2.3/zlib-1.2.3.tar.gz
     4XOTCL_URL   = http://heanet.dl.sourceforge.net/project/xotcl/xotcl/1.6.7/xotcl-1.6.7.tar.gz
     5TKTABLE_URL = http://heanet.dl.sourceforge.net/project/tktable/tktable/2.10/Tktable2.10.tar.gz
     6SQLITE_URL  = http://www.sqlite.org/2014/sqlite-autoconf-3080403.tar.gz
     7LIBUSB_URL  = http://heanet.dl.sourceforge.net/project/libusb/libusb-0.1%20%28LEGACY%29/0.1.12/libusb-0.1.12.tar.gz
    78
    8 TCL_CVS    = :pserver:anonymous@tcl.cvs.sourceforge.net:/cvsroot/tcl
    9 TK_CVS     = :pserver:anonymous@tktoolkit.cvs.sourceforge.net:/cvsroot/tktoolkit
     9TCL_CVS     = :pserver:anonymous@tcl.cvs.sourceforge.net:/cvsroot/tcl
     10TK_CVS      = :pserver:anonymous@tktoolkit.cvs.sourceforge.net:/cvsroot/tktoolkit
    1011
    11 VFS_CVS    = :pserver:anonymous@tclvfs.cvs.sourceforge.net:/cvsroot/tclvfs
    12 TCLLIB_CVS = :pserver:anonymous@tcllib.cvs.sourceforge.net:/cvsroot/tcllib
     12VFS_CVS     = :pserver:anonymous@tclvfs.cvs.sourceforge.net:/cvsroot/tclvfs
    1313
    1414unspecified-target:
    … …  
    1616cvs:
    1717        mkdir -p 8.x && cd 8.x && \
    18           cvs -d $(VFS_CVS) co tclvfs && \
    19           cvs -d ${TCLLIB_CVS} co tcllib
     18          cvs -d $(VFS_CVS) co tclvfs
    2019        mkdir -p 8.5 && cd 8.5 && \
    2120          cvs -d $(TCL_CVS) co -r core-8-5-branch tcl && \
    … …  
    2423tars:
    2524        mkdir -p 8.x && cd 8.x && \
    26           wget -q $(GSL_URL) && \
    2725          wget -q $(TDOM_URL) && \
     26          wget -q $(TCLLIB_URL) && \
    2827          wget -q $(ZLIB_URL) && \
    2928          wget -q $(XOTCL_URL) && \
     29          wget -q $(TKTABLE_URL) && \
    3030          wget -q $(SQLITE_URL) && \
    3131          wget -q $(LIBUSB_URL)
    … …  
    3333untar:
    3434        mkdir -p 8.x && cd 8.x && \
    35           tar xfz gsl-1.15.tar.gz && \
    3635          tar xfz tDOM-0.8.3.tgz && \
    37           tar xfz zlib-1.2.7.tar.gz && \
     36          tar xfz tcllib_1_16.tar.gz && \
     37          tar xfz zlib-1.2.3.tar.gz && \
    3838          tar xfz xotcl-1.6.7.tar.gz && \
    39           tar xfz sqlite-autoconf-3071401.tar.gz && \
     39          tar xfz Tktable2.10.tar.gz && \
     40          tar xfz sqlite-autoconf-3080403.tar.gz && \
    4041          tar xfz libusb-0.1.12.tar.gz && \
    41           mv gsl-1.15 gsl && \
    4242          mv tDOM-0.8.3 tdom && \
    43           mv zlib-1.2.7 zlib && \
     43          mv tcllib-tcllib_1_16 tcllib && \
     44          mv zlib-1.2.3 zlib && \
    4445          mv xotcl-1.6.7 xotcl && \
    45           mv sqlite-autoconf-3071401 sqlite && \
     46          mv Tktable2.10 Tktable && \
     47          mv sqlite-autoconf-3080403 sqlite && \
    4648          mv libusb-0.1.12 libusb
    4749

  • trunk/kitgen/kitInit.c

    r175 r195  
    4444#ifdef KIT_INCLUDES_TK
    4545Tcl_AppInitProc Blt_Init, Blt_SafeInit;
     46Tcl_AppInitProc Tktable_Init, Tktable_SafeInit;
    4647#endif
    4748
    … …  
    114115    Tcl_StaticPackage(0, "Tk", Tk_Init, Tk_SafeInit);
    115116    Tcl_StaticPackage(0, "Blt", Blt_Init, Blt_SafeInit);
     117    Tcl_StaticPackage(0, "Tktable", Tktable_Init, Tktable_SafeInit);
    116118#endif
    117119

  • trunk/kitgen/makefile.include

    r176 r195  
    2727
    2828BLT_OPTS = --disable-threads
     29TKTABLE_OPTS = --disable-threads
    2930VFS_OPTS = --disable-threads
    3031TDOM_OPTS = --disable-threads
    … …  
    4344
    4445ifeq ($(PLAT), win)
    45 kit-gui$(EXE): build/tcl build/tk build/blt build/tclvfs build/zlib \
     46kit-gui$(EXE): build/tcl build/tk build/blt build/Tktable build/tclvfs build/zlib \
    4647        build/tdom build/tcllib build/xotcl build/sqlite build/libusb-win32 $(GUIOBJ)
    4748        $(CC) -o $@ $(CFLAGS) ../../kitInit.c $(GUIOBJ) \
    … …  
    5253          build/lib/*tcl8*$A \
    5354          build/lib/BLT2*/*BLT2*$A \
     55          build/lib/Tktable2*/*Tktable2*$A \
    5456          build/lib/tdom0*/*tdom0*$A \
    5557          build/lib/sqlite3*/*sqlite3*$A \
    … …  
    5759          $(LDFLAGS) $(GUI_OPTS)
    5860else
    59 kit-gui$(EXE): build/tcl build/tk build/blt build/tclvfs build/zlib \
     61kit-gui$(EXE): build/tcl build/tk build/blt build/Tktable build/tclvfs build/zlib \
    6062        build/tdom build/tcllib build/xotcl build/sqlite build/libusb $(GUIOBJ)
    6163        $(CC) -o $@ $(CFLAGS) ../../kitInit.c $(GUIOBJ) \
    … …  
    6668          build/lib/*tcl8*$A \
    6769          build/lib/BLT2*/*BLT2*$A \
     70          build/lib/Tktable2*/*Tktable2*$A \
    6871          build/lib/tdom0*/*tdom0*$A \
    6972          build/lib/sqlite3*/*sqlite3*$A \
    … …  
    8992        mkdir -p $@ && cd $@ && CFLAGS="$(CFLAGS)" && export CFLAGS && \
    9093          sh $(EXTDIR)/blt/configure $(STATIC) $(TCLDIR) $(BLT_OPTS) && \
     94          $(MAKE) install-binaries install-libraries
     95
     96build/Tktable: build/tk
     97        mkdir -p $@ && cd $@ && CFLAGS="$(CFLAGS)" && export CFLAGS && \
     98          sh $(EXTDIR)/Tktable/configure $(STATIC) $(TCLDIR) $(TKTABLE_OPTS) && \
    9199          $(MAKE) install-binaries install-libraries
    92100

  • trunk/kitgen/setupvfs.tcl

    r175 r195  
    4040  exit 1
    4141}
     42
     43set tcl_library ../tcl/library
     44source ../tcl/library/init.tcl ;# for tcl::CopyDirectory
     45
     46package require platform
     47
     48set platform [lindex [split [platform::generic] -] 0]
    4249
    4350load {} zlib
    … …  
    6471                  csr0@ csr[package require csr]]
    6572
     73if {[string equal $platform win32]} {
     74  load {} registry
     75  lappend versmap registry1@ registry[package require registry]
     76}
     77
    6678if {$debugOpt} {
    6779  puts "Starting [info script]"
    … …  
    7486}
    7587
    76 set tcl_library ../tcl/library
    77 source ../tcl/library/init.tcl ;# for tcl::CopyDirectory
    78 
    7988# Create package index files for the static extensions.
    80 set exts {swt csr usb g2lite XOTcl zlib}
     89set exts [list swt csr usb g2lite XOTcl zlib]
     90if {[string equal $platform win32]} {
     91  lappend exts registry
     92}
    8193foreach ext $exts {
    8294  load {} $ext
    … …  
    89101set clifiles {
    90102  boot.tcl
    91   main.tcl
    92103  config.tcl
    93104  lib/tcl8@/auto.tcl
    … …  
    115126  lib/csr0@/pkgIndex.tcl
    116127  lib/zlib1@/pkgIndex.tcl
    117   lib/tcllib1.14/pkgIndex.tcl
    118   lib/tcllib1.14/asn
    119   lib/tcllib1.14/base64
    120   lib/tcllib1.14/comm
    121   lib/tcllib1.14/cmdline
    122   lib/tcllib1.14/fileutil
    123   lib/tcllib1.14/ldap
    124   lib/tcllib1.14/log
    125   lib/tcllib1.14/math
    126   lib/tcllib1.14/snit
    127   lib/tcllib1.14/uri}
     128  lib/tcllib1.16/pkgIndex.tcl
     129  lib/tcllib1.16/asn
     130  lib/tcllib1.16/base64
     131  lib/tcllib1.16/comm
     132  lib/tcllib1.16/cmdline
     133  lib/tcllib1.16/csv
     134  lib/tcllib1.16/fileutil
     135  lib/tcllib1.16/ldap
     136  lib/tcllib1.16/log
     137  lib/tcllib1.16/math
     138  lib/tcllib1.16/snit
     139  lib/tcllib1.16/struct
     140  lib/tcllib1.16/uri
     141}
     142
     143if {[string equal $platform win32]} {
     144  lappend clifiles lib/registry1@/pkgIndex.tcl
     145}
    128146
    129147set guifiles {
    … …  
    168186  lib/BLT2.4/bltCanvEps.pro
    169187  lib/BLT2.4/bltGraph.pro
     188  lib/Tktable2.10/pkgIndex.tcl
     189  lib/Tktable2.10/tkTable.tcl
    170190}
    171191
Note: See TracChangeset for help on using the changeset viewer.