Merge pull request #69 from ispras/from2.0.0

Fix prepare, build script

Author: thientc

custom-llvm/build.sh

@@ -55,16 +55,25 @@ cp $futag_src/Checkers/lib/*.cpp $custom_llvm/clang/lib/StaticAnalyzer/Checkers/
 cp -r $futag_src/Checkers/lib/$CheckerCMakeLists $custom_llvm/clang/lib/StaticAnalyzer/Checkers/CMakeLists.txt
 
 if [ $llvmVersion == "LLVM=14.0.6" ]; then
-    cmake  -G "Unix Makefiles"  -DLLVM_BUILD_TESTS=OFF  -DLLVM_ENABLE_ZLIB=ON  -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$futag_install_folder  -DCMAKE_EXPORT_COMPILE_COMMANDS=1  -DCLANG_INCLUDE_DOCS="OFF"  -DLLVM_BUILD_LLVM_DYLIB="ON"  -DLLVM_ENABLE_BINDINGS="OFF"  -DLLVM_ENABLE_PROJECTS='clang;'  -DLLVM_ENABLE_WARNINGS="OFF"  -DLLVM_INCLUDE_BENCHMARKS="OFF"  -DLLVM_INCLUDE_DOCS="OFF"  -DLLVM_INCLUDE_EXAMPLES="OFF"  -DLLVM_INCLUDE_TESTS="OFF"  -DLLVM_LINK_LLVM_DYLIB="ON"  -DLLVM_TARGETS_TO_BUILD="host" -DLLVM_ENABLE_RUNTIMES="compiler-rt;"  $custom_llvm/llvm
+    cmake  -G "Unix Makefiles"  -DLLVM_BUILD_TESTS=OFF  -DLLVM_ENABLE_ZLIB=ON  -DCMAKE_BUILD_TYPE=Release  -DLLVM_BINUTILS_INCDIR=/usr/include/  -DCMAKE_INSTALL_PREFIX=$futag_install_folder  -DCMAKE_EXPORT_COMPILE_COMMANDS=1  -DCLANG_INCLUDE_DOCS="OFF"  -DLLVM_BUILD_LLVM_DYLIB="ON"  -DLLVM_ENABLE_BINDINGS="OFF"  -DLLVM_ENABLE_PROJECTS='clang;'  -DLLVM_ENABLE_WARNINGS="OFF"  -DLLVM_INCLUDE_BENCHMARKS="OFF"  -DLLVM_INCLUDE_DOCS="OFF"  -DLLVM_INCLUDE_EXAMPLES="OFF"  -DLLVM_INCLUDE_TESTS="OFF"  -DLLVM_LINK_LLVM_DYLIB="ON"  -DLLVM_TARGETS_TO_BUILD="host" -DLLVM_ENABLE_RUNTIMES="compiler-rt;"  $custom_llvm/llvm
 
 fi
 if [ $llvmVersion == "LLVM=13.0.1" ]; then
-    cmake  -G "Unix Makefiles"  -DLLVM_BUILD_TESTS=OFF  -DLLVM_ENABLE_ZLIB=ON  -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$futag_install_folder  -DCMAKE_EXPORT_COMPILE_COMMANDS=1  -DCLANG_INCLUDE_DOCS="OFF"  -DLLVM_BUILD_LLVM_DYLIB="ON"  -DLLVM_ENABLE_BINDINGS="OFF"  -DLLVM_ENABLE_PROJECTS='clang;compiler-rt;'  -DLLVM_ENABLE_WARNINGS="OFF"  -DLLVM_INCLUDE_BENCHMARKS="OFF"  -DLLVM_INCLUDE_DOCS="OFF"  -DLLVM_INCLUDE_EXAMPLES="OFF"  -DLLVM_INCLUDE_TESTS="OFF"  -DLLVM_LINK_LLVM_DYLIB="ON"  -DLLVM_TARGETS_TO_BUILD="host"  $custom_llvm/llvm
+    cmake  -G "Unix Makefiles"  -DLLVM_BUILD_TESTS=OFF  -DLLVM_ENABLE_ZLIB=ON  -DCMAKE_BUILD_TYPE=Release  -DLLVM_BINUTILS_INCDIR=/usr/include/  -DCMAKE_INSTALL_PREFIX=$futag_install_folder  -DCMAKE_EXPORT_COMPILE_COMMANDS=1  -DCLANG_INCLUDE_DOCS="OFF"  -DLLVM_BUILD_LLVM_DYLIB="ON"  -DLLVM_ENABLE_BINDINGS="OFF"  -DLLVM_ENABLE_PROJECTS='clang;compiler-rt;'  -DLLVM_ENABLE_WARNINGS="OFF"  -DLLVM_INCLUDE_BENCHMARKS="OFF"  -DLLVM_INCLUDE_DOCS="OFF"  -DLLVM_INCLUDE_EXAMPLES="OFF"  -DLLVM_INCLUDE_TESTS="OFF"  -DLLVM_LINK_LLVM_DYLIB="ON"  -DLLVM_TARGETS_TO_BUILD="host"  $custom_llvm/llvm
 
 fi
-
 make -j$(($(nproc)/2)) && make -j$(($(nproc)/2)) install
 
+export PATH="$(pwd)/bin:$PATH"
+export LLVM_CONFIG="$(pwd)/bin/llvm-config"
+export LD_LIBRARY_PATH="$(llvm-config --libdir)${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
+
+#build AFLplusplus
+cd AFLplusplus-4.02c
+make -j$(($(nproc)/2)) distrib
+make -j$(($(nproc)/2)) DESTDIR=$futag_install_folder/AFLplusplus install
+cd ..
+
 if [ -d $futag_install_folder/python-package ]
 then
     rm -rf $futag_install_folder/python-package
@@ -76,11 +85,10 @@ cp -r $futag_src/python/*.py $futag_install_folder/python-package
 cp -r $futag_src/svres-tmpl $futag_install_folder/
 cp -r ../*.md $futag_install_folder/
 cp -r ../LICENSE $futag_install_folder/
-cp $custom_prepare/INFO $futag_install_folder/
-git rev-parse HEAD >> $futag_install_folder/INFO
+cp $custom_prepare/export.sh $futag_install_folder/
 
 cd ../product-tests
-XZ_OPT='-T8 -9' tar cJf futag-llvm$version.latest.tar.xz ../futag-llvm
+XZ_OPT='-T'$(($(nproc)/2))' -9' tar cJf futag-llvm$version.latest.tar.xz ../futag-llvm
 
 echo ""
 echo "======== End of build script for FUTAG - a fuzzing target automated generator ========"

custom-llvm/buildwAFLplusplus.sh

@@ -38,11 +38,6 @@ echo
 # https://github.com/AFLplusplus/AFLplusplus/archive/refs/tags/4.02c.tar.gz
 
 echo "========================================================="
-read -p "-- [Futag] Build with AFLplusplus-4.02c? (y/n): " wAFLplusplus
-if [[ ! $wAFLplusplus == [yYnN] ]]; then
-    echo "-- [Futag] Wrong input! Please enter y or n! Exit..."
-    exit
-fi
 
 # # https://github.com/ossf/fuzz-introspector/archive/refs/tags/v1.0.0.tar.gz
 # echo "========================================================="
@@ -96,22 +91,15 @@ if [ "$selectedVersion" == "2" ]; then
     mv llvm-project-13.0.1.src llvm-project
 fi
 
-build_script="build.sh"
-
-if [ $wAFLplusplus == "Y" ] || [ $wAFLplusplus == "y" ]; then
-    echo "AFLplusplus=yes" >> $file_info
-    if [ -d AFLplusplus-4.02c ]; then
-        rm -rf AFLplusplus-4.02c
-    fi
-    if [ ! -f 4.02c.tar.gz ]; then
-        wget https://github.com/AFLplusplus/AFLplusplus/archive/refs/tags/4.02c.tar.gz
-    fi
-    tar xf 4.02c.tar.gz
-    mv AFLplusplus-4.02c $build_folder/
-    build_script="buildwAFLplusplus.sh"
-else
-    echo "AFLplusplus=no" >> $file_info
+if [ -d AFLplusplus-4.02c ]; then
+    rm -rf AFLplusplus-4.02c
+fi
+if [ ! -f 4.02c.tar.gz ]; then
+    wget https://github.com/AFLplusplus/AFLplusplus/archive/refs/tags/4.02c.tar.gz
 fi
+tar xf 4.02c.tar.gz
+mv AFLplusplus-4.02c $build_folder/
+build_script="build.sh"
 
 # if [ $fuzzintro == "Y" ] || [ $fuzzintro == "y" ]; then
 #     echo "FuzzIntrospector=yes" >> $file_info