[rtems-testing commit] Distribute cvs-helpers to other directories.

[Joel Sherrill]

Module:    rtems-testing
Branch:    master
Commit:    3f621085163cf2f3bb5bf6d0602b5f3fc6f7f4fd
Changeset: http://git.rtems.org/rtems-testing/commit/?id=3f621085163cf2f3bb5bf6d0602b5f3fc6f7f4fd

Author:    Joel Sherrill <joel.sherrill at oarcorp.com>
Date:      Sat Jan 14 02:30:14 2012 -0600

Distribute cvs-helpers to other directories.

---

 Makefile                                           |    6 +-
 cvs-helpers/ChangeLog                              |   65 --------------------
 merge-helpers/Makefile                             |    6 ++-
 {cvs-helpers => merge-helpers}/README              |    0
 {cvs-helpers => merge-helpers}/commit              |    0
 .../commit-with-changelog-diff                     |    0
 {cvs-helpers => merge-helpers}/mkChangeLogList     |    0
 {cvs-helpers => merge-helpers}/prepend             |    0
 {cvs-helpers => rtems-test-template}/Makefile      |    0
 {cvs-helpers => rtems-test-template}/mktest        |    0
 10 files changed, 8 insertions(+), 69 deletions(-)

diff --git a/Makefile b/Makefile
index d647b59..a060d88 100644
--- a/Makefile
+++ b/Makefile
@@ -7,22 +7,22 @@
 all:
 	make -C covoar
 	make -C sim-scripts
-	make -C cvs-helpers
 	make -C merge-helpers
+	make -C rtems-test-template
 	make -C coverity
 
 install:
 	make -C covoar install
 	make -C sim-scripts install
-	make -C cvs-helpers install
 	make -C merge-helpers install
+	make -C rtems-test-template install
 	make -C coverity install
 
 clean:
 	make -C covoar clean
 	make -C sim-scripts clean
-	make -C cvs-helpers clean
 	make -C merge-helpers clean
+	make -C rtems-test-template clean
 	make -C coverity clean
 	rm -rf bin
 
diff --git a/cvs-helpers/ChangeLog b/cvs-helpers/ChangeLog
deleted file mode 100644
index 46422e6..0000000
--- a/cvs-helpers/ChangeLog
+++ /dev/null
@@ -1,65 +0,0 @@
-2011-07-20	Joel Sherrill <joel.sherrill at oarcorp.com>
-
-	* mktest: Add option to put test number in.
-
-2011-01-28	Joel Sherrill <joel.sherrill at oarcorp.com>
-
-	* cvscommit: Now running Go tests on PowerPC (2/3 passing) and i386 (in
-	process).
-
-2011-01-04	Joel Sherrill <joel.sherrill at oarcorp.com>
-
-	* cvscommit, mkChangeLogList: Avoid processing autom4te.cache
-	directories and directories not added to CVS yet.
-
-2010-08-02	Joel Sherrill <joel.sherrill at oarcorp.com>
-
-	* mktest: Add .doc files with -kkv option so keyword expansion is on.
-	Otherwise cvs assumes it is a Word file and treats it as binary.
-
-2010-06-21	Joel Sherrill <joel.sherrill at oarcorp.com>
-
-	* mktest: Test backwards.
-
-2010-06-21	Joel Sherrill <joel.sherrill at oarcorp.com>
-
-	* mktest: Remove echo on cvs add and verify it works.
-
-2010-06-21	Joel Sherrill <joel.sherrill at oarcorp.com>
-
-	* mktest: Add generation of .cvsignore and first attempt at cvs add.
-
-2010-06-21	Joel Sherrill <joel.sherrill at oarcorp.com>
-
-	* Makefile: Add RTEMS test templates and test instantiator.
-	* mktest: New file.
-
-2010-04-09	Joel Sherrill <joel.sherrilL at OARcorp.com>
-
-	* mkChangeLogList: elif not else if
-
-2010-03-27	Joel Sherrill <joel.sherrill at oarcorp.com>
-
-	* mkChangeLogList: Add initial support for svn.
-
-2010-01-29	Joel Sherrill <joel.sherrill at oarcorp.com>
-
-	* mkChangeLogList: Fixed bug where new files and removed files messages
-	could go past the desired column.
-
-2010-01-19	Joel Sherrill <joel.sherrill at oarcorp.com>
-
-	* cvscommit, mkChangeLogList: Add Coverity Id support.
-
-2009-10-21	Joel Sherrill <joel.sherrill at oarcorp.com>
-
-	* cvscommit: Fix handling of files/directories with spaces in the name.
-
-2009-09-14	Joel Sherrill <joel.sherrill at OARcorp.com>
-
-	* Makefile: Add more files.
-
-2009-08-26	Joel Sherrill <joel.sherrill at oarcorp.com>
-
-	* ChangeLog, README, commit-with-changelog-diff: New files.
-
diff --git a/merge-helpers/Makefile b/merge-helpers/Makefile
index 26fd792..7f35d6c 100644
--- a/merge-helpers/Makefile
+++ b/merge-helpers/Makefile
@@ -3,7 +3,11 @@
 #
 
 INSTALL_DIR=../bin
-SCRIPTS=check_submission
+SCRIPTS  = check_submission
+SCRIPTS += commit-with-changelog-diff
+SCRIPTS += commit
+SCRIPTS += mkChangeLogList
+SCRIPTS += prepend
 
 all: prep ${SCRIPTS} install
 
diff --git a/cvs-helpers/README b/merge-helpers/README
similarity index 100%
rename from cvs-helpers/README
rename to merge-helpers/README
diff --git a/cvs-helpers/commit b/merge-helpers/commit
similarity index 100%
rename from cvs-helpers/commit
rename to merge-helpers/commit
diff --git a/cvs-helpers/commit-with-changelog-diff b/merge-helpers/commit-with-changelog-diff
similarity index 100%
rename from cvs-helpers/commit-with-changelog-diff
rename to merge-helpers/commit-with-changelog-diff
diff --git a/cvs-helpers/mkChangeLogList b/merge-helpers/mkChangeLogList
similarity index 100%
rename from cvs-helpers/mkChangeLogList
rename to merge-helpers/mkChangeLogList
diff --git a/cvs-helpers/prepend b/merge-helpers/prepend
similarity index 100%
rename from cvs-helpers/prepend
rename to merge-helpers/prepend
diff --git a/cvs-helpers/Makefile b/rtems-test-template/Makefile
similarity index 100%
rename from cvs-helpers/Makefile
rename to rtems-test-template/Makefile
diff --git a/cvs-helpers/mktest b/rtems-test-template/mktest
similarity index 100%
rename from cvs-helpers/mktest
rename to rtems-test-template/mktest