Changeset 5919 for branches/1.5
- Timestamp:
- Oct 22, 2015, 1:42:02 PM (9 years ago)
- Location:
- branches/1.5/lang
- Files:
-
- 4 added
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/1.5/lang/cf/rpLangRuby.m4
r5906 r5919 1 1 dnl Get a key from ruby's configuration table 2 AC_DEFUN([RUBY_CONFIG], [3 $RUBY -rrbconfig -e "puts(Config::CONFIG[['$1']] || '')"])4 2 5 3 AC_DEFUN([RP_LANG_RUBY], [ 6 4 7 5 AC_ARG_WITH( 8 ruby,6 [ruby], 9 7 AC_HELP_STRING( 10 8 --with-ruby=PATH, 11 9 [ path to the ruby interpreter [[ruby]] ]), 12 [ RUBY=$withval ], 13 [ RUBY=ruby ]) 10 [WITH_RUBY=$withval], 11 [WITH_RUBY=ruby]) 12 14 13 AC_ARG_WITH( 15 14 ruby_sitelibdir, … … 17 16 --with-ruby-sitelibdir=PATH, 18 17 [ path to install ruby scripts [[auto-detect]] ]), 19 [ ruby_sitelibdir=$withval],20 [ ruby_sitelibdir=NONE])18 [WITH_RUBY_SITELIBDIR=$withval], 19 [WITH_RUBY_SITELIBDIR=""]) 21 20 21 echo RUBY=$WITH_RUBY 22 if test "$WITH_RUBY" != "no" ; then 23 if test "$WITH_RUBY" = "yes" ; then 24 AC_PATH_PROG(RUBY, [ruby], [no]) 25 fi 26 else 27 RUBY=$WITH_RUBY 28 fi 29 echo "after RUBY=$RUBY" 30 if test "$RUBY" = "no" ; then 31 RUBY="/bin/true" 32 fi 33 AC_SUBST(WITH_RUBY) 22 34 AC_SUBST(RUBY) 35 36 . ${srcdir}/cf/rp_ruby_functions.sh 37 38 #AC_DEFUN([RUBY_CONFIG], [ 39 # $RUBY -rrbconfig -e "puts(RbConfig::CONFIG[['$1']])"]) 23 40 24 41 RUBY_VERSION_CODE=`$RUBY -e "puts RUBY_VERSION.gsub(/\./, '')"` 25 42 AC_SUBST(RUBY_VERSION_CODE) 26 43 27 RUBY_CONFIG_SO_NAME=`RUBY_CONFIG(RUBY_SO_NAME)` 28 RUBY_CONFIG_ARCHDIR=`RUBY_CONFIG(archdir)` 29 RUBY_CONFIG_ARCH=`RUBY_CONFIG(arch)` 30 RUBY_CONFIG_LIBDIR=`RUBY_CONFIG(libdir)` 31 RUBY_CONFIG_BINDIR=`RUBY_CONFIG(bindir)` 32 RUBY_CONFIG_RUBYHDRDIR=`RUBY_CONFIG(rubyhdrdir)` 33 RUBY_CONFIG_CFLAGS=`RUBY_CONFIG(CFLAGS)` 34 RUBY_CONFIG_LIBS=`RUBY_CONFIG(LIBS)` 35 RUBY_CONFIG_DLDLIBS=`RUBY_CONFIG(DLDLIBS)` 36 RUBY_CONFIG_LDFLAGS=`RUBY_CONFIG(LDFLAGS)` 37 RUBY_CONFIG_LIBRUBYARG=`RUBY_CONFIG(LIBRUBYARG)` 38 RUBY_CONFIG_LIBRUBYARG_STATIC=`RUBY_CONFIG(LIBRUBYARG_STATIC)` 39 RUBY_CONFIG_CCDLFLAGS=`RUBY_CONFIG(CCDLFLAGS)` 44 RUBY_VERSION=`ruby_get_config_param "ruby_version"` 45 RUBY_CONFIG_ARCHDIR=`ruby_get_config_param "archdir"` 46 RUBY_CONFIG_ARCH=`ruby_get_config_param "arch"` 47 RUBY_CONFIG_LIBDIR=`ruby_get_config_param "libdir"` 48 RUBY_CONFIG_BINDIR=`ruby_get_config_param "bindir"` 49 RUBY_CONFIG_RUBYHDRDIR=`ruby_get_config_param rubyhdrdir` 50 RUBY_CONFIG_CFLAGS=`ruby_get_config_param CFLAGS` 51 RUBY_CONFIG_LIBS=`ruby_get_config_param LIBS` 52 RUBY_CONFIG_DLDLIBS=`ruby_get_config_param DLDLIBS` 53 RUBY_CONFIG_LDFLAGS=`ruby_get_config_param LDFLAGS` 54 RUBY_CONFIG_SITELIBDIR=`ruby_get_config_param sitelibdir` 55 RUBY_CONFIG_LIBRUBYARG=`ruby_get_config_param LIBRUBYARG` 56 RUBY_CONFIG_LIBRUBYARG_STATIC=`ruby_get_config_param "LIBRUBYARG_STATIC"` 57 RUBY_CONFIG_CCDLFLAGS=`ruby_get_config_param "CCDLFLAGS"` 58 echo RUBY_CONFIG_ARCHDIR=$RUBY_CONFIG_ARCHDIR 59 echo RUBY_CONFIG_ARCH=$RUBY_CONFIG_ARCH 60 echo RUBY_CONFIG_LIBDIR=$RUBY_CONFIG_LIBDIR 61 echo RUBY_CONFIG_BINDIR=$RUBY_CONFIG_BINDIR 62 echo RUBY_CONFIG_RUBYHDRDIR=$RUBY_CONFIG_RUBYHDRDIR 63 echo RUBY_CONFIG_CFLAGS=$RUBY_CONFIG_CFLAGS 64 echo RUBY_CONFIG_LDFLAGS=$RUBY_CONFIG_LDFLAGS 65 echo RUBY_CONFIG_SITELIBDIR=$RUBY_CONFIG_SITELIBDIR 66 echo RUBY_VERSION=$RUBY_VERSION 40 67 41 if test "x${RUBY_CONFIG_RUBYHDRDIR} x" != "xx"; then68 if test "x${RUBY_CONFIG_RUBYHDRDIR}" != "x"; then 42 69 # 1.9 43 70 RUBY_CPPFLAGS="-I${RUBY_CONFIG_RUBYHDRDIR}" 44 71 RUBY_CPPFLAGS="${RUBY_CPPFLAGS} -I${RUBY_CONFIG_RUBYHDRDIR}/${RUBY_CONFIG_ARCH}" 72 echo RUBY_CPPFLAGS=$RUBY_CPPFLAGS" 45 73 else 46 74 # 1.8 47 75 RUBY_CPPFLAGS="-I${RUBY_CONFIG_ARCHDIR}" 76 echo "RUBY_CPPFLAGS=$RUBY_CPPFLAGS" 48 77 fi 49 78 AC_SUBST(RUBY_CPPFLAGS) … … 67 96 AC_SUBST(RUBY_LIBRUBYARG_STATIC) 68 97 69 dnl If the user specified a prefix, then use it, otherwise defalut to70 dnl the configured sitelibdir71 if test "x${ruby_sitelibdir}x" != "xNONEx"72 then73 RUBY_SITELIBDIR="${ruby_sitelibdir}"74 else75 if test "x${prefix}x" = "xNONEx"76 then77 RUBY_SITELIBDIR=`RUBY_CONFIG(sitelibdir)`78 else79 sitelibdir_no_prefix=`$RUBY -rrbconfig \80 -e "include Config; \81 puts CONFIG[['sitelibdir']].sub(CONFIG[['prefix']], '')"`82 RUBY_SITELIBDIR="${prefix}/${sitelibdir_no_prefix}"83 fi84 fi85 AC_SUBST(RUBY_SITELIBDIR)86 87 98 dnl The fourth parameter to AC_CHECK_HEADER keeps autoconf from 88 99 dnl searching for standard header files as a side-effect (which we want) 89 100 CPPFLAGS_save="${CPPFLAGS}" 90 CPPFLAGS="${CPPFLAGS} ${RUBY_CPPFLAGS} "91 CXXFLAGS="${CPPFLAGS}" 101 CPPFLAGS="${CPPFLAGS} ${RUBY_CPPFLAGS} -I${RUBY_HEADER_DIR}" 102 echo CPPFLAGS=$CPPFLAGS 92 103 AC_CHECK_HEADERS(ruby.h) 93 104 HAVE_RUBY_H=${ac_cv_header_ruby_h} … … 114 125 AC_MINGW32 115 126 116 if test x"${MINGW32}"x = xyesx; then127 if test "${MINGW32}" = yes; then 117 128 RB_FIX_MINGW_LIBS 118 129 fi -
branches/1.5/lang/configure
r5907 r5919 691 691 build 692 692 HAVE_RUBY_H 693 RUBY_SITELIBDIR 693 694 RUBY_LIBRUBYARG_STATIC 694 695 RUBY_LIBRUBYARG … … 699 700 RUBY_CPPFLAGS 700 701 RUBY_VERSION_CODE 701 WITH_RUBY702 702 RUBY 703 703 R … … 8821 8821 # Check whether --with-ruby was given. 8822 8822 if test "${with_ruby+set}" = set; then : 8823 withval=$with_ruby; WITH_RUBY=$withval 8824 else 8825 WITH_RUBY=ruby 8826 fi 8827 8823 withval=$with_ruby; RUBY=$withval 8824 else 8825 RUBY=ruby 8826 fi 8828 8827 8829 8828 8830 8829 # Check whether --with-ruby_sitelibdir was given. 8831 8830 if test "${with_ruby_sitelibdir+set}" = set; then : 8832 withval=$with_ruby_sitelibdir; WITH_RUBY_SITELIBDIR=$withval 8833 else 8834 WITH_RUBY_SITELIBDIR="" 8835 fi 8836 8837 8838 echo RUBY=$WITH_RUBY 8839 if test "$WITH_RUBY" != "no" ; then 8840 if test "$WITH_RUBY" = "yes" ; then 8841 # Extract the first word of "ruby", so it can be a program name with args. 8842 set dummy ruby; ac_word=$2 8843 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8844 $as_echo_n "checking for $ac_word... " >&6; } 8845 if ${ac_cv_path_RUBY+:} false; then : 8846 $as_echo_n "(cached) " >&6 8847 else 8848 case $RUBY in 8849 [\\/]* | ?:[\\/]*) 8850 ac_cv_path_RUBY="$RUBY" # Let the user override the test with a path. 8851 ;; 8852 *) 8853 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 8854 for as_dir in $PATH 8855 do 8856 IFS=$as_save_IFS 8857 test -z "$as_dir" && as_dir=. 8858 for ac_exec_ext in '' $ac_executable_extensions; do 8859 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 8860 ac_cv_path_RUBY="$as_dir/$ac_word$ac_exec_ext" 8861 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 8862 break 2 8863 fi 8864 done 8865 done 8866 IFS=$as_save_IFS 8867 8868 test -z "$ac_cv_path_RUBY" && ac_cv_path_RUBY="no" 8869 ;; 8870 esac 8871 fi 8872 RUBY=$ac_cv_path_RUBY 8873 if test -n "$RUBY"; then 8874 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RUBY" >&5 8875 $as_echo "$RUBY" >&6; } 8876 else 8877 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 8878 $as_echo "no" >&6; } 8879 fi 8880 8881 8882 fi 8883 else 8884 RUBY=$WITH_RUBY 8885 fi 8886 echo "after RUBY=$RUBY" 8887 if test "$RUBY" = "no" ; then 8888 RUBY="/bin/true" 8889 fi 8890 8891 8892 8893 . ${srcdir}/cf/rp_ruby_functions.sh 8894 8895 #AC_DEFUN([RUBY_CONFIG], [ 8896 # $RUBY -rrbconfig -e "puts(RbConfig::CONFIG[['']])"]) 8831 withval=$with_ruby_sitelibdir; ruby_sitelibdir=$withval 8832 else 8833 ruby_sitelibdir=NONE 8834 fi 8835 8836 8837 8897 8838 8898 8839 RUBY_VERSION_CODE=`$RUBY -e "puts RUBY_VERSION.gsub(/\./, '')"` 8899 8840 8900 8841 8901 RUBY_VERSION=`ruby_get_config_param "ruby_version"` 8902 RUBY_CONFIG_ARCHDIR=`ruby_get_config_param "archdir"` 8903 RUBY_CONFIG_ARCH=`ruby_get_config_param "arch"` 8904 RUBY_CONFIG_LIBDIR=`ruby_get_config_param "libdir"` 8905 RUBY_CONFIG_BINDIR=`ruby_get_config_param "bindir"` 8906 RUBY_CONFIG_RUBYHDRDIR=`ruby_get_config_param rubyhdrdir` 8907 RUBY_CONFIG_CFLAGS=`ruby_get_config_param CFLAGS` 8908 RUBY_CONFIG_LIBS=`ruby_get_config_param LIBS` 8909 RUBY_CONFIG_DLDLIBS=`ruby_get_config_param DLDLIBS` 8910 RUBY_CONFIG_LDFLAGS=`ruby_get_config_param LDFLAGS` 8911 RUBY_CONFIG_SITELIBDIR=`ruby_get_config_param sitelibdir` 8912 RUBY_CONFIG_LIBRUBYARG=`ruby_get_config_param LIBRUBYARG` 8913 RUBY_CONFIG_LIBRUBYARG_STATIC=`ruby_get_config_param "LIBRUBYARG_STATIC"` 8914 RUBY_CONFIG_CCDLFLAGS=`ruby_get_config_param "CCDLFLAGS"` 8915 echo RUBY_CONFIG_ARCHDIR=$RUBY_CONFIG_ARCHDIR 8916 echo RUBY_CONFIG_ARCH=$RUBY_CONFIG_ARCH 8917 echo RUBY_CONFIG_LIBDIR=$RUBY_CONFIG_LIBDIR 8918 echo RUBY_CONFIG_BINDIR=$RUBY_CONFIG_BINDIR 8919 echo RUBY_CONFIG_RUBYHDRDIR=$RUBY_CONFIG_RUBYHDRDIR 8920 echo RUBY_CONFIG_CFLAGS=$RUBY_CONFIG_CFLAGS 8921 echo RUBY_CONFIG_LDFLAGS=$RUBY_CONFIG_LDFLAGS 8922 echo RUBY_CONFIG_SITELIBDIR=$RUBY_CONFIG_SITELIBDIR 8923 echo RUBY_VERSION=$RUBY_VERSION 8924 8925 if test "x${RUBY_CONFIG_RUBYHDRDIR}" != "x"; then 8842 RUBY_CONFIG_SO_NAME=` 8843 $RUBY -rrbconfig -e "puts(Config::CONFIG['RUBY_SO_NAME'] || '')"` 8844 RUBY_CONFIG_ARCHDIR=` 8845 $RUBY -rrbconfig -e "puts(Config::CONFIG['archdir'] || '')"` 8846 RUBY_CONFIG_ARCH=` 8847 $RUBY -rrbconfig -e "puts(Config::CONFIG['arch'] || '')"` 8848 RUBY_CONFIG_LIBDIR=` 8849 $RUBY -rrbconfig -e "puts(Config::CONFIG['libdir'] || '')"` 8850 RUBY_CONFIG_BINDIR=` 8851 $RUBY -rrbconfig -e "puts(Config::CONFIG['bindir'] || '')"` 8852 RUBY_CONFIG_RUBYHDRDIR=` 8853 $RUBY -rrbconfig -e "puts(Config::CONFIG['rubyhdrdir'] || '')"` 8854 RUBY_CONFIG_CFLAGS=` 8855 $RUBY -rrbconfig -e "puts(Config::CONFIG['CFLAGS'] || '')"` 8856 RUBY_CONFIG_LIBS=` 8857 $RUBY -rrbconfig -e "puts(Config::CONFIG['LIBS'] || '')"` 8858 RUBY_CONFIG_DLDLIBS=` 8859 $RUBY -rrbconfig -e "puts(Config::CONFIG['DLDLIBS'] || '')"` 8860 RUBY_CONFIG_LDFLAGS=` 8861 $RUBY -rrbconfig -e "puts(Config::CONFIG['LDFLAGS'] || '')"` 8862 RUBY_CONFIG_LIBRUBYARG=` 8863 $RUBY -rrbconfig -e "puts(Config::CONFIG['LIBRUBYARG'] || '')"` 8864 RUBY_CONFIG_LIBRUBYARG_STATIC=` 8865 $RUBY -rrbconfig -e "puts(Config::CONFIG['LIBRUBYARG_STATIC'] || '')"` 8866 RUBY_CONFIG_CCDLFLAGS=` 8867 $RUBY -rrbconfig -e "puts(Config::CONFIG['CCDLFLAGS'] || '')"` 8868 8869 if test "x${RUBY_CONFIG_RUBYHDRDIR}x" != "xx"; then 8926 8870 # 1.9 8927 8871 RUBY_CPPFLAGS="-I${RUBY_CONFIG_RUBYHDRDIR}" 8928 8872 RUBY_CPPFLAGS="${RUBY_CPPFLAGS} -I${RUBY_CONFIG_RUBYHDRDIR}/${RUBY_CONFIG_ARCH}" 8929 echo RUBY_CPPFLAGS=$RUBY_CPPFLAGS"8930 8873 else 8931 8874 # 1.8 8932 8875 RUBY_CPPFLAGS="-I${RUBY_CONFIG_ARCHDIR}" 8933 echo "RUBY_CPPFLAGS=$RUBY_CPPFLAGS"8934 8876 fi 8935 8877 … … 8953 8895 8954 8896 8897 if test "x${ruby_sitelibdir}x" != "xNONEx" 8898 then 8899 RUBY_SITELIBDIR="${ruby_sitelibdir}" 8900 else 8901 if test "x${prefix}x" = "xNONEx" 8902 then 8903 RUBY_SITELIBDIR=` 8904 $RUBY -rrbconfig -e "puts(Config::CONFIG['sitelibdir'] || '')"` 8905 else 8906 sitelibdir_no_prefix=`$RUBY -rrbconfig \ 8907 -e "include Config; \ 8908 puts CONFIG['sitelibdir'].sub(CONFIG['prefix'], '')"` 8909 RUBY_SITELIBDIR="${prefix}/${sitelibdir_no_prefix}" 8910 fi 8911 fi 8912 8913 8955 8914 CPPFLAGS_save="${CPPFLAGS}" 8956 CPPFLAGS="${CPPFLAGS} ${RUBY_CPPFLAGS} -I${RUBY_HEADER_DIR}"8957 echo CPPFLAGS=$CPPFLAGS 8915 CPPFLAGS="${CPPFLAGS} ${RUBY_CPPFLAGS}" 8916 CXXFLAGS="${CPPFLAGS}" 8958 8917 for ac_header in ruby.h 8959 8918 do : … … 9043 9002 9044 9003 9045 if test "${MINGW32}" = yes; then9004 if test x"${MINGW32}"x = xyesx; then 9046 9005 9047 9006 RUBY_LIBS=`echo ${RUBY_LIBS} | sed -e "s%oldnames.lib%-lmoldname%"` -
branches/1.5/lang/examples/app-fermi/Makefile.in
r5679 r5919 30 30 RUBY = @RUBY@ 31 31 TCLSH = @TCLSH@ 32 ENABLE_LANG = @ENABLE_LANG@33 32 34 33 .PHONY: all install clean distclean tcl cee fortran octave matlab perl python ruby java 2.0 wrapper 35 34 36 LANGS = cee 37 ifneq ($(ENABLE_LANG),) 38 LANGS += tcl wrapper 2.0 39 ifneq ($(F77),) 40 LANGS += fortran 35 LANGS = cee tcl wrapper 2.0 36 ifneq ($(F77),) 37 LANGS += fortran 38 endif 39 ifneq ($(OCTAVE),) 40 LANGS += octave 41 endif 42 ifneq ($(MEX),) 43 LANGS += matlab 44 endif 45 ifneq ($(PERL),) 46 LANGS += perl 47 endif 48 ifneq ($(PYTHON),) 49 LANGS += python 50 endif 51 ifneq ($(RUBY),) 52 ifeq ($(HAVE_RUBY_H),yes) 53 LANGS += ruby 41 54 endif 42 ifneq ($(OCTAVE),) 43 LANGS += octave 44 endif 45 ifneq ($(MEX),) 46 LANGS += matlab 47 endif 48 ifneq ($(PERL),) 49 LANGS += perl 50 endif 51 ifneq ($(PYTHON),) 52 LANGS += python 53 endif 54 ifneq ($(RUBY),) 55 ifeq ($(HAVE_RUBY_H),yes) 56 LANGS += ruby 57 endif 58 endif 59 ifneq ($(JAVA_INC_DIR),) 60 LANGS += java 61 endif 62 ifneq ($(R),) 63 LANGS += R 64 endif 55 endif 56 ifneq ($(JAVA_INC_DIR),) 57 LANGS += java 58 endif 59 ifneq ($(R),) 60 LANGS += R 65 61 endif 66 62 -
branches/1.5/lang/examples/app-fermi/cee/Makefile.in
r2071 r5919 20 20 VPATH = $(srcdir) 21 21 22 INCLUDES = -I$(srcdir)/../../../src/core 23 LIBS = -L../../../src/core -lrappture \ 24 -L$(libdir) -lexpat -lz -lm 22 INCLUDES = -I$(includedir) 23 LIBS = -L$(libdir) -lrappture \ 24 -L$(libdir) -lexpat -lz -lm \ 25 -Wl,-rpath,'${ORIGIN}../lib' 25 26 26 27 CC_SWITCHES = $(CFLAGS) $(CDEBUGFLAGS) $(DEFINES) $(INCLUDES) -
branches/1.5/lang/examples/app-fermi/fortran/Makefile.in
r2256 r5919 20 20 VPATH = $(srcdir) 21 21 22 INCLUDES = -I$(srcdir)/../../../src/core 23 LIBS = -L../../../src/core -lrappture \ 24 -L$(libdir) -lexpat -lz -lm 22 INCLUDES = -I$(includedir) 23 LIBS = -L$(libdir) -lrappture \ 24 -L$(libdir) -lexpat -lz -lm \ 25 -Wl,-rpath,$(libdir) 25 26 26 27 FC_SWITCHES = $(FCFLAGS) $(FCDEBUGFLAGS) $(DEFINES) $(INCLUDES) -
branches/1.5/lang/examples/app-fermi/wrapper/cee/Makefile.in
r2071 r5919 20 20 VPATH = $(srcdir) 21 21 22 INCLUDES = -I$(srcdir)/../../../../src/core 23 LIBS = -L../../../../src/core -lrappture \ 24 -L$(libdir) -lexpat -lz -lm 22 INCLUDES = -I$(includedir) 23 LIBS = -L$(libdir) -lrappture \ 24 -L$(libdir) -lexpat -lz -lm \ 25 -Wl,-rpath,'${ORIGIN}../lib' 25 26 26 27 CC_SWITCHES = $(CFLAGS) $(CDEBUGFLAGS) $(DEFINES) $(INCLUDES) -
branches/1.5/lang/matlab/Makefile.in
r5906 r5919 33 33 OBJS = \ 34 34 rpAddPresets$(EXT) \ 35 rpExec$(EXT) \ 35 36 rpLib$(EXT) \ 36 37 rpLibChildren$(EXT) \ -
branches/1.5/lang/octave/octave2/Makefile.in
r5906 r5919 36 36 rpLibElementAsType.oct \ 37 37 rpLibElement.oct \ 38 rpExec.oct \ 38 39 rpLibGet.oct \ 39 40 rpLibGetData.oct \ -
branches/1.5/lang/octave/octave3/Makefile.in
r5906 r5919 27 27 OBJS = \ 28 28 rpAddPresets.oct \ 29 rpExec.oct \ 29 30 rpUtilsProgress.oct \ 30 31 rpLib.oct \
Note: See TracChangeset
for help on using the changeset viewer.