From c82384b734b90fec9d2b3c64c7febd9ae8db0a50 Mon Sep 17 00:00:00 2001 From: Eric Froemling Date: Mon, 7 Oct 2019 03:03:48 -0700 Subject: [PATCH] latest tweaks --- .gitignore | 1 + .idea/dictionaries/ericf.xml | 14 +++++++------- Makefile | 6 +++++- .projectile => config/toolconfigsrc/projectile | 0 4 files changed, 13 insertions(+), 8 deletions(-) rename .projectile => config/toolconfigsrc/projectile (100%) diff --git a/.gitignore b/.gitignore index 6a003869..bfe1c7cb 100644 --- a/.gitignore +++ b/.gitignore @@ -20,6 +20,7 @@ local.properties .pycheckers .flycheck-dir-locals.el .pylintrc +.projectile .clang-format .style.yapf .irony diff --git a/.idea/dictionaries/ericf.xml b/.idea/dictionaries/ericf.xml index 49873008..1b566dc1 100644 --- a/.idea/dictionaries/ericf.xml +++ b/.idea/dictionaries/ericf.xml @@ -1,13 +1,6 @@ - spacelen - plines - formatmakefile - nosynctools - nosyncdir - nosyncdirs - pulllist aaaa aaab aaac @@ -536,6 +529,7 @@ formatcodefull formatdoc formatfull + formatmakefile formatscripts formatscriptsfull fout @@ -1005,6 +999,9 @@ norun nospeak nosub + nosyncdir + nosyncdirs + nosynctools notdir npos ntpath @@ -1096,6 +1093,7 @@ playsound playtype playtypes + plines plistlib plpt plst @@ -1173,6 +1171,7 @@ ptype pubsync pucknode + pulllist punchdir punchiness punchmats @@ -1360,6 +1359,7 @@ socketserver sourceimages sourcelines + spacelen spacingstr spammers spammy diff --git a/Makefile b/Makefile index ddf1f9ad..3ebf8b4e 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,8 @@ DOCPREFIX = "ballisticacore_" # Prerequisites that should be in place before running most any other build; # things like tool config files, etc. PREREQS = .dir-locals.el .mypy.ini .pycheckers \ - .pylintrc .style.yapf .clang-format + .pylintrc .style.yapf .clang-format \ + .projectile # List the targets in this Makefile and basic descriptions for them. list: @@ -306,6 +307,9 @@ TOOL_CFG_SRC = tools/efrotools/snippets.py config/config.json .pylintrc: config/toolconfigsrc/pylintrc ${TOOL_CFG_SRC} ${TOOL_CFG_INST} $< $@ +.projectile: config/toolconfigsrc/projectile ${TOOL_CFG_SRC} + ${TOOL_CFG_INST} $< $@ + .dir-locals.el: config/toolconfigsrc/dir-locals.el ${TOOL_CFG_SRC} ${TOOL_CFG_INST} $< $@ diff --git a/.projectile b/config/toolconfigsrc/projectile similarity index 100% rename from .projectile rename to config/toolconfigsrc/projectile