From 8356ca930c796d3c07497261ac9a505c2d347570 Mon Sep 17 00:00:00 2001 From: Jean-Claude Wippler Date: Thu, 5 Apr 2007 00:12:57 +0000 Subject: [PATCH] Changed "Sh" to "Run", and added explicit "Run sh" calls for all shell scripts, such as the configure scripts. This is needed for MSYS/Mingw. git-svn-id: svn://svn.equi4.com/kitgen/trunk@1395 9e558909-932a-0410-a563-af77432da1eb --- extdefs/Img.kbs | 6 +++--- extdefs/Itcl.kbs | 8 ++++---- extdefs/Itk.kbs | 8 ++++---- extdefs/Iwidgets.kbs | 4 ++-- extdefs/Memchan.kbs | 11 ----------- extdefs/Mk4tcl.kbs | 20 -------------------- extdefs/Tclx.kbs | 11 ----------- extdefs/Tktable.kbs | 11 ----------- extdefs/XOTcl.kbs | 11 ----------- extdefs/ral.kbs | 6 +++--- extdefs/snack.kbs | 8 ++++---- extdefs/sqlite3.kbs | 6 +++--- extdefs/tdom.kbs | 6 +++--- extdefs/thread.kbs | 6 +++--- extdefs/tls.kbs | 6 +++--- extdefs/trofs.kbs | 6 +++--- extdefs/udp.kbs | 6 +++--- 17 files changed, 38 insertions(+), 102 deletions(-) delete mode 100644 extdefs/Memchan.kbs delete mode 100644 extdefs/Mk4tcl.kbs delete mode 100644 extdefs/Tclx.kbs delete mode 100644 extdefs/Tktable.kbs delete mode 100644 extdefs/XOTcl.kbs diff --git a/extdefs/Img.kbs b/extdefs/Img.kbs index 316604e..dad04f4 100644 --- a/extdefs/Img.kbs +++ b/extdefs/Img.kbs @@ -5,10 +5,10 @@ Version 1.2.6 Sources cvs tkimg.cvs.sourceforge.net:/cvsroot/tkimg Build { - Sh [Srcdir]/configure --with-tcl=[Libdir] --with-tk=[Libdir] - Sh make install + Run sh [Srcdir]/configure --with-tcl=[Libdir] --with-tk=[Libdir] + Run make install foreach f [glob ../lib/Img1*/*[info sharedlibext]] { - Sh strip -x $f + Run strip -x $f } } diff --git a/extdefs/Itcl.kbs b/extdefs/Itcl.kbs index f482c35..7944678 100644 --- a/extdefs/Itcl.kbs +++ b/extdefs/Itcl.kbs @@ -3,10 +3,10 @@ Version 3.3 Sources cvs incrtcl.cvs.sourceforge.net:/cvsroot/incrtcl incrTcl Build { - Sh [Srcdir]/itcl/configure --with-tcl=[Libdir] - Sh make binaries ITCL_LIBRARY= - Sh make install-binaries install-libraries - Sh strip -x [Unglob ../lib/itcl3*/libitcl3*] + Run sh [Srcdir]/itcl/configure --with-tcl=[Libdir] + Run make binaries ITCL_LIBRARY= + Run make install-binaries install-libraries + Run strip -x [Unglob ../lib/itcl3*/libitcl3*] } Result [Unglob ../lib/itcl3*] \ No newline at end of file diff --git a/extdefs/Itk.kbs b/extdefs/Itk.kbs index c137a19..7e4a125 100644 --- a/extdefs/Itk.kbs +++ b/extdefs/Itk.kbs @@ -5,11 +5,11 @@ Requires Itcl Sources symlink [Srcdir]/../Itcl-[Version] Build { - Sh [Srcdir]/itk/configure \ + Run sh [Srcdir]/itk/configure \ --with-tcl=[Libdir] --with-itcl=[Libdir] --with-tk=[Libdir] - Sh make binaries ITCL_LIBRARY= - Sh make install-binaries - Sh strip -x [Unglob ../lib/itk3*/libitk3*] + Run make binaries ITCL_LIBRARY= + Run make install-binaries + Run strip -x [Unglob ../lib/itk3*/libitk3*] } Result [Unglob ../lib/itk3*] diff --git a/extdefs/Iwidgets.kbs b/extdefs/Iwidgets.kbs index 31170b4..444b149 100644 --- a/extdefs/Iwidgets.kbs +++ b/extdefs/Iwidgets.kbs @@ -5,9 +5,9 @@ Requires Itk Sources cvs incrtcl.cvs.sourceforge.net:/cvsroot/incrtcl iwidgets Build { - Sh [Srcdir]/configure \ + Run sh [Srcdir]/configure \ --with-tcl=[Libdir] --with-itcl=[Srcdir]/../Itcl-3.3 --with-tk=[Libdir] - Sh make install-libraries + Run make install-libraries } Result [Unglob ../lib/iwidgets4*] \ No newline at end of file diff --git a/extdefs/Memchan.kbs b/extdefs/Memchan.kbs deleted file mode 100644 index f3ad2b0..0000000 --- a/extdefs/Memchan.kbs +++ /dev/null @@ -1,11 +0,0 @@ -Version 2.2.1 - -Sources cvs memchan.cvs.sourceforge.net:/cvsroot/memchan - -Build { - Sh [Srcdir]/configure --with-tcl=[Libdir] - Sh make install-binaries - Sh strip -x [Unglob ../lib/Memchan2*/libMemchan2*] -} - -Result [Unglob ../lib/Memchan2*] diff --git a/extdefs/Mk4tcl.kbs b/extdefs/Mk4tcl.kbs deleted file mode 100644 index b68f53f..0000000 --- a/extdefs/Mk4tcl.kbs +++ /dev/null @@ -1,20 +0,0 @@ -Version 2.4.9.6 - -Sources fetch http://www.equi4.com/pub/mk/metakit-2.4.9.6.tar.gz - -Build { - Sh [Srcdir]/unix/configure --with-tcl=[Incdir] - Sh make tcl - Sh strip -x Mk4tcl[info sharedlibext] - - file delete -force out - file mkdir out - file copy Mk4tcl[info sharedlibext] out/libmk4tcl[info sharedlibext] - - set fd [open out/pkgIndex.tcl w] - puts $fd "package ifneeded Mk4tcl [Version] \\" - puts $fd { [list load [file join $dir libmk4tcl[info sharedlibext]] Mk4tcl]} - close $fd -} - -Result out \ No newline at end of file diff --git a/extdefs/Tclx.kbs b/extdefs/Tclx.kbs deleted file mode 100644 index ab9fd29..0000000 --- a/extdefs/Tclx.kbs +++ /dev/null @@ -1,11 +0,0 @@ -Version 8.4 - -Sources cvs tclx.cvs.sourceforge.net:/cvsroot/tclx - -Build { - Sh [Srcdir]/configure --with-tcl=[Libdir] - Sh make install-binaries - Sh strip -x [Unglob ../lib/tclx8*/libtclx8*] -} - -Result [Unglob ../lib/tclx8*] \ No newline at end of file diff --git a/extdefs/Tktable.kbs b/extdefs/Tktable.kbs deleted file mode 100644 index 44e2257..0000000 --- a/extdefs/Tktable.kbs +++ /dev/null @@ -1,11 +0,0 @@ -Version 2.9 - -Sources cvs tktable.cvs.sourceforge.net:/cvsroot/tktable - -Build { - Sh [Srcdir]/configure --with-tcl=[Libdir] --with-tk=[Libdir] - Sh make install-binaries - Sh strip -x [Unglob ../lib/Tktable2*/libTktable2*] -} - -Result [Unglob ../lib/Tktable2*] \ No newline at end of file diff --git a/extdefs/XOTcl.kbs b/extdefs/XOTcl.kbs deleted file mode 100644 index d710b0d..0000000 --- a/extdefs/XOTcl.kbs +++ /dev/null @@ -1,11 +0,0 @@ -Version 1.5.3 - -Sources fetch http://media.wu-wien.ac.at/download/xotcl-1.5.3.tar.gz - -Build { - Sh [Srcdir]/configure --with-tcl=[Libdir] - Sh make install-binaries install-libraries - Sh strip -x [Unglob ../lib/xotcl1*/libxotcl1*] -} - -Result [Unglob ../lib/xotcl1*] \ No newline at end of file diff --git a/extdefs/ral.kbs b/extdefs/ral.kbs index 140d0db..ae5c9ee 100644 --- a/extdefs/ral.kbs +++ b/extdefs/ral.kbs @@ -5,9 +5,9 @@ Sources cvs tclral.cvs.sourceforge.net:/cvsroot/tclral . # http://mesh.dl.sourceforge.net/sourceforge/tclral/tclral-0.8.2.tar.gz Build { - Sh [Srcdir]/configure --with-tcl=[Libdir] - Sh make install-binaries - Sh strip -x [Unglob ../lib/ral0*/libral0*] + Run sh [Srcdir]/configure --with-tcl=[Libdir] + Run make install-binaries + Run strip -x [Unglob ../lib/ral0*/libral0*] } Result [Unglob ../lib/ral0*] \ No newline at end of file diff --git a/extdefs/snack.kbs b/extdefs/snack.kbs index f573e67..b0da92b 100644 --- a/extdefs/snack.kbs +++ b/extdefs/snack.kbs @@ -9,11 +9,11 @@ Build { set d [string map [list "TCL_SHARED_BUILD=0" "TCL_SHARED_BUILD=1"] $d] set f [open [Libdir]/tclConfig.sh w]; puts -nonewline $f $d; close $f } - Sh [Srcdir]/unix/configure \ + Run sh [Srcdir]/unix/configure \ --with-tcl=[Libdir] --with-tk=[Libdir] --libdir=[Libdir] - Sh make - Sh make install - Sh strip -x [Unglob ../lib/snack2*/libsnack*] + Run make + Run make install + Run strip -x [Unglob ../lib/snack2*/libsnack*] } Result [Unglob ../lib/snack2*] diff --git a/extdefs/sqlite3.kbs b/extdefs/sqlite3.kbs index ba7b532..a039171 100644 --- a/extdefs/sqlite3.kbs +++ b/extdefs/sqlite3.kbs @@ -3,9 +3,9 @@ Version 3.3.13 Sources fetch http://www.sqlite.org/sqlite-3_3_13-tea.tar.gz Build { - Sh [Srcdir]/configure --with-tcl=[Libdir] - Sh make install-binaries - Sh strip -x [Unglob ../lib/sqlite3*/libsqlite3*] + Run sh [Srcdir]/configure --with-tcl=[Libdir] + Run make install-binaries + Run strip -x [Unglob ../lib/sqlite3*/libsqlite3*] } Result [Unglob ../lib/sqlite3*] \ No newline at end of file diff --git a/extdefs/tdom.kbs b/extdefs/tdom.kbs index 7c57e55..ab0fb7e 100644 --- a/extdefs/tdom.kbs +++ b/extdefs/tdom.kbs @@ -3,9 +3,9 @@ Version 0.8.1 Sources cvs cvs.tdom.org:/usr/local/pubcvs tdom Build { - Sh [Srcdir]/configure --with-tcl=[Libdir] - Sh make install-binaries - Sh strip -x [Unglob ../lib/tdom0*/libtdom0*] + Run sh [Srcdir]/configure --with-tcl=[Libdir] + Run make install-binaries + Run strip -x [Unglob ../lib/tdom0*/libtdom0*] } Result [Unglob ../lib/tdom0*] \ No newline at end of file diff --git a/extdefs/thread.kbs b/extdefs/thread.kbs index 501bd66..3dd3e94 100644 --- a/extdefs/thread.kbs +++ b/extdefs/thread.kbs @@ -3,9 +3,9 @@ Version 2.6.5 Sources cvs tcl.cvs.sourceforge.net:/cvsroot/tcl thread Build { - Sh [Srcdir]/configure --with-tcl=[Libdir] - Sh make install-binaries - Sh strip -x [Unglob ../lib/thread2*/libthread2*] + Run sh [Srcdir]/configure --with-tcl=[Libdir] + Run make install-binaries + Run strip -x [Unglob ../lib/thread2*/libthread2*] } Result [Unglob ../lib/thread2*] \ No newline at end of file diff --git a/extdefs/tls.kbs b/extdefs/tls.kbs index f34b6f4..2317bbb 100644 --- a/extdefs/tls.kbs +++ b/extdefs/tls.kbs @@ -3,9 +3,9 @@ Version 1.5.1 Sources cvs tls.cvs.sourceforge.net:/cvsroot/tls Build { - Sh [Srcdir]/configure --with-tcl=[Libdir] --with-ssl-dir=/usr - Sh make install-binaries - Sh strip -x [Unglob ../lib/tls1*/libtls1*] + Run sh [Srcdir]/configure --with-tcl=[Libdir] --with-ssl-dir=/usr + Run make install-binaries + Run strip -x [Unglob ../lib/tls1*/libtls1*] } Result [Unglob ../lib/tls1*] diff --git a/extdefs/trofs.kbs b/extdefs/trofs.kbs index 0895af7..afee2f9 100644 --- a/extdefs/trofs.kbs +++ b/extdefs/trofs.kbs @@ -5,9 +5,9 @@ Sources fetch http://math.nist.gov/~DPorter/tcltk/trofs/trofs[Version].tar.gz package require Tcl 8.5 Build { - Sh [Srcdir]/configure --with-tcl=[Libdir] - Sh make install-binaries - Sh strip -x [Unglob ../lib/trofs0*/libtrofs0*] + Run sh [Srcdir]/configure --with-tcl=[Libdir] + Run make install-binaries + Run strip -x [Unglob ../lib/trofs0*/libtrofs0*] } Result [Unglob ../lib/trofs0*] \ No newline at end of file diff --git a/extdefs/udp.kbs b/extdefs/udp.kbs index ae5d133..c79d8c9 100644 --- a/extdefs/udp.kbs +++ b/extdefs/udp.kbs @@ -3,9 +3,9 @@ Version 1.0.9 Sources cvs tcludp.cvs.sourceforge.net:/cvsroot/tcludp Build { - Sh [Srcdir]/configure --with-tcl=[Libdir] - Sh make install-binaries - Sh strip -x [Unglob ../lib/udp1*/libudp1*] + Run sh [Srcdir]/configure --with-tcl=[Libdir] + Run make install-binaries + Run strip -x [Unglob ../lib/udp1*/libudp1*] } Result [Unglob ../lib/udp1*] -- 2.23.0