diff --git a/.tools/.bundle_runtime.sh b/.mystools/.bundle_runtime.sh similarity index 97% rename from .tools/.bundle_runtime.sh rename to .mystools/.bundle_runtime.sh index f27f650..744e9ba 100755 --- a/.tools/.bundle_runtime.sh +++ b/.mystools/.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) ]; then + if [ ! $($git_config_tools_dir) -o ! -d $($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/.tools/README.md b/.mystools/README.md similarity index 95% rename from .tools/README.md rename to .mystools/README.md index 694c4d3..19a6742 100644 --- a/.tools/README.md +++ b/.mystools/README.md @@ -23,16 +23,16 @@ editor linters, etc.) The [boostrap-dev](bootstrap-dev.sh) script completely configures a development environment. The boostrap-dev script validates development -pre-requisites such as verifying the git repo ```origin``` & +prerequisites 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. ```shell-script $ cd MySensors # git repo -$ .tools/bootstrap-dev.sh +$ .mystools/bootstrap-dev.sh Checking operating system support: darwin16... Checking github 'origin' & 'upstream' remotes... -Checking tool/utility pre-requisites... +Checking tool/utility prerequisites... 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 pre-requisite +re-run bootstrap.sh. See [Installation instructions for prerequisite 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 pre-requisite tools +### Installation instructions for prerequisite tools This first time you run the bootstrap script, it may inform you that certain development tools are missing from your path or system: @@ -87,7 +87,7 @@ Checking github 'origin' & 'upstream' remotes... Checking tool/utility prerequisites... astyle not installed or not in current path. cppcheck not installed or not in current path. -One or more required tools not found. Install required tools and re-run .tools/bootstrap-dev.sh +One or more required tools not found. Install required tools and re-run .mystools/bootstrap-dev.sh ``` To finish the bootstrap process, you will need to install the required @@ -168,6 +168,7 @@ 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 @@ -191,7 +192,7 @@ convenience functions and environment variables common to all tools. Each tool bundle is laid out as follows: ``` -${TOOLSDIR} [e.g. ${GITREPO}/.tools}] +${TOOLSDIR} [e.g. ${GITREPO}/.mystools}] .../tool [e.g. cppcheck, astyle] ....../run.sh [tool run script] ....../options.sh [command-line options] @@ -209,7 +210,7 @@ that the runtime leverages. #####git config keys -* mysensors.toolsdir = .tools (defined as a repo-relative path - location agnostic) +* mysensors.toolsdir = .mystools (defined as a repo-relative path - location agnostic) * mysensors.bootstrap-cksum = \ #####git aliases diff --git a/.tools/astyle/config/style.cfg b/.mystools/astyle/config/style.cfg similarity index 100% rename from .tools/astyle/config/style.cfg rename to .mystools/astyle/config/style.cfg diff --git a/.tools/astyle/options.sh b/.mystools/astyle/options.sh similarity index 100% rename from .tools/astyle/options.sh rename to .mystools/astyle/options.sh diff --git a/.tools/astyle/run.sh b/.mystools/astyle/run.sh similarity index 100% rename from .tools/astyle/run.sh rename to .mystools/astyle/run.sh diff --git a/.tools/bootstrap-dev.sh b/.mystools/bootstrap-dev.sh similarity index 94% rename from .tools/bootstrap-dev.sh rename to .mystools/bootstrap-dev.sh index ce51aba..e264671 100755 --- a/.tools/bootstrap-dev.sh +++ b/.mystools/bootstrap-dev.sh @@ -6,7 +6,7 @@ # USAGE: # git clone https://github.com/mysensors/MySensors.git # cd MySensors -# .tools/bootstrap-dev.sh +# .mystools/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 pre-requisites -# 4. Install client commit hook pre-requisites +# 3. Check for client commit hook prerequisites +# 4. Install client commit hook prerequisites # 5. Define aliases for conveniently running tool bundles ## diff --git a/.tools/cppcheck/config/avr.xml b/.mystools/cppcheck/config/avr.xml similarity index 100% rename from .tools/cppcheck/config/avr.xml rename to .mystools/cppcheck/config/avr.xml diff --git a/.tools/cppcheck/config/includes.cfg b/.mystools/cppcheck/config/includes.cfg similarity index 100% rename from .tools/cppcheck/config/includes.cfg rename to .mystools/cppcheck/config/includes.cfg diff --git a/.tools/cppcheck/config/suppressions.cfg b/.mystools/cppcheck/config/suppressions.cfg similarity index 100% rename from .tools/cppcheck/config/suppressions.cfg rename to .mystools/cppcheck/config/suppressions.cfg diff --git a/.tools/cppcheck/options.sh b/.mystools/cppcheck/options.sh similarity index 100% rename from .tools/cppcheck/options.sh rename to .mystools/cppcheck/options.sh diff --git a/.tools/cppcheck/run.sh b/.mystools/cppcheck/run.sh similarity index 100% rename from .tools/cppcheck/run.sh rename to .mystools/cppcheck/run.sh diff --git a/.tools/hooks/pre-commit.sh b/.mystools/hooks/pre-commit.sh similarity index 100% rename from .tools/hooks/pre-commit.sh rename to .mystools/hooks/pre-commit.sh