From 552f724cac54982a983d678cb36021df90d8473d Mon Sep 17 00:00:00 2001 From: Marek Roszko Date: Thu, 21 Jul 2022 19:16:16 -0400 Subject: [PATCH] helpers and tools are the same thing Make it so! --- README.md | 3 +-- {helpers => tools}/gal_bitmap_font/README | 0 .../gal_bitmap_font/UbuntuMono-R.ttf_sdf.png | Bin .../gal_bitmap_font/UbuntuMono-R.ttf_sdf.txt | 0 {helpers => tools}/gal_bitmap_font/bitmap_font.fnt | 0 {helpers => tools}/gal_bitmap_font/bitmap_font.png | Bin .../gal_bitmap_font/bitmap_font_2048.fnt | 0 .../gal_bitmap_font/bitmap_font_2048_0.png | Bin .../gal_bitmap_font/bitmap_font_2048_0_img.c | 0 .../gal_bitmap_font/bitmap_font_2048_desc.c | 0 .../gal_bitmap_font/bitmap_font_desc.c | 0 .../gal_bitmap_font/bitmap_font_img.c | 0 {helpers => tools}/gal_bitmap_font/fnt2struct.py | 0 {helpers => tools}/gal_bitmap_font/fnt2struct_2.py | 0 {helpers => tools}/gal_bitmap_font/font1024.bmfc | 0 {helpers => tools}/gal_bitmap_font/font2048.bmfc | 0 {helpers => tools}/gal_bitmap_font/hiero_desc.c | 0 {helpers => tools}/gal_bitmap_font/hiero_img.c | 0 {helpers => tools}/gal_bitmap_font/png2struct.py | 0 {helpers => tools}/git/fixes_alias | 2 +- {helpers => tools}/git/format_alias | 0 .../newstroke}/AUTHOR.txt | 0 .../newstroke}/CJK_symbol.lib | 0 .../newstroke}/CKJ_wide.lib | 0 .../newstroke}/README.txt | 0 .../newstroke}/charlist.txt | 0 .../newstroke}/charlist_without_CJK.txt | 0 .../newstroke}/coord.txt | 0 .../newstroke}/font-cache.lib | 0 .../newstroke}/font.dcm | 0 .../newstroke}/font.kicad_pcb | 0 .../newstroke}/font.lib | 0 .../newstroke}/font.pro | 0 .../newstroke}/font.sch | 0 .../newstroke}/font_draft.sch | 0 .../newstroke}/font_draft1.lib | 0 .../newstroke}/fontconv.awk | 0 .../newstroke}/half_full.lib | 0 .../newstroke}/hiragana.lib | 0 .../newstroke}/katakana.lib | 0 .../newstroke}/scale.py | 0 .../newstroke}/sym-lib-table | 0 .../newstroke}/symbol.dcm | 0 .../newstroke}/symbol.lib | 0 .../newstroke}/symbols.sch | 0 .../newstroke}/test.h | 0 .../newstroke}/testlist.txt | 0 47 files changed, 2 insertions(+), 3 deletions(-) rename {helpers => tools}/gal_bitmap_font/README (100%) rename {helpers => tools}/gal_bitmap_font/UbuntuMono-R.ttf_sdf.png (100%) rename {helpers => tools}/gal_bitmap_font/UbuntuMono-R.ttf_sdf.txt (100%) rename {helpers => tools}/gal_bitmap_font/bitmap_font.fnt (100%) rename {helpers => tools}/gal_bitmap_font/bitmap_font.png (100%) rename {helpers => tools}/gal_bitmap_font/bitmap_font_2048.fnt (100%) rename {helpers => tools}/gal_bitmap_font/bitmap_font_2048_0.png (100%) rename {helpers => tools}/gal_bitmap_font/bitmap_font_2048_0_img.c (100%) rename {helpers => tools}/gal_bitmap_font/bitmap_font_2048_desc.c (100%) rename {helpers => tools}/gal_bitmap_font/bitmap_font_desc.c (100%) rename {helpers => tools}/gal_bitmap_font/bitmap_font_img.c (100%) rename {helpers => tools}/gal_bitmap_font/fnt2struct.py (100%) rename {helpers => tools}/gal_bitmap_font/fnt2struct_2.py (100%) rename {helpers => tools}/gal_bitmap_font/font1024.bmfc (100%) rename {helpers => tools}/gal_bitmap_font/font2048.bmfc (100%) rename {helpers => tools}/gal_bitmap_font/hiero_desc.c (100%) rename {helpers => tools}/gal_bitmap_font/hiero_img.c (100%) rename {helpers => tools}/gal_bitmap_font/png2struct.py (100%) rename {helpers => tools}/git/fixes_alias (89%) rename {helpers => tools}/git/format_alias (100%) rename {helpers/tools_to_build_newstroke-font => tools/newstroke}/AUTHOR.txt (100%) rename {helpers/tools_to_build_newstroke-font => tools/newstroke}/CJK_symbol.lib (100%) rename {helpers/tools_to_build_newstroke-font => tools/newstroke}/CKJ_wide.lib (100%) rename {helpers/tools_to_build_newstroke-font => tools/newstroke}/README.txt (100%) rename {helpers/tools_to_build_newstroke-font => tools/newstroke}/charlist.txt (100%) rename {helpers/tools_to_build_newstroke-font => tools/newstroke}/charlist_without_CJK.txt (100%) rename {helpers/tools_to_build_newstroke-font => tools/newstroke}/coord.txt (100%) rename {helpers/tools_to_build_newstroke-font => tools/newstroke}/font-cache.lib (100%) rename {helpers/tools_to_build_newstroke-font => tools/newstroke}/font.dcm (100%) rename {helpers/tools_to_build_newstroke-font => tools/newstroke}/font.kicad_pcb (100%) rename {helpers/tools_to_build_newstroke-font => tools/newstroke}/font.lib (100%) rename {helpers/tools_to_build_newstroke-font => tools/newstroke}/font.pro (100%) rename {helpers/tools_to_build_newstroke-font => tools/newstroke}/font.sch (100%) rename {helpers/tools_to_build_newstroke-font => tools/newstroke}/font_draft.sch (100%) rename {helpers/tools_to_build_newstroke-font => tools/newstroke}/font_draft1.lib (100%) rename {helpers/tools_to_build_newstroke-font => tools/newstroke}/fontconv.awk (100%) rename {helpers/tools_to_build_newstroke-font => tools/newstroke}/half_full.lib (100%) rename {helpers/tools_to_build_newstroke-font => tools/newstroke}/hiragana.lib (100%) rename {helpers/tools_to_build_newstroke-font => tools/newstroke}/katakana.lib (100%) rename {helpers/tools_to_build_newstroke-font => tools/newstroke}/scale.py (100%) rename {helpers/tools_to_build_newstroke-font => tools/newstroke}/sym-lib-table (100%) rename {helpers/tools_to_build_newstroke-font => tools/newstroke}/symbol.dcm (100%) rename {helpers/tools_to_build_newstroke-font => tools/newstroke}/symbol.lib (100%) rename {helpers/tools_to_build_newstroke-font => tools/newstroke}/symbols.sch (100%) rename {helpers/tools_to_build_newstroke-font => tools/newstroke}/test.h (100%) rename {helpers/tools_to_build_newstroke-font => tools/newstroke}/testlist.txt (100%) diff --git a/README.md b/README.md index 50a241e225..5f563f147a 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,6 @@ GitLab CI pipeline status can be viewed for Linux and Windows builds of the late * [doxygen](doxygen) - Configuration for generating pretty doxygen manual of the codebase * [eeschema](eeschema) - Sourcecode of the schematic editor * [gerbview](gerbview) - Sourcecode of the gerber viewer -* [helpers](helpers) - Helper tools and utilities for development * [include](include) - Interfaces to the common library * [kicad](kicad) - Sourcecode of the project manager * [libs](libs) - Sourcecode of KiCad utilities (geometry and others) @@ -55,6 +54,6 @@ GitLab CI pipeline status can be viewed for Linux and Windows builds of the late * [scripting](scripting) - Python integration for KiCad * [template](template) - Project template * [thirdparty](thirdparty) - Sourcecode of external libraries used in KiCad but not written by the KiCad team -* [tools](tools) - Other miscellaneous helpers for testing and building +* [tools](tools) - Helpers for developing, testing and building * [translation](translation) - Translation data files (managed through [Weblate](https://hosted.weblate.org/projects/kicad/master-source/) for most languages) * [utils](utils) - Small utils for KiCad, e.g. IDF, STEP, and OGL tools and converters diff --git a/helpers/gal_bitmap_font/README b/tools/gal_bitmap_font/README similarity index 100% rename from helpers/gal_bitmap_font/README rename to tools/gal_bitmap_font/README diff --git a/helpers/gal_bitmap_font/UbuntuMono-R.ttf_sdf.png b/tools/gal_bitmap_font/UbuntuMono-R.ttf_sdf.png similarity index 100% rename from helpers/gal_bitmap_font/UbuntuMono-R.ttf_sdf.png rename to tools/gal_bitmap_font/UbuntuMono-R.ttf_sdf.png diff --git a/helpers/gal_bitmap_font/UbuntuMono-R.ttf_sdf.txt b/tools/gal_bitmap_font/UbuntuMono-R.ttf_sdf.txt similarity index 100% rename from helpers/gal_bitmap_font/UbuntuMono-R.ttf_sdf.txt rename to tools/gal_bitmap_font/UbuntuMono-R.ttf_sdf.txt diff --git a/helpers/gal_bitmap_font/bitmap_font.fnt b/tools/gal_bitmap_font/bitmap_font.fnt similarity index 100% rename from helpers/gal_bitmap_font/bitmap_font.fnt rename to tools/gal_bitmap_font/bitmap_font.fnt diff --git a/helpers/gal_bitmap_font/bitmap_font.png b/tools/gal_bitmap_font/bitmap_font.png similarity index 100% rename from helpers/gal_bitmap_font/bitmap_font.png rename to tools/gal_bitmap_font/bitmap_font.png diff --git a/helpers/gal_bitmap_font/bitmap_font_2048.fnt b/tools/gal_bitmap_font/bitmap_font_2048.fnt similarity index 100% rename from helpers/gal_bitmap_font/bitmap_font_2048.fnt rename to tools/gal_bitmap_font/bitmap_font_2048.fnt diff --git a/helpers/gal_bitmap_font/bitmap_font_2048_0.png b/tools/gal_bitmap_font/bitmap_font_2048_0.png similarity index 100% rename from helpers/gal_bitmap_font/bitmap_font_2048_0.png rename to tools/gal_bitmap_font/bitmap_font_2048_0.png diff --git a/helpers/gal_bitmap_font/bitmap_font_2048_0_img.c b/tools/gal_bitmap_font/bitmap_font_2048_0_img.c similarity index 100% rename from helpers/gal_bitmap_font/bitmap_font_2048_0_img.c rename to tools/gal_bitmap_font/bitmap_font_2048_0_img.c diff --git a/helpers/gal_bitmap_font/bitmap_font_2048_desc.c b/tools/gal_bitmap_font/bitmap_font_2048_desc.c similarity index 100% rename from helpers/gal_bitmap_font/bitmap_font_2048_desc.c rename to tools/gal_bitmap_font/bitmap_font_2048_desc.c diff --git a/helpers/gal_bitmap_font/bitmap_font_desc.c b/tools/gal_bitmap_font/bitmap_font_desc.c similarity index 100% rename from helpers/gal_bitmap_font/bitmap_font_desc.c rename to tools/gal_bitmap_font/bitmap_font_desc.c diff --git a/helpers/gal_bitmap_font/bitmap_font_img.c b/tools/gal_bitmap_font/bitmap_font_img.c similarity index 100% rename from helpers/gal_bitmap_font/bitmap_font_img.c rename to tools/gal_bitmap_font/bitmap_font_img.c diff --git a/helpers/gal_bitmap_font/fnt2struct.py b/tools/gal_bitmap_font/fnt2struct.py similarity index 100% rename from helpers/gal_bitmap_font/fnt2struct.py rename to tools/gal_bitmap_font/fnt2struct.py diff --git a/helpers/gal_bitmap_font/fnt2struct_2.py b/tools/gal_bitmap_font/fnt2struct_2.py similarity index 100% rename from helpers/gal_bitmap_font/fnt2struct_2.py rename to tools/gal_bitmap_font/fnt2struct_2.py diff --git a/helpers/gal_bitmap_font/font1024.bmfc b/tools/gal_bitmap_font/font1024.bmfc similarity index 100% rename from helpers/gal_bitmap_font/font1024.bmfc rename to tools/gal_bitmap_font/font1024.bmfc diff --git a/helpers/gal_bitmap_font/font2048.bmfc b/tools/gal_bitmap_font/font2048.bmfc similarity index 100% rename from helpers/gal_bitmap_font/font2048.bmfc rename to tools/gal_bitmap_font/font2048.bmfc diff --git a/helpers/gal_bitmap_font/hiero_desc.c b/tools/gal_bitmap_font/hiero_desc.c similarity index 100% rename from helpers/gal_bitmap_font/hiero_desc.c rename to tools/gal_bitmap_font/hiero_desc.c diff --git a/helpers/gal_bitmap_font/hiero_img.c b/tools/gal_bitmap_font/hiero_img.c similarity index 100% rename from helpers/gal_bitmap_font/hiero_img.c rename to tools/gal_bitmap_font/hiero_img.c diff --git a/helpers/gal_bitmap_font/png2struct.py b/tools/gal_bitmap_font/png2struct.py similarity index 100% rename from helpers/gal_bitmap_font/png2struct.py rename to tools/gal_bitmap_font/png2struct.py diff --git a/helpers/git/fixes_alias b/tools/git/fixes_alias similarity index 89% rename from helpers/git/fixes_alias rename to tools/git/fixes_alias index 572f0f8d04..4cd2e6cfa5 100644 --- a/helpers/git/fixes_alias +++ b/tools/git/fixes_alias @@ -3,7 +3,7 @@ # Once the script is enabled, commit your changes and run 'git fixes 123456' to mark the last commit as a fix for issue #123456 # Enable by executing in the source root directory: - # git config --add include.path $(pwd)/helpers/git/fixes_alias + # git config --add include.path $(pwd)/tools/git/fixes_alias fixes = "!f() { \ COMMIT_MSG=$(git log -n1 --format=%B); \ diff --git a/helpers/git/format_alias b/tools/git/format_alias similarity index 100% rename from helpers/git/format_alias rename to tools/git/format_alias diff --git a/helpers/tools_to_build_newstroke-font/AUTHOR.txt b/tools/newstroke/AUTHOR.txt similarity index 100% rename from helpers/tools_to_build_newstroke-font/AUTHOR.txt rename to tools/newstroke/AUTHOR.txt diff --git a/helpers/tools_to_build_newstroke-font/CJK_symbol.lib b/tools/newstroke/CJK_symbol.lib similarity index 100% rename from helpers/tools_to_build_newstroke-font/CJK_symbol.lib rename to tools/newstroke/CJK_symbol.lib diff --git a/helpers/tools_to_build_newstroke-font/CKJ_wide.lib b/tools/newstroke/CKJ_wide.lib similarity index 100% rename from helpers/tools_to_build_newstroke-font/CKJ_wide.lib rename to tools/newstroke/CKJ_wide.lib diff --git a/helpers/tools_to_build_newstroke-font/README.txt b/tools/newstroke/README.txt similarity index 100% rename from helpers/tools_to_build_newstroke-font/README.txt rename to tools/newstroke/README.txt diff --git a/helpers/tools_to_build_newstroke-font/charlist.txt b/tools/newstroke/charlist.txt similarity index 100% rename from helpers/tools_to_build_newstroke-font/charlist.txt rename to tools/newstroke/charlist.txt diff --git a/helpers/tools_to_build_newstroke-font/charlist_without_CJK.txt b/tools/newstroke/charlist_without_CJK.txt similarity index 100% rename from helpers/tools_to_build_newstroke-font/charlist_without_CJK.txt rename to tools/newstroke/charlist_without_CJK.txt diff --git a/helpers/tools_to_build_newstroke-font/coord.txt b/tools/newstroke/coord.txt similarity index 100% rename from helpers/tools_to_build_newstroke-font/coord.txt rename to tools/newstroke/coord.txt diff --git a/helpers/tools_to_build_newstroke-font/font-cache.lib b/tools/newstroke/font-cache.lib similarity index 100% rename from helpers/tools_to_build_newstroke-font/font-cache.lib rename to tools/newstroke/font-cache.lib diff --git a/helpers/tools_to_build_newstroke-font/font.dcm b/tools/newstroke/font.dcm similarity index 100% rename from helpers/tools_to_build_newstroke-font/font.dcm rename to tools/newstroke/font.dcm diff --git a/helpers/tools_to_build_newstroke-font/font.kicad_pcb b/tools/newstroke/font.kicad_pcb similarity index 100% rename from helpers/tools_to_build_newstroke-font/font.kicad_pcb rename to tools/newstroke/font.kicad_pcb diff --git a/helpers/tools_to_build_newstroke-font/font.lib b/tools/newstroke/font.lib similarity index 100% rename from helpers/tools_to_build_newstroke-font/font.lib rename to tools/newstroke/font.lib diff --git a/helpers/tools_to_build_newstroke-font/font.pro b/tools/newstroke/font.pro similarity index 100% rename from helpers/tools_to_build_newstroke-font/font.pro rename to tools/newstroke/font.pro diff --git a/helpers/tools_to_build_newstroke-font/font.sch b/tools/newstroke/font.sch similarity index 100% rename from helpers/tools_to_build_newstroke-font/font.sch rename to tools/newstroke/font.sch diff --git a/helpers/tools_to_build_newstroke-font/font_draft.sch b/tools/newstroke/font_draft.sch similarity index 100% rename from helpers/tools_to_build_newstroke-font/font_draft.sch rename to tools/newstroke/font_draft.sch diff --git a/helpers/tools_to_build_newstroke-font/font_draft1.lib b/tools/newstroke/font_draft1.lib similarity index 100% rename from helpers/tools_to_build_newstroke-font/font_draft1.lib rename to tools/newstroke/font_draft1.lib diff --git a/helpers/tools_to_build_newstroke-font/fontconv.awk b/tools/newstroke/fontconv.awk similarity index 100% rename from helpers/tools_to_build_newstroke-font/fontconv.awk rename to tools/newstroke/fontconv.awk diff --git a/helpers/tools_to_build_newstroke-font/half_full.lib b/tools/newstroke/half_full.lib similarity index 100% rename from helpers/tools_to_build_newstroke-font/half_full.lib rename to tools/newstroke/half_full.lib diff --git a/helpers/tools_to_build_newstroke-font/hiragana.lib b/tools/newstroke/hiragana.lib similarity index 100% rename from helpers/tools_to_build_newstroke-font/hiragana.lib rename to tools/newstroke/hiragana.lib diff --git a/helpers/tools_to_build_newstroke-font/katakana.lib b/tools/newstroke/katakana.lib similarity index 100% rename from helpers/tools_to_build_newstroke-font/katakana.lib rename to tools/newstroke/katakana.lib diff --git a/helpers/tools_to_build_newstroke-font/scale.py b/tools/newstroke/scale.py similarity index 100% rename from helpers/tools_to_build_newstroke-font/scale.py rename to tools/newstroke/scale.py diff --git a/helpers/tools_to_build_newstroke-font/sym-lib-table b/tools/newstroke/sym-lib-table similarity index 100% rename from helpers/tools_to_build_newstroke-font/sym-lib-table rename to tools/newstroke/sym-lib-table diff --git a/helpers/tools_to_build_newstroke-font/symbol.dcm b/tools/newstroke/symbol.dcm similarity index 100% rename from helpers/tools_to_build_newstroke-font/symbol.dcm rename to tools/newstroke/symbol.dcm diff --git a/helpers/tools_to_build_newstroke-font/symbol.lib b/tools/newstroke/symbol.lib similarity index 100% rename from helpers/tools_to_build_newstroke-font/symbol.lib rename to tools/newstroke/symbol.lib diff --git a/helpers/tools_to_build_newstroke-font/symbols.sch b/tools/newstroke/symbols.sch similarity index 100% rename from helpers/tools_to_build_newstroke-font/symbols.sch rename to tools/newstroke/symbols.sch diff --git a/helpers/tools_to_build_newstroke-font/test.h b/tools/newstroke/test.h similarity index 100% rename from helpers/tools_to_build_newstroke-font/test.h rename to tools/newstroke/test.h diff --git a/helpers/tools_to_build_newstroke-font/testlist.txt b/tools/newstroke/testlist.txt similarity index 100% rename from helpers/tools_to_build_newstroke-font/testlist.txt rename to tools/newstroke/testlist.txt