Move internal scripts to the "helper" subdirectory

This patch implements the following TODO entry:

Re-arrange the source code structure so that the internal scripts would all sit
in a separate sub-directory. Internal scripts are those which users are not
supposed to run directly. For example, 'aiaiai-locker' is one of them.

Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>

diff --git a/.gitignore b/.gitignore
index 4361bc4c49a1ff1fce0221f3d3f1e30e98b01db1..d707290dff95a52994b99e96d7715181f1e9032e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-aiaiai-locker
+helpers/aiaiai-locker
 helpers/remap-log

diff --git a/Makefile b/Makefile
index a6c722ced3df3da56b6113dcf7599e3a1bd2cb2d..00039af1262abaf3d0a1918e7530d84dc890069f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,5 @@
-CFLAGS = -O2 -g -Wextra
-
 all:
-       $(CC) $(CFLAGS) -o aiaiai-locker aiaiai-locker.c
        make -C helpers
 
 clean:
-       $(RM) aiaiai-locker
        make -C helpers clean

diff --git a/doc/TODO.txt b/doc/TODO.txt
index 7652d160b66d5d06d7f2997920cb981f1faec82e..c5eed3877dd47b1d53fcc5234b7e036bb7215391 100644 (file)
--- a/doc/TODO.txt
+++ b/doc/TODO.txt
@@ -39,10 +39,6 @@ implementing them.
     instead of just failing. This is probably more user-friendly.
   * Describe some review policy, e.g., how many days I promise to wait
     for review/reply before applying patches.
-  * Re-arrange the source code structure so that the internal scripts
-    would all sit in a separate sub-directory. Internal scripts are
-    those which users are not supposed to run directly. For example,
-    'aiaiai-locker' is one of them.
 
 * Functional improvements
   * Gcc 4.8 change the format of warnings and now they look like this:

diff --git a/email/aiaiai-email-dispatcher b/email/aiaiai-email-dispatcher
index 7487cd9c5d03a503e6d213edded778004481d544..5920968466bf8c3edf068966b1475fdd43bb2bfc 100755 (executable)
--- a/email/aiaiai-email-dispatcher
+++ b/email/aiaiai-email-dispatcher
@@ -5,8 +5,9 @@
 # License: GPLv2
 
 srcdir="$(readlink -ev -- ${0%/*}/..)"
-PATH="$srcdir:$srcdir/email:$srcdir/helpers/libshell:$PATH"
+PATH="$srcdir/helpers:$srcdir/email:$srcdir/helpers/libshell:$PATH"
 
+echo $PATH
 . shell-error
 . shell-args
 . shell-signal

diff --git a/email/aiaiai-email-dispatcher-helper b/email/aiaiai-email-dispatcher-helper
index 7d0365d2320803897bc73de10344ddd9c64c4396..9dfe115c0b1ae6835d74fc62474fd05d7c052e5a 100755 (executable)
--- a/email/aiaiai-email-dispatcher-helper
+++ b/email/aiaiai-email-dispatcher-helper
@@ -5,7 +5,7 @@
 # License: GPLv2
 
 srcdir="$(readlink -ev -- ${0%/*}/..)"
-PATH="$srcdir:$srcdir/email:$srcdir/helpers/libshell:$PATH"
+PATH="$srcdir/helpers:$srcdir/email:$srcdir/libshell:$PATH"
 
 . shell-error
 . shell-signal

diff --git a/email/aiaiai-email-lda b/email/aiaiai-email-lda
index b9f28540b850fc6f216a975706584d66cbe3e968..770f96e348f47e088c8b348c1cd088de770deeed 100755 (executable)
--- a/email/aiaiai-email-lda
+++ b/email/aiaiai-email-lda
@@ -5,7 +5,7 @@
 # License: GPLv2
 
 srcdir="$(readlink -ev -- ${0%/*}/..)"
-PATH="$srcdir:$srcdir/email:$srcdir/helpers/libshell:$PATH"
+PATH="$srcdir/helpers:$srcdir/email:$srcdir/helpers/libshell:$PATH"
 
 . shell-error
 . shell-args

diff --git a/email/aiaiai-email-test-patchset b/email/aiaiai-email-test-patchset
index aa76b71f6a464b9acc1e3d0fdccfa0bccab8aff8..1988a7164d216e6a6f5a335c110cda032a032b39 100755 (executable)
--- a/email/aiaiai-email-test-patchset
+++ b/email/aiaiai-email-test-patchset
@@ -5,7 +5,7 @@
 # License: GPLv2
 
 srcdir="$(readlink -ev -- ${0%/*}/..)"
-PATH="$srcdir:$srcdir/email:$srcdir/helpers/libshell:$PATH"
+PATH="$srcdir:$srcdir/helpers:$srcdir/email:$srcdir/helpers/libshell:$PATH"
 
 . shell-error
 . shell-args

diff --git a/gerrit/aiaiai-jenkins-test-patchset b/gerrit/aiaiai-jenkins-test-patchset
index 326268b4eeb50ebd070e363e7a683c98c0aa4dd2..86294fcb14b22cfaac65c4cc0dcfefc6b84afad9 100755 (executable)
--- a/gerrit/aiaiai-jenkins-test-patchset
+++ b/gerrit/aiaiai-jenkins-test-patchset
@@ -4,8 +4,8 @@
 # Author: Artem Bityutskiy
 # License: GPLv2
 
-srcdir="$(readlink -ev -- ${0%/*})"
-PATH="$srcdir/..:$srcdir/../helpers/libshell:$PATH"
+srcdir="$(readlink -ev -- ${0%/*}/..)"
+PATH="$srcdir:$srcdir/helpers/libshell:$PATH"
 
 . shell-error
 . shell-args

diff --git a/helpers/Makefile b/helpers/Makefile
index cbc949329150be5cf28fcb6761bef847f106540f..4a06f739c125d779dc7be2148f17af219cba2de8 100644 (file)
--- a/helpers/Makefile
+++ b/helpers/Makefile
@@ -1,7 +1,6 @@
-CFLAGS = -O2 -g -Wextra
-
 all:
        $(CC) $(CFLAGS) -o remap-log remap-log.c
+       $(CC) $(CFLAGS) -o aiaiai-locker aiaiai-locker.c
 
 clean:
-       $(RM) remap-log
+       $(RM) remap-log aiaiai-locker

diff --git a/aiaiai-checker b/helpers/aiaiai-checker
similarity index 98%
rename from aiaiai-checker
rename to helpers/aiaiai-checker
index 1c68efcd458ef156ea62bbf39e051d9f991f15fc..048767023ef11e1019aa21416e2387ea7762b3fe 100755 (executable)
--- a/aiaiai-checker
+++ b/helpers/aiaiai-checker
@@ -5,7 +5,7 @@
 # License: GPLv2
 
 srcdir="$(readlink -ev -- ${0%/*})"
-PATH="$srcdir:$srcdir/helpers/libshell:$srcdir/helpers:$PATH"
+PATH="$srcdir:$srcdir/libshell:$PATH"
 
 . shell-error
 . shell-args

diff --git a/aiaiai-decode-rfc-2047 b/helpers/aiaiai-decode-rfc-2047
similarity index 100%
rename from aiaiai-decode-rfc-2047
rename to helpers/aiaiai-decode-rfc-2047

diff --git a/aiaiai-diff-log b/helpers/aiaiai-diff-log
similarity index 98%
rename from aiaiai-diff-log
rename to helpers/aiaiai-diff-log
index 54228d92bca60ee99e8fa957cfe6698be867361d..e053edc357f099788167589af0c9a60910f5d0ba 100755 (executable)
--- a/aiaiai-diff-log
+++ b/helpers/aiaiai-diff-log
@@ -6,7 +6,7 @@
 # License: GPLv2
 
 srcdir="$(readlink -ev -- ${0%/*})"
-PATH="$srcdir:$srcdir/helpers/libshell:$srcdir/helpers:$PATH"
+PATH="$srcdir:$srcdir/libshell:$PATH"
 
 . shell-error
 . shell-args

diff --git a/aiaiai-diff-log-helper b/helpers/aiaiai-diff-log-helper
similarity index 100%
rename from aiaiai-diff-log-helper
rename to helpers/aiaiai-diff-log-helper

diff --git a/aiaiai-locker.c b/helpers/aiaiai-locker.c
similarity index 100%
rename from aiaiai-locker.c
rename to helpers/aiaiai-locker.c

diff --git a/aiaiai-make-kernel b/helpers/aiaiai-make-kernel
similarity index 99%
rename from aiaiai-make-kernel
rename to helpers/aiaiai-make-kernel
index 3bb2f021e1dc38ee4f8a5be513dd95e513e43c08..71536296614a8e42a260be457bc32d608ea7e2ce 100755 (executable)
--- a/aiaiai-make-kernel
+++ b/helpers/aiaiai-make-kernel
@@ -5,7 +5,7 @@
 # License: GPLv2
 
 srcdir="$(readlink -ev -- ${0%/*})"
-export PATH="$srcdir:$srcdir/helpers/libshell:$srcdir/helpers:$PATH"
+export PATH="$srcdir:$srcdir/libshell:$PATH"
 
 . shell-error
 . shell-args

diff --git a/aiaiai-match-keywords b/helpers/aiaiai-match-keywords
similarity index 97%
rename from aiaiai-match-keywords
rename to helpers/aiaiai-match-keywords
index bab7902a881cd0e9bc73f0538087e8b979158c75..f316792469edcfa7624c9fd8d9bbe312eec14dda 100755 (executable)
--- a/aiaiai-match-keywords
+++ b/helpers/aiaiai-match-keywords
@@ -5,7 +5,7 @@
 # License: GPLv2
 
 srcdir="$(readlink -ev -- ${0%/*})"
-PATH="$srcdir:$srcdir/helpers/libshell:$PATH"
+PATH="$srcdir:$srcdir/libshell:$PATH"
 
 . shell-error
 . shell-args

diff --git a/aiaiai-sh-functions b/helpers/aiaiai-sh-functions
similarity index 100%
rename from aiaiai-sh-functions
rename to helpers/aiaiai-sh-functions

diff --git a/aiaiai-test-bisectability b/helpers/aiaiai-test-bisectability
similarity index 99%
rename from aiaiai-test-bisectability
rename to helpers/aiaiai-test-bisectability
index ffc0f5594ddfd089d751ff3f6eac721160742f59..913c0a6cbc251a4ea1bdb7aee9bdd2778a1cc6d4 100755 (executable)
--- a/aiaiai-test-bisectability
+++ b/helpers/aiaiai-test-bisectability
@@ -5,7 +5,7 @@
 # License: GPLv2
 
 srcdir="$(readlink -ev -- ${0%/*})"
-PATH="$srcdir:$srcdir/helpers/libshell:$srcdir/helpers:$PATH"
+PATH="$srcdir:$srcdir/libshell:$PATH"
 
 . shell-error
 . shell-args