Fixed helper scripts.

This commit is contained in:
Adrien Guatto 2011-05-30 10:23:03 +02:00
parent 938e8897b2
commit fd0b3efd2c
3 changed files with 12 additions and 12 deletions

18
heptc
View file

@ -17,28 +17,28 @@ HEPTC=$COMPILER_DIR/$COMPILER
HEPTC_DEBUG=$COMPILER_DIR/$COMPILER_DEBUG
#compile the compiler
if [ ! -x $HEPTC ]
if [ ! -x "$HEPTC" ]
then
if [ -x $HEPTC_DEBUG ]
if [ -x "$HEPTC_DEBUG" ]
then
#use the debug
HEPTC=$HEPTC_DEBUG
else
cd $COMPILER_DIR
ocamlbuild -j 0 $COMPILER
cd "$COMPILER_DIR"
ocamlbuild -j 0 "$COMPILER"
cd -
fi
fi
#compile the stdlib
if [ ! -e $LIB_DIR/pervasives.epci ] || [ $HEPTC -nt $LIB_DIR/pervasives.epci ]
if [ ! -e "$LIB_DIR/pervasives.epci" ] || [ "$HEPTC" -nt "$LIB_DIR/pervasives.epci" ]
then
cd $LIB_DIR
cd "$LIB_DIR"
echo "Recompile pervasives.epci"
$HEPTC -nopervasives pervasives.epi
"$HEPTC" -nopervasives pervasives.epi
cd -
fi
#call the compiler with the passed arguments.
cd $RUN_DIR
$HEPTC -stdlib $LIB_DIR "$@"
cd "$RUN_DIR"
"$HEPTC" -stdlib "$LIB_DIR" "$@"

View file

@ -17,7 +17,7 @@ coption=
CAMLC=ocamlc
JAVAC=javac
LUSTREC=lustre
CC="gcc -std=c99"
CC="gcc -std=c99 -I../../../lib/c"
# par defaut : pas de test de generation de code

View file

@ -26,8 +26,8 @@ shift
# Compile source file to VHDL, flattening node calls
if [ $compile -eq 1 ]; then
$HEPTC $@ -s main -target c $F $@ || exit 1
"$HEPTC" $@ -s main -target c $F $@ || exit 1
fi
# Compile it with GCC
cc -I `$HEPTC -where`/c -std=c99 $REP/*.c -o `basename $F .ept` || exit 1
cc -I "`$HEPTC -where`/c" -std=c99 $REP/*.c -o "`basename $F .ept`" || exit 1