paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-14 17:09:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add handling of extra parameters, using eval if equal sign is found.

Browse Source 
+ Add TMP_DIR variable and use it.
  * Only remove temp files if verbose is not set.

git-svn-id: trunk@46883 -
This commit is contained in:
pierre 2020-09-16 20:44:44 +00:00
parent 2b023c62c5
commit f316121d53
1 changed files with 53 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
rtl/unix/scripts/check_rtl_types.sh
View File

@ -1,7 +1,23 @@
#!/usr/bin/env bash #!/usr/bin/env bash
filename="$1" filename="$1"
shift shift
FPC_OPTS="$*"
verbose=0
i=1
while [ $i -le $# ] ; do
arg="${!i}"
echo "Handling arg $i, \"$arg\""
if [ "${arg//=}" != "$arg" ] ; then
echo "Evaluating \"$arg\""
arg2="${arg/=*/}=\"${arg/*=/}\""
eval "$arg2"
elif [ "$arg" == "-v" ] ; then
verbose=1
else
FPC_OPTS="$FPC_OPTS $arg"
fi
let i++
done
if [ ! -f "$filename" ] ; then if [ ! -f "$filename" ] ; then
echo "Usage: $0 file.h2paschk" echo "Usage: $0 file.h2paschk"
@ -58,8 +74,16 @@ if [ $res -ne 0 ] ; then
exit exit
fi fi
echo "Calling $CC $CC_OPT -o ${filebase}_c ${filebase}.c" TMP_DIR=tmp_$VERSION
$CC $CC_OPT -o ${filebase}_c${VERSION} ${filebase}.c > ${filebase}${VERSION}_c.comp.log 2>&1 if [ -d $TMP_DIR ] ; then
rm -Rf $TMP_DIR
fi
mkdir $TMP_DIR
mv ${filebase}.c ${filebase}.pas $TMP_DIR
cd $TMP_DIR
echo "Calling $CC $CC_OPT -o ${filebase}_${VERSION}_c ${filebase}.c"
$CC $CC_OPT -o ${filebase}_${VERSION}_c ${filebase}.c > ${filebase}_${VERSION}_c.comp.log 2>&1
res=$? res=$?
if [ $res -ne 0 ] ; then if [ $res -ne 0 ] ; then
echo "$CC call failed in $VERSION, res=$res" echo "$CC call failed in $VERSION, res=$res"
@ -67,15 +91,15 @@ if [ $res -ne 0 ] ; then
exit exit
fi fi
./${filebase}_c${VERSION} > ${filebase}_c${VERSION}.out ./${filebase}_${VERSION}_c > ${filebase}_${VERSION}_c.out
res=$? res=$?
if [ $res -ne 0 ] ; then if [ $res -ne 0 ] ; then
echo "./${filebase}_c${VERSION} failed in $VERSION, res=$res" echo "./${filebase}_${VERSION}_c failed in $VERSION, res=$res"
exit exit
fi fi
echo "Calling $MAKE all OPT=\"-n -gwl $FPC_OPTS\" FPC=$FPC" echo "Calling $MAKE -C .. all OPT=\"-n -gwl $FPC_OPTS\" FPC=$FPC"
$MAKE all OPT="-n -gwl $FPC_OPTS" FPC=$FPC > ${filebase}${VERSION}_make_all.log 2>&1 $MAKE -C .. all OPT="-n -gwl $FPC_OPTS" FPC=$FPC > ${filebase}${VERSION}_make_all.log 2>&1
res=$? res=$?
if [ $res -ne 0 ] ; then if [ $res -ne 0 ] ; then
echo "$MAKE call failed in $VERSION, res=$res" echo "$MAKE call failed in $VERSION, res=$res"
@ -85,24 +109,24 @@ fi
OS_TARGET=`$FPC $FPC_OPTS -iTO` OS_TARGET=`$FPC $FPC_OPTS -iTO`
CPU_TARGET=`$FPC $FPC_OPTS -iTP` CPU_TARGET=`$FPC $FPC_OPTS -iTP`
echo "Calling $MAKE -C ${filedir} ${filebaseonly} FPC=$FPC OPT=\"-n -gwl $FPC_OPTS\" -Fu../units/$CPU_TARGET-$OS_TARGET" echo "Calling $MAKE -C .. ${TMP_DIR}/${filebaseonly} FPC=$FPC OPT=\"-n -gwl $FPC_OPTS\" -Fu../units/$CPU_TARGET-$OS_TARGET"
$MAKE -C ${filedir} ${filebaseonly} FPC=$FPC OPT="-n -gwl $FPC_OPTS -Fu../units/$CPU_TARGET-$OS_TARGET" > ${filebase}${VERSION}_pas.comp.log 2>&1 $MAKE -C .. ${TMP_DIR}/${filebaseonly} FPC=$FPC OPT="-n -gwl $FPC_OPTS -Fu../units/$CPU_TARGET-$OS_TARGET" > ${filebase}_${VERSION}_pas.comp.log 2>&1
res=$? res=$?
if [ $res -ne 0 ] ; then if [ $res -ne 0 ] ; then
echo "$FPC call failed in $VERSION, res=$res" echo "$FPC call failed in $VERSION, res=$res"
cat ${filebase}${VERSION}_pas.comp.log cat ${filebase}_${VERSION}_pas.comp.log
exit exit
fi fi
mv -f ${filebase} ${filebase}${VERSION} mv -f ../${filebase} ./${filebase}_${VERSION}_pas
./${filebase}${VERSION} > ${filebase}_pas${VERSION}.out ./${filebase}_${VERSION}_pas > ${filebase}_${VERSION}_pas.out
res=$? res=$?
if [ $res -ne 0 ] ; then if [ $res -ne 0 ] ; then
echo "./${filebase}${VERSION} call failed in $VERSION, res=$res" echo "./${filebase}${VERSION} call failed in $VERSION, res=$res"
exit exit
fi fi
diff ${filebase}_c${VERSION}.out ${filebase}_pas${VERSION}.out > ${filebase}${VERSION}.diffs diff ${filebase}_${VERSION}_c.out ${filebase}_${VERSION}_pas.out > ${filebase}_${VERSION}.diffs
res=$? res=$?
if [ $res -eq 0 ] ; then if [ $res -eq 0 ] ; then
echo "No difference found!" echo "No difference found!"
@ -110,19 +134,21 @@ else
echo "Diffs for ${VERSION} are:" echo "Diffs for ${VERSION} are:"
echo "< C results" echo "< C results"
echo "> Pascal results" echo "> Pascal results"
cat ${filebase}${VERSION}.diffs cat ${filebase}_${VERSION}.diffs
fi fi
# Clean up # Clean up
rm -f ${filebase}_c${VERSION} if [ $verbose -eq 0 ] ; then
rm -f ${filebase}${VERSION} rm -f ${filebase}_${VERSION}_c
rm -f ${filebase}_c${VERSION}.out rm -f ${filebase}_${VERSION}_pas
rm -f ${filebase}_pas${VERSION}.out rm -f ${filebase}_${VERSION}_c.out
rm -f ${filebase}${VERSION}_c.comp.log rm -f ${filebase}_pas${VERSION}.out
rm -f ${filebase}${VERSION}_pas.comp.log rm -f ${filebase}_${VERSION}_c.comp.log
rm -f ${filebase}${VERSION}_make_all.log rm -f ${filebase}_${VERSION}_pas.comp.log
rm -f ${filebase}.c rm -f ${filebase}_${VERSION}_make_all.log
rm -f ${filebase}.pas rm -f ${filebase}.c
rm -f ${filebase}.pas
fi
cd ..
} }
function check_64 () function check_64 ()
@ -207,10 +233,10 @@ if [ $default_fpc -eq 1 ] ; then
else else
if [ "${FPC}" == "$FPC64" ] ; then if [ "${FPC}" == "$FPC64" ] ; then
check_64 check_64
fi elif [ "${FPC}" == "$FPC32" ] ; then
if [ "${FPC}" == "$FPC32" ] ; then
check_32 check_32
else
echo "Unrecognized FPC=\"$FPC\""
fi fi
fi fi