Merge branch 'internal-dev' into 'master'

Public release

See merge request github/Killerbeez!35

CMakeLists.txt

@@ -22,7 +22,8 @@ endif (WIN32)
 include_directories (${CMAKE_SOURCE_DIR}/../killerbeez-utils/jansson/)
 include_directories (${CMAKE_SOURCE_DIR}/../killerbeez-utils/utils/)
 
-add_subdirectory(${CMAKE_SOURCE_DIR}/../killerbeez-mutators/ ${CMAKE_BINARY_DIR}/../killerbeez-mutators/)
+# compile mutators, which will compile utils
+add_subdirectory(${CMAKE_SOURCE_DIR}/../killerbeez-mutators/ ${CMAKE_BINARY_DIR}/killerbeez-mutators/)
 
 add_subdirectory(driver)
 add_subdirectory(fuzzer)

README.md

@@ -25,12 +25,12 @@ To build Killerbeez on Windows you will need Microsoft Visual Studio 2017, Cygwi
 
 3. Create a working directory to store all of the Killerbeez components, for example `WORKDIR=C:\killerbeez`
 
-4. Build [Radamsa](https://github.com/aoh/radamsa).
+4. Build [Radamsa](https://gitlab.com/akihe/radamsa).
   + Clone the Radamsa repository into %WORKDIR% from a Cygwin terminal and build: 
 
         ```
         cd /cydrive/c/killerbeez
-        git clone https://github.com/aoh/radamsa.git
+        git clone https://gitlab.com/akihe/radamsa.git
         cd radamsa
         make
         ```

tools/release.bat

@@ -4,7 +4,7 @@ REM      : cd killerbeez-mutators; ..\Killerbeez\tools\release
 REM      : cd killerbeez-utils; ..\Killerbeez\tools\release
 
 if "%RADAMSA_URL%" == "" (
-  set RADAMSA_URL=https://github.com/aoh/radamsa.git
+  set RADAMSA_URL=https://gitlab.com/akihe/radamsa.git
 )
 if "%KILLERBEEZ_URL%" == "" (
   set KILLERBEEZ_URL=https://github.com/grimm-co/Killerbeez.git
@@ -40,8 +40,6 @@ if not exist dynamorio (
 
 call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x86
 
-call :compile killerbeez-utils || exit /b 1
-call :compile killerbeez-mutators || exit /b 1
 call :compile Killerbeez || exit /b 1
 
 set oldpath=%path%
@@ -54,8 +52,6 @@ call :package X86
 
 call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x64
 
-call :compile killerbeez-utils || exit /b 1
-call :compile killerbeez-mutators || exit /b 1
 call :compile Killerbeez || exit /b 1
 
 set oldpath=%path%