mirror of
https://github.com/VCMP-SqMod/SqMod.git
synced 2026-05-01 00:07:19 +02:00
Update libraries and make it build on windows.
Still gets some warnings because compilers have changed. But should work.
This commit is contained in:
+1
-1
@@ -19,4 +19,4 @@ shift
|
||||
dir4=$1
|
||||
shift
|
||||
|
||||
CC -xM1 $@ $source | sed "s#\(.*\.o$\)#$dir1/\1 $dir2/\1 $dir3/\1 $dir4/\1#" >$target
|
||||
CC -xM1 "$@" "$source" | sed "s#\(.*\.o$\)#$dir1/\1 $dir2/\1 $dir3/\1 $dir4/\1#" >"$target"
|
||||
|
||||
+4
-4
@@ -19,7 +19,7 @@ shift
|
||||
dir4=$1
|
||||
shift
|
||||
|
||||
tmpfile=`basename $target`
|
||||
aCC -E +maked $@ $source >/dev/null
|
||||
sed "s#\(.*\.o$\)#$dir1/\1 $dir2/\1 $dir3/\1 $dir4/\1#" <$tmpfile >$target
|
||||
rm $tmpfile
|
||||
tmpfile=$(basename $target)
|
||||
aCC -E +maked "$@" "$source" >/dev/null
|
||||
sed "s#\(.*\.o$\)#$dir1/\1 $dir2/\1 $dir3/\1 $dir4/\1#" <"$tmpfile" >"$target"
|
||||
rm "$tmpfile"
|
||||
|
||||
+1
-1
@@ -26,4 +26,4 @@ else
|
||||
CLANG=clang++
|
||||
fi
|
||||
|
||||
$CLANG -MM $@ $source | sed "s#\(.*\.o\):#$dir1/\1 $dir2/\1 $dir3/\1 $dir4/\1:#" >$target
|
||||
$CLANG -MM "$@" "$source" | sed "s#\(.*\.o\):#$dir1/\1 $dir2/\1 $dir3/\1 $dir4/\1:#" >"$target"
|
||||
|
||||
+1
-1
@@ -19,4 +19,4 @@ shift
|
||||
dir4=$1
|
||||
shift
|
||||
|
||||
cxx -M $@ $source | sed "s#\(.*\.o$\)#$dir1/\1 $dir2/\1 $dir3/\1 $dir4/\1#" >$target
|
||||
cxx -M "$@" "$source" | sed "s#\(.*\.o$\)#$dir1/\1 $dir2/\1 $dir3/\1 $dir4/\1#" >"$target"
|
||||
|
||||
+1
-1
@@ -19,4 +19,4 @@ shift
|
||||
dir4=$1
|
||||
shift
|
||||
|
||||
$CC -MM $@ $source | sed "s#\(.*\.o\):#$dir1/\1 $dir2/\1 $dir3/\1 $dir4/\1:#" >$target
|
||||
$CC -MM "$@" "$source" | sed "s#\(.*\.o\):#$dir1/\1 $dir2/\1 $dir3/\1 $dir4/\1:#" >"$target"
|
||||
|
||||
+1
-1
@@ -18,4 +18,4 @@ shift
|
||||
dir4=$1
|
||||
shift
|
||||
|
||||
$CC -E -Wp,-MM $@ $source | sed "s#\(.*\.o$\)#$dir1/\1 $dir2/\1 $dir3/\1 $dir4/\1#" >$target
|
||||
$CC -E -Wp,-MM "$@" "$source" | sed "s#\(.*\.o$\)#$dir1/\1 $dir2/\1 $dir3/\1 $dir4/\1#" >"$target"
|
||||
|
||||
+6
-7
@@ -20,12 +20,11 @@ shift
|
||||
dir4=$1
|
||||
shift
|
||||
|
||||
cwd=`pwd`
|
||||
cwd=$(pwd)
|
||||
|
||||
cd `dirname $target`
|
||||
$CXX -qmakedep -E -w $@ $cwd/$source >/dev/null
|
||||
|
||||
ufile=`basename $source`
|
||||
ufile=`echo $ufile | sed "s#\.cpp#\.u#"`
|
||||
cat $ufile | sort | uniq | grep -v '/usr/include' | grep -v '/usr/vacpp' | sed "s#\(.*\.o$\)#$dir1/\1 $dir2/\1 $dir3/\1 $dir4/\1#" >$target
|
||||
cd "$(dirname "$target")" || exit
|
||||
$CXX -qmakedep -E -w "$@" "$cwd"/"$source" >/dev/null
|
||||
|
||||
ufile=$(basename "$source")
|
||||
ufile=$(echo "$ufile" | sed "s#\.cpp#\.u#")
|
||||
sort "$ufile" | uniq | grep -v '/usr/include' | grep -v '/usr/vacpp' | sed "s#\(.*\.o$\)#$dir1/\1 $dir2/\1 $dir3/\1 $dir4/\1#" >"$target"
|
||||
|
||||
Vendored
+6
-6
@@ -10,16 +10,16 @@ if [ "$POCO_BASE" == "" ] ; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
projectList=`cat ${POCO_BASE}/components`
|
||||
projectList=$(cat "${POCO_BASE}"/components)
|
||||
|
||||
OSNAME=`uname`
|
||||
OSARCH=`uname -m | tr " /" "_-"`
|
||||
OSNAME=$(uname)
|
||||
OSARCH=$(uname -m | tr " /" "_-")
|
||||
|
||||
for proj in $projectList ;
|
||||
do
|
||||
path=${POCO_BASE}/${proj}/lib/${OSNAME}/${OSARCH}
|
||||
echo $path
|
||||
if [ -d $path ] ; then
|
||||
echo -n ":"$path
|
||||
echo "$path"
|
||||
if [ -d "$path" ] ; then
|
||||
printf ":%s" "$path"
|
||||
fi
|
||||
done
|
||||
|
||||
+29
@@ -0,0 +1,29 @@
|
||||
#!/bin/bash -eu
|
||||
|
||||
mkdir -p cmake-build
|
||||
cd cmake-build
|
||||
|
||||
cmake -DBUILD_SHARED_LIBS=OFF -DENABLE_TESTS=OFF -DENABLE_FUZZING=ON \
|
||||
-DENABLE_ACTIVERECORD=OFF -DENABLE_PAGECOMPILER=OFF \
|
||||
-DENABLE_PAGECOMPILER_FILE2PAGE=OFF -DENABLE_DATA_SQLITE=OFF \
|
||||
-DENABLE_REDIS=OFF -DENABLE_MONGODB=OFF -DENABLE_PROMETHEUS=OFF \
|
||||
-DENABLE_ACTIVERECORD_COMPILER=OFF \
|
||||
..
|
||||
|
||||
make -j$(nproc)
|
||||
|
||||
# Copy binaries with preserving historical names
|
||||
cp bin/JSON-parse-fuzzer $OUT/json_parser_fuzzer
|
||||
cp bin/XML-parse-fuzzer $OUT/xml_parser_fuzzer
|
||||
cp bin/Foundation-datetime-fuzzer $OUT/date_time_fuzzer
|
||||
cp bin/Foundation-misc-fuzzer $OUT/foundation_misc_fuzzer
|
||||
cp bin/JWT-decode-fuzzer $OUT/jwt_decode_fuzzer
|
||||
cp bin/Net-mail-parser-fuzzer $OUT/mail_message_fuzzer
|
||||
cp bin/Net-http-parser-fuzzer $OUT/http_message_fuzzer
|
||||
|
||||
# Seed corpus
|
||||
zip -q -r -j $OUT/mail_message_fuzzer_seed_corpus.zip $SRC/poco/Net/fuzzing/seed/Mail
|
||||
zip -q -r -j $OUT/http_message_fuzzer_seed_corpus.zip $SRC/poco/Net/fuzzing/seed/HTTP
|
||||
|
||||
# Dictionaries
|
||||
cp $SRC/poco/XML/fuzzing/xml.dict $OUT/xml_parser_fuzzer.dict
|
||||
Vendored
+4
-4
@@ -10,8 +10,8 @@
|
||||
#
|
||||
|
||||
PROJECT_BASE=$1
|
||||
cdir=`sh -c pwd`
|
||||
cd $PROJECT_BASE
|
||||
projbase=`sh -c pwd`
|
||||
cd "$cdir"
|
||||
cdir=$(sh -c pwd)
|
||||
cd "$PROJECT_BASE" || exit
|
||||
projbase=$(sh -c pwd)
|
||||
cd "$cdir" || exit
|
||||
sh -c pwd | sed "s:^$projbase::" | sed "s:^/::"
|
||||
|
||||
Vendored
+9
-9
@@ -2,7 +2,7 @@
|
||||
#
|
||||
# A script for running the POCO testsuites.
|
||||
#
|
||||
# usage: runtests [component [test] ]
|
||||
# usage: runtests [component [test] [d]]
|
||||
#
|
||||
# If the environment variable EXCLUDE_TESTS is set, containing
|
||||
# a space-separated list of project names (as found in the
|
||||
@@ -21,7 +21,7 @@
|
||||
#
|
||||
|
||||
if [ "$POCO_BASE" = "" ] ; then
|
||||
POCO_BASE=`pwd`
|
||||
POCO_BASE=$(pwd)
|
||||
fi
|
||||
|
||||
if [ "$POCO_BUILD" = "" ] ; then
|
||||
@@ -31,7 +31,7 @@ fi
|
||||
TESTRUNNER=./testrunner
|
||||
|
||||
if [ "$1" = "" ] ; then
|
||||
components=`cat $POCO_BASE/components`
|
||||
components=$(cat "$POCO_BASE"/components)
|
||||
else
|
||||
components=$1
|
||||
fi
|
||||
@@ -43,11 +43,11 @@ else
|
||||
fi
|
||||
|
||||
if [ "$OSARCH" = "" ] ; then
|
||||
OSARCH=`uname -m | tr ' /' _-`
|
||||
OSARCH=$(uname -m | tr ' /' _-)
|
||||
fi
|
||||
|
||||
if [ "$OSNAME" = "" ] ; then
|
||||
OSNAME=`uname`
|
||||
OSNAME=$(uname)
|
||||
case $OSNAME in
|
||||
CYGWIN*)
|
||||
OSNAME=CYGWIN
|
||||
@@ -86,10 +86,10 @@ do
|
||||
echo "****************************************"
|
||||
echo ""
|
||||
|
||||
runs=`expr $runs + 1`
|
||||
sh -c "cd $POCO_BUILD/$comp/testsuite/$BINDIR && PATH=.:$PATH && LD_LIBRARY_PATH=.:$LD_LIBRARY_PATH $TESTRUNNER $IGNORE $TESTRUNNERARGS"
|
||||
if [ $? -ne 0 ] ; then
|
||||
failures=`expr $failures + 1`
|
||||
runs=$((runs + 1))
|
||||
if ! sh -c "export POCO_BASE='$POCO_BASE'; export OSNAME='$OSNAME'; export OSARCH='$OSARCH'; cd $POCO_BUILD/$comp/testsuite/$BINDIR && PATH=.:$PATH && LD_LIBRARY_PATH=.:$LD_LIBRARY_PATH $TESTRUNNER$2 $IGNORE $TESTRUNNERARGS";
|
||||
then
|
||||
failures=$((failures + 1))
|
||||
failedTests="$failedTests $comp"
|
||||
status=1
|
||||
fi
|
||||
|
||||
Vendored
+3
-3
@@ -13,11 +13,11 @@ fi
|
||||
source="$1"
|
||||
target="$2"
|
||||
|
||||
sourcedir=`dirname "$source"`
|
||||
targetdir=`dirname "$target"`
|
||||
sourcedir=$(dirname "$source")
|
||||
targetdir=$(dirname "$target")
|
||||
|
||||
if [ "$sourcedir" = "$targetdir" ] ; then
|
||||
source=`basename $source`
|
||||
source=$(basename "$source")
|
||||
fi
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user