Changeset 4914 for branches/r9/lang


Ignore:
Timestamp:
Jan 1, 2015 2:52:13 PM (6 years ago)
Author:
gah
Message:
 
Location:
branches/r9/lang
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • branches/r9/lang/configure

    r4909 r4914  
    629629TCL_SHLIB_LD
    630630TCL_SHLIB_CFLAGS
     631TCL_LIB_SPEC
     632TCL_INC_SPEC
    631633TCL_CFLAGS_OPTIMIZE
    632634TCL_CFLAGS_DEBUG
    633 TCL_LIB_SPEC
    634 TCL_INC_SPEC
     635TCLSH
     636SVN_VERSION
    635637SIZEOF_VOID_P
    636638SIZEOF_LONG_LONG
     
    641643RUBY_PLATFORM
    642644RP_BASE
     645RAPPTURE_VERSION
     646RAPPTURE_RELEASE_SERIAL
     647RAPPTURE_MINOR_VERSION
     648RAPPTURE_MAJOR_VERSION
    643649PYTHON_VERSION
    644650PYTHON_SITE_PACKAGES
     
    664670OCTAVE_VERSION_MAJOR
    665671OCTAVE_VERSION
    666 SVN_VERSION
    667672MKOCTFILE3
    668673MKOCTFILE2
     
    712717MEX
    713718MATLAB
    714 TCLSH
    715719INSTALL_STUB_LIB
    716720INSTALL_LIB
     
    808812enable_corefoundation
    809813enable_load
    810 with_tclsh
    811814with_matlab
    812815with_octave
     
    14671470  --with-x                use the X Window System
    14681471  --with-install=DIR      location of installation [default=yes]
    1469   --with-tclsh=DIR        location of tclsh [default=yes]
    14701472  --with-matlab=DIR       location of matlab and mex compiler [default=yes]
    14711473  --with-octave=DIR       path of default octave compiler `mkoctfile'
     
    74607462
    74617463
    7462 SVN_VERSION=`svnversion $srcdir`
    7463 
    7464 make_command=""
    7465 for m in "$MAKE" make gmake gnumake ; do
    7466   if test "x${m}" != "x" ; then
    7467     if  ( sh -c "$m --version" 2>/dev/null | grep GNU >/dev/null ) ; then
    7468       make_command=$m; break;
    7469     fi
    7470   fi
    7471 done
    7472 if test "x${make_command}" = "x" ; then
    7473   as_fn_error $? "Requires GNU make. You can specify a version with \$MAKE" "$LINENO" 5
    7474 fi
    7475 
    7476 TCL_VERSION="8.4"
    7477 for dir in \
    7478  ${exec_prefix} \
    7479  ${exec_prefix}/lib ; do
    7480   tclconfig="${dir}/tclConfig.sh"
    7481   if test -f "$tclconfig" ; then
    7482     . $tclconfig
    7483     break
    7484   fi
    7485 done
    7486 
    7487 
    7488 # Check whether --with-tclsh was given.
    7489 if test "${with_tclsh+set}" = set; then :
    7490   withval=$with_tclsh;
    7491 else
    7492   with_tclsh=yes
    7493 fi
    7494 
    7495 
    7496 TCLSH=""
    7497 if test "${with_tclsh}" != "no" ; then
    7498   tclsh="tclsh${TCL_VERSION}"
    7499   if test "${with_tclsh}" = "yes" ; then
    7500     # Extract the first word of "${tclsh}", so it can be a program name with args.
    7501 set dummy ${tclsh}; ac_word=$2
    7502 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    7503 $as_echo_n "checking for $ac_word... " >&6; }
    7504 if ${ac_cv_path_TCLSH+:} false; then :
    7505   $as_echo_n "(cached) " >&6
    7506 else
    7507   case $TCLSH in
    7508   [\\/]* | ?:[\\/]*)
    7509   ac_cv_path_TCLSH="$TCLSH" # Let the user override the test with a path.
    7510   ;;
    7511   *)
    7512   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    7513 as_dummy="${exec_prefix}/bin:${PATH}"
    7514 for as_dir in $as_dummy
    7515 do
    7516   IFS=$as_save_IFS
    7517   test -z "$as_dir" && as_dir=.
    7518     for ac_exec_ext in '' $ac_executable_extensions; do
    7519   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    7520     ac_cv_path_TCLSH="$as_dir/$ac_word$ac_exec_ext"
    7521     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    7522     break 2
    7523   fi
    7524 done
    7525   done
    7526 IFS=$as_save_IFS
    7527 
    7528   ;;
    7529 esac
    7530 fi
    7531 TCLSH=$ac_cv_path_TCLSH
    7532 if test -n "$TCLSH"; then
    7533   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TCLSH" >&5
    7534 $as_echo "$TCLSH" >&6; }
    7535 else
    7536   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
    7537 $as_echo "no" >&6; }
    7538 fi
    7539 
    7540 
    7541   else
    7542     # Extract the first word of "${tclsh}", so it can be a program name with args.
    7543 set dummy ${tclsh}; ac_word=$2
    7544 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    7545 $as_echo_n "checking for $ac_word... " >&6; }
    7546 if ${ac_cv_path_TCLSH+:} false; then :
    7547   $as_echo_n "(cached) " >&6
    7548 else
    7549   case $TCLSH in
    7550   [\\/]* | ?:[\\/]*)
    7551   ac_cv_path_TCLSH="$TCLSH" # Let the user override the test with a path.
    7552   ;;
    7553   *)
    7554   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    7555 as_dummy="${with_tclsh}/bin:${with_tclsh}"
    7556 for as_dir in $as_dummy
    7557 do
    7558   IFS=$as_save_IFS
    7559   test -z "$as_dir" && as_dir=.
    7560     for ac_exec_ext in '' $ac_executable_extensions; do
    7561   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    7562     ac_cv_path_TCLSH="$as_dir/$ac_word$ac_exec_ext"
    7563     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    7564     break 2
    7565   fi
    7566 done
    7567   done
    7568 IFS=$as_save_IFS
    7569 
    7570   ;;
    7571 esac
    7572 fi
    7573 TCLSH=$ac_cv_path_TCLSH
    7574 if test -n "$TCLSH"; then
    7575   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TCLSH" >&5
    7576 $as_echo "$TCLSH" >&6; }
    7577 else
    7578   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
    7579 $as_echo "no" >&6; }
    7580 fi
    7581 
    7582 
    7583   fi
    7584   if test "x${TCLSH}" = "x" ; then
    7585     as_fn_error $? "can't find tclsh" "$LINENO" 5
    7586   fi
     7464if test -r "${exec_prefix}/lib/tclConfig.sh" ; then
     7465  . ${exec_prefix}/lib/tclConfig.sh
     7466fi
     7467if test -r "${exec_prefix}/lib/tkConfig.sh" ; then
     7468  . ${exec_prefix}/lib/tkConfig.sh
     7469fi
     7470if test -r "${exec_prefix}/lib/rapptureConfig.sh" ; then
     7471  . ${exec_prefix}/lib/rapptureConfig.sh
    75877472fi
    75887473
     
    96699554
    96709555MAKE=${make_command}
     9556
     9557
     9558
     9559
    96719560
    96729561
  • branches/r9/lang/configure.in

    r4867 r4914  
    9999SC_CONFIG_CFLAGS
    100100
    101 SVN_VERSION=`svnversion $srcdir`
    102 
    103 make_command=""
    104 for m in "$MAKE" make gmake gnumake ; do
    105   if test "x${m}" != "x" ; then
    106     if  ( sh -c "$m --version" 2>/dev/null | grep GNU >/dev/null ) ; then
    107       make_command=$m; break;
    108     fi
    109   fi
    110 done
    111 if test "x${make_command}" = "x" ; then
    112   AC_MSG_ERROR([Requires GNU make. You can specify a version with \$MAKE])
    113 fi
    114 
    115 TCL_VERSION="8.4"
    116 for dir in \
    117  ${exec_prefix} \
    118  ${exec_prefix}/lib ; do
    119   tclconfig="${dir}/tclConfig.sh"
    120   if test -f "$tclconfig" ; then
    121     . $tclconfig
    122     break
    123   fi
    124 done
    125 
    126 AC_ARG_WITH(
    127     [tclsh],
    128     [AS_HELP_STRING([--with-tclsh[=DIR]],
    129         [location of tclsh @<:@default=yes@:>@])],
    130     [],
    131     [with_tclsh=yes])
    132 
    133 TCLSH=""
    134 if test "${with_tclsh}" != "no" ; then
    135   tclsh="tclsh${TCL_VERSION}"
    136   if test "${with_tclsh}" = "yes" ; then
    137     AC_PATH_PROG(TCLSH, ${tclsh}, [], [${exec_prefix}/bin:${PATH}])
    138   else
    139     AC_PATH_PROG(TCLSH, ${tclsh}, [], [${with_tclsh}/bin:${with_tclsh}])
    140   fi
    141   if test "x${TCLSH}" = "x" ; then
    142     AC_ERROR([can't find tclsh])
    143   fi
     101if test -r "${exec_prefix}/lib/tclConfig.sh" ; then
     102  . ${exec_prefix}/lib/tclConfig.sh
     103fi   
     104if test -r "${exec_prefix}/lib/tkConfig.sh" ; then
     105  . ${exec_prefix}/lib/tkConfig.sh
     106fi
     107if test -r "${exec_prefix}/lib/rapptureConfig.sh" ; then
     108  . ${exec_prefix}/lib/rapptureConfig.sh
    144109fi
    145110
     
    213178AC_SUBST(MKOCTFILE2)
    214179AC_SUBST(MKOCTFILE3)
    215 AC_SUBST(SVN_VERSION)
    216180AC_SUBST(OCTAVE_VERSION)
    217181AC_SUBST(OCTAVE_VERSION_MAJOR)
     
    240204AC_SUBST(PYTHON_VERSION)
    241205AC_SUBST(R)
     206AC_SUBST(RAPPTURE_MAJOR_VERSION)
     207AC_SUBST(RAPPTURE_MINOR_VERSION)
     208AC_SUBST(RAPPTURE_RELEASE_SERIAL)
     209AC_SUBST(RAPPTURE_VERSION)
    242210AC_SUBST(RP_BASE)
    243211AC_SUBST(RUBY)
     
    253221AC_SUBST(SIZEOF_VOID_P)
    254222AC_SUBST(STLIB_LD)
     223AC_SUBST(SVN_VERSION)
    255224AC_SUBST(TCLSH)
     225AC_SUBST(TCL_CFLAGS_DEBUG)
     226AC_SUBST(TCL_CFLAGS_DEBUG)
     227AC_SUBST(TCL_CFLAGS_OPTIMIZE)
    256228AC_SUBST(TCL_INC_SPEC)
    257229AC_SUBST(TCL_LIB_SPEC)
    258 AC_SUBST(TCL_CFLAGS_DEBUG)
    259 AC_SUBST(TCL_CFLAGS_OPTIMIZE)
     230AC_SUBST(TCL_SHLIB_CFLAGS)
    260231AC_SUBST(TCL_SHLIB_CFLAGS)
    261232AC_SUBST(TCL_SHLIB_LD)
     233AC_SUBST(TCL_SHLIB_LD)
    262234AC_SUBST(TCL_SHLIB_LDFLAGS)
     235AC_SUBST(TCL_SHLIB_LDFLAGS)
     236AC_SUBST(TCL_SHLIB_SUFFIX)
    263237AC_SUBST(TCL_SHLIB_SUFFIX)
    264238AC_SUBST(TCL_VERSION)
    265239AC_SUBST(TCL_VERSION)
    266 AC_SUBST(TCL_CFLAGS_DEBUG)
    267 AC_SUBST(TCL_SHLIB_CFLAGS)
    268 AC_SUBST(TCL_SHLIB_SUFFIX)
    269 AC_SUBST(TCL_SHLIB_LD)
    270 AC_SUBST(TCL_SHLIB_LDFLAGS)
    271240AC_SUBST(XSUBPP)
    272241
  • branches/r9/lang/tcl/Makefile.in

    r1944 r4914  
    99prefix          = @prefix@
    1010
    11 destdir         = $(libdir)/Rappture$(PACKAGE_VERSION)
     11destdir         = $(libdir)/Rappture$(VERSION)
    1212
    13 PACKAGE_VERSION = @PACKAGE_VERSION@
    14 
     13AR              = ar
     14CC              = @CC@
     15CFLAGS          = @CFLAGS@
     16CFLAGS_DEBUG    = @CFLAGS_DEBUG@
     17CFLAGS_DEFAULT  = @CFLAGS_DEFAULT@
     18CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@
     19CXX             = @CXX@
    1520INSTALL         = @INSTALL@
    16 
    17 CXX             = @CXX@
    18 CC              = @CC@
    19 CFLAGS_DEBUG    = @CFLAGS_DEBUG@
    20 CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@
    21 STLIB_LD        = @STLIB_LD@
     21LIB_SEARCH_DIRS = @LIB_SEARCH_DIRS@
     22LN_S            = @LN_S@
     23MKDIR_P         = @MKDIR_P@
     24RANLIB          = @RANLIB@
     25VERSION         = @RAPPTURE_VERSION@
     26RM              = rm -f
     27SHLIB_CFLAGS    = @SHLIB_CFLAGS@
    2228SHLIB_LD        = @SHLIB_LD@
    23 SHLIB_CFLAGS    = @SHLIB_CFLAGS@
    2429SHLIB_LDFLAGS   = @SHLIB_LDFLAGS@
    2530SHLIB_SUFFIX    = @SHLIB_SUFFIX@
    26 CFLAGS_DEFAULT  = @CFLAGS_DEFAULT@
    27 LIB_SEARCH_DIRS = @LIB_SEARCH_DIRS@
    28 CFLAGS          = @CFLAGS@
    29 TCL_VERSION     = @TCL_VERSION@
    30 TK_VERSION      = @TK_VERSION@
    31 
    32 RANLIB          = @RANLIB@
    33 MKDIR_P         = @MKDIR_P@
    34 AR              = ar
    35 LN_S            = @LN_S@
    36 RM              = rm -f
     31STLIB_LD        = @STLIB_LD@
    3732
    3833# The script directory is moved from src/tcl.
     
    5146        $(MAKE) -C src install
    5247        $(MAKE) -C scripts install
    53         $(RM) $(bindir)/tclsh
    54         (cd $(bindir); $(LN_S) tclsh$(TCL_VERSION) tclsh)
    55         $(RM) $(bindir)/wish
    56         (cd $(bindir); $(LN_S) wish$(TK_VERSION) wish)
    5748
    5849test:
  • branches/r9/lang/tcl/pkgIndex.tcl.in

    r4913 r4914  
    11# This is a duplicate of pkgs/runner/pkgIndex.tcl.in
    2 package ifneeded Rappture @PACKAGE_VERSION@ [format {
     2package ifneeded Rappture @RAPPTURE_VERSION@ [format {
    33    set dir "%s"
    4     set version @PACKAGE_VERSION@
     4    set version @RAPPTURE_VERSION@
    55    lappend auto_path [file join $dir scripts]
    66    namespace eval Rappture {
  • branches/r9/lang/tcl/scripts/Makefile.in

    r4869 r4914  
    1010srcdir          = @srcdir@
    1111
     12AR              = ar
     13CC              = @CC@
     14CFLAGS          = @CFLAGS@
     15CFLAGS_DEBUG    = @CFLAGS_DEBUG@
     16CFLAGS_DEFAULT  = @CFLAGS_DEFAULT@
     17CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@
     18CXX             = @CXX@
    1219INSTALL         = @INSTALL@
     20INSTALL_DATA    = ${INSTALL} -m 644
    1321INSTALL_PROGRAM = ${INSTALL} -m 755
    14 INSTALL_DATA    = ${INSTALL} -m 644
    1522INSTALL_SCRIPT  = ${INSTALL}
    16 TCL_VERSION     = @TCL_VERSION@
    17 TCLSH           = $(bindir)/tclsh$(TCL_VERSION)
    18 VERSION         = @PACKAGE_VERSION@
    19 VPATH           = $(srcdir)
    20 
    21 CXX             = @CXX@
    22 CC              = @CC@
    23 CFLAGS_DEBUG    = @CFLAGS_DEBUG@
    24 CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@
     23LIB_SEARCH_DIRS = @LIB_SEARCH_DIRS@
     24MKDIR_P         = @MKDIR_P@
     25RANLIB          = @RANLIB@
     26RM              = rm -f
     27SHLIB_CFLAGS    = @SHLIB_CFLAGS@
    2528SHLIB_LD        = @SHLIB_LD@
    26 SHLIB_CFLAGS    = @SHLIB_CFLAGS@
    2729SHLIB_LDFLAGS   = @SHLIB_LDFLAGS@
    2830SHLIB_SUFFIX    = @SHLIB_SUFFIX@
    29 CFLAGS_DEFAULT  = @CFLAGS_DEFAULT@
    30 LIB_SEARCH_DIRS = @LIB_SEARCH_DIRS@
    31 CFLAGS          = @CFLAGS@
    32 
    33 RANLIB          = @RANLIB@
    34 MKDIR_P         = @MKDIR_P@
    35 AR              = ar
    36 RM              = rm -f
     31TCLSH           = $(bindir)/tclsh$(TCL_VERSION)
     32TCL_VERSION     = @TCL_VERSION@
     33VERSION         = @RAPPTURE_VERSION@
     34VPATH           = $(srcdir)
    3735
    3836destdir         = $(prefix)/lib/Rappture$(VERSION)/scripts
  • branches/r9/lang/tcl/src/Makefile.in

    r4867 r4914  
    1010srcdir          = @srcdir@
    1111
     12CC              = @CC@
     13CFLAGS          = @CFLAGS@ -fPIC
     14CFLAGS_DEBUG    = @CFLAGS_DEBUG@ -Wall
     15CFLAGS_DEFAULT  = @CFLAGS_DEFAULT@
     16CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@
     17CXX             = @CXX@
     18INSTALL         = @INSTALL@
     19LIB_SEARCH_DIRS = @LIB_SEARCH_DIRS@
     20MKDIR_P         = @MKDIR_P@
    1221SHELL           = @SHELL@
    13 INSTALL         = @INSTALL@
    14 MKDIR_P         = @MKDIR_P@
    15 
    16 CXX             = @CXX@
    17 CC              = @CC@
    18 CFLAGS_DEBUG    = @CFLAGS_DEBUG@ -Wall
    19 CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@
    20 STLIB_LD        = @STLIB_LD@
     22SHLIB_CFLAGS    = @SHLIB_CFLAGS@
    2123SHLIB_LD        = @SHLIB_LD@
    22 SHLIB_CFLAGS    = @SHLIB_CFLAGS@
    2324SHLIB_LDFLAGS   = @SHLIB_LDFLAGS@
    2425SHLIB_SUFFIX    = @SHLIB_SUFFIX@
    25 CFLAGS_DEFAULT  = @CFLAGS_DEFAULT@
    26 LIB_SEARCH_DIRS = @LIB_SEARCH_DIRS@
    27 CFLAGS          = @CFLAGS@ -fPIC
    28 TCL_VERSION     = @TCL_VERSION@
     26STLIB_LD        = @STLIB_LD@
     27SVN_VERSION     = @SVN_VERSION@
    2928TCL_LIB_SPEC    = @TCL_LIB_SPEC@
     29VERSION         = @RAPPTURE_VERSION@
    3030
    3131CC_SWITCHES     = $(CFLAGS) $(CFLAGS_DEBUG) $(INCLUDES) $(DEFINES)
     
    3535                  -I$(includedir)
    3636
    37 RAPPTURE_VERSION = @PACKAGE_VERSION@
    38 SVN_VERSION     := $(shell svnversion $(srcdir))
    3937DEFINES         = -DSVN_VERSION=\"$(SVN_VERSION)\" \
    40                   -DRAPPTURE_VERSION=\"$(RAPPTURE_VERSION)\"
     38                  -DRAPPTURE_VERSION=\"$(VERSION)\"
    4139
    4240RANLIB          = @RANLIB@
     
    6058# Not using     RpLibraryTclInterface.o \
    6159
    62 name        = Rappture$(RAPPTURE_VERSION)
     60name        = Rappture$(VERSION)
    6361libname     = $(name)
    6462lib         = $(libname)$(SHLIB_SUFFIX)
Note: See TracChangeset for help on using the changeset viewer.