Changeset 4867 for branches/r9/lang


Ignore:
Timestamp:
Dec 13, 2014 1:10:09 PM (6 years ago)
Author:
gah
Message:
 
Location:
branches/r9/lang
Files:
5 edited
1 moved

Legend:

Unmodified
Added
Removed
  • branches/r9/lang/Makefile.in

    r3749 r4867  
    5555
    5656all:
    57         make -C ../src install
    5857        for i in $(LANGS) ; do \
    5958          $(MAKE) -C $$i all || exit 1 ;\
  • branches/r9/lang/configure

    r4837 r4867  
    96789678
    96799679
    9680 ac_config_files="$ac_config_files Makefile java/Makefile java/rappture/Makefile perl/Makefile perl/Makefile.PL python/Makefile python/setup.py matlab/Makefile octave/Makefile octave/octave2/Makefile octave/octave3/Makefile R/Makefile ruby/Makefile ruby/build.rb tcl/Makefile tcl/pkgIndex.tcl tcl/scripts/Makefile tcl/src/Makefile tcl/tests/Makefile"
     9680ac_config_files="$ac_config_files Makefile java/Makefile java/rappture/Makefile perl/Makefile perl/Makefile.PL python/Makefile python/setup.py matlab/Makefile octave/Makefile octave/octave2/Makefile octave/octave3/Makefile R/Makefile ruby/Makefile ruby/build.rb tcl/Makefile tcl/pkgIndex.tcl tcl/scripts/Makefile tcl/src/Makefile tcl/tests/Makefile examples/3D/Makefile examples/Makefile examples/app-fermi/2.0/Makefile examples/app-fermi/Makefile examples/app-fermi/R/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/Makefile examples/app-fermi/octave/octave2/Makefile examples/app-fermi/octave/octave3/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/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/curve/Makefile examples/zoo/drawing/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/log/Makefile examples/zoo/mesh/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"
    96819681
    96829682cat >confcache <<\_ACEOF
     
    1040710407    "tcl/src/Makefile") CONFIG_FILES="$CONFIG_FILES tcl/src/Makefile" ;;
    1040810408    "tcl/tests/Makefile") CONFIG_FILES="$CONFIG_FILES tcl/tests/Makefile" ;;
     10409    "examples/3D/Makefile") CONFIG_FILES="$CONFIG_FILES examples/3D/Makefile" ;;
     10410    "examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;;
     10411    "examples/app-fermi/2.0/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/2.0/Makefile" ;;
     10412    "examples/app-fermi/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/Makefile" ;;
     10413    "examples/app-fermi/R/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/R/Makefile" ;;
     10414    "examples/app-fermi/cee/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/cee/Makefile" ;;
     10415    "examples/app-fermi/fortran/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/fortran/Makefile" ;;
     10416    "examples/app-fermi/java/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/java/Makefile" ;;
     10417    "examples/app-fermi/matlab/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/matlab/Makefile" ;;
     10418    "examples/app-fermi/matlab/compiled/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/matlab/compiled/Makefile" ;;
     10419    "examples/app-fermi/matlab/uncompiled/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/matlab/uncompiled/Makefile" ;;
     10420    "examples/app-fermi/octave/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/octave/Makefile" ;;
     10421    "examples/app-fermi/octave/octave2/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/octave/octave2/Makefile" ;;
     10422    "examples/app-fermi/octave/octave3/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/octave/octave3/Makefile" ;;
     10423    "examples/app-fermi/perl/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/perl/Makefile" ;;
     10424    "examples/app-fermi/python/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/python/Makefile" ;;
     10425    "examples/app-fermi/ruby/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/ruby/Makefile" ;;
     10426    "examples/app-fermi/tcl/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/tcl/Makefile" ;;
     10427    "examples/app-fermi/wrapper/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/wrapper/Makefile" ;;
     10428    "examples/app-fermi/wrapper/cee/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/wrapper/cee/Makefile" ;;
     10429    "examples/app-fermi/wrapper/perl/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/wrapper/perl/Makefile" ;;
     10430    "examples/app-fermi/wrapper/python/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/wrapper/python/Makefile" ;;
     10431    "examples/app-fermi/wrapper/tcl/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/wrapper/tcl/Makefile" ;;
     10432    "examples/c-example/Makefile") CONFIG_FILES="$CONFIG_FILES examples/c-example/Makefile" ;;
     10433    "examples/canvas/Makefile") CONFIG_FILES="$CONFIG_FILES examples/canvas/Makefile" ;;
     10434    "examples/demo.bash") CONFIG_FILES="$CONFIG_FILES examples/demo.bash" ;;
     10435    "examples/flow/Makefile") CONFIG_FILES="$CONFIG_FILES examples/flow/Makefile" ;;
     10436    "examples/flow/demo1/Makefile") CONFIG_FILES="$CONFIG_FILES examples/flow/demo1/Makefile" ;;
     10437    "examples/flow/demo2/Makefile") CONFIG_FILES="$CONFIG_FILES examples/flow/demo2/Makefile" ;;
     10438    "examples/flow/demo3/Makefile") CONFIG_FILES="$CONFIG_FILES examples/flow/demo3/Makefile" ;;
     10439    "examples/graph/Makefile") CONFIG_FILES="$CONFIG_FILES examples/graph/Makefile" ;;
     10440    "examples/objects/Makefile") CONFIG_FILES="$CONFIG_FILES examples/objects/Makefile" ;;
     10441    "examples/objects/axis/Makefile") CONFIG_FILES="$CONFIG_FILES examples/objects/axis/Makefile" ;;
     10442    "examples/objects/curve/Makefile") CONFIG_FILES="$CONFIG_FILES examples/objects/curve/Makefile" ;;
     10443    "examples/objects/dxWriter/Makefile") CONFIG_FILES="$CONFIG_FILES examples/objects/dxWriter/Makefile" ;;
     10444    "examples/objects/floatBuffer/Makefile") CONFIG_FILES="$CONFIG_FILES examples/objects/floatBuffer/Makefile" ;;
     10445    "examples/objects/histogram/Makefile") CONFIG_FILES="$CONFIG_FILES examples/objects/histogram/Makefile" ;;
     10446    "examples/objects/library/Makefile") CONFIG_FILES="$CONFIG_FILES examples/objects/library/Makefile" ;;
     10447    "examples/objects/number/Makefile") CONFIG_FILES="$CONFIG_FILES examples/objects/number/Makefile" ;;
     10448    "examples/objects/path/Makefile") CONFIG_FILES="$CONFIG_FILES examples/objects/path/Makefile" ;;
     10449    "examples/objects/plot/Makefile") CONFIG_FILES="$CONFIG_FILES examples/objects/plot/Makefile" ;;
     10450    "examples/objects/scatter/Makefile") CONFIG_FILES="$CONFIG_FILES examples/objects/scatter/Makefile" ;;
     10451    "examples/objects/string/Makefile") CONFIG_FILES="$CONFIG_FILES examples/objects/string/Makefile" ;;
     10452    "examples/objects/tree/Makefile") CONFIG_FILES="$CONFIG_FILES examples/objects/tree/Makefile" ;;
     10453    "examples/objects/xmlparser/Makefile") CONFIG_FILES="$CONFIG_FILES examples/objects/xmlparser/Makefile" ;;
     10454    "examples/zoo/Makefile") CONFIG_FILES="$CONFIG_FILES examples/zoo/Makefile" ;;
     10455    "examples/zoo/binary/Makefile") CONFIG_FILES="$CONFIG_FILES examples/zoo/binary/Makefile" ;;
     10456    "examples/zoo/boolean/Makefile") CONFIG_FILES="$CONFIG_FILES examples/zoo/boolean/Makefile" ;;
     10457    "examples/zoo/choice/Makefile") CONFIG_FILES="$CONFIG_FILES examples/zoo/choice/Makefile" ;;
     10458    "examples/zoo/curve/Makefile") CONFIG_FILES="$CONFIG_FILES examples/zoo/curve/Makefile" ;;
     10459    "examples/zoo/drawing/Makefile") CONFIG_FILES="$CONFIG_FILES examples/zoo/drawing/Makefile" ;;
     10460    "examples/zoo/enable/Makefile") CONFIG_FILES="$CONFIG_FILES examples/zoo/enable/Makefile" ;;
     10461    "examples/zoo/field/Makefile") CONFIG_FILES="$CONFIG_FILES examples/zoo/field/Makefile" ;;
     10462    "examples/zoo/group/Makefile") CONFIG_FILES="$CONFIG_FILES examples/zoo/group/Makefile" ;;
     10463    "examples/zoo/histogram/Makefile") CONFIG_FILES="$CONFIG_FILES examples/zoo/histogram/Makefile" ;;
     10464    "examples/zoo/image/Makefile") CONFIG_FILES="$CONFIG_FILES examples/zoo/image/Makefile" ;;
     10465    "examples/zoo/image/docs/Makefile") CONFIG_FILES="$CONFIG_FILES examples/zoo/image/docs/Makefile" ;;
     10466    "examples/zoo/image/examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/zoo/image/examples/Makefile" ;;
     10467    "examples/zoo/integer/Makefile") CONFIG_FILES="$CONFIG_FILES examples/zoo/integer/Makefile" ;;
     10468    "examples/zoo/integer2/Makefile") CONFIG_FILES="$CONFIG_FILES examples/zoo/integer2/Makefile" ;;
     10469    "examples/zoo/loader/Makefile") CONFIG_FILES="$CONFIG_FILES examples/zoo/loader/Makefile" ;;
     10470    "examples/zoo/loader/examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/zoo/loader/examples/Makefile" ;;
     10471    "examples/zoo/log/Makefile") CONFIG_FILES="$CONFIG_FILES examples/zoo/log/Makefile" ;;
     10472    "examples/zoo/mesh/Makefile") CONFIG_FILES="$CONFIG_FILES examples/zoo/mesh/Makefile" ;;
     10473    "examples/zoo/note/Makefile") CONFIG_FILES="$CONFIG_FILES examples/zoo/note/Makefile" ;;
     10474    "examples/zoo/note/docs/Makefile") CONFIG_FILES="$CONFIG_FILES examples/zoo/note/docs/Makefile" ;;
     10475    "examples/zoo/number/Makefile") CONFIG_FILES="$CONFIG_FILES examples/zoo/number/Makefile" ;;
     10476    "examples/zoo/number2/Makefile") CONFIG_FILES="$CONFIG_FILES examples/zoo/number2/Makefile" ;;
     10477    "examples/zoo/parallelepiped/Makefile") CONFIG_FILES="$CONFIG_FILES examples/zoo/parallelepiped/Makefile" ;;
     10478    "examples/zoo/periodicelement/Makefile") CONFIG_FILES="$CONFIG_FILES examples/zoo/periodicelement/Makefile" ;;
     10479    "examples/zoo/phase/Makefile") CONFIG_FILES="$CONFIG_FILES examples/zoo/phase/Makefile" ;;
     10480    "examples/zoo/sequence/Makefile") CONFIG_FILES="$CONFIG_FILES examples/zoo/sequence/Makefile" ;;
     10481    "examples/zoo/sequence/examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/zoo/sequence/examples/Makefile" ;;
     10482    "examples/zoo/string/Makefile") CONFIG_FILES="$CONFIG_FILES examples/zoo/string/Makefile" ;;
     10483    "examples/zoo/structure/Makefile") CONFIG_FILES="$CONFIG_FILES examples/zoo/structure/Makefile" ;;
     10484    "examples/zoo/structure/examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/zoo/structure/examples/Makefile" ;;
     10485    "examples/zoo/table/Makefile") CONFIG_FILES="$CONFIG_FILES examples/zoo/table/Makefile" ;;
    1040910486
    1041010487  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
  • branches/r9/lang/configure.in

    r4837 r4867  
    292292    tcl/src/Makefile
    293293    tcl/tests/Makefile
     294    examples/3D/Makefile
     295    examples/Makefile
     296    examples/app-fermi/2.0/Makefile
     297    examples/app-fermi/Makefile
     298    examples/app-fermi/R/Makefile
     299    examples/app-fermi/cee/Makefile
     300    examples/app-fermi/fortran/Makefile
     301    examples/app-fermi/java/Makefile
     302    examples/app-fermi/matlab/Makefile
     303    examples/app-fermi/matlab/compiled/Makefile
     304    examples/app-fermi/matlab/uncompiled/Makefile
     305    examples/app-fermi/octave/Makefile
     306    examples/app-fermi/octave/octave2/Makefile
     307    examples/app-fermi/octave/octave3/Makefile
     308    examples/app-fermi/perl/Makefile
     309    examples/app-fermi/python/Makefile
     310    examples/app-fermi/ruby/Makefile
     311    examples/app-fermi/tcl/Makefile
     312    examples/app-fermi/wrapper/Makefile
     313    examples/app-fermi/wrapper/cee/Makefile
     314    examples/app-fermi/wrapper/perl/Makefile
     315    examples/app-fermi/wrapper/python/Makefile
     316    examples/app-fermi/wrapper/tcl/Makefile
     317    examples/c-example/Makefile
     318    examples/canvas/Makefile
     319    examples/demo.bash
     320    examples/flow/Makefile
     321    examples/flow/demo1/Makefile
     322    examples/flow/demo2/Makefile
     323    examples/flow/demo3/Makefile
     324    examples/graph/Makefile
     325    examples/objects/Makefile
     326    examples/objects/axis/Makefile
     327    examples/objects/curve/Makefile
     328    examples/objects/dxWriter/Makefile
     329    examples/objects/floatBuffer/Makefile
     330    examples/objects/histogram/Makefile
     331    examples/objects/library/Makefile
     332    examples/objects/number/Makefile
     333    examples/objects/path/Makefile
     334    examples/objects/plot/Makefile
     335    examples/objects/scatter/Makefile
     336    examples/objects/string/Makefile
     337    examples/objects/tree/Makefile
     338    examples/objects/xmlparser/Makefile
     339    examples/zoo/Makefile
     340    examples/zoo/binary/Makefile
     341    examples/zoo/boolean/Makefile
     342    examples/zoo/choice/Makefile
     343    examples/zoo/curve/Makefile
     344    examples/zoo/drawing/Makefile
     345    examples/zoo/enable/Makefile
     346    examples/zoo/field/Makefile
     347    examples/zoo/group/Makefile
     348    examples/zoo/histogram/Makefile
     349    examples/zoo/image/Makefile
     350    examples/zoo/image/docs/Makefile
     351    examples/zoo/image/examples/Makefile
     352    examples/zoo/integer/Makefile
     353    examples/zoo/integer2/Makefile
     354    examples/zoo/loader/Makefile
     355    examples/zoo/loader/examples/Makefile
     356    examples/zoo/log/Makefile
     357    examples/zoo/mesh/Makefile
     358    examples/zoo/note/Makefile
     359    examples/zoo/note/docs/Makefile
     360    examples/zoo/number/Makefile
     361    examples/zoo/number2/Makefile
     362    examples/zoo/parallelepiped/Makefile
     363    examples/zoo/periodicelement/Makefile
     364    examples/zoo/phase/Makefile
     365    examples/zoo/sequence/Makefile
     366    examples/zoo/sequence/examples/Makefile
     367    examples/zoo/string/Makefile
     368    examples/zoo/structure/Makefile
     369    examples/zoo/structure/examples/Makefile
     370    examples/zoo/table/Makefile
    294371])
    295372AC_OUTPUT
  • branches/r9/lang/tcl/src/Makefile.in

    r4861 r4867  
    4848
    4949LIBS            = \
    50                 -L$(libdir) -lrappture \
     50                -L$(libdir) -lrappture \
    5151                $(TCL_LIB_SPEC) -lexpat -lz -lm -lstdc++
    5252
    5353OBJS = \
    54         Rappture_Init.o \
     54        Rappture_Init.o \
     55        RpSwitch.o \
    5556        RpEncodeTclInterface.o \
    5657        RpUnitsTclInterface.o \
  • branches/r9/lang/tcl/src/RpEncodeTclInterface.cc

    r3177 r4867  
    1515#include "RpEncode.h"
    1616extern "C" {
    17 #include "Switch.h"
     17#include "RpSwitch.h"
    1818extern Tcl_AppInitProc RpEncoding_Init;
    1919}
     
    179179          Tcl_Obj *const *objv)
    180180{
     181    EncodeSwitches switches;
     182    const char* string;
     183    int last;
     184    int n;
     185    int nBytes;
     186
    181187    if (objc < 1) {
    182188        Tcl_AppendResult(interp, "wrong # args: should be \"",
     
    185191        return TCL_ERROR;
    186192    }
    187     EncodeSwitches switches;
    188193    switches.flags = 0;
    189     int n;
    190     n = Rp_ParseSwitches(interp, encodeSwitches, objc - 1, objv + 1, &switches,
     194    n = RpParseSwitches(interp, encodeSwitches, objc - 1, objv + 1, &switches,
    191195                         SWITCH_OBJV_PARTIAL);
    192196    if (n < 0) {
    193197        return TCL_ERROR;
    194198    }
    195     int last;
    196199    last = n + 1;
    197200    if ((objc - last) != 1) {
     
    201204        return TCL_ERROR;
    202205    }
    203     int nBytes;
    204     const char* string;
    205206    string = (const char*)Tcl_GetByteArrayFromObj(objv[last], &nBytes);
    206207    if (nBytes <= 0) {
     
    251252          Tcl_Obj *const *objv)
    252253{
     254    DecodeSwitches switches;
     255    int n;
     256    int numBytes;
     257    const char *string;
     258    int last;
     259
    253260    if (objc < 1) {
    254261        Tcl_AppendResult(interp, "wrong # args: should be \"",
     
    258265    }
    259266
    260     DecodeSwitches switches;
    261267    switches.flags = 0;
    262     int n;
    263     n = Rp_ParseSwitches(interp, decodeSwitches, objc - 1, objv + 1, &switches,
     268    n = RpParseSwitches(interp, decodeSwitches, objc - 1, objv + 1, &switches,
    264269        SWITCH_OBJV_PARTIAL);
    265270    if (n < 0) {
    266271        return TCL_ERROR;
    267272    }
    268     int last;
    269273    last = n + 1;
    270274    if ((objc - last) != 1) {
     
    274278        return TCL_ERROR;
    275279    }
    276     int numBytes;
    277     const char *string;
    278280
    279281    string = Tcl_GetStringFromObj(objv[last], &numBytes);
Note: See TracChangeset for help on using the changeset viewer.