From ed67e9417966850427f58d7f98a8df957d9d6b07 Mon Sep 17 00:00:00 2001 From: Jean-Claude Wippler Date: Wed, 4 Apr 2007 13:31:10 +0000 Subject: [PATCH] renamed vlerqtcl to vqtcl git-svn-id: svn://svn.equi4.com/kitgen/trunk@1376 9e558909-932a-0410-a563-af77432da1eb --- extdefs/vlerq.kbs | 6 +++--- makefile.include | 14 +++++++------- setupvfs.tcl | 14 +++++++------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/extdefs/vlerq.kbs b/extdefs/vlerq.kbs index 383be3d..9656f9f 100644 --- a/extdefs/vlerq.kbs +++ b/extdefs/vlerq.kbs @@ -1,11 +1,11 @@ Version 4.1 -Sources fetch http://www.equi4.com/pub/vq/vlerqtcl-2007-01-25.tar.gz +Sources fetch http://www.equi4.com/pub/vq/vqtcl.tgz Build { Sh [Srcdir]/configure --with-tcl=[Libdir] Sh make install-binaries - Sh strip -x [Unglob ../lib/vlerqtcl4*/libvlerqtcl4*] + Sh strip -x [Unglob ../lib/vqtcl4*/libvqtcl4*] } -Result [Unglob ../lib/vlerqtcl4*] \ No newline at end of file +Result [Unglob ../lib/vqtcl4*] diff --git a/makefile.include b/makefile.include index 87112dd..41cdb62 100644 --- a/makefile.include +++ b/makefile.include @@ -32,16 +32,16 @@ tclkit-gui$(EXE): kit-cli$(EXE) kit-gui$(EXE) ../../setupvfs.tcl build/files cp kit-gui$(EXE) $@ && $(STRIP) $@ ./kit-cli -init- ../../setupvfs.tcl $(KIT_OPTS) $@ gui -kit-cli$(EXE): build/tcl build/tclvfs build/vlerq build/zlib $(KITSRC) +kit-cli$(EXE): build/tcl build/tclvfs build/vqtcl build/zlib $(KITSRC) $(CC) -o $@ $(CFLAGS) $(KITSRC) -Ibuild/include \ -DKIT_LITE -DTCL_LOCAL_APPINIT=TclKit_AppInit -DSTATIC_BUILD \ - build/lib/vfs1*/*vfs1*.a build/lib/vlerqtcl4*/*vlerqtcl4*.a \ + build/lib/vfs1*/*vfs1*.a build/lib/vqtcl4*/libvqtcl4*.a \ build/lib/libz.a build/lib/libtcl8*.a $(LDFLAGS) -kit-gui$(EXE): build/tcl build/tk build/tclvfs build/vlerq build/zlib $(KITSRC) +kit-gui$(EXE): build/tcl build/tk build/tclvfs build/vqtcl build/zlib $(KITSRC) $(CC) -o $@ $(CFLAGS) $(KITSRC) -Ibuild/include \ -DKIT_LITE -DTCL_LOCAL_APPINIT=TclKit_AppInit -DSTATIC_BUILD \ - build/lib/vfs1*/*vfs1*.a build/lib/vlerqtcl4*/*vlerqtcl4*.a \ + build/lib/vfs1*/*vfs1*.a build/lib/vqtcl4*/libvqtcl4*.a \ -DKIT_INCLUDES_TK build/lib/libtk8*.a \ build/lib/libz.a build/lib/libtcl8*.a $(LDFLAGS) $(GUI_OPTS) @@ -76,9 +76,9 @@ build/tclvfs: build/tcl sh $(EXTDIR)/tclvfs/configure $(STATIC) $(TCLDIR) $(VFS_OPTS) && \ $(MAKE) install -build/vlerq: build/tcl +build/vqtcl: build/tcl mkdir -p $@ && cd $@ && CFLAGS="$(CFLAGS)" && export CFLAGS && \ - sh $(EXTDIR)/vlerq/configure $(STATIC) $(TCLDIR) $(VLERQ_OPTS) && \ + sh $(EXTDIR)/vqtcl/configure $(STATIC) $(TCLDIR) $(VLERQ_OPTS) && \ $(MAKE) install build/zlib: build/tcl @@ -90,7 +90,7 @@ base: build/tcl build/tk tidy: rm -rf build/tcl build/tclvfs build/thread build/tk \ - build/tkdyn build/vlerq build/zlib + build/tkdyn build/vqtcl build/zlib clean: rm -rf build kit-cli$(EXE) kit-gui$(EXE) diff --git a/setupvfs.tcl b/setupvfs.tcl index 0f087f5..bf075b5 100644 --- a/setupvfs.tcl +++ b/setupvfs.tcl @@ -46,7 +46,7 @@ load {} vfs ;# vlerq is already loaded by now # this relies on having all necessary extensions already loaded at this point set versmap [list tcl8@ tcl$tcl_version tk8@ tk$tcl_version \ vfs1@ vfs[package require vfs] \ - vlerqtcl4@ vlerqtcl[package require vlerq]] + vqtcl4@ vqtcl[package require vlerq]] if {$debugOpt} { puts "Starting [info script]" @@ -62,7 +62,7 @@ set tcl_library ../tcl/library source ../tcl/library/init.tcl ;# for tcl::CopyDirectory source ../../8.x/tclvfs/library/vfsUtils.tcl source ../../8.x/tclvfs/library/vfslib.tcl ;# override vfs::memchan/vfsUtils.tcl -source ../../8.x/vlerq/library/m2mvfs.tcl +source ../../8.x/vqtcl/library/m2mvfs.tcl set clifiles { boot.tcl @@ -82,11 +82,11 @@ set clifiles { lib/vfs1@/vfslib.tcl lib/vfs1@/vfsUtils.tcl lib/vfs1@/zipvfs.tcl - lib/vlerqtcl4@/m2mvfs.tcl - lib/vlerqtcl4@/mkclvfs.tcl - lib/vlerqtcl4@/mklite.tcl - lib/vlerqtcl4@/pkgIndex.tcl - lib/vlerqtcl4@/ratcl.tcl + lib/vqtcl4@/m2mvfs.tcl + lib/vqtcl4@/mkclvfs.tcl + lib/vqtcl4@/mklite.tcl + lib/vqtcl4@/pkgIndex.tcl + lib/vqtcl4@/ratcl.tcl } set guifiles { -- 2.23.0