Changeset 207


Ignore:
Timestamp:
Feb 22, 2006 11:16:19 AM (15 years ago)
Author:
dkearney
Message:

reorganized tcl directory

Location:
trunk/src/tcl
Files:
1 added
2 deleted
13 copied

Legend:

Unmodified
Added
Removed
  • trunk/src/tcl/Makefile.in

    r205 r207  
    1111#========================================================================
    1212
    13 lib_BINARIES=$(RapptureLibrary_LIB_FILE)
     13lib_BINARIES=$(Rappture_LIB_FILE)
    1414BINARIES=$(lib_BINARIES)
    1515
     
    1919#========================================================================
    2020
    21 RapptureLibrary_SOURCES = \
     21Rappture_SOURCES = \
     22  src/Rappture_Init.cc \
    2223  src/RpLibraryTclInterface.cc
    23 SOURCES = $(RapptureLibrary_SOURCES)
     24SOURCES = $(Rappture_SOURCES)
    2425
    2526#========================================================================
     
    3031#========================================================================
    3132
    32 RapptureLibrary_OBJECTS = \
     33Rappture_OBJECTS = \
     34  Rappture_Init.$(OBJEXT) \
    3335  RpLibraryTclInterface.$(OBJEXT)
    34 OBJECTS = $(RapptureLibrary_OBJECTS)
    35 
    36 #========================================================================
    37 # The substitution of "RapptureLibrary_LIB_FILE" into the variable name below
     36OBJECTS = $(Rappture_OBJECTS)
     37
     38#========================================================================
     39# The substitution of "Rappture_LIB_FILE" into the variable name below
    3840# let's us refer to the objects for the library without knowing the name
    3941# of the library in advance.  It also lets us use the "$@" variable in
     
    4244#========================================================================
    4345
    44 RapptureLibrary_LIB_FILE = @RapptureLibrary_LIB_FILE@
    45 $(RapptureLibrary_LIB_FILE)_OBJECTS = $(RapptureLibrary_OBJECTS)
     46Rappture_LIB_FILE = @Rappture_LIB_FILE@
     47$(Rappture_LIB_FILE)_OBJECTS = $(Rappture_OBJECTS)
    4648
    4749#========================================================================
     
    228230# above.
    229231#
    230 # $(RapptureLibrary_LIB_FILE) should be listed as part of the BINARIES variable
     232# $(Rappture_LIB_FILE) should be listed as part of the BINARIES variable
    231233# at the top of the Makefile.  That will ensure that this target is built
    232234# when you run "make binaries".
     
    236238#========================================================================
    237239
    238 $(RapptureLibrary_LIB_FILE): $(RapptureLibrary_OBJECTS)
    239         -rm -f $(RapptureLibrary_LIB_FILE)
     240$(Rappture_LIB_FILE): $(Rappture_OBJECTS)
     241        -rm -f $(Rappture_LIB_FILE)
    240242        @MAKE_LIB@  -lrappture
    241         $(RANLIB) $(RapptureLibrary_LIB_FILE) -lrappture
     243        $(RANLIB) $(Rappture_LIB_FILE) -lrappture
    242244
    243245#========================================================================
     
    257259#RpRusage.$(OBJEXT): $(srcdir)/src/RpRusage.c
    258260#       $(COMPILE) -c `@CYGPATH@ $(srcdir)/src/RpRusage.c` -o $@
     261
     262Rappture_Init.$(OBJEXT): $(srcdir)/src/Rappture_Init.cc
     263        $(COMPILEXX) -c `@CYGPATH@ $(srcdir)/src/Rappture_Init.cc` -o $@
    259264
    260265RpLibraryTclInterface.$(OBJEXT): $(srcdir)/src/RpLibraryTclInterface.cc
  • trunk/src/tcl/configure

    r205 r207  
    273273
    274274ac_unique_file="src/RpLibraryTclInterface.cc"
    275 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'
     275ac_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'
    276276ac_subst_files=''
    277277
     
    13041304#--------------------------------------------------------------------
    13051305
    1306 PACKAGE=RapptureLibrary
     1306PACKAGE=Rappture
    13071307
    13081308MAJOR_VERSION=1
    1309 MINOR_VERSION=0
     1309MINOR_VERSION=1
    13101310VERSION=${MAJOR_VERSION}.${MINOR_VERSION}
    13111311
     
    24702470    *win32* | *WIN32* | *CYGWIN_NT*)
    24712471        cat >>confdefs.h <<\_ACEOF
    2472 #define BUILD_RapptureGUI 1
     2472#define BUILD_Rappture 1
    24732473_ACEOF
    24742474
     
    42814281s,@MAKE_SHARED_LIB@,$MAKE_SHARED_LIB,;t t
    42824282s,@MAKE_STATIC_LIB@,$MAKE_STATIC_LIB,;t t
    4283 s,@RapptureLibrary_LIB_FILE@,$RapptureLibrary_LIB_FILE,;t t
     4283s,@Rappture_LIB_FILE@,$Rappture_LIB_FILE,;t t
    42844284s,@SHLIB_LD_LIBS@,$SHLIB_LD_LIBS,;t t
    42854285s,@TCLSH_PROG@,$TCLSH_PROG,;t t
  • trunk/src/tcl/configure.in

    r205 r207  
    2424#--------------------------------------------------------------------
    2525
    26 PACKAGE=RapptureLibrary
     26PACKAGE=Rappture
    2727
    2828MAJOR_VERSION=1
    29 MINOR_VERSION=0
     29MINOR_VERSION=1
    3030VERSION=${MAJOR_VERSION}.${MINOR_VERSION}
    3131
     
    205205case "`uname -s`" in
    206206    *win32* | *WIN32* | *CYGWIN_NT*)
    207         AC_DEFINE(BUILD_RapptureGUI)
     207        AC_DEFINE(BUILD_Rappture)
    208208        CLEANFILES="*.lib *.dll *.exp *.ilk *.pdb vc50.pch"
    209209        AC_SUBST(CLEANFILES)
     
    316316#--------------------------------------------------------------------
    317317
    318 AC_SUBST(RapptureLibrary_LIB_FILE)
     318AC_SUBST(Rappture_LIB_FILE)
    319319AC_SUBST(SHLIB_LD_LIBS)
    320320
  • trunk/src/tcl/init.tcl.in

    r205 r207  
    1212#  redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
    1313# ======================================================================
    14 proc RapptureLibrary_init {} {
     14proc Rappture_init {} {
    1515    global auto_path
    1616    global rappture_library
     
    2424
    2525    set suffix [info sharedlibextension]
    26     set library [file join $dir .. libRapptureLibrary@VERSION@${suffix}]
     26    set library [file join $dir .. libRappture@VERSION@${suffix}]
    2727    load $library
    2828
     
    3232    }
    3333
    34     package provide RapptureLibrary @VERSION@
    35     rename RapptureLibrary_init ""
     34    package provide Rappture @VERSION@
     35    rename Rappture_init ""
    3636}
    37 RapptureLibrary_init
     37Rappture_init
  • trunk/src/tcl/pkgIndex.tcl.in

    r205 r207  
    1 # this file identifies RapptureLibrary as a Tcl package
    2 package ifneeded RapptureLibrary @VERSION@ [list source [file join $dir init.tcl]]
     1# this file identifies Rappture as a Tcl package
     2package ifneeded Rappture @VERSION@ [list source [file join $dir init.tcl]]
  • trunk/src/tcl/tcl_test.tcl

    r205 r207  
    1 package require RapptureLibrary
     1package require Rappture
    22
    33Rappture::library "rplib_test.xml"
Note: See TracChangeset for help on using the changeset viewer.