From 1e37f35dc6626a17e293c1cf8d197996bf87fa75 Mon Sep 17 00:00:00 2001 From: Bruce Lacey Date: Sun, 11 Dec 2016 13:28:37 -0800 Subject: [PATCH] Revert "Rename .tools to .mystools for Arduino IDE" (#687) --- {.mystools => .tools}/.bundle_runtime.sh | 2 +- {.mystools => .tools}/README.md | 9 ++++----- {.mystools => .tools}/astyle/config/style.cfg | 0 {.mystools => .tools}/astyle/options.sh | 0 {.mystools => .tools}/astyle/run.sh | 0 {.mystools => .tools}/bootstrap-dev.sh | 4 ++-- {.mystools => .tools}/cppcheck/config/avr.xml | 0 {.mystools => .tools}/cppcheck/config/includes.cfg | 0 {.mystools => .tools}/cppcheck/config/suppressions.cfg | 0 {.mystools => .tools}/cppcheck/options.sh | 0 {.mystools => .tools}/cppcheck/run.sh | 0 {.mystools => .tools}/hooks/pre-commit.sh | 0 12 files changed, 7 insertions(+), 8 deletions(-) rename {.mystools => .tools}/.bundle_runtime.sh (97%) rename {.mystools => .tools}/README.md (97%) rename {.mystools => .tools}/astyle/config/style.cfg (100%) rename {.mystools => .tools}/astyle/options.sh (100%) rename {.mystools => .tools}/astyle/run.sh (100%) rename {.mystools => .tools}/bootstrap-dev.sh (95%) rename {.mystools => .tools}/cppcheck/config/avr.xml (100%) rename {.mystools => .tools}/cppcheck/config/includes.cfg (100%) rename {.mystools => .tools}/cppcheck/config/suppressions.cfg (100%) rename {.mystools => .tools}/cppcheck/options.sh (100%) rename {.mystools => .tools}/cppcheck/run.sh (100%) rename {.mystools => .tools}/hooks/pre-commit.sh (100%) diff --git a/.mystools/.bundle_runtime.sh b/.tools/.bundle_runtime.sh similarity index 97% rename from .mystools/.bundle_runtime.sh rename to .tools/.bundle_runtime.sh index 744e9ba..f27f650 100755 --- a/.mystools/.bundle_runtime.sh +++ b/.tools/.bundle_runtime.sh @@ -24,7 +24,7 @@ tools_dir() git_config_tools_dir='git config mysensors.toolsdir' # Set mysensors.toolsdir in git config if it hasn't been set - if [ ! $($git_config_tools_dir) -o ! -d $($git_config_tools_dir) ]; then + if [ ! $($git_config_tools_dir) ]; then $git_config_tools_dir "$( cd "$(dirname "${BASH_SOURCE[0]}")"; git rev-parse --show-prefix )" git config alias.mystoolspath '![ -z "${GIT_PREFIX}" ] || cd ${GIT_PREFIX}; echo $(git rev-parse --show-cdup)$(git config mysensors.toolsdir)' fi diff --git a/.mystools/README.md b/.tools/README.md similarity index 97% rename from .mystools/README.md rename to .tools/README.md index 64dce0e..694c4d3 100644 --- a/.mystools/README.md +++ b/.tools/README.md @@ -23,7 +23,7 @@ editor linters, etc.) The [boostrap-dev](bootstrap-dev.sh) script completely configures a development environment. The boostrap-dev script validates development -prerequisites such as verifying the git repo ```origin``` & +pre-requisites such as verifying the git repo ```origin``` & ```upstream``` remotes, tools needed for the git client hooks, installing local commit hooks, and creating git aliases, etc. @@ -32,7 +32,7 @@ $ cd MySensors # git repo $ .tools/bootstrap-dev.sh Checking operating system support: darwin16... Checking github 'origin' & 'upstream' remotes... -Checking tool/utility prerequisites... +Checking tool/utility pre-requisites... Installing git client-side hooks... Configuring git aliases for running mysensor tool bundles... Successfully configured your repo for MySensors development... Thanks for your support! @@ -40,7 +40,7 @@ $ ``` **Note:** If the bootstrap can not find required command-line utilities, you will be requested to install the required tools and -re-run bootstrap.sh. See [Installation instructions for prerequisite +re-run bootstrap.sh. See [Installation instructions for pre-requisite tools](#installtools). Once the bootstrapping process is complete, a git alias for each tool @@ -76,7 +76,7 @@ team. Gitler will also enforce the coding guidelines so the hooks are provided to reduce development cycle times by detecting standards variances locally before pushing to GitHub. -### Installation instructions for prerequisite tools +### Installation instructions for pre-requisite tools This first time you run the bootstrap script, it may inform you that certain development tools are missing from your path or system: @@ -168,7 +168,6 @@ cd astyle/build/gcc && sudo make shared release shared static install curl -L 'https://sourceforge.net/projects/cppcheck/files/cppcheck/1.76.1/cppcheck-1.76.1.tar.gz/download' | tar xvz # Compile and install -cd cppcheck-1.76.1 sudo apt-get install libpcre++-dev sudo make SRCDIR=build CFGDIR=/usr/share/cppcheck HAVE_RULES=yes CXXFLAGS="-O2 -DNDEBUG -Wall -Wno-sign-compare -Wno-unused-function" install diff --git a/.mystools/astyle/config/style.cfg b/.tools/astyle/config/style.cfg similarity index 100% rename from .mystools/astyle/config/style.cfg rename to .tools/astyle/config/style.cfg diff --git a/.mystools/astyle/options.sh b/.tools/astyle/options.sh similarity index 100% rename from .mystools/astyle/options.sh rename to .tools/astyle/options.sh diff --git a/.mystools/astyle/run.sh b/.tools/astyle/run.sh similarity index 100% rename from .mystools/astyle/run.sh rename to .tools/astyle/run.sh diff --git a/.mystools/bootstrap-dev.sh b/.tools/bootstrap-dev.sh similarity index 95% rename from .mystools/bootstrap-dev.sh rename to .tools/bootstrap-dev.sh index 48e9d55..ce51aba 100755 --- a/.mystools/bootstrap-dev.sh +++ b/.tools/bootstrap-dev.sh @@ -44,8 +44,8 @@ install_hooks() # # 1. Check that we are bootstrapping a supported OS/environment # 2. Validate github remotes include valid upstream and origin -# 3. Check for client commit hook prerequisites -# 4. Install client commit hook prerequisites +# 3. Check for client commit hook pre-requisites +# 4. Install client commit hook pre-requisites # 5. Define aliases for conveniently running tool bundles ## diff --git a/.mystools/cppcheck/config/avr.xml b/.tools/cppcheck/config/avr.xml similarity index 100% rename from .mystools/cppcheck/config/avr.xml rename to .tools/cppcheck/config/avr.xml diff --git a/.mystools/cppcheck/config/includes.cfg b/.tools/cppcheck/config/includes.cfg similarity index 100% rename from .mystools/cppcheck/config/includes.cfg rename to .tools/cppcheck/config/includes.cfg diff --git a/.mystools/cppcheck/config/suppressions.cfg b/.tools/cppcheck/config/suppressions.cfg similarity index 100% rename from .mystools/cppcheck/config/suppressions.cfg rename to .tools/cppcheck/config/suppressions.cfg diff --git a/.mystools/cppcheck/options.sh b/.tools/cppcheck/options.sh similarity index 100% rename from .mystools/cppcheck/options.sh rename to .tools/cppcheck/options.sh diff --git a/.mystools/cppcheck/run.sh b/.tools/cppcheck/run.sh similarity index 100% rename from .mystools/cppcheck/run.sh rename to .tools/cppcheck/run.sh diff --git a/.mystools/hooks/pre-commit.sh b/.tools/hooks/pre-commit.sh similarity index 100% rename from .mystools/hooks/pre-commit.sh rename to .tools/hooks/pre-commit.sh