Changeset 2530

Show
Ignore:
Timestamp:
11/07/06 19:43:33 (2 years ago)
Author:
maxr
Message:

Ada: new environment variable GELA_INCLUDE_PATH to point gela-asis to std library
Use this variable and -I comand line option in regression tests

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/tendra/regression/ada/asis/cases/Makefile

    r2475 r2530  
    33SRC_DIR =       ${.CURDIR:C/(.*)\/regression.*/\1/} 
    44OUT_DIR =       ${SRC_DIR}/obj/${NAME} 
    5  
     5INCL    =       ${SRC_DIR}/src/lib/libada/spec/ 
    66.SUFFIXES:      .${NAME} .${NAME}.out 
    77 
    …… 
    1111.${NAME}.${NAME}.out : 
    1212        if [ -f ${.IMPSRC:R}.adb ]; then \ 
     13                GELA_INCLUDE_PATH=${INCL} \ 
    1314                ${OUT_DIR}/${NAME} ${.IMPSRC:R}.adb body ${.IMPSRC:R} \ 
    1415                >  ${OUT_DIR}/${.TARGET}; \ 
    1516        else \ 
     17                GELA_INCLUDE_PATH=${INCL} \ 
    1618                ${OUT_DIR}/${NAME} ${.IMPSRC:R}.ads spec ${.IMPSRC:R} \ 
    1719                >  ${OUT_DIR}/${.TARGET}; \ 

  • trunk/tendra/regression/ada/asis/src/common/test.mk

    r2464 r2530  
    1515DONT_INSTALL = Y 
    1616 
    17 DEPEND_SRC = ${LIB_DIR}/libasis.a lib 
     17DEPEND_SRC = ${LIB_DIR}/libasis.a 
    1818 
    1919CLEANFILES=* 
    2020 
    21 lib: 
    22         ln -s ${SRC_DIR}/src/lib/libada/spec lib 
    23  
    2421.include "${SRC_DIR}/mk/base/tendra.prog.mk" 

  • trunk/tendra/regression/ada/tdfada/Makefile

    r2491 r2530  
    77OBJ_DIR =       ${SRC_DIR}/obj/regression/tdfada 
    88TDFADA =        ${SRC_DIR}/obj/producers/ada/tdfada/tdfada 
    9 INCL =          ${SRC_DIR}/obj/producers/ada/tdfada/lib 
     9INCL =          ${SRC_DIR}/src/lib/libada/spec/ 
    1010 
    1111.include "${SRC_DIR}/config.mk" 
    …… 
    3939 
    4040.ads.j: 
    41         ${TDFADA} ${.IMPSRC} 
     41        ${TDFADA} -I${INCL} ${.IMPSRC} 
    4242 
    4343.adb.j: 
    44         ${TDFADA} ${.IMPSRC} 
     44        ${TDFADA} -I${INCL} ${.IMPSRC} 
    4545 
    4646make-subdir: obj-dir all-tests 

  • trunk/tendra/src/producers/ada/asis/asis-gela-library.adb

    r2528 r2530  
    1212 
    1313   function Gela_Lib_Path return String; 
     14   function Env return String is separate; 
    1415 
    1516   Search_Path    : Unbounded_Wide_String; 
    …… 
    6667 
    6768   function Gela_Lib_Path return String is 
    68       use Ada.Strings; 
    69       Cmd    : constant String := Ada.Command_Line.Command_Name; 
    70       Slash  : constant Natural := 
    71         Fixed.Index (Cmd, Maps.To_Set ("/\"), Going => Backward); 
    72       Suffix : constant String := "lib/" 
    7369   begin 
    74       if Slash = 0 then 
    75          return Suffix; 
    76       else 
    77          return Cmd (Cmd'First .. Slash) & Suffix; 
    78       end if; 
     70      return Env; 
    7971   end Gela_Lib_Path; 
    8072