From 5d6b1129f0e95a29a3fd7a7e09a93a5c1db6c78a Mon Sep 17 00:00:00 2001
From: "R. Elliott Childre" <elliottchildre329@gmail.com>
Date: Tue, 8 Dec 2020 03:30:17 -0500
Subject: Fix Grammar Mutator Submodule (#623)

Fixes: 651ad18e2179 ("added the grammar mutator as a git submodule ...")

* Project pointer never pushed
* Reduces dirctory complexity
* Building and dependencies for the subproject should be isolated to the
  subproject's documentation
* Fix broken link to README
* Use `--init` for `git submodule`
---
 custom_mutators/README.md                               | 10 ++++------
 custom_mutators/grammar_mutator                         |  1 +
 custom_mutators/grammar_mutator/README.md               |  6 ------
 .../grammar_mutator/build_grammar_mutator.sh            | 17 -----------------
 4 files changed, 5 insertions(+), 29 deletions(-)
 create mode 160000 custom_mutators/grammar_mutator
 delete mode 100644 custom_mutators/grammar_mutator/README.md
 delete mode 100755 custom_mutators/grammar_mutator/build_grammar_mutator.sh

(limited to 'custom_mutators')

diff --git a/custom_mutators/README.md b/custom_mutators/README.md
index 0cf52746..b0444c85 100644
--- a/custom_mutators/README.md
+++ b/custom_mutators/README.md
@@ -7,15 +7,13 @@ For further information and documentation on how to write your own, read [the do
 
 If you use git to clone afl++, then the following will incorporate our
 excellent grammar custom mutator:
-```
-git submodule init
-git submodule update
+```sh
+git submodule update --init
 ```
 
-otherwise just use the script: `grammar_mutator/build_grammar_mutator.sh`
+Read the README in the [Grammar-Mutator] repository on how to use it.
 
-Read the [Grammar-Mutator/README.md](Grammar-Mutator/README.md) on how to use
-it.
+[Grammar-Mutator]: https://github.com/AFLplusplus/Grammar-Mutator
 
 ## Production-Ready Custom Mutators
 
diff --git a/custom_mutators/grammar_mutator b/custom_mutators/grammar_mutator
new file mode 160000
index 00000000..b3c4fcfa
--- /dev/null
+++ b/custom_mutators/grammar_mutator
@@ -0,0 +1 @@
+Subproject commit b3c4fcfa6ae28918bc410f7747135eafd4fb7263
diff --git a/custom_mutators/grammar_mutator/README.md b/custom_mutators/grammar_mutator/README.md
deleted file mode 100644
index a015744c..00000000
--- a/custom_mutators/grammar_mutator/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# Grammar-Mutator
-
-This is just a stub directory that will clone the real grammar mutator
-directory.
-
-Execute `./build_grammar_mutator.sh` to set everything up.
diff --git a/custom_mutators/grammar_mutator/build_grammar_mutator.sh b/custom_mutators/grammar_mutator/build_grammar_mutator.sh
deleted file mode 100755
index f3f5e164..00000000
--- a/custom_mutators/grammar_mutator/build_grammar_mutator.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-test -d Grammar-Mutator || git clone --depth=1 https://github.com/AFLplusplus/Grammar-Mutator
-
-cd Grammar-Mutator || exit 1
-git stash ; git pull
-
-wget -c https://www.antlr.org/download/antlr-4.8-complete.jar
-
-echo
-echo
-echo "All successfully prepared!"
-echo "To build for your grammar just do:"
-echo "  cd Grammar_Mutator"
-echo "  make GRAMMAR_FILE=/path/to/your/grammar"
-echo "You will find a JSON and RUBY grammar in Grammar_Mutator/grammars to play with."
-echo
-- 
cgit 1.4.1