Changeset 207

Timestamp:

Feb 22, 2006 11:16:19 AM (16 years ago)

Author:

dkearney

Message:

reorganized tcl directory

Location:

trunk/src/tcl

Files:

• Makefile.in (copied) (copied from trunk/src/tcl/library/Makefile.in) (7 diffs)
• README (copied) (copied from trunk/src/tcl/library/README)
• aclocal.m4 (copied) (copied from trunk/src/tcl/library/aclocal.m4)
• cf (copied) (copied from trunk/src/tcl/library/cf)
• configure (copied) (copied from trunk/src/tcl/library/configure) (4 diffs)
• configure.in (copied) (copied from trunk/src/tcl/library/configure.in) (3 diffs)
• init.tcl.in (copied) (copied from trunk/src/tcl/library/init.tcl.in) (3 diffs)
• library (deleted)
• pkgIndex.tcl.in (copied) (copied from trunk/src/tcl/library/pkgIndex.tcl.in) (1 diff)
• rplib_test.xml (copied) (copied from trunk/src/tcl/library/rplib_test.xml)
• src (copied) (copied from trunk/src/tcl/library/src)
• src/Rappture_Init.cc (added)
• src/RpLibraryTclInterface.cc (copied) (copied from trunk/src/tcl/library/src/RpLibraryTclInterface.cc)
• tcl.m4 (copied) (copied from trunk/src/tcl/library/tcl.m4)
• tcl_test.tcl (copied) (copied from trunk/src/tcl/library/tcl_test.tcl) (1 diff)
• units (deleted)

trunk/src/tcl/Makefile.in

@@ -11 +11 @@
 #========================================================================
 
-lib_BINARIES=$(RapptureLibrary_LIB_FILE)
+lib_BINARIES=$(Rappture_LIB_FILE)
 BINARIES=$(lib_BINARIES)
 
@@ -19 +19 @@
 #========================================================================
 
-RapptureLibrary_SOURCES = \
+Rappture_SOURCES = \
+  src/Rappture_Init.cc \
   src/RpLibraryTclInterface.cc
-SOURCES = $(RapptureLibrary_SOURCES)
+SOURCES = $(Rappture_SOURCES)
 
 #========================================================================
@@ -30 +31 @@
 #========================================================================
 
-RapptureLibrary_OBJECTS = \
+Rappture_OBJECTS = \
+  Rappture_Init.$(OBJEXT) \
   RpLibraryTclInterface.$(OBJEXT)
-OBJECTS = $(RapptureLibrary_OBJECTS)
-
-#========================================================================
-# The substitution of "RapptureLibrary_LIB_FILE" into the variable name below
+OBJECTS = $(Rappture_OBJECTS)
+
+#========================================================================
+# The substitution of "Rappture_LIB_FILE" into the variable name below
 # let's us refer to the objects for the library without knowing the name
 # of the library in advance.  It also lets us use the "$@" variable in
@@ -42 +44 @@
 #========================================================================
 
-RapptureLibrary_LIB_FILE = @RapptureLibrary_LIB_FILE@
-$(RapptureLibrary_LIB_FILE)_OBJECTS = $(RapptureLibrary_OBJECTS)
+Rappture_LIB_FILE = @Rappture_LIB_FILE@
+$(Rappture_LIB_FILE)_OBJECTS = $(Rappture_OBJECTS)
 
 #========================================================================
@@ -228 +230 @@
 # above.
 #
-# $(RapptureLibrary_LIB_FILE) should be listed as part of the BINARIES variable
+# $(Rappture_LIB_FILE) should be listed as part of the BINARIES variable
 # at the top of the Makefile.  That will ensure that this target is built
 # when you run "make binaries".
@@ -236 +238 @@
 #========================================================================
 
-$(RapptureLibrary_LIB_FILE): $(RapptureLibrary_OBJECTS)
-        -rm -f $(RapptureLibrary_LIB_FILE) 
+$(Rappture_LIB_FILE): $(Rappture_OBJECTS)
+        -rm -f $(Rappture_LIB_FILE) 
         @MAKE_LIB@  -lrappture
-        $(RANLIB) $(RapptureLibrary_LIB_FILE) -lrappture
+        $(RANLIB) $(Rappture_LIB_FILE) -lrappture
 
 #========================================================================
@@ -257 +259 @@
 #RpRusage.$(OBJEXT): $(srcdir)/src/RpRusage.c
 #       $(COMPILE) -c `@CYGPATH@ $(srcdir)/src/RpRusage.c` -o $@
+
+Rappture_Init.$(OBJEXT): $(srcdir)/src/Rappture_Init.cc
+        $(COMPILEXX) -c `@CYGPATH@ $(srcdir)/src/Rappture_Init.cc` -o $@
 
 RpLibraryTclInterface.$(OBJEXT): $(srcdir)/src/RpLibraryTclInterface.cc

trunk/src/tcl/configure

@@ -273 +273 @@
 
 ac_unique_file="src/RpLibraryTclInterface.cc"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE RANLIB ac_ct_RANLIB build build_cpu build_vendor build_os host host_cpu host_vendor host_os CYGPATH TCL_INCLUDES TCL_BIN_DIR TCL_SRC_DIR TCL_LIB_FILE TCL_LIBS TCL_DEFS TCL_SHLIB_LD_LIBS TCL_EXTRA_CFLAGS TCL_LD_FLAGS TCL_STUB_LIB_FILE TCL_LIB_SPEC TCL_BUILD_LIB_SPEC TCL_STUB_LIB_SPEC TCL_BUILD_STUB_LIB_SPEC CLEANFILES CC CFLAGS ac_ct_CC CFLAGS_DEBUG CFLAGS_OPTIMIZE STLIB_LD SHLIB_LD SHLIB_CFLAGS SHLIB_LDFLAGS TCL_DBGX CFLAGS_DEFAULT LDFLAGS_DEFAULT MAKE_LIB MAKE_SHARED_LIB MAKE_STATIC_LIB RapptureLibrary_LIB_FILE SHLIB_LD_LIBS TCLSH_PROG PACKAGE VERSION PATCHLEVEL EXACT_VERSION NODOT_VERSION LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE RANLIB ac_ct_RANLIB build build_cpu build_vendor build_os host host_cpu host_vendor host_os CYGPATH TCL_INCLUDES TCL_BIN_DIR TCL_SRC_DIR TCL_LIB_FILE TCL_LIBS TCL_DEFS TCL_SHLIB_LD_LIBS TCL_EXTRA_CFLAGS TCL_LD_FLAGS TCL_STUB_LIB_FILE TCL_LIB_SPEC TCL_BUILD_LIB_SPEC TCL_STUB_LIB_SPEC TCL_BUILD_STUB_LIB_SPEC CLEANFILES CC CFLAGS ac_ct_CC CFLAGS_DEBUG CFLAGS_OPTIMIZE STLIB_LD SHLIB_LD SHLIB_CFLAGS SHLIB_LDFLAGS TCL_DBGX CFLAGS_DEFAULT LDFLAGS_DEFAULT MAKE_LIB MAKE_SHARED_LIB MAKE_STATIC_LIB Rappture_LIB_FILE SHLIB_LD_LIBS TCLSH_PROG PACKAGE VERSION PATCHLEVEL EXACT_VERSION NODOT_VERSION LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
@@ -1304 +1304 @@
 #--------------------------------------------------------------------
 
-PACKAGE=RapptureLibrary
+PACKAGE=Rappture
 
 MAJOR_VERSION=1
-MINOR_VERSION=0
+MINOR_VERSION=1
 VERSION=${MAJOR_VERSION}.${MINOR_VERSION}
 
@@ -2470 +2470 @@
     *win32* | *WIN32* | *CYGWIN_NT*)
         cat >>confdefs.h <<\_ACEOF
-#define BUILD_RapptureGUI 1
+#define BUILD_Rappture 1
 _ACEOF
 
@@ -4281 +4281 @@
 s,@MAKE_SHARED_LIB@,$MAKE_SHARED_LIB,;t t
 s,@MAKE_STATIC_LIB@,$MAKE_STATIC_LIB,;t t
-s,@RapptureLibrary_LIB_FILE@,$RapptureLibrary_LIB_FILE,;t t
+s,@Rappture_LIB_FILE@,$Rappture_LIB_FILE,;t t
 s,@SHLIB_LD_LIBS@,$SHLIB_LD_LIBS,;t t
 s,@TCLSH_PROG@,$TCLSH_PROG,;t t

trunk/src/tcl/configure.in

@@ -24 +24 @@
 #--------------------------------------------------------------------
 
-PACKAGE=RapptureLibrary
+PACKAGE=Rappture
 
 MAJOR_VERSION=1
-MINOR_VERSION=0
+MINOR_VERSION=1
 VERSION=${MAJOR_VERSION}.${MINOR_VERSION}
 
@@ -205 +205 @@
 case "`uname -s`" in
     *win32* | *WIN32* | *CYGWIN_NT*)
-        AC_DEFINE(BUILD_RapptureGUI)
+        AC_DEFINE(BUILD_Rappture)
         CLEANFILES="*.lib *.dll *.exp *.ilk *.pdb vc50.pch"
         AC_SUBST(CLEANFILES)
@@ -316 +316 @@
 #--------------------------------------------------------------------
 
-AC_SUBST(RapptureLibrary_LIB_FILE)
+AC_SUBST(Rappture_LIB_FILE)
 AC_SUBST(SHLIB_LD_LIBS)
 

trunk/src/tcl/init.tcl.in

@@ -12 +12 @@
 #  redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 # ======================================================================
-proc RapptureLibrary_init {} {
+proc Rappture_init {} {
     global auto_path
     global rappture_library
@@ -24 +24 @@
 
     set suffix [info sharedlibextension]
-    set library [file join $dir .. libRapptureLibrary@VERSION@${suffix}]
+    set library [file join $dir .. libRappture@VERSION@${suffix}]
     load $library
 
@@ -32 +32 @@
     }
 
-    package provide RapptureLibrary @VERSION@
-    rename RapptureLibrary_init ""
+    package provide Rappture @VERSION@
+    rename Rappture_init ""
 }
-RapptureLibrary_init
+Rappture_init

trunk/src/tcl/pkgIndex.tcl.in

@@ -1 @@
-# this file identifies RapptureLibrary as a Tcl package
-package ifneeded RapptureLibrary @VERSION@ [list source [file join $dir init.tcl]]
+# this file identifies Rappture as a Tcl package
+package ifneeded Rappture @VERSION@ [list source [file join $dir init.tcl]]

trunk/src/tcl/tcl_test.tcl

@@ -1 @@
-package require RapptureLibrary
+package require Rappture
 
 Rappture::library "rplib_test.xml"