- Timestamp:
- Nov 29, 2011, 6:42:58 PM (13 years ago)
- Location:
- trunk
- Files:
-
- 29 added
- 2 deleted
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/aclocal.m4
r2209 r2709 8 8 builtin(include,./cf/rpLangJava.m4) 9 9 builtin(include,./cf/rpLangMatlab.m4) 10 builtin(include,./cf/rpLangR.m4) -
trunk/configure
r2555 r2709 668 668 SED 669 669 RUBY 670 R 670 671 JAVAH 671 672 JAVAC … … 787 788 with_python 788 789 with_java 790 with_R 789 791 with_ruby 790 792 enable_shared … … 1441 1443 --with-python=DIR location of python [default=yes] 1442 1444 --with-java=DIR location of java [default=yes] 1445 --with-R=DIR location of R interpreter [default=yes] 1443 1446 --with-ruby=DIR location of ruby [default=yes] 1444 1447 … … 7226 7229 7227 7230 7228 7229 7231 # Check whether --with-ffmpeg was given. 7230 7232 if test "${with_ffmpeg+set}" = set; then : … … 7339 7341 7340 7342 TCL_INC_SPEC="$TCL_INCLUDE_SPEC" 7341 7342 7343 7343 7344 … … 8544 8545 done 8545 8546 fi 8547 8548 8549 8550 # Check whether --with-R was given. 8551 if test "${with_R+set}" = set; then : 8552 withval=$with_R; 8553 else 8554 with_R=yes 8555 fi 8556 8557 8558 R="" 8559 if test "$with_R" != "no" ; then 8560 if test "$with_R" = "yes" ; then 8561 # Extract the first word of "R", so it can be a program name with args. 8562 set dummy R; ac_word=$2 8563 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8564 $as_echo_n "checking for $ac_word... " >&6; } 8565 if ${ac_cv_path_R+:} false; then : 8566 $as_echo_n "(cached) " >&6 8567 else 8568 case $R in 8569 [\\/]* | ?:[\\/]*) 8570 ac_cv_path_R="$R" # Let the user override the test with a path. 8571 ;; 8572 *) 8573 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 8574 for as_dir in $PATH 8575 do 8576 IFS=$as_save_IFS 8577 test -z "$as_dir" && as_dir=. 8578 for ac_exec_ext in '' $ac_executable_extensions; do 8579 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 8580 ac_cv_path_R="$as_dir/$ac_word$ac_exec_ext" 8581 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 8582 break 2 8583 fi 8584 done 8585 done 8586 IFS=$as_save_IFS 8587 8588 ;; 8589 esac 8590 fi 8591 R=$ac_cv_path_R 8592 if test -n "$R"; then 8593 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $R" >&5 8594 $as_echo "$R" >&6; } 8595 else 8596 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 8597 $as_echo "no" >&6; } 8598 fi 8599 8600 8601 else 8602 # Extract the first word of "R", so it can be a program name with args. 8603 set dummy R; ac_word=$2 8604 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8605 $as_echo_n "checking for $ac_word... " >&6; } 8606 if ${ac_cv_path_R+:} false; then : 8607 $as_echo_n "(cached) " >&6 8608 else 8609 case $R in 8610 [\\/]* | ?:[\\/]*) 8611 ac_cv_path_R="$R" # Let the user override the test with a path. 8612 ;; 8613 *) 8614 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 8615 as_dummy="${with_R}/bin:${with_R}" 8616 for as_dir in $as_dummy 8617 do 8618 IFS=$as_save_IFS 8619 test -z "$as_dir" && as_dir=. 8620 for ac_exec_ext in '' $ac_executable_extensions; do 8621 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 8622 ac_cv_path_R="$as_dir/$ac_word$ac_exec_ext" 8623 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 8624 break 2 8625 fi 8626 done 8627 done 8628 IFS=$as_save_IFS 8629 8630 ;; 8631 esac 8632 fi 8633 R=$ac_cv_path_R 8634 if test -n "$R"; then 8635 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $R" >&5 8636 $as_echo "$R" >&6; } 8637 else 8638 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 8639 $as_echo "no" >&6; } 8640 fi 8641 8642 8643 fi 8644 fi 8645 8546 8646 8547 8647 … … 9001 9101 #-------------------------------------------------------------------- 9002 9102 9003 9004 9103 if test -f "${exec_prefix}/lib/tclConfig.sh" ; then 9005 9104 . ${exec_prefix}/lib/tclConfig.sh … … 9698 9797 9699 9798 9799 9700 9800 ac_configure_args="--disable-threads --enable-shared" 9701 9801 … … 9704 9804 9705 9805 9706 ac_config_files="$ac_config_files Makefile packages/Makefile src/Makefile src/core/Makefile src/core2/Makefile src/objects/Makefile src/objects/RpHash.h gui/Makefile gui/apps/Makefile gui/apps/about gui/apps/encodedata gui/apps/rappture gui/apps/rappture-csh.env gui/apps/rappture.env gui/apps/rappture.use gui/apps/rerun gui/apps/simsim gui/apps/xmldiff gui/pkgIndex.tcl gui/scripts/Makefile gui/src/Makefile builder/Makefile builder/pkgIndex.tcl builder/scripts/Makefile tester/Makefile tester/pkgIndex.tcl tester/scripts/Makefile lang/Makefile lang/java/Makefile lang/java/rappture/Makefile lang/perl/Makefile lang/perl/Makefile.PL lang/python/Makefile lang/python/setup.py lang/matlab/Makefile lang/octave/Makefile lang/octave/octave2/Makefile lang/octave/octave3/Makefile lang/ ruby/Makefile lang/ruby/build.rb lang/tcl/Makefile lang/tcl/pkgIndex.tcl lang/tcl/src/Makefile lang/tcl/scripts/Makefile lang/tcl/tests/Makefile lib/Makefile examples/3D/Makefile examples/Makefile examples/app-fermi/2.0/Makefile examples/app-fermi/Makefile examples/app-fermi/cee/Makefile examples/app-fermi/fortran/Makefile examples/app-fermi/java/Makefile examples/app-fermi/matlab/Makefile examples/app-fermi/matlab/compiled/Makefile examples/app-fermi/matlab/uncompiled/Makefile examples/app-fermi/octave/octave2/Makefile examples/app-fermi/octave/octave3/Makefile examples/app-fermi/octave/Makefile examples/app-fermi/perl/Makefile examples/app-fermi/python/Makefile examples/app-fermi/ruby/Makefile examples/app-fermi/tcl/Makefile examples/app-fermi/wrapper/Makefile examples/app-fermi/wrapper/cee/Makefile examples/app-fermi/wrapper/perl/Makefile examples/app-fermi/wrapper/python/Makefile examples/app-fermi/wrapper/tcl/Makefile examples/c-example/Makefile examples/canvas/Makefile examples/demo.bash examples/flow/Makefile examples/flow/demo1/Makefile examples/flow/demo2/Makefile examples/flow/demo3/Makefile examples/graph/Makefile examples/objects/Makefile examples/objects/axis/Makefile examples/objects/contour/Makefile examples/objects/curve/Makefile examples/objects/dxWriter/Makefile examples/objects/floatBuffer/Makefile examples/objects/histogram/Makefile examples/objects/library/Makefile examples/objects/number/Makefile examples/objects/path/Makefile examples/objects/plot/Makefile examples/objects/scatter/Makefile examples/objects/string/Makefile examples/objects/tree/Makefile examples/objects/xmlparser/Makefile examples/zoo/Makefile examples/zoo/binary/Makefile examples/zoo/boolean/Makefile examples/zoo/choice/Makefile examples/zoo/cloud/Makefile examples/zoo/cloud/matlab/Makefile examples/zoo/curve/Makefile examples/zoo/enable/Makefile examples/zoo/field/Makefile examples/zoo/group/Makefile examples/zoo/histogram/Makefile examples/zoo/image/Makefile examples/zoo/image/docs/Makefile examples/zoo/image/examples/Makefile examples/zoo/integer/Makefile examples/zoo/integer2/Makefile examples/zoo/loader/Makefile examples/zoo/loader/examples/Makefile examples/zoo/loadrun/Makefile examples/zoo/log/Makefile examples/zoo/note/Makefile examples/zoo/note/docs/Makefile examples/zoo/number/Makefile examples/zoo/number2/Makefile examples/zoo/parallelepiped/Makefile examples/zoo/periodicelement/Makefile examples/zoo/phase/Makefile examples/zoo/sequence/Makefile examples/zoo/sequence/examples/Makefile examples/zoo/string/Makefile examples/zoo/structure/Makefile examples/zoo/structure/examples/Makefile examples/zoo/table/Makefile examples/zoo/unirect2d/Makefile oldtest/Makefile oldtest/src/Makefile"9806 ac_config_files="$ac_config_files Makefile packages/Makefile src/Makefile src/core/Makefile src/core2/Makefile src/objects/Makefile src/objects/RpHash.h gui/Makefile gui/apps/Makefile gui/apps/about gui/apps/encodedata gui/apps/rappture gui/apps/rappture-csh.env gui/apps/rappture.env gui/apps/rappture.use gui/apps/rerun gui/apps/simsim gui/apps/xmldiff gui/pkgIndex.tcl gui/scripts/Makefile gui/src/Makefile builder/Makefile builder/pkgIndex.tcl builder/scripts/Makefile tester/Makefile tester/pkgIndex.tcl tester/scripts/Makefile lang/Makefile lang/java/Makefile lang/java/rappture/Makefile lang/perl/Makefile lang/perl/Makefile.PL lang/python/Makefile lang/python/setup.py lang/matlab/Makefile lang/octave/Makefile lang/octave/octave2/Makefile lang/octave/octave3/Makefile lang/R/Makefile lang/ruby/Makefile lang/ruby/build.rb lang/tcl/Makefile lang/tcl/pkgIndex.tcl lang/tcl/src/Makefile lang/tcl/scripts/Makefile lang/tcl/tests/Makefile lib/Makefile examples/3D/Makefile examples/Makefile examples/app-fermi/2.0/Makefile examples/app-fermi/Makefile examples/app-fermi/cee/Makefile examples/app-fermi/fortran/Makefile examples/app-fermi/java/Makefile examples/app-fermi/matlab/Makefile examples/app-fermi/matlab/compiled/Makefile examples/app-fermi/matlab/uncompiled/Makefile examples/app-fermi/octave/octave2/Makefile examples/app-fermi/octave/octave3/Makefile examples/app-fermi/octave/Makefile examples/app-fermi/perl/Makefile examples/app-fermi/python/Makefile examples/app-fermi/ruby/Makefile examples/app-fermi/tcl/Makefile examples/app-fermi/wrapper/Makefile examples/app-fermi/wrapper/cee/Makefile examples/app-fermi/wrapper/perl/Makefile examples/app-fermi/wrapper/python/Makefile examples/app-fermi/wrapper/tcl/Makefile examples/app-fermi/R/Makefile examples/c-example/Makefile examples/canvas/Makefile examples/demo.bash examples/flow/Makefile examples/flow/demo1/Makefile examples/flow/demo2/Makefile examples/flow/demo3/Makefile examples/graph/Makefile examples/objects/Makefile examples/objects/axis/Makefile examples/objects/contour/Makefile examples/objects/curve/Makefile examples/objects/dxWriter/Makefile examples/objects/floatBuffer/Makefile examples/objects/histogram/Makefile examples/objects/library/Makefile examples/objects/number/Makefile examples/objects/path/Makefile examples/objects/plot/Makefile examples/objects/scatter/Makefile examples/objects/string/Makefile examples/objects/tree/Makefile examples/objects/xmlparser/Makefile examples/zoo/Makefile examples/zoo/binary/Makefile examples/zoo/boolean/Makefile examples/zoo/choice/Makefile examples/zoo/cloud/Makefile examples/zoo/cloud/matlab/Makefile examples/zoo/curve/Makefile examples/zoo/enable/Makefile examples/zoo/field/Makefile examples/zoo/group/Makefile examples/zoo/histogram/Makefile examples/zoo/image/Makefile examples/zoo/image/docs/Makefile examples/zoo/image/examples/Makefile examples/zoo/integer/Makefile examples/zoo/integer2/Makefile examples/zoo/loader/Makefile examples/zoo/loader/examples/Makefile examples/zoo/loadrun/Makefile examples/zoo/log/Makefile examples/zoo/note/Makefile examples/zoo/note/docs/Makefile examples/zoo/number/Makefile examples/zoo/number2/Makefile examples/zoo/parallelepiped/Makefile examples/zoo/periodicelement/Makefile examples/zoo/phase/Makefile examples/zoo/sequence/Makefile examples/zoo/sequence/examples/Makefile examples/zoo/string/Makefile examples/zoo/structure/Makefile examples/zoo/structure/examples/Makefile examples/zoo/table/Makefile examples/zoo/unirect2d/Makefile oldtest/Makefile oldtest/src/Makefile" 9707 9807 9708 9808 cat >confcache <<\_ACEOF … … 10450 10550 "lang/octave/octave2/Makefile") CONFIG_FILES="$CONFIG_FILES lang/octave/octave2/Makefile" ;; 10451 10551 "lang/octave/octave3/Makefile") CONFIG_FILES="$CONFIG_FILES lang/octave/octave3/Makefile" ;; 10552 "lang/R/Makefile") CONFIG_FILES="$CONFIG_FILES lang/R/Makefile" ;; 10452 10553 "lang/ruby/Makefile") CONFIG_FILES="$CONFIG_FILES lang/ruby/Makefile" ;; 10453 10554 "lang/ruby/build.rb") CONFIG_FILES="$CONFIG_FILES lang/ruby/build.rb" ;; … … 10480 10581 "examples/app-fermi/wrapper/python/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/wrapper/python/Makefile" ;; 10481 10582 "examples/app-fermi/wrapper/tcl/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/wrapper/tcl/Makefile" ;; 10583 "examples/app-fermi/R/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/R/Makefile" ;; 10482 10584 "examples/c-example/Makefile") CONFIG_FILES="$CONFIG_FILES examples/c-example/Makefile" ;; 10483 10585 "examples/canvas/Makefile") CONFIG_FILES="$CONFIG_FILES examples/canvas/Makefile" ;; -
trunk/configure.in
r2688 r2709 162 162 fi 163 163 164 164 165 165 TCL_INC_SPEC="$TCL_INCLUDE_SPEC" 166 166 … … 201 201 RP_LANG_PYTHON 202 202 RP_LANG_JAVA 203 RP_LANG_R 203 204 204 205 RUBY="" … … 402 403 AC_SUBST(PYTHON_SITE_PACKAGES) 403 404 AC_SUBST(PYTHON_VERSION) 405 AC_SUBST(R) 404 406 AC_SUBST(RP_BASE) 405 407 AC_SUBST(RUBY) … … 470 472 lang/octave/octave2/Makefile 471 473 lang/octave/octave3/Makefile 474 lang/R/Makefile 472 475 lang/ruby/Makefile 473 476 lang/ruby/build.rb … … 500 503 examples/app-fermi/wrapper/python/Makefile 501 504 examples/app-fermi/wrapper/tcl/Makefile 505 examples/app-fermi/R/Makefile 502 506 examples/c-example/Makefile 503 507 examples/canvas/Makefile -
trunk/examples/app-fermi/Makefile.in
r2311 r2709 14 14 INSTALL_SCRIPT = ${INSTALL} -m 644 15 15 16 F77 = @F77@ 17 CC = @CC@ 18 CXX = @CXX@ 19 RUBY = @RUBY@ 20 PERL = @PERL@ 21 TCLSH = @TCLSH@ 22 PYTHON = @PYTHON@ 23 MEX = @MEX@ 24 MKOCTFILE2 = @MKOCTFILE2@ 25 MKOCTFILE3 = @MKOCTFILE3@ 26 OCTAVE = $(MKOCTFILE2) $(MKOCTFILE3) 27 JAVAC = @JAVAC@ 16 F77 = @F77@ 17 CC = @CC@ 18 CXX = @CXX@ 19 RUBY = @RUBY@ 20 PERL = @PERL@ 21 TCLSH = @TCLSH@ 22 PYTHON = @PYTHON@ 23 MEX = @MEX@ 24 MKOCTFILE2 = @MKOCTFILE2@ 25 MKOCTFILE3 = @MKOCTFILE3@ 26 OCTAVE = $(MKOCTFILE2) $(MKOCTFILE3) 27 JAVAC = @JAVAC@ 28 R = @R@ 28 29 29 30 .PHONY: tcl cee fortran octave matlab perl python ruby java 2.0 wrapper … … 51 52 LANGS += java 52 53 endif 54 ifneq ($(R),) 55 LANGS += R 56 endif 53 57 54 58 all: -
trunk/gui/apps/rappture.env.in
r2095 r2709 57 57 export CLASSPATH 58 58 59 R_LIBS=${libdir}/R:$R_LIBS 60 61 export R_LIBS -
trunk/gui/apps/rappture.use.in
r1989 r2709 35 35 prepend TK_LIBRARY ${libdir}/tk${tcl_version} 36 36 37 prepend R_LIBS ${libdir}/R 38 37 39 tags DEVEL -
trunk/lang/Makefile.in
r2298 r2709 20 20 PYTHON = @PYTHON_DISTUTILS@ 21 21 MEX = @MEX@ 22 OCTAVE = @OCTAVE_VERSION@ 23 JAVAC = @JAVAC@ 22 OCTAVE = @OCTAVE_VERSION@ 23 JAVAC = @JAVAC@ 24 R = @R@ 24 25 25 26 # Rappture requires it. We always build a Tcl language API. … … 44 45 LANGS += java 45 46 endif 47 ifneq ($(R),) 48 LANGS += R 49 endif 46 50 47 .PHONY: tcl octave matlab perl python ruby java 51 .PHONY: tcl octave matlab perl python ruby java R 48 52 49 53 all:
Note: See TracChangeset
for help on using the changeset viewer.