Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove most legacy generated files. #399

Merged
merged 4 commits into from
Mar 25, 2019
Merged

Remove most legacy generated files. #399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
020bc29
Remove legacy Beats fields.yml file
Mar 22, 2019
dc2eb76
Stop generating legacy schema.csv file
Mar 22, 2019
7628559
Change changelog entry for `fields.yml`
Mar 22, 2019
9b5df26
Actually remove the changelog entry altogether
Mar 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion CHANGELOG.next.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

### Deprecated

* Move old `fields.yml` file from the root of the repo to `generated/legacy`. #386

<!-- All empty sections:

Expand Down
19 changes: 2 additions & 17 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,19 +31,14 @@ check-license-headers:
.PHONY: clean
clean:
rm -rf schema.json build
rm -rf generated/legacy/{schema.csv,template.json,fields.yml}
rm -rf generated/legacy/template.json
# Clean all markdown files for use-cases
find ./use-cases -type f -name '*.md' -not -name 'README.md' -print0 | xargs -0 rm --

# Alias to generate source code for all languages.
.PHONY: codegen
codegen: gocodegen

# Build schema.csv from schema files.
.PHONY: csv
csv: ve
$(PYTHON) scripts/schemas.py

# Build the asciidoc book.
.PHONY: docs
docs:
Expand All @@ -52,16 +47,6 @@ docs:
fi
./build/docs/build_docs.pl --doc ./docs/index.asciidoc --chunk=1 $(OPEN_DOCS) -out ./build/html_docs

# Build the legacy fields.yml file.
.PHONY: fields_legacy
fields_legacy:
cat schemas/*.yml > fields.tmp.yml
sed -i.bak 's/^/ /g' fields.tmp.yml
sed -i.bak 's/---//g' fields.tmp.yml
cat generated/legacy/fields_header.yml > generated/legacy/fields.yml
cat fields.tmp.yml >> generated/legacy/fields.yml
rm -f fields.tmp.yml fields.tmp.yml.bak

# Format code and files in the repo.
.PHONY: fmt
fmt: ve
Expand All @@ -71,7 +56,7 @@ fmt: ve

# Alias to generate everything.
.PHONY: generate
generate: csv readme template fields_legacy codegen generator
generate: readme template codegen generator

# Run the new generator
.PHONY: generator
Expand Down
Loading