From 84bffd5d3602010b9200b25ad09457e8bbd4cbd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20DELRIEU?= Date: Sat, 13 Jan 2018 13:05:42 +0100 Subject: [PATCH] move amalgamate tool to third_party folder --- .gitignore | 1 - Makefile | 2 +- {develop => third_party}/amalgamate/CHANGES.md | 0 {develop => third_party}/amalgamate/LICENSE.md | 0 {develop => third_party}/amalgamate/README.md | 0 {develop => third_party}/amalgamate/amalgamate.py | 0 {develop => third_party}/amalgamate/config.json | 0 7 files changed, 1 insertion(+), 2 deletions(-) rename {develop => third_party}/amalgamate/CHANGES.md (100%) rename {develop => third_party}/amalgamate/LICENSE.md (100%) rename {develop => third_party}/amalgamate/README.md (100%) rename {develop => third_party}/amalgamate/amalgamate.py (100%) mode change 100755 => 100644 rename {develop => third_party}/amalgamate/config.json (100%) diff --git a/.gitignore b/.gitignore index 92ea2903..8157f1a9 100644 --- a/.gitignore +++ b/.gitignore @@ -21,4 +21,3 @@ benchmarks/files/numbers/*.json cmake-build-debug test/test-* -third_party/Amalgamate diff --git a/Makefile b/Makefile index 0029f849..8bfdb193 100644 --- a/Makefile +++ b/Makefile @@ -252,7 +252,7 @@ pretty: amalgamate: src/json.hpp src/json.hpp: $(SRCS) - develop/amalgamate/amalgamate.py -c develop/amalgamate/config.json -s develop --verbose=yes + third_party/amalgamate/amalgamate.py -c third_party/amalgamate/config.json -s develop --verbose=yes $(MAKE) pretty diff --git a/develop/amalgamate/CHANGES.md b/third_party/amalgamate/CHANGES.md similarity index 100% rename from develop/amalgamate/CHANGES.md rename to third_party/amalgamate/CHANGES.md diff --git a/develop/amalgamate/LICENSE.md b/third_party/amalgamate/LICENSE.md similarity index 100% rename from develop/amalgamate/LICENSE.md rename to third_party/amalgamate/LICENSE.md diff --git a/develop/amalgamate/README.md b/third_party/amalgamate/README.md similarity index 100% rename from develop/amalgamate/README.md rename to third_party/amalgamate/README.md diff --git a/develop/amalgamate/amalgamate.py b/third_party/amalgamate/amalgamate.py old mode 100755 new mode 100644 similarity index 100% rename from develop/amalgamate/amalgamate.py rename to third_party/amalgamate/amalgamate.py diff --git a/develop/amalgamate/config.json b/third_party/amalgamate/config.json similarity index 100% rename from develop/amalgamate/config.json rename to third_party/amalgamate/config.json