Revision: 40521
http://brlcad.svn.sourceforge.net/brlcad/?rev=40521&view=rev
Author: bob1961
Date: 2010-09-09 17:35:40 +0000 (Thu, 09 Sep 2010)
Log Message:
-----------
Added code to create and install tktable related files.
Modified Paths:
--------------
brlcad/trunk/misc/win32-msvc8/tclsh/library/installTree.tcl
Modified: brlcad/trunk/misc/win32-msvc8/tclsh/library/installTree.tcl
===================================================================
--- brlcad/trunk/misc/win32-msvc8/tclsh/library/installTree.tcl 2010-09-09
17:32:47 UTC (rev 40520)
+++ brlcad/trunk/misc/win32-msvc8/tclsh/library/installTree.tcl 2010-09-09
17:35:40 UTC (rev 40521)
@@ -139,7 +139,7 @@
file mkdir $dir_arg
}
-puts "\[01 of 14] SETTING UP AUTO_PATH FOR TCLSH"
+puts "\[01 of 15] SETTING UP AUTO_PATH FOR TCLSH"
catch {
lappend auto_path [file join $rootDir src other tcl library]
lappend auto_path [file join $rootDir misc win32-msvc8 tclsh library]
@@ -151,11 +151,13 @@
}
-puts "\[02 of 14] CREATING INSTALL DIRECTORIES"
+puts "\[02 of 15] CREATING INSTALL DIRECTORIES"
catch {
# stub_dir [file join $shareDir pix]
+ stub_dir [file join $installDir bin]
stub_dir [file join $installDir bin Tkhtml3.0]
- stub_dir [file join $installDir bin]
+ stub_dir [file join $installDir bin Tktable2.10]
+ stub_dir [file join $installDir bin Tktable2.10 html]
stub_dir [file join $installDir lib iwidgets$iwidgetsVersion]
stub_dir [file join $installDir lib]
stub_dir [file join $installDir share brlcad]
@@ -176,14 +178,14 @@
}
-puts "\[03 of 14] COPYING ICONS TO INSTALL DIRECTORY"
+puts "\[03 of 15] COPYING ICONS TO INSTALL DIRECTORY"
catch {
copy_stuff [file join $rootDir doc html manuals archer archer.ico] [file
join $installDir]
copy_stuff [file join $rootDir misc nsis brlcad.ico] [file join $installDir]
}
-puts "\[04 of 14] COPYING APPS TO BIN DIRECTORY"
+puts "\[04 of 15] COPYING APPS TO BIN DIRECTORY"
catch {
copy_stuff [file join $rootDir src archer archer.bat] [file join $installDir
bin]
copy_stuff [file join $rootDir src archer archer] [file join $installDir bin]
@@ -192,13 +194,13 @@
}
-puts "\[05 of 14] COPYING HEADER FILES TO INCLUDE DIRECTORY"
+puts "\[05 of 15] COPYING HEADER FILES TO INCLUDE DIRECTORY"
catch {
copy_stuff [file join $rootDir include] $installDir
}
-puts "\[06 of 14] COPYING LIBRARIES TO LIB DIRECTORY"
+puts "\[06 of 15] COPYING LIBRARIES TO LIB DIRECTORY"
catch {
copy_stuff [file join $rootDir src other incrTcl itcl library] [file join
$installDir lib itcl$itclVersion]
copy_stuff [file join $rootDir src other incrTcl itk library] [file join
$installDir lib itk$itclVersion]
@@ -208,7 +210,7 @@
}
-puts "\[07 of 14] COPYING DATA TO SHARE DIRECTORY"
+puts "\[07 of 15] COPYING DATA TO SHARE DIRECTORY"
catch {
#copy_stuff [file join $rootDir doc] [file join $shareDir]
copy_stuff [file join $rootDir AUTHORS] [file join $shareDir]
@@ -244,7 +246,7 @@
}
-puts "\[08 of 14] CREATING iwidgets.tcl"
+puts "\[08 of 15] CREATING iwidgets.tcl"
catch {
set fd1 [open [file join $rootDir src other iwidgets iwidgets.tcl.in] r]
set lines [read $fd1]
@@ -258,7 +260,7 @@
}
-puts "\[09 of 14] CREATING pkgIndex.tcl FOR iwidgets"
+puts "\[09 of 15] CREATING pkgIndex.tcl FOR iwidgets"
catch {
set fd1 [open [file join $rootDir src other iwidgets pkgIndex.tcl.in] r]
set lines [read $fd1]
@@ -271,7 +273,7 @@
}
-puts "\[10 of 14] CREATING wish.exe.manifest"
+puts "\[10 of 15] CREATING wish.exe.manifest"
catch {
set fd1 [open [file join $rootDir src other tk win wish.exe.manifest].in r]
set lines [read $fd1]
@@ -285,7 +287,7 @@
}
-puts "\[11 of 14] CREATING tclIndex FILES"
+puts "\[11 of 15] CREATING tclIndex FILES"
catch {
make_tclIndex [list [file join $shareDir tclscripts]]
make_tclIndex [list [file join $shareDir tclscripts lib]]
@@ -299,17 +301,17 @@
# FIXME: MUCH MORE NEEDED
-puts "\[12 of 14] COPYING REDIST FILES"
+puts "\[12 of 15] COPYING REDIST FILES"
catch {
copy_stuff "C:/Program Files/Microsoft Visual Studio
8/VC/redist/x86/Microsoft.VC80.CRT" [file join $installDir bin]
copy_stuff "C:/Program Files/Microsoft Visual Studio
8/VC/redist/x86/Microsoft.VC80.MFC" [file join $installDir bin]
}
-puts "\[13 of 14] CREATING AND COPYING tkhtml SOURCE FILES"
+puts "\[13 of 15] CREATING AND COPYING tkhtml SOURCE FILES"
catch {
set savepwd [pwd]
- cd [file join $rootDir src other tkhtml3 src]
+ cd [file join $rootDir src other tkhtml src]
if {$verbose} { puts "... creating htmltokens files" }
source tokenlist.txt
if {$verbose} { puts "... creating cssprop files" }
@@ -321,10 +323,40 @@
puts $fd {package ifneeded Tkhtml 3.0 [list load [file join $dir
tkhtml.dll]]}
close $fd
cd $savepwd
- copy_stuff [file join $rootDir src other tkhtml3 src pkgIndex.tcl] [file
join $installDir bin Tkhtml3.0]
+ copy_stuff [file join $rootDir src other tkhtml src pkgIndex.tcl] [file join
$installDir bin Tkhtml3.0]
}
+puts "\[14 of 15] CREATING tkTable.tcl.h and pkgIndex.tcl"
+catch {
+ set tktabledir [file join $rootDir src other tktable]
+ set fd1 [open [file join $tktabledir library tkTable.tcl] r]
+ set lines [split [read $fd1] "\n"]
+ close $fd1
+ set fd2 [open [file join $tktabledir tkTable.tcl.h] w]
+
+ foreach line $lines {
+ switch -regexp -- $line "^$$" - {^#} continue
+ regsub -all {\\} $line {\\\\} line
+ regsub -all {\"} $line {\"} line
+ puts $fd2 "\"$line\\n\""
+ }
+
+ close $fd2
+
+ if {$verbose} { puts "... creating pkgIndex.tcl" }
+ set fd [open [file join $tktabledir pkgIndex.tcl] "w"]
+ puts $fd {if {[catch {package require Tcl 8.2}]} return}
+ puts $fd {package ifneeded Tktable 2.10 [list load [file join $dir
tktable.dll] Tktable]}
+ close $fd
+
+ copy_stuff [file join $tktabledir pkgIndex.tcl] [file join $installDir bin
Tktable2.10]
+ copy_stuff [file join $tktabledir library tkTable.tcl] [file join
$installDir bin Tktable2.10]
+ copy_stuff [file join $tktabledir doc tkTable.html] [file join $installDir
bin Tktable2.10 html]
+ copy_stuff [file join $tktabledir license.txt] [file join $installDir bin
Tktable2.10]
+}
+
+
proc removeUnwanted {_startDir} {
global verbose
set savepwd [pwd]
@@ -386,5 +418,5 @@
# Remove unwanted directories/files as a result of wholesale copies
-puts "\[14 of 14] REMOVING UNWANTED FILES FROM $installDir"
+puts "\[15 of 15] REMOVING UNWANTED FILES FROM $installDir"
removeUnwanted $installDir
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net Dev2Dev email is sponsored by:
Show off your parallel programming skills.
Enter the Intel(R) Threading Challenge 2010.
http://p.sf.net/sfu/intel-thread-sfd
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
