diff -u -p -x configure -x autom4te.cache -x .DS_Store -x .cvsignore -r -N orig/xotcl-1.3.6/Makefile.in xotcl/Makefile.in --- orig/xotcl-1.3.6/Makefile.in Fri Mar 18 08:28:33 2005 +++ xotcl/Makefile.in Fri Mar 25 10:45:36 2005 @@ -42,7 +42,7 @@ src_test_dir_native = `@CYGPATH@ ${src_ src_app_dir_native = `@CYGPATH@ ${src_app_dir}` src_generic_dir_native = `@CYGPATH@ ${src_generic_dir}` -libdirs = comm lib serialize @libdirs_actiweb@ +libdirs = comm lib serialize store @libdirs_actiweb@ libsrc = COPYRIGHT pkgIndex.tcl appdirs = comm scripts utils @apps_actiweb@ appsrc = COPYRIGHT @@ -52,7 +52,6 @@ DOC_SOURCE = \ $(src_lib_dir)/lib/*.xotcl \ $(src_lib_dir)/store/*.xotcl \ $(src_lib_dir)/serialize/Serializer.xotcl \ - $(src_test_dir)/*.xotcl \ $(src_app_dir)/scripts/*.xotcl \ $(src_app_dir)/comm/[flsw]*.xotcl \ $(src_app_dir)/actiweb/univ/UNIVERSAL.xotcl \ @@ -232,7 +231,7 @@ fulldoc: doc pdf # use language reference as sample file to trigger generation of documentation files doc: $(target_doc_dir)/langRef-xotcl.html -$(target_doc_dir)/langRef-xotcl.html: $(src_doc_dir)/langRef.xotcl $(DOC_SOURCE) +$(target_doc_dir)/langRef-xotcl.html: $(src_doc_dir)/langRef.xotcl $(DOC_SOURCE) $(PKG_LIB_FILE) @docs=""; \ for i in $(DOC_SOURCE); do docs="$$docs `@CYGPATH@ $$i`"; done; \ $(TCLSH) $(src_lib_dir_native)/lib/makeDoc.xotcl \ @@ -281,7 +280,7 @@ install-libraries: libraries $(DESTDIR)$ rm -rf $(DESTDIR)$(pkglibdir)/$$i ; \ $(INSTALL_DATA) $(src_lib_dir)/$$i $(DESTDIR)$(pkglibdir)/$$i ; \ done; - cat unix/pkgIndex.unix >> $(DESTDIR)$(pkglibdir)/pkgIndex.tcl + cat pkgIndex.tcl >> $(DESTDIR)$(pkglibdir)/pkgIndex.tcl $(INSTALL_DATA) xotclConfig.sh $(DESTDIR)$(libdir)/ @echo "Installing Applications to $(DESTDIR)$(pkglibdir)/apps/" @for i in $(appdirs) ; do \ @@ -292,6 +291,10 @@ install-libraries: libraries $(DESTDIR)$ for j in $(src_app_dir)/$$i/* ; do \ $(INSTALL) $$j $(DESTDIR)$(pkglibdir)/apps/$$i/; \ done; \ + if [ -d apps/$$i ]; then for j in apps/$$i/* ; do \ + $(INSTALL) $$j $(DESTDIR)$(pkglibdir)/apps/$$i/; \ + done; fi; \ + rm -f $(DESTDIR)$(pkglibdir)/apps/$$i/*.in; \ done; @for i in $(appsrc) ; do \ echo " Installing $$i" ; \ diff -u -p -x configure -x autom4te.cache -x .DS_Store -x .cvsignore -r -N orig/xotcl-1.3.6/apps/utils/xotclsh.in xotcl/apps/utils/xotclsh.in --- orig/xotcl-1.3.6/apps/utils/xotclsh.in Mon May 24 08:50:39 2004 +++ xotcl/apps/utils/xotclsh.in Fri Mar 25 10:45:36 2005 @@ -1,4 +1,6 @@ -#!@TCLSH_PROG@ +#!/bin/sh +# \ +exec @TCLSH_PROG@ "$0" ${1+"$@"} if {$argc == 0} { puts "Don't use [info script] as interactive shell! Use instead:" puts " @TCLSH_PROG@" diff -u -p -x configure -x autom4te.cache -x .DS_Store -x .cvsignore -r -N orig/xotcl-1.3.6/apps/utils/xowish.in xotcl/apps/utils/xowish.in --- orig/xotcl-1.3.6/apps/utils/xowish.in Mon May 24 08:50:39 2004 +++ xotcl/apps/utils/xowish.in Fri Mar 25 10:45:36 2005 @@ -1,17 +1,24 @@ -#!@WISH_PROG@ -###!@TCLSH_PROG@ +#!/bin/sh +# \ +exec @WISH_PROG@ "$0" ${1+"$@"} +###exec @TCLSH_PROG@ "$0" ${1+"$@"} ###package require Tk -if {$argc == 0} { - puts "Don't use [info script] as interactive shell! Use instead:" - puts " @WISH_PROG@" - puts " package require XOTcl; namespace import ::xotcl::*" - exit -} else { +if {$argc && [string equal -length \ + [string length [lindex $argv 0]] [lindex $argv 0] "-file"]} { + set argv [lreplace $argv 0 0] + incr argc -1 +} +if {$argc && [string index [lindex $argv 0] 0] ne "-" } { package require XOTcl namespace import ::xotcl::* set argv0 [lindex $argv 0] set argv [lreplace $argv 0 0] incr argc -1 source $argv0 +} else { + puts "Don't use [info script] as interactive shell! Use instead:" + puts " @WISH_PROG@" + puts " package require XOTcl; namespace import ::xotcl::*" + exit -1 } ###catch {vwait forever} diff -u -p -x configure -x autom4te.cache -x .DS_Store -x .cvsignore -r -N orig/xotcl-1.3.6/configure.in xotcl/configure.in --- orig/xotcl-1.3.6/configure.in Sat Mar 12 01:14:20 2005 +++ xotcl/configure.in Fri Mar 25 10:45:36 2005 @@ -336,6 +336,9 @@ TEA_MAKE_LIB #-------------------------------------------------------------------- TEA_PROG_TCLSH +if test "$with_tk" != no; then +TEA_PROG_WISH +fi # make this available, for such as xotclConfig.sh XOTCL_COMPATIBLE_TCLSH=${TCLSH_PROG} diff -u -p -x configure -x autom4te.cache -x .DS_Store -x .cvsignore -r -N orig/xotcl-1.3.6/doc/index.html xotcl/doc/index.html --- orig/xotcl-1.3.6/doc/index.html Fri Mar 18 07:34:07 2005 +++ xotcl/doc/index.html Thu Jan 1 10:00:00 1970 @@ -1,35 +0,0 @@ - - -The Extended Object Tcl (XOTcl) Documentation contains the -following parts: - -

XOTcl Language Documentation

- - -

Package and Script Documentation

-
- This section of the documentation is under work... -
- - -

- -

Tcl Online Information

- - - diff -u -p -x configure -x autom4te.cache -x .DS_Store -x .cvsignore -r -N orig/xotcl-1.3.6/doc/xo-daemon.html xotcl/doc/xo-daemon.html --- orig/xotcl-1.3.6/doc/xo-daemon.html Fri Mar 18 07:34:07 2005 +++ xotcl/doc/xo-daemon.html Thu Jan 1 10:00:00 1970 @@ -1,98 +0,0 @@ - - - - - XOTcl - Documentation -- ./apps/utils/xo-daemon - - - - -

- ./apps/utils/xo-daemon - ./apps/utils/xo-daemon

-
-

-

Package/File Information

- Package required: XOTcl -
-
- Filename: - - ./apps/utils/xo-daemon - -
-
- - - - - - - - - - - - - -
- Description: - - - This script can be used to start/stop/restart xotcl daemons - and maintains the process IDs, log files and means for easy - restart. -

- It receives as first parameter the name of the xotcl script - to be executed followed by the desired action and optional - parameters. The specified action can be -

    -
  • start: the specified script is started in - the background, an entry to restart is generated in - the run-directory as well as the process id of the started - script. In addition a logfile is created in the log directory. - If the start of the script fails, the error messages are - shown. -
  • startall: all scripts that were started before - via this script, are started -
  • stop terminates te specified script. -
  • stopall terminates all scripts started via this - command -
  • restart tries to restart the specified script. -
- The optional parameters are: -
    -
  • -logir specifies the directory for logging. - The default is ~/.xotcl/log. -
  • -rundir specifies the directory where - the information about the running processes is kept. - The default is ~/.xotcl/run. -
- -
- Authors: - - - Gustaf Neumann, Gustaf.Neumann@wu-wien.ac.at - -
- Date: - - [::xotcl::rcs date {$Date: 2004/05/23 22:50:39 $}] -
-
-
-

-
-

-

- - Back to index page. - -
-
-

-

- - - diff -u -p -x configure -x autom4te.cache -x .DS_Store -x .cvsignore -r -N orig/xotcl-1.3.6/doc/xo-whichPkg.html xotcl/doc/xo-whichPkg.html --- orig/xotcl-1.3.6/doc/xo-whichPkg.html Fri Mar 18 07:34:07 2005 +++ xotcl/doc/xo-whichPkg.html Thu Jan 1 10:00:00 1970 @@ -1,74 +0,0 @@ - - - - - XOTcl - Documentation -- ./apps/utils/xo-whichPkg - - - - -

- ./apps/utils/xo-whichPkg - ./apps/utils/xo-whichPkg

-
-

-

Package/File Information

- Package required: XOTcl -
- Package required: xotcl::package -
-
- Filename: - - ./apps/utils/xo-whichPkg - -
-
- - - - - - - - - - - - - -
- Description: - - - A small sample script to show which package is loaded from where - when a target package is loaded.

- Usage: "xo-whichPkg -pkg PACKAGENAME" - -

- Authors: - - - Fredj Dridi dridi@nestroy.wi-inf.uni-essen.de - -
- Date: - - [::xotcl::rcs date {$Date: 2004/05/23 22:50:39 $}] -
-
-
-

-
-

-

- - Back to index page. - -
-
-

-

- - - diff -u -p -x configure -x autom4te.cache -x .DS_Store -x .cvsignore -r -N orig/xotcl-1.3.6/library/lib/makeDoc.xotcl xotcl/library/lib/makeDoc.xotcl --- orig/xotcl-1.3.6/library/lib/makeDoc.xotcl Thu Dec 2 11:01:20 2004 +++ xotcl/library/lib/makeDoc.xotcl Fri Mar 25 10:45:36 2005 @@ -45,7 +45,7 @@ foreach {f fb} $fileList { if {$fb != "langRef-xotcl"} { set tail ", " if {$dir != $filesDir} { - append filesHtml "
  • Directory '$dir':
    " + append filesHtml "
  • Directory '[regsub {^/.*/xotcl/} $dir {./}]':
    " set filesDir $dir set tail "" } diff -u -p -x configure -x autom4te.cache -x .DS_Store -x .cvsignore -r -N orig/xotcl-1.3.6/library/lib/staticMetadata.xotcl xotcl/library/lib/staticMetadata.xotcl --- orig/xotcl-1.3.6/library/lib/staticMetadata.xotcl Thu Dec 2 10:49:52 2004 +++ xotcl/library/lib/staticMetadata.xotcl Fri Mar 25 10:45:36 2005 @@ -59,7 +59,7 @@ StaticMetadataAnalyzer instproc analyzeF my set cmd "" set t [FileToken create [my autoname t]] - $t set name $name + $t set name [regsub {^/.*/xotcl/} $name {./}] my set fileToken $t set f [open $name r] diff -u -p -x configure -x autom4te.cache -x .DS_Store -x .cvsignore -r -N orig/xotcl-1.3.6/library/lib/xodoc.xotcl xotcl/library/lib/xodoc.xotcl --- orig/xotcl-1.3.6/library/lib/xodoc.xotcl Sun Oct 31 07:19:55 2004 +++ xotcl/library/lib/xodoc.xotcl Fri Mar 25 10:45:36 2005 @@ -225,7 +225,7 @@ XODoc proc documentFileAsHTML {file docd set ext [file extension $file] if {$ext != ""} {set ext -[string trimleft $ext .]} set docfilename [file rootname [file tail $file]]$ext - $docdb writeFile ${docdir}/$docfilename.html $file + $docdb writeFile ${docdir}/$docfilename.html [regsub {^/.*/xotcl/} $file {./}] $docdb destroy return $docfilename }