Revision: 42345
http://brlcad.svn.sourceforge.net/brlcad/?rev=42345&view=rev
Author: starseeker
Date: 2011-01-16 22:31:21 +0000 (Sun, 16 Jan 2011)
Log Message:
-----------
Grab some of the changes from trunk - incrTcl is hopelessly messed up between
cmake and trunk, so will probably have to script out CMake's and put trunk's in
place.
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
Added Paths:
-----------
brlcad/branches/cmake/src/other/tktable/aclocal.m4
Modified: brlcad/branches/cmake/configure.ac
===================================================================
--- brlcad/branches/cmake/configure.ac 2011-01-16 22:24:57 UTC (rev 42344)
+++ brlcad/branches/cmake/configure.ac 2011-01-16 22:31:21 UTC (rev 42345)
@@ -4334,6 +4334,7 @@
src/other/URToolkit/tools/Makefile
src/other/URToolkit/tools/clock/Makefile
src/other/incrTcl/Makefile
+ src/other/incrTcl/doc/Makefile
src/other/incrTcl/itcl/Makefile
src/other/incrTcl/itcl/doc/Makefile
src/other/incrTcl/itcl/generic/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 22:24:57 UTC (rev 42344)
+++ brlcad/branches/cmake/misc/win32-msvc8/tclsh/library/installTree.tcl
2011-01-16 22:31:21 UTC (rev 42345)
@@ -49,14 +49,14 @@
# Look for required source files
set missingFile 0
-if {![file exists [file join $rootDir src other iwidgets iwidgets.tcl.in]]} {
- puts "ERROR: Missing [file join $rootDir src other iwidgets iwidgets.tcl.in]"
+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]"
set missingFile 1
}
-if {![file exists [file join $rootDir src other iwidgets pkgIndex.tcl.in]]} {
- puts "ERROR: Missing [file join $rootDir src other iwidgets pkgIndex.tcl.in]"
+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]"
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 iwidgets generic] [file join
$installDir lib iwidgets$iwidgetsVersion scripts]
+ copy_stuff [file join $rootDir src other incrTcl 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 iwidgets iwidgets.tcl.in] r]
+ set fd1 [open [file join $rootDir src other incrTcl 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 iwidgets pkgIndex.tcl.in] r]
+ set fd1 [open [file join $rootDir src other incrTcl 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
22:24:57 UTC (rev 42344)
+++ brlcad/branches/cmake/src/libtclcad/tclcadAutoPath.c 2011-01-16
22:31:21 UTC (rev 42345)
@@ -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/iwidgets/library/iwidgets.tcl
+ * src/other/incrTcl/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%ciwidgets",
- BU_PATH_SEPARATOR, srcpath, 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%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%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%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%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 22:24:57 UTC (rev
42344)
+++ brlcad/branches/cmake/src/other/Makefile.am 2011-01-16 22:31:21 UTC (rev
42345)
@@ -43,12 +43,6 @@
TKDIR=
endif
-if BUILD_ITCL
-ITCLDIR=incrTcl
-else !BUILD_ITCL
-ITCLDIR=
-endif
-
if BUILD_TERMLIB
TERMLIBDIR=libtermlib
else !BUILD_TERMLIB
@@ -148,7 +142,8 @@
$(URTDIR) \
${TCLDIR} \
${TKDIR} \
- ${ITCLDIR} \
+ incrTcl \
+ ${IWIDGETSDIR} \
${TERMLIBDIR} \
${JOVEDIR} \
${STEPDIR} \
Modified: brlcad/branches/cmake/src/other/incrTcl/Makefile.am
===================================================================
--- brlcad/branches/cmake/src/other/incrTcl/Makefile.am 2011-01-16 22:24:57 UTC
(rev 42344)
+++ brlcad/branches/cmake/src/other/incrTcl/Makefile.am 2011-01-16 22:31:21 UTC
(rev 42345)
@@ -1,13 +1,14 @@
-if BUILD_IWIDGETS
-IWIDGETSDIR=iwidgets
-else !BUILD_IWIDGETS
-IWIDGETSDIR=
-endif
ITCLLIB = \
libitcl.la \
libitcl@[email protected]
+if BUILD_ITCL
+ITCLDIR= itcl
+else !BUILD_ITCL
+ITCLDIR=
+endif
+
if BUILD_ITK
ITKDIR = itk
ITKLIB = \
@@ -18,16 +19,25 @@
ITKLIB =
endif
+if BUILD_IWIDGETS
+IWIDGETSDIR=iwidgets
+else !BUILD_IWIDGETS
+IWIDGETSDIR=
+endif
+
SUBDIRS = \
- itcl \
+ doc \
+ $(ITCLDIR) \
$(ITKDIR) \
- $(IWIDGETSDIR) \
- tools
+ tools \
+ $(IWIDGETSDIR)
DIST_SUBDIRS = \
+ doc \
itcl \
itk \
- tools
+ tools \
+ iwidgets
EXTRA_DIST = \
CHANGES \
Added: brlcad/branches/cmake/src/other/tktable/aclocal.m4
===================================================================
--- brlcad/branches/cmake/src/other/tktable/aclocal.m4
(rev 0)
+++ brlcad/branches/cmake/src/other/tktable/aclocal.m4 2011-01-16 22:31:21 UTC
(rev 42345)
@@ -0,0 +1,9 @@
+#
+# Include the TEA standard macro set
+#
+
+builtin(include,tclconfig/tcl.m4)
+
+#
+# Add here whatever m4 macros you want to define for your package
+#
Property changes on: brlcad/branches/cmake/src/other/tktable/aclocal.m4
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
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
