Revision: 42349
http://brlcad.svn.sourceforge.net/brlcad/?rev=42349&view=rev
Author: starseeker
Date: 2011-01-16 23:38:30 +0000 (Sun, 16 Jan 2011)
Log Message:
-----------
Put itcl/itk logic back, pull in trunk's LoadArcherLibs.tcl.
Modified Paths:
--------------
brlcad/branches/cmake/configure.ac
brlcad/branches/cmake/misc/win32-msvc8/tclsh/library/installTree.tcl
brlcad/branches/cmake/src/libtclcad/tclcadAutoPath.c
brlcad/branches/cmake/src/other/Makefile.am
brlcad/branches/cmake/src/other/incrTcl/Makefile.am
brlcad/branches/cmake/src/tclscripts/archer/LoadArcherLibs.tcl
Modified: brlcad/branches/cmake/configure.ac
===================================================================
--- brlcad/branches/cmake/configure.ac 2011-01-16 23:36:28 UTC (rev 42348)
+++ brlcad/branches/cmake/configure.ac 2011-01-16 23:38:30 UTC (rev 42349)
@@ -4346,11 +4346,11 @@
src/other/incrTcl/itk/library/Makefile
src/other/incrTcl/itk/pkgIndex.tcl
src/other/incrTcl/tools/Makefile
- src/other/incrTcl/iwidgets/Makefile
- src/other/incrTcl/iwidgets/doc/Makefile
- src/other/incrTcl/iwidgets/generic/Makefile
- src/other/incrTcl/iwidgets/iwidgets.tcl
- src/other/incrTcl/iwidgets/pkgIndex.tcl
+ src/other/iwidgets/Makefile
+ src/other/iwidgets/doc/Makefile
+ src/other/iwidgets/generic/Makefile
+ src/other/iwidgets/iwidgets.tcl
+ src/other/iwidgets/pkgIndex.tcl
src/other/jove/Makefile
src/other/jove/teach-jove
src/other/libregex/Makefile
Modified: brlcad/branches/cmake/misc/win32-msvc8/tclsh/library/installTree.tcl
===================================================================
--- brlcad/branches/cmake/misc/win32-msvc8/tclsh/library/installTree.tcl
2011-01-16 23:36:28 UTC (rev 42348)
+++ brlcad/branches/cmake/misc/win32-msvc8/tclsh/library/installTree.tcl
2011-01-16 23:38:30 UTC (rev 42349)
@@ -49,14 +49,14 @@
# Look for required source files
set missingFile 0
-if {![file exists [file join $rootDir src other incrTcl iwidgets
iwidgets.tcl.in]]} {
- puts "ERROR: Missing [file join $rootDir src other incrTcl iwidgets
iwidgets.tcl.in]"
+if {![file exists [file join $rootDir src other iwidgets iwidgets.tcl.in]]} {
+ puts "ERROR: Missing [file join $rootDir src other iwidgets iwidgets.tcl.in]"
set missingFile 1
}
-if {![file exists [file join $rootDir src other incrTcl iwidgets
pkgIndex.tcl.in]]} {
- puts "ERROR: Missing [file join $rootDir src other incrTcl iwidgets
pkgIndex.tcl.in]"
+if {![file exists [file join $rootDir src other iwidgets pkgIndex.tcl.in]]} {
+ puts "ERROR: Missing [file join $rootDir src other iwidgets pkgIndex.tcl.in]"
set missingFile 1
}
@@ -205,7 +205,7 @@
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]
- copy_stuff [file join $rootDir src other incrTcl iwidgets generic] [file
join $installDir lib iwidgets$iwidgetsVersion scripts]
+ copy_stuff [file join $rootDir src other iwidgets generic] [file join
$installDir lib iwidgets$iwidgetsVersion scripts]
copy_stuff [file join $rootDir src other tcl library] [file join $installDir
lib tcl$tclVersion]
copy_stuff [file join $rootDir src other tk library] [file join $installDir
lib tk$tclVersion]
}
@@ -249,7 +249,7 @@
puts "\[08 of 15] CREATING iwidgets.tcl"
catch {
- set fd1 [open [file join $rootDir src other incrTcl iwidgets
iwidgets.tcl.in] r]
+ set fd1 [open [file join $rootDir src other iwidgets iwidgets.tcl.in] r]
set lines [read $fd1]
close $fd1
if {$verbose} { puts "Creating [file join $installDir lib
iwidgets$iwidgetsVersion iwidgets.tcl]" }
@@ -263,7 +263,7 @@
puts "\[09 of 15] CREATING pkgIndex.tcl FOR iwidgets"
catch {
- set fd1 [open [file join $rootDir src other incrTcl iwidgets
pkgIndex.tcl.in] r]
+ set fd1 [open [file join $rootDir src other iwidgets pkgIndex.tcl.in] r]
set lines [read $fd1]
close $fd1
if {$verbose} { puts "Creating [file join $installDir lib
iwidgets$iwidgetsVersion pkgIndex.tcl]" }
Modified: brlcad/branches/cmake/src/libtclcad/tclcadAutoPath.c
===================================================================
--- brlcad/branches/cmake/src/libtclcad/tclcadAutoPath.c 2011-01-16
23:36:28 UTC (rev 42348)
+++ brlcad/branches/cmake/src/libtclcad/tclcadAutoPath.c 2011-01-16
23:38:30 UTC (rev 42349)
@@ -175,7 +175,7 @@
* src/other/tk/library/tk.tcl
* src/other/incrTcl/itcl/library/itcl.tcl
* src/other/incrTcl/itk/library/itk.tcl
- * src/other/incrTcl/iwidgets/library/iwidgets.tcl
+ * src/other/iwidgets/library/iwidgets.tcl
* src/tclscripts/pkgIndex.tcl and subdirs
*
* if TCLCAD_LIBRARY_PATH is set
@@ -295,8 +295,8 @@
BU_PATH_SEPARATOR, srcpath, BU_DIR_SEPARATOR,
BU_DIR_SEPARATOR, BU_DIR_SEPARATOR, BU_DIR_SEPARATOR, BU_DIR_SEPARATOR);
bu_vls_printf(&auto_path, "%c%s%csrc%cother%cincrTcl%citk%clibrary",
BU_PATH_SEPARATOR, srcpath, BU_DIR_SEPARATOR,
BU_DIR_SEPARATOR, BU_DIR_SEPARATOR, BU_DIR_SEPARATOR, BU_DIR_SEPARATOR);
- bu_vls_printf(&auto_path, "%c%s%csrc%cother%cincrTcl%ciwidgets",
- BU_PATH_SEPARATOR, srcpath, BU_DIR_SEPARATOR,
BU_DIR_SEPARATOR, BU_DIR_SEPARATOR, BU_DIR_SEPARATOR);
+ bu_vls_printf(&auto_path, "%c%s%csrc%cother%ciwidgets",
+ BU_PATH_SEPARATOR, srcpath, BU_DIR_SEPARATOR,
BU_DIR_SEPARATOR, BU_DIR_SEPARATOR);
bu_vls_printf(&auto_path, "%c%s%csrc%ctclscripts",
BU_PATH_SEPARATOR, srcpath, BU_DIR_SEPARATOR,
BU_DIR_SEPARATOR);
bu_vls_printf(&auto_path, "%c%s%csrc%ctclscripts%clib",
@@ -332,8 +332,8 @@
BU_PATH_SEPARATOR, srcpath, BU_DIR_SEPARATOR,
BU_DIR_SEPARATOR, BU_DIR_SEPARATOR, BU_DIR_SEPARATOR, BU_DIR_SEPARATOR,
BU_DIR_SEPARATOR);
bu_vls_printf(&auto_path,
"%c%s%c..%csrc%cother%cincrTcl%citk%clibrary",
BU_PATH_SEPARATOR, srcpath, BU_DIR_SEPARATOR,
BU_DIR_SEPARATOR, BU_DIR_SEPARATOR, BU_DIR_SEPARATOR, BU_DIR_SEPARATOR,
BU_DIR_SEPARATOR);
- bu_vls_printf(&auto_path, "%c%s%c..%csrc%cother%cincrTcl%ciwidgets",
- BU_PATH_SEPARATOR, srcpath, BU_DIR_SEPARATOR,
BU_DIR_SEPARATOR, BU_DIR_SEPARATOR, BU_DIR_SEPARATOR, BU_DIR_SEPARATOR);
+ bu_vls_printf(&auto_path, "%c%s%c..%csrc%cother%ciwidgets",
+ BU_PATH_SEPARATOR, srcpath, BU_DIR_SEPARATOR,
BU_DIR_SEPARATOR, BU_DIR_SEPARATOR, BU_DIR_SEPARATOR);
bu_vls_printf(&auto_path, "%c%s%c..%csrc%ctclscripts",
BU_PATH_SEPARATOR, srcpath, BU_DIR_SEPARATOR,
BU_DIR_SEPARATOR, BU_DIR_SEPARATOR);
bu_vls_printf(&auto_path, "%c%s%c..%csrc%ctclscripts%clib",
Modified: brlcad/branches/cmake/src/other/Makefile.am
===================================================================
--- brlcad/branches/cmake/src/other/Makefile.am 2011-01-16 23:36:28 UTC (rev
42348)
+++ brlcad/branches/cmake/src/other/Makefile.am 2011-01-16 23:38:30 UTC (rev
42349)
@@ -43,6 +43,18 @@
TKDIR=
endif
+if BUILD_ITCL
+ITCLDIR=incrTcl
+else !BUILD_ITCL
+ITCLDIR=
+endif
+
+if BUILD_IWIDGETS
+IWIDGETSDIR=iwidgets
+else !BUILD_IWIDGETS
+IWIDGETSDIR=
+endif
+
if BUILD_TERMLIB
TERMLIBDIR=libtermlib
else !BUILD_TERMLIB
@@ -142,7 +154,7 @@
$(URTDIR) \
${TCLDIR} \
${TKDIR} \
- incrTcl \
+ ${ITCLDIR} \
${IWIDGETSDIR} \
${TERMLIBDIR} \
${JOVEDIR} \
@@ -167,6 +179,7 @@
DIST_SUBDIRS = \
URToolkit \
incrTcl \
+ iwidgets \
jove \
libpng \
libregex \
Modified: brlcad/branches/cmake/src/other/incrTcl/Makefile.am
===================================================================
--- brlcad/branches/cmake/src/other/incrTcl/Makefile.am 2011-01-16 23:36:28 UTC
(rev 42348)
+++ brlcad/branches/cmake/src/other/incrTcl/Makefile.am 2011-01-16 23:38:30 UTC
(rev 42349)
@@ -3,12 +3,6 @@
libitcl.la \
libitcl@[email protected]
-if BUILD_ITCL
-ITCLDIR= itcl
-else !BUILD_ITCL
-ITCLDIR=
-endif
-
if BUILD_ITK
ITKDIR = itk
ITKLIB = \
@@ -19,25 +13,17 @@
ITKLIB =
endif
-if BUILD_IWIDGETS
-IWIDGETSDIR=iwidgets
-else !BUILD_IWIDGETS
-IWIDGETSDIR=
-endif
-
SUBDIRS = \
doc \
- $(ITCLDIR) \
+ itcl \
$(ITKDIR) \
- tools \
- $(IWIDGETSDIR)
+ tools
DIST_SUBDIRS = \
doc \
itcl \
itk \
- tools \
- iwidgets
+ tools
EXTRA_DIST = \
CHANGES \
Modified: brlcad/branches/cmake/src/tclscripts/archer/LoadArcherLibs.tcl
===================================================================
--- brlcad/branches/cmake/src/tclscripts/archer/LoadArcherLibs.tcl
2011-01-16 23:36:28 UTC (rev 42348)
+++ brlcad/branches/cmake/src/tclscripts/archer/LoadArcherLibs.tcl
2011-01-16 23:38:30 UTC (rev 42349)
@@ -29,6 +29,15 @@
proc LoadArcherCoreLibs {} {
global tcl_platform
+ # load tkpng
+ if { [catch {package require tkpng} _initialized] } {
+ puts "$_initialized"
+ puts ""
+ puts "ERROR: Unable to load tkpng"
+ exit 1
+ }
+
+
if { [catch {package require Swidgets} _initialized] } {
puts "$_initialized"
puts ""
@@ -36,9 +45,6 @@
exit 1
}
- # load tkpng
- catch {package require tkpng} tkpng
-
# load Tkhtml
catch {package require hv3 0.1} hv3
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand
malware threats, the impact they can have on your business, and how you
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
