From 80449dd01485bd5e282075ee0e8965df092ce862 Mon Sep 17 00:00:00 2001 From: John Alexander Le Roux <94056103+CMDR-JohnAlex@users.noreply.github.com> Date: Mon, 21 Nov 2022 15:51:21 -0500 Subject: [PATCH 1/2] Fixed some grammar and spelling mistakes --- Build.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Build.md b/Build.md index b83271aaa..957031b5f 100644 --- a/Build.md +++ b/Build.md @@ -27,7 +27,7 @@ pip install pyassimp ## Manual build instructions ### Install CMake -Asset-Importer-Lib can be build for a lot of different platforms. We are using cmake to generate the build environment for these via cmake. So you have to make sure that you have a working cmake-installation on your system. You can download it at https://cmake.org/ or for linux install it via +Asset-Importer-Lib can be built for a lot of different platforms. We are using cmake to generate the build environment for these via cmake. So you have to make sure that you have a working cmake-installation on your system. You can download it at https://cmake.org/ or for linux install it via ```bash sudo apt-get install cmake ``` @@ -46,12 +46,12 @@ cmake --build . ### Build instructions for Windows with Visual-Studio -First you have to install Visual-Studio on your windows-system. You can get the Community-Version for free here: https://visualstudio.microsoft.com/de/downloads/ +First, you have to install Visual-Studio on your windows-system. You can get the Community-Version for free here: https://visualstudio.microsoft.com/de/downloads/ To generate the build environment for your IDE open a command prompt, navigate to your repo and type: ```bash cmake CMakeLists.txt ``` -This will generate the project files for the visual studio. All dependencies used to build Asset-IMporter-Lib shall be part of the repo. If you want to use you own zlib.installation this is possible as well. Check the options for it. +This will generate the project files for the visual studio. All dependencies used to build Asset-Importer-Lib shall be part of the repo. If you want to use you own zlib installation this is possible as well. Check the options for it. ### Build instructions for Windows with UWP See @@ -63,9 +63,9 @@ Open a terminal and got to your repository. You can generate the makefiles and b cmake CMakeLists.txt make -j4 ``` -The option -j descripes the number of parallel processes for the build. In this case make will try to use 4 cores for the build. +The option -j describes the number of parallel processes for the build. In this case make will try to use 4 cores for the build. -If you want to use a IDE for linux you can try QTCreator for instance. +If you want to use an IDE for linux you can try QTCreator for instance. ### Build instructions for MinGW Older versions of MinGW's compiler (e.g. 5.1.0) do not support the -mbig_obj flag @@ -93,8 +93,8 @@ The cmake-build-environment provides options to configure the build. The followi - **ASSIMP_ANDROID_JNIIOSYSTEM (default OFF)**: Android JNI IOSystem support is active. - **ASSIMP_NO_EXPORT (default OFF)**: Disable Assimp's export functionality. - **ASSIMP_BUILD_ZLIB (default OFF)**: Build our own zlib. -- **ASSIMP_BUILD_ALL_EXPORTERS_BY_DEFAULT (default ON)**: Build Assimp with all exporter senabled. -- **ASSIMP_BUILD_ALL_IMPORTERS_BY_DEFAULT (default ON)**: Build Assimp with all importer senabled. +- **ASSIMP_BUILD_ALL_EXPORTERS_BY_DEFAULT (default ON)**: Build Assimp with all exporters enabled. +- **ASSIMP_BUILD_ALL_IMPORTERS_BY_DEFAULT (default ON)**: Build Assimp with all importers enabled. - **ASSIMP_BUILD_ASSIMP_TOOLS (default OFF)**: If the supplementary tools for Assimp are built in addition to the library. - **ASSIMP_BUILD_SAMPLES (default OFF)**: If the official samples are built as well (needs Glut). - **ASSIMP_BUILD_TESTS (default ON)**: If the test suite for Assimp is built in addition to the library. From 355ebbedf3f0b17ccfffac8e1cfa74137eb95c41 Mon Sep 17 00:00:00 2001 From: David Korczynski Date: Mon, 21 Nov 2022 16:45:38 -0800 Subject: [PATCH 2/2] Add CIFuzz GitHub action --- .github/workflows/cifuzz.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .github/workflows/cifuzz.yml diff --git a/.github/workflows/cifuzz.yml b/.github/workflows/cifuzz.yml new file mode 100644 index 000000000..a84be8cbc --- /dev/null +++ b/.github/workflows/cifuzz.yml @@ -0,0 +1,26 @@ +name: CIFuzz +on: [pull_request] +jobs: + Fuzzing: + runs-on: ubuntu-latest + steps: + - name: Build Fuzzers + id: build + uses: google/oss-fuzz/infra/cifuzz/actions/build_fuzzers@master + with: + oss-fuzz-project-name: 'assimp' + dry-run: false + language: c++ + - name: Run Fuzzers + uses: google/oss-fuzz/infra/cifuzz/actions/run_fuzzers@master + with: + oss-fuzz-project-name: 'assimp' + fuzz-seconds: 300 + dry-run: false + language: c++ + - name: Upload Crash + uses: actions/upload-artifact@v3 + if: failure() && steps.build.outcome == 'success' + with: + name: artifacts + path: ./out/artifacts