/[ascend]/trunk/tcltk98/generic/interface/Driver.c
ViewVC logotype

Diff of /trunk/tcltk98/generic/interface/Driver.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 27 by aw0a, Thu Dec 9 02:03:34 2004 UTC revision 28 by aw0a, Thu Dec 9 18:54:52 2004 UTC
# Line 557  static int AscDriver(int argc, CONST84 c Line 557  static int AscDriver(int argc, CONST84 c
557   *    ASCTK_ENVIRONVAR     ASCENDTK           ASCENDDIST/../../tcltk98/TK   *    ASCTK_ENVIRONVAR     ASCENDTK           ASCENDDIST/../../tcltk98/TK
558   *    BITMAP_ENVIRONVAR    ASCENDBITMAPS      ASCENDTK/bitmaps   *    BITMAP_ENVIRONVAR    ASCENDBITMAPS      ASCENDTK/bitmaps
559   *    LIBR_ENVIRONVAR      ASCENDLIBRARY   *    LIBR_ENVIRONVAR      ASCENDLIBRARY
560   *                     .:ASCENDDIST/models/libraries:ASCENDDIST/models/examples   * AWW20041209: .:ASCENDDIST/models/libraries:ASCENDDIST/models/examples
561     *       .:ASCENDDIST/../../models
562   *   *
563   */   */
564  static int AscCheckEnvironVars(Tcl_Interp *interp)  static int AscCheckEnvironVars(Tcl_Interp *interp)
# Line 632  static int AscCheckEnvironVars(Tcl_Inter Line 633  static int AscCheckEnvironVars(Tcl_Inter
633                  "Not enough memory to extend the environment");                  "Not enough memory to extend the environment");
634      }      }
635    
636      /*  Add ``$ASCENDDIST/models'' to the ASCENDLIBRARY envar */      /*AWW20041209:  Add ``$ASCENDDIST/models'' to the ASCENDLIBRARY envar */
637        /* Add ``$ASCENDDIST/../../models'' to the ASCENDLIBRARY envar */
638      Tcl_DStringAppend(&buffer2, Tcl_DStringValue(&ascenddist), -1);      Tcl_DStringAppend(&buffer2, Tcl_DStringValue(&ascenddist), -1);
639      Tcl_DStringAppend(&buffer2, "/models", -1);      /*AWW20041209:    Tcl_DStringAppend(&buffer2, "/models",
640          -1);*/
641        Tcl_DStringAppend(&buffer2, "/../../models", -1);
642      if( NULL != (Tcl_TranslateFileName(interp, Tcl_DStringValue(&buffer2),      if( NULL != (Tcl_TranslateFileName(interp, Tcl_DStringValue(&buffer2),
643                                         &buffer1))) {                                         &buffer1))) {
644        if(Asc_AppendPath(LIBR_ENVIRONVAR, Tcl_DStringValue(&buffer1)) != 0) {        if(Asc_AppendPath(LIBR_ENVIRONVAR, Tcl_DStringValue(&buffer1)) != 0) {
# Line 647  static int AscCheckEnvironVars(Tcl_Inter Line 651  static int AscCheckEnvironVars(Tcl_Inter
651      Tcl_DStringFree(&buffer2);      Tcl_DStringFree(&buffer2);
652    
653      /*  Add ``$ASCENDDIST/models/examples'' to the ASCENDLIBRARY envar */      /*  Add ``$ASCENDDIST/models/examples'' to the ASCENDLIBRARY envar */
654      Tcl_DStringAppend(&buffer2, Tcl_DStringValue(&ascenddist), -1);      /*AWW20041209 - remove all this:    Tcl_DStringAppend(&buffer2, Tcl_DStringValue(&ascenddist), -1);
655      Tcl_DStringAppend(&buffer2, "/models/examples", -1);      Tcl_DStringAppend(&buffer2, "/models/examples", -1);
656      if( NULL != (Tcl_TranslateFileName(interp, Tcl_DStringValue(&buffer2),      if( NULL != (Tcl_TranslateFileName(interp, Tcl_DStringValue(&buffer2),
657                                         &buffer1))) {                                         &buffer1))) {
# Line 659  static int AscCheckEnvironVars(Tcl_Inter Line 663  static int AscCheckEnvironVars(Tcl_Inter
663        Tcl_DStringFree(&buffer1);        Tcl_DStringFree(&buffer1);
664      }      }
665      Tcl_DStringFree(&buffer2);      Tcl_DStringFree(&buffer2);
666        */
667      /*  Add ``$ASCENDDIST/models/libraries'' to the ASCENDLIBRARY envar */      /*  Add ``$ASCENDDIST/models/libraries'' to the ASCENDLIBRARY envar */
668      Tcl_DStringAppend(&buffer2, Tcl_DStringValue(&ascenddist), -1);      /*    Tcl_DStringAppend(&buffer2, Tcl_DStringValue(&ascenddist), -1);
669      Tcl_DStringAppend(&buffer2, "/models/libraries", -1);      Tcl_DStringAppend(&buffer2, "/models/libraries", -1);
670      if( NULL != (Tcl_TranslateFileName(interp, Tcl_DStringValue(&buffer2),      if( NULL != (Tcl_TranslateFileName(interp, Tcl_DStringValue(&buffer2),
671                                         &buffer1))) {                                         &buffer1))) {
# Line 674  static int AscCheckEnvironVars(Tcl_Inter Line 678  static int AscCheckEnvironVars(Tcl_Inter
678      }      }
679      Tcl_DStringFree(&buffer2);      Tcl_DStringFree(&buffer2);
680    
681        up to here */
682    
683      /*  Get the full value of the environment variable and set      /*  Get the full value of the environment variable and set
684       *  $env(ASCENDLIBRARY) in the Tcl code       *  $env(ASCENDLIBRARY) in the Tcl code
685       */       */

Legend:
Removed from v.27  
changed lines
  Added in v.28

john.pye@anu.edu.au
ViewVC Help
Powered by ViewVC 1.1.22