Revision: 42360
http://brlcad.svn.sourceforge.net/brlcad/?rev=42360&view=rev
Author: starseeker
Date: 2011-01-17 05:37:03 +0000 (Mon, 17 Jan 2011)
Log Message:
-----------
Just a few changes in the itk subdir
Modified Paths:
--------------
brlcad/trunk/src/other/incrTcl/itk/tests/interp.test
brlcad/trunk/src/other/incrTcl/itk/tests/toplevel.test
brlcad/trunk/src/other/incrTcl/itk/win/makefile.vc
brlcad/trunk/src/other/incrTcl/itk/win/rc/itk.rc
Modified: brlcad/trunk/src/other/incrTcl/itk/tests/interp.test
===================================================================
--- brlcad/trunk/src/other/incrTcl/itk/tests/interp.test 2011-01-17
05:35:23 UTC (rev 42359)
+++ brlcad/trunk/src/other/incrTcl/itk/tests/interp.test 2011-01-17
05:37:03 UTC (rev 42360)
@@ -31,13 +31,14 @@
list [slave eval "namespace children :: ::itk"] [interp delete slave]
} {::itk {}}
-test interp-1.2 {can't load [incr Tk] into a safe interp} {
- interp create -safe slave
+test interp-1.2 {can load [incr Tk] into a safe interp} {
+ safe::interpCreate slave
+ safe::loadTk slave
load "" Itcl slave
set result [list [catch {load "" Itk slave} msg] $msg]
- interp delete slave
+ safe::interpDelete slave
set result
-} {1 {can't use package in a safe interpreter: no Itk_SafeInit procedure}}
+} {0 {}}
test interp-1.3 {errors are okay when slave interp is deleted} {
interp create slave
Modified: brlcad/trunk/src/other/incrTcl/itk/tests/toplevel.test
===================================================================
--- brlcad/trunk/src/other/incrTcl/itk/tests/toplevel.test 2011-01-17
05:35:23 UTC (rev 42359)
+++ brlcad/trunk/src/other/incrTcl/itk/tests/toplevel.test 2011-01-17
05:37:03 UTC (rev 42360)
@@ -56,7 +56,7 @@
test toplevel-1.2 {check the list of configuration options} {
.testToplevel0 configure
-} {{-background background Background linen linen} {-clientdata clientData
ClientData {} {}} {-cursor cursor Cursor {} {}} {-foreground foreground
Foreground navy navy} {-takefocus takeFocus TakeFocus 0 0} {-text text Text {}
{}} {-title title Title {} {}}}
+} {{-background background Background linen linen} {-clientdata clientData
ClientData {} {}} {-cursor cursor Cursor {} {}} {-foreground foreground
Foreground navy navy} {-menu menu Menu {} {}} {-takefocus takeFocus TakeFocus 0
0} {-text text Text {} {}} {-title title Title {} {}}}
test toplevel-1.3 {check the list components} {
lsort [.testToplevel0 component]
Modified: brlcad/trunk/src/other/incrTcl/itk/win/makefile.vc
===================================================================
--- brlcad/trunk/src/other/incrTcl/itk/win/makefile.vc 2011-01-17 05:35:23 UTC
(rev 42359)
+++ brlcad/trunk/src/other/incrTcl/itk/win/makefile.vc 2011-01-17 05:37:03 UTC
(rev 42360)
@@ -83,18 +83,20 @@
!if $(TCLINSTALL)
TKSTUBLIB = "$(TCLDIR)\lib\tkstub$(TCL_VERSION).lib"
TKIMPLIB = "$(TCLDIR)\lib\tk$(TCL_VERSION)$(DBGX).lib"
+TKLIB = "$(TCLDIR)\bin\tk$(TCL_VERSION)$(DBGX).dll"
WISH = "$(TCLDIR)\bin\wish$(TCL_VERSION)$(DBGX).exe"
TCL_LIBRARY =
TK_LIBRARY =
!else
TKSTUBLIB = "$(TKDIR)\win\Release\tkstub$(TCL_VERSION).lib"
TKIMPLIB = "$(TKDIR)\win\$(OUT_DIR)\tk$(TCL_VERSION)$(DBGX).lib"
+TKLIB = "$(TKDIR)\win\$(OUT_DIR)\tk$(TCL_VERSION)$(DBGX).dll"
WISH = "$(TKDIR)\win\$(OUT_DIR)\wish$(TCL_VERSION)$(DBGX).exe"
TCL_LIBRARY = "$(TCLDIR)\library"
TK_LIBRARY = "$(TKDIR)\library"
!endif
ITCL_LIBRARY = "$(ITCLDIR:\=/)/library"
-ITK_LIBRARY = "$(ROOT)/library
+ITK_LIBRARY = "$(ROOT)/library"
ITCLSTUBLIBNAME = itclstub$(ITCL_VERSION).lib
ITCLSTUBLIB = "$(ITCLDIR)\win\Release\$(ITCLSTUBLIBNAME)"
@@ -224,11 +226,11 @@
### By convention, static builds do not use Stubs. This is just a practice,
### not a technical limitation.
!if $(STATIC_BUILD)
-ITK_CFLAGS = $(ITK_EXE_CFLAGS) -DSTATIC_BUILD
+ITK_CFLAGS = $(ITK_EXE_CFLAGS) -DSTATIC_BUILD $(OPTDEFINES)
!elseif $(TCL_DOES_STUBS)
-ITK_CFLAGS = $(ITK_EXE_CFLAGS) -DUSE_TCL_STUBS -DUSE_TK_STUBS
-DUSE_ITCL_STUBS
+ITK_CFLAGS = $(ITK_EXE_CFLAGS) -DUSE_TCL_STUBS -DUSE_TK_STUBS
-DUSE_ITCL_STUBS $(OPTDEFINES)
!else
-ITK_CFLAGS = $(ITK_EXE_CFLAGS)
+ITK_CFLAGS = $(ITK_EXE_CFLAGS) $(OPTDEFINES)
!endif
#---------------------------------------------------------------------
@@ -244,12 +246,12 @@
@echo test target not supported for a static library.
!else
test : setup $(ITKLIB) $(ITKSTUBLIB)
- set TCL_LIBRARY=$(TCL_LIBRARY)
- set TK_LIBRARY=$(TK_LIBRARY)
- set ITCL_LIBRARY=$(ITCL_LIBRARY)
- set ITK_LIBRARY=$(ITK_LIBRARY)
$(TCLSH) ..\tests\all.tcl $(TESTFLAGS) -loadfile <<
+ set env(TK_LIBRARY) $(TK_LIBRARY:\=/)
+ set env(ITCL_LIBRARY) [file normalize $(ITCL_LIBRARY:\=/)]
+ set env(ITK_LIBRARY) [file normalize $(ITK_LIBRARY:\=/)]
load [file normalize $(ITCLLIB:\=/)] Itcl
+ load [file normalize $(TKLIB:\=/)] Tk
load [file normalize $(ITKLIB:\=/)] Itk
<<
!endif
@@ -323,6 +325,35 @@
!endif
#---------------------------------------------------------------------
+# Generate the source dependencies.
+#---------------------------------------------------------------------
+
+depend:
+!if !exist($(TCLSH))
+ @echo Build tclsh first!
+!else
+ $(TCLSH) $(TCLTOOLSDIR)\mkdepend.tcl -vc32 -out:"$(OUT_DIR)\depend.mk" \
+ -passthru:"-DBUILD_itcl $(ITCL_INCLUDES) $(TCL_INCLUDES)
$(ITK_INCLUDES) $(TK_INCLUDES)" \
+ $(GENERICDIR),$$(GENERICDIR) $(WINDIR),$$(WINDIR) @<<
+$(ITKOBJS)
+<<
+!endif
+
+#---------------------------------------------------------------------
+# Dependency rules
+#---------------------------------------------------------------------
+
+!if exist("$(OUT_DIR)\depend.mk")
+!include "$(OUT_DIR)\depend.mk"
+!message *** Dependency rules in use.
+!else
+!message *** Dependency rules are not being used.
+!endif
+
+### add a spacer in the output
+!message
+
+#---------------------------------------------------------------------
# Special case object file targets
#---------------------------------------------------------------------
Modified: brlcad/trunk/src/other/incrTcl/itk/win/rc/itk.rc
===================================================================
--- brlcad/trunk/src/other/incrTcl/itk/win/rc/itk.rc 2011-01-17 05:35:23 UTC
(rev 42359)
+++ brlcad/trunk/src/other/incrTcl/itk/win/rc/itk.rc 2011-01-17 05:37:03 UTC
(rev 42360)
@@ -1,60 +1,60 @@
-// RCS: @(#) $Id$
-//
-// Version resource script.
-//
-
-#include <winver.h>
-#include <itcl.h>
-#include <itk.h>
-
-//
-// build-up the name suffix that defines the type of build this is.
-//
-#if DEBUG
-#define SUFFIX_DEBUG "g"
-#else
-#define SUFFIX_DEBUG ""
-#endif
-
-#define SUFFIX SUFFIX_DEBUG
-
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION
ITK_MAJOR_VERSION,ITK_MINOR_VERSION,ITK_RELEASE_LEVEL,ITK_RELEASE_SERIAL
- PRODUCTVERSION
ITK_MAJOR_VERSION,ITK_MINOR_VERSION,ITK_RELEASE_LEVEL,ITK_RELEASE_SERIAL
- FILEFLAGSMASK 0x3fL
-#if DEBUG
- FILEFLAGS VS_FF_DEBUG
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS VOS__WINDOWS32
- FILETYPE VFT_DLL
- FILESUBTYPE 0x0L
-
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0"
- BEGIN
- VALUE "FileDescription", "[Incr Tk] Object-Oriented Tk extension\0"
- VALUE "Authors", "Michael McLennan\0"
- VALUE "OriginalFilename", "itk" STRINGIFY(ITK_MAJOR_VERSION)
STRINGIFY(ITK_MINOR_VERSION) SUFFIX ".dll\0"
- VALUE "CompanyName", "Bell Labs Innovations for Lucent
Technologies\0"
- VALUE "FileVersion", ITK_PATCH_LEVEL
- VALUE "LegalCopyright", "Copyright \251 1993-2003\0"
- VALUE "ProductName", "[Incr Tk] " ITK_VERSION " for Windows\0"
- VALUE "ProductVersion", ITK_PATCH_LEVEL
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200
- END
-END
-
-//
-// Icons
-//
-
-toaster ICON DISCARDABLE "itk.ico"
+// RCS: @(#) $Id$
+//
+// Version resource script.
+//
+
+#include <winver.h>
+#include <itcl.h>
+#include <itk.h>
+
+//
+// build-up the name suffix that defines the type of build this is.
+//
+#if DEBUG
+#define SUFFIX_DEBUG "g"
+#else
+#define SUFFIX_DEBUG ""
+#endif
+
+#define SUFFIX SUFFIX_DEBUG
+
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION
ITK_MAJOR_VERSION,ITK_MINOR_VERSION,ITK_RELEASE_LEVEL,ITK_RELEASE_SERIAL
+ PRODUCTVERSION
ITK_MAJOR_VERSION,ITK_MINOR_VERSION,ITK_RELEASE_LEVEL,ITK_RELEASE_SERIAL
+ FILEFLAGSMASK 0x3fL
+#if DEBUG
+ FILEFLAGS VS_FF_DEBUG
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS VOS__WINDOWS32
+ FILETYPE VFT_DLL
+ FILESUBTYPE 0x0L
+
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904b0"
+ BEGIN
+ VALUE "FileDescription", "[Incr Tk] Object-Oriented Tk extension\0"
+ VALUE "Authors", "Michael McLennan\0"
+ VALUE "OriginalFilename", "itk" STRINGIFY(ITK_MAJOR_VERSION)
STRINGIFY(ITK_MINOR_VERSION) SUFFIX ".dll\0"
+ VALUE "CompanyName", "Bell Labs Innovations for Lucent
Technologies\0"
+ VALUE "FileVersion", ITK_PATCH_LEVEL
+ VALUE "LegalCopyright", "Copyright \251 1993-2003\0"
+ VALUE "ProductName", "[Incr Tk] " ITK_VERSION " for Windows\0"
+ VALUE "ProductVersion", ITK_PATCH_LEVEL
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 1200
+ END
+END
+
+//
+// Icons
+//
+
+toaster ICON DISCARDABLE "itk.ico"
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
