From 32f26f386a8560a41044890cf983e9478fb3daf2 Mon Sep 17 00:00:00 2001 From: Laurence Withers Date: Wed, 8 Aug 2007 12:03:18 +0000 Subject: [PATCH 1/6] Use numeric prefixes on source files --- scripts/build.app.c++-qt/{TopSource.cpp => 000_TopSource.cpp} | 0 scripts/build.app.c++-qt/build.app | 2 +- scripts/build.app.c++-qt/build.install-app | 2 +- scripts/build.app.c++-qt/build.monolithic | 2 +- scripts/build.app.c++-qt/instantiate | 2 +- scripts/build.app.c++/{TopSource.cpp => 000_TopSource.cpp} | 0 scripts/build.app.c++/build.app | 2 +- scripts/build.app.c++/build.install-app | 2 +- scripts/build.app.c++/build.monolithic | 2 +- scripts/build.app.c++/instantiate | 2 +- scripts/build.app.c/{TopSource.c => 000_TopSource.c} | 2 +- scripts/build.app.c/build.app | 2 +- scripts/build.app.c/build.install-app | 2 +- scripts/build.app.c/build.monolithic | 4 ++-- scripts/build.app.c/instantiate | 2 +- scripts/build.app.sh/build.install-app | 2 +- scripts/build.app.sh/instantiate | 2 +- scripts/build.docs.doxygen/build.docs | 2 +- scripts/build.docs.doxygen/build.install-docs | 2 +- scripts/build.docs.doxygen/instantiate | 2 +- scripts/build.docs.none/build.install-docs | 2 +- scripts/build.docs.none/instantiate | 2 +- scripts/build.files.none/build.install-files | 2 +- scripts/build.files.none/instantiate | 2 +- .../build.firmware.gpasm/{TopSource.asm => 000_TopSource.asm} | 0 scripts/build.firmware.gpasm/build.firmware | 2 +- scripts/build.firmware.gpasm/build.install-firmware | 2 +- scripts/build.firmware.gpasm/build.monolithic | 2 +- scripts/build.firmware.gpasm/instantiate | 2 +- scripts/build.firmware.sdcc/{TopSource.c => 000_TopSource.c} | 2 +- scripts/build.firmware.sdcc/build.firmware | 2 +- scripts/build.firmware.sdcc/build.install-firmware | 2 +- scripts/build.firmware.sdcc/build.monolithic | 2 +- scripts/build.firmware.sdcc/instantiate | 2 +- scripts/build.lib.c++/{TopHeader.h => 000_TopHeader.h} | 2 +- scripts/build.lib.c++/{TopSource.cpp => 000_TopSource.cpp} | 0 scripts/build.lib.c++/{BottomHeader.h => 999_BottomHeader.h} | 2 +- scripts/build.lib.c++/build.install-lib | 2 +- scripts/build.lib.c++/build.lib | 2 +- scripts/build.lib.c++/build.monolithic | 2 +- scripts/build.lib.c++/config-script | 2 +- scripts/build.lib.c++/instantiate | 2 +- scripts/build.lib.c/{TopHeader.h => 000_TopHeader.h} | 2 +- scripts/build.lib.c/{TopSource.c => 000_TopSource.c} | 2 +- scripts/build.lib.c/{BottomHeader.h => 999_BottomHeader.h} | 2 +- scripts/build.lib.c/build.install-lib | 2 +- scripts/build.lib.c/build.lib | 2 +- scripts/build.lib.c/build.monolithic | 2 +- scripts/build.lib.c/config-script | 2 +- scripts/build.lib.c/instantiate | 2 +- scripts/build.module.c/{TopSource.c => 000_TopSource.c} | 2 +- scripts/build.module.c/build.install-module | 2 +- scripts/build.module.c/build.module | 2 +- scripts/build.module.c/build.monolithic | 2 +- scripts/build.module.c/instantiate | 2 +- scripts/build.tests.c++/build.default | 2 +- scripts/build.tests.c++/build.tests | 2 +- scripts/build.tests.c++/instantiate | 2 +- scripts/build.tests.c/build.default | 2 +- scripts/build.tests.c/build.tests | 2 +- scripts/build.tests.c/instantiate | 2 +- scripts/module-create.sh | 2 +- scripts/release.sh | 2 +- 63 files changed, 60 insertions(+), 60 deletions(-) rename scripts/build.app.c++-qt/{TopSource.cpp => 000_TopSource.cpp} (100%) rename scripts/build.app.c++/{TopSource.cpp => 000_TopSource.cpp} (100%) rename scripts/build.app.c/{TopSource.c => 000_TopSource.c} (89%) rename scripts/build.firmware.gpasm/{TopSource.asm => 000_TopSource.asm} (100%) rename scripts/build.firmware.sdcc/{TopSource.c => 000_TopSource.c} (89%) rename scripts/build.lib.c++/{TopHeader.h => 000_TopHeader.h} (90%) rename scripts/build.lib.c++/{TopSource.cpp => 000_TopSource.cpp} (100%) rename scripts/build.lib.c++/{BottomHeader.h => 999_BottomHeader.h} (86%) rename scripts/build.lib.c/{TopHeader.h => 000_TopHeader.h} (90%) rename scripts/build.lib.c/{TopSource.c => 000_TopSource.c} (90%) rename scripts/build.lib.c/{BottomHeader.h => 999_BottomHeader.h} (86%) rename scripts/build.module.c/{TopSource.c => 000_TopSource.c} (88%) diff --git a/scripts/build.app.c++-qt/TopSource.cpp b/scripts/build.app.c++-qt/000_TopSource.cpp similarity index 100% rename from scripts/build.app.c++-qt/TopSource.cpp rename to scripts/build.app.c++-qt/000_TopSource.cpp diff --git a/scripts/build.app.c++-qt/build.app b/scripts/build.app.c++-qt/build.app index c9e0aaf..67568a0 100644 --- a/scripts/build.app.c++-qt/build.app +++ b/scripts/build.app.c++-qt/build.app @@ -38,4 +38,4 @@ then fi # kate: @KATE_MODELINE@ -# vim: @VIM_MODELINE@ +# vim: syntax=sh:@VIM_MODELINE@ diff --git a/scripts/build.app.c++-qt/build.install-app b/scripts/build.app.c++-qt/build.install-app index 739cc0c..8d77b7f 100644 --- a/scripts/build.app.c++-qt/build.install-app +++ b/scripts/build.app.c++-qt/build.install-app @@ -9,4 +9,4 @@ install_file "${@CNAME@}" "${BINDIR}" 0755 || return 1 print_success "Done" # kate: @KATE_MODELINE@ -# vim: @VIM_MODELINE@ +# vim: syntax=sh:@VIM_MODELINE@ diff --git a/scripts/build.app.c++-qt/build.monolithic b/scripts/build.app.c++-qt/build.monolithic index 2df0dc8..9fb05f8 100644 --- a/scripts/build.app.c++-qt/build.monolithic +++ b/scripts/build.app.c++-qt/build.monolithic @@ -24,4 +24,4 @@ then fi # kate: @KATE_MODELINE@ -# vim: @VIM_MODELINE@ +# vim: syntax=sh:@VIM_MODELINE@ diff --git a/scripts/build.app.c++-qt/instantiate b/scripts/build.app.c++-qt/instantiate index 22a11a0..646a88d 100644 --- a/scripts/build.app.c++-qt/instantiate +++ b/scripts/build.app.c++-qt/instantiate @@ -12,4 +12,4 @@ add_config_option "BINDIR" "${COPT_BINDIR_DEFAULT}" true # kate: replace-trailing-space-save true; space-indent true; tab-width 4; -# vim: expandtab:ts=4:sw=4 +# vim: syntax=sh:expandtab:ts=4:sw=4 diff --git a/scripts/build.app.c++/TopSource.cpp b/scripts/build.app.c++/000_TopSource.cpp similarity index 100% rename from scripts/build.app.c++/TopSource.cpp rename to scripts/build.app.c++/000_TopSource.cpp diff --git a/scripts/build.app.c++/build.app b/scripts/build.app.c++/build.app index 397c3a2..9b524d5 100644 --- a/scripts/build.app.c++/build.app +++ b/scripts/build.app.c++/build.app @@ -38,4 +38,4 @@ then fi # kate: @KATE_MODELINE@ -# vim: @VIM_MODELINE@ +# vim: syntax=sh:@VIM_MODELINE@ diff --git a/scripts/build.app.c++/build.install-app b/scripts/build.app.c++/build.install-app index 739cc0c..8d77b7f 100644 --- a/scripts/build.app.c++/build.install-app +++ b/scripts/build.app.c++/build.install-app @@ -9,4 +9,4 @@ install_file "${@CNAME@}" "${BINDIR}" 0755 || return 1 print_success "Done" # kate: @KATE_MODELINE@ -# vim: @VIM_MODELINE@ +# vim: syntax=sh:@VIM_MODELINE@ diff --git a/scripts/build.app.c++/build.monolithic b/scripts/build.app.c++/build.monolithic index 53f171c..ba32701 100644 --- a/scripts/build.app.c++/build.monolithic +++ b/scripts/build.app.c++/build.monolithic @@ -15,4 +15,4 @@ then fi # kate: @KATE_MODELINE@ -# vim: @VIM_MODELINE@ +# vim: syntax=sh:@VIM_MODELINE@ diff --git a/scripts/build.app.c++/instantiate b/scripts/build.app.c++/instantiate index 492e72e..b4b8819 100644 --- a/scripts/build.app.c++/instantiate +++ b/scripts/build.app.c++/instantiate @@ -11,4 +11,4 @@ add_config_option "BINDIR" "${COPT_BINDIR_DEFAULT}" true # kate: replace-trailing-space-save true; space-indent true; tab-width 4; -# vim: expandtab:ts=4:sw=4 +# vim: syntax=sh:expandtab:ts=4:sw=4 diff --git a/scripts/build.app.c/TopSource.c b/scripts/build.app.c/000_TopSource.c similarity index 89% rename from scripts/build.app.c/TopSource.c rename to scripts/build.app.c/000_TopSource.c index debda3b..e7768f2 100644 --- a/scripts/build.app.c/TopSource.c +++ b/scripts/build.app.c/000_TopSource.c @@ -1,4 +1,4 @@ -/* @P@/src/@NAME@/TopSource.c +/* @P@/src/@NAME@/000_TopSource.c * * (c)2007, @AUTHOR@, <@EMAIL@>. * Released under the GNU GPLv2. See file COPYING or diff --git a/scripts/build.app.c/build.app b/scripts/build.app.c/build.app index 11b22c6..df73192 100644 --- a/scripts/build.app.c/build.app +++ b/scripts/build.app.c/build.app @@ -38,4 +38,4 @@ then fi # kate: @KATE_MODELINE@ -# vim: @VIM_MODELINE@ +# vim: syntax=sh:@VIM_MODELINE@ diff --git a/scripts/build.app.c/build.install-app b/scripts/build.app.c/build.install-app index 739cc0c..8d77b7f 100644 --- a/scripts/build.app.c/build.install-app +++ b/scripts/build.app.c/build.install-app @@ -9,4 +9,4 @@ install_file "${@CNAME@}" "${BINDIR}" 0755 || return 1 print_success "Done" # kate: @KATE_MODELINE@ -# vim: @VIM_MODELINE@ +# vim: syntax=sh:@VIM_MODELINE@ diff --git a/scripts/build.app.c/build.monolithic b/scripts/build.app.c/build.monolithic index d56c004..8f540e6 100644 --- a/scripts/build.app.c/build.monolithic +++ b/scripts/build.app.c/build.monolithic @@ -7,7 +7,7 @@ MONOLITHIC_TESTS="src/@NAME@/build.app src/@NAME@/build.monolithic" if [ -z "${@CNAME@_MONOLITHIC}" ] then - MONOLITHIC_SOURCE="$(echo src/@NAME@/TopSource.c)" + MONOLITHIC_SOURCE="$(echo src/@NAME@/*.c)" make_monolithic ${SRC} C || return 1 @CNAME@_MONOLITHIC=1 @@ -15,4 +15,4 @@ then fi # kate: @KATE_MODELINE@ -# vim: @VIM_MODELINE@ +# vim: syntax=sh:@VIM_MODELINE@ diff --git a/scripts/build.app.c/instantiate b/scripts/build.app.c/instantiate index dc6b368..da8f4af 100644 --- a/scripts/build.app.c/instantiate +++ b/scripts/build.app.c/instantiate @@ -11,4 +11,4 @@ add_config_option "BINDIR" "${COPT_BINDIR_DEFAULT}" true # kate: replace-trailing-space-save true; space-indent true; tab-width 4; -# vim: expandtab:ts=4:sw=4 +# vim: syntax=sh:expandtab:ts=4:sw=4 diff --git a/scripts/build.app.sh/build.install-app b/scripts/build.app.sh/build.install-app index a6e27a5..645d595 100644 --- a/scripts/build.app.sh/build.install-app +++ b/scripts/build.app.sh/build.install-app @@ -10,4 +10,4 @@ done print_success "Done" # kate: @KATE_MODELINE@ -# vim: @VIM_MODELINE@ +# vim: syntax=sh:@VIM_MODELINE@ diff --git a/scripts/build.app.sh/instantiate b/scripts/build.app.sh/instantiate index 10fc290..62eafc5 100644 --- a/scripts/build.app.sh/instantiate +++ b/scripts/build.app.sh/instantiate @@ -9,4 +9,4 @@ add_config_option "BINDIR" "${COPT_BINDIR_DEFAULT}" true # kate: replace-trailing-space-save true; space-indent true; tab-width 4; -# vim: expandtab:ts=4:sw=4 +# vim: syntax=sh:expandtab:ts=4:sw=4 diff --git a/scripts/build.docs.doxygen/build.docs b/scripts/build.docs.doxygen/build.docs index a90714c..6be6f9d 100644 --- a/scripts/build.docs.doxygen/build.docs +++ b/scripts/build.docs.doxygen/build.docs @@ -40,4 +40,4 @@ then fi # kate: @KATE_MODELINE@ -# vim: @VIM_MODELINE@ +# vim: syntax=sh:@VIM_MODELINE@ diff --git a/scripts/build.docs.doxygen/build.install-docs b/scripts/build.docs.doxygen/build.install-docs index d6d60a2..a228999 100644 --- a/scripts/build.docs.doxygen/build.install-docs +++ b/scripts/build.docs.doxygen/build.install-docs @@ -18,4 +18,4 @@ done print_success "Documentation installed" # kate: @KATE_MODELINE@ -# vim: @VIM_MODELINE@ +# vim: syntax=sh:@VIM_MODELINE@ diff --git a/scripts/build.docs.doxygen/instantiate b/scripts/build.docs.doxygen/instantiate index 5c0eb7c..9dcd4d8 100644 --- a/scripts/build.docs.doxygen/instantiate +++ b/scripts/build.docs.doxygen/instantiate @@ -9,4 +9,4 @@ add_config_option "DOCSDIR" "${COPT_DOCSDIR_DEFAULT}" true # kate: replace-trailing-space-save true; space-indent true; tab-width 4; -# vim: expandtab:ts=4:sw=4 +# vim: syntax=sh:expandtab:ts=4:sw=4 diff --git a/scripts/build.docs.none/build.install-docs b/scripts/build.docs.none/build.install-docs index 8a59f39..181a453 100644 --- a/scripts/build.docs.none/build.install-docs +++ b/scripts/build.docs.none/build.install-docs @@ -11,4 +11,4 @@ done print_success "Documentation installed" # kate: @KATE_MODELINE@ -# vim: @VIM_MODELINE@ +# vim: syntax=sh:@VIM_MODELINE@ diff --git a/scripts/build.docs.none/instantiate b/scripts/build.docs.none/instantiate index 5c0eb7c..9dcd4d8 100644 --- a/scripts/build.docs.none/instantiate +++ b/scripts/build.docs.none/instantiate @@ -9,4 +9,4 @@ add_config_option "DOCSDIR" "${COPT_DOCSDIR_DEFAULT}" true # kate: replace-trailing-space-save true; space-indent true; tab-width 4; -# vim: expandtab:ts=4:sw=4 +# vim: syntax=sh:expandtab:ts=4:sw=4 diff --git a/scripts/build.files.none/build.install-files b/scripts/build.files.none/build.install-files index d2be502..e6daf59 100644 --- a/scripts/build.files.none/build.install-files +++ b/scripts/build.files.none/build.install-files @@ -13,4 +13,4 @@ done print_success "Files installed" # kate: @KATE_MODELINE@ -# vim: @VIM_MODELINE@ +# vim: syntax=sh:@VIM_MODELINE@ diff --git a/scripts/build.files.none/instantiate b/scripts/build.files.none/instantiate index 9fb90de..0cf761b 100644 --- a/scripts/build.files.none/instantiate +++ b/scripts/build.files.none/instantiate @@ -8,4 +8,4 @@ do_parameter_subst true # kate: replace-trailing-space-save true; space-indent true; tab-width 4; -# vim: expandtab:ts=4:sw=4 +# vim: syntax=sh:expandtab:ts=4:sw=4 diff --git a/scripts/build.firmware.gpasm/TopSource.asm b/scripts/build.firmware.gpasm/000_TopSource.asm similarity index 100% rename from scripts/build.firmware.gpasm/TopSource.asm rename to scripts/build.firmware.gpasm/000_TopSource.asm diff --git a/scripts/build.firmware.gpasm/build.firmware b/scripts/build.firmware.gpasm/build.firmware index 6651c69..d9fe502 100644 --- a/scripts/build.firmware.gpasm/build.firmware +++ b/scripts/build.firmware.gpasm/build.firmware @@ -39,4 +39,4 @@ then fi # kate: @KATE_MODELINE@ -# vim: @VIM_MODELINE@ +# vim: syntax=sh:@VIM_MODELINE@ diff --git a/scripts/build.firmware.gpasm/build.install-firmware b/scripts/build.firmware.gpasm/build.install-firmware index e720ead..9e75af1 100644 --- a/scripts/build.firmware.gpasm/build.install-firmware +++ b/scripts/build.firmware.gpasm/build.install-firmware @@ -9,4 +9,4 @@ install_file "${@CNAME@}" "${HEXDIR}" 0755 || return 1 print_success "Done" # kate: @KATE_MODELINE@ -# vim: @VIM_MODELINE@ +# vim: syntax=sh:@VIM_MODELINE@ diff --git a/scripts/build.firmware.gpasm/build.monolithic b/scripts/build.firmware.gpasm/build.monolithic index 15bf7da..68df7a9 100644 --- a/scripts/build.firmware.gpasm/build.monolithic +++ b/scripts/build.firmware.gpasm/build.monolithic @@ -15,4 +15,4 @@ then fi # kate: @KATE_MODELINE@ -# vim: @VIM_MODELINE@ +# vim: syntax=sh:@VIM_MODELINE@ diff --git a/scripts/build.firmware.gpasm/instantiate b/scripts/build.firmware.gpasm/instantiate index 813a515..95e47b8 100644 --- a/scripts/build.firmware.gpasm/instantiate +++ b/scripts/build.firmware.gpasm/instantiate @@ -11,4 +11,4 @@ add_config_option "GPASM_FLAGS" "" true # kate: replace-trailing-space-save true; space-indent true; tab-width 4; -# vim: expandtab:ts=4:sw=4 +# vim: syntax=sh:expandtab:ts=4:sw=4 diff --git a/scripts/build.firmware.sdcc/TopSource.c b/scripts/build.firmware.sdcc/000_TopSource.c similarity index 89% rename from scripts/build.firmware.sdcc/TopSource.c rename to scripts/build.firmware.sdcc/000_TopSource.c index debda3b..e7768f2 100644 --- a/scripts/build.firmware.sdcc/TopSource.c +++ b/scripts/build.firmware.sdcc/000_TopSource.c @@ -1,4 +1,4 @@ -/* @P@/src/@NAME@/TopSource.c +/* @P@/src/@NAME@/000_TopSource.c * * (c)2007, @AUTHOR@, <@EMAIL@>. * Released under the GNU GPLv2. See file COPYING or diff --git a/scripts/build.firmware.sdcc/build.firmware b/scripts/build.firmware.sdcc/build.firmware index 33ce002..044bd37 100644 --- a/scripts/build.firmware.sdcc/build.firmware +++ b/scripts/build.firmware.sdcc/build.firmware @@ -38,4 +38,4 @@ then fi # kate: @KATE_MODELINE@ -# vim: @VIM_MODELINE@ +# vim: syntax=sh:@VIM_MODELINE@ diff --git a/scripts/build.firmware.sdcc/build.install-firmware b/scripts/build.firmware.sdcc/build.install-firmware index e720ead..9e75af1 100644 --- a/scripts/build.firmware.sdcc/build.install-firmware +++ b/scripts/build.firmware.sdcc/build.install-firmware @@ -9,4 +9,4 @@ install_file "${@CNAME@}" "${HEXDIR}" 0755 || return 1 print_success "Done" # kate: @KATE_MODELINE@ -# vim: @VIM_MODELINE@ +# vim: syntax=sh:@VIM_MODELINE@ diff --git a/scripts/build.firmware.sdcc/build.monolithic b/scripts/build.firmware.sdcc/build.monolithic index cd0120f..9065ded 100644 --- a/scripts/build.firmware.sdcc/build.monolithic +++ b/scripts/build.firmware.sdcc/build.monolithic @@ -15,4 +15,4 @@ then fi # kate: @KATE_MODELINE@ -# vim: @VIM_MODELINE@ +# vim: syntax=sh:@VIM_MODELINE@ diff --git a/scripts/build.firmware.sdcc/instantiate b/scripts/build.firmware.sdcc/instantiate index 7947a79..37a2891 100644 --- a/scripts/build.firmware.sdcc/instantiate +++ b/scripts/build.firmware.sdcc/instantiate @@ -11,4 +11,4 @@ add_config_option "SDCCFLAGS" "" true # kate: replace-trailing-space-save true; space-indent true; tab-width 4; -# vim: expandtab:ts=4:sw=4 +# vim: syntax=sh:expandtab:ts=4:sw=4 diff --git a/scripts/build.lib.c++/TopHeader.h b/scripts/build.lib.c++/000_TopHeader.h similarity index 90% rename from scripts/build.lib.c++/TopHeader.h rename to scripts/build.lib.c++/000_TopHeader.h index 347827c..84aecc7 100644 --- a/scripts/build.lib.c++/TopHeader.h +++ b/scripts/build.lib.c++/000_TopHeader.h @@ -1,4 +1,4 @@ -/* @P@/src/@NAME@/TopHeader.h +/* @P@/src/@NAME@/000_TopHeader.h * * (c)2007, @AUTHOR@, <@EMAIL@>. * Released under the GNU GPLv2. See file COPYING or diff --git a/scripts/build.lib.c++/TopSource.cpp b/scripts/build.lib.c++/000_TopSource.cpp similarity index 100% rename from scripts/build.lib.c++/TopSource.cpp rename to scripts/build.lib.c++/000_TopSource.cpp diff --git a/scripts/build.lib.c++/BottomHeader.h b/scripts/build.lib.c++/999_BottomHeader.h similarity index 86% rename from scripts/build.lib.c++/BottomHeader.h rename to scripts/build.lib.c++/999_BottomHeader.h index 27b7e48..4523c61 100644 --- a/scripts/build.lib.c++/BottomHeader.h +++ b/scripts/build.lib.c++/999_BottomHeader.h @@ -1,4 +1,4 @@ -/* @P@/src/@NAME@/BottomHeader.h +/* @P@/src/@NAME@/999_BottomHeader.h * * (c)2007, @AUTHOR@, <@EMAIL@>. * Released under the GNU GPLv2. See file COPYING or diff --git a/scripts/build.lib.c++/build.install-lib b/scripts/build.lib.c++/build.install-lib index 721f818..80df111 100644 --- a/scripts/build.lib.c++/build.install-lib +++ b/scripts/build.lib.c++/build.install-lib @@ -36,4 +36,4 @@ do_cmd chmod 0644 "${CONFFILE}" print_success "Done" # kate: @KATE_MODELINE@ -# vim: @VIM_MODELINE@ +# vim: syntax=sh:@VIM_MODELINE@ diff --git a/scripts/build.lib.c++/build.lib b/scripts/build.lib.c++/build.lib index 06949ab..dda7750 100644 --- a/scripts/build.lib.c++/build.lib +++ b/scripts/build.lib.c++/build.lib @@ -52,4 +52,4 @@ then fi # kate: @KATE_MODELINE@ -# vim: @VIM_MODELINE@ +# vim: syntax=sh:@VIM_MODELINE@ diff --git a/scripts/build.lib.c++/build.monolithic b/scripts/build.lib.c++/build.monolithic index 5e8b56f..5435506 100644 --- a/scripts/build.lib.c++/build.monolithic +++ b/scripts/build.lib.c++/build.monolithic @@ -18,4 +18,4 @@ then MONOLITHIC_DOC="${MONOLITHIC_DOC} ${HDR}" fi # kate: @KATE_MODELINE@ -# vim: @VIM_MODELINE@ +# vim: syntax=sh:@VIM_MODELINE@ diff --git a/scripts/build.lib.c++/config-script b/scripts/build.lib.c++/config-script index 39b7ba6..d3e4b02 100644 --- a/scripts/build.lib.c++/config-script +++ b/scripts/build.lib.c++/config-script @@ -94,5 +94,5 @@ true -# vim: @VIM_MODELINE@ +# vim: syntax=sh:@VIM_MODELINE@ # kate: @KATE_MODELINE@ diff --git a/scripts/build.lib.c++/instantiate b/scripts/build.lib.c++/instantiate index 963f530..840ecf6 100644 --- a/scripts/build.lib.c++/instantiate +++ b/scripts/build.lib.c++/instantiate @@ -28,4 +28,4 @@ add_config_option "FINALINCLUDEDIR" "${COPT_FINALINCLUDEDIR_DEFAULT}" true # kate: replace-trailing-space-save true; space-indent true; tab-width 4; -# vim: expandtab:ts=4:sw=4 +# vim: syntax=sh:expandtab:ts=4:sw=4 diff --git a/scripts/build.lib.c/TopHeader.h b/scripts/build.lib.c/000_TopHeader.h similarity index 90% rename from scripts/build.lib.c/TopHeader.h rename to scripts/build.lib.c/000_TopHeader.h index 18d1c02..9aad683 100644 --- a/scripts/build.lib.c/TopHeader.h +++ b/scripts/build.lib.c/000_TopHeader.h @@ -1,4 +1,4 @@ -/* @P@/src/@NAME@/TopHeader.h +/* @P@/src/@NAME@/000_TopHeader.h * * (c)2007, @AUTHOR@, <@EMAIL@>. * Released under the GNU GPLv2. See file COPYING or diff --git a/scripts/build.lib.c/TopSource.c b/scripts/build.lib.c/000_TopSource.c similarity index 90% rename from scripts/build.lib.c/TopSource.c rename to scripts/build.lib.c/000_TopSource.c index 32f6799..61916e9 100644 --- a/scripts/build.lib.c/TopSource.c +++ b/scripts/build.lib.c/000_TopSource.c @@ -1,4 +1,4 @@ -/* @P@/src/@NAME@/TopSource.c +/* @P@/src/@NAME@/000_TopSource.c * * (c)2007, @AUTHOR@, <@EMAIL@>. * Released under the GNU GPLv2. See file COPYING or diff --git a/scripts/build.lib.c/BottomHeader.h b/scripts/build.lib.c/999_BottomHeader.h similarity index 86% rename from scripts/build.lib.c/BottomHeader.h rename to scripts/build.lib.c/999_BottomHeader.h index 27b7e48..4523c61 100644 --- a/scripts/build.lib.c/BottomHeader.h +++ b/scripts/build.lib.c/999_BottomHeader.h @@ -1,4 +1,4 @@ -/* @P@/src/@NAME@/BottomHeader.h +/* @P@/src/@NAME@/999_BottomHeader.h * * (c)2007, @AUTHOR@, <@EMAIL@>. * Released under the GNU GPLv2. See file COPYING or diff --git a/scripts/build.lib.c/build.install-lib b/scripts/build.lib.c/build.install-lib index 7fa800f..b07ef88 100644 --- a/scripts/build.lib.c/build.install-lib +++ b/scripts/build.lib.c/build.install-lib @@ -37,4 +37,4 @@ do_cmd chmod 0755 "${CONFFILE}" print_success "Done" # kate: @KATE_MODELINE@ -# vim: @VIM_MODELINE@ +# vim: syntax=sh:@VIM_MODELINE@ diff --git a/scripts/build.lib.c/build.lib b/scripts/build.lib.c/build.lib index 0ee113e..48d0819 100644 --- a/scripts/build.lib.c/build.lib +++ b/scripts/build.lib.c/build.lib @@ -52,4 +52,4 @@ then fi # kate: @KATE_MODELINE@ -# vim: @VIM_MODELINE@ +# vim: syntax=sh:@VIM_MODELINE@ diff --git a/scripts/build.lib.c/build.monolithic b/scripts/build.lib.c/build.monolithic index bdecb43..ef8f88d 100644 --- a/scripts/build.lib.c/build.monolithic +++ b/scripts/build.lib.c/build.monolithic @@ -18,4 +18,4 @@ then MONOLITHIC_DOC="${MONOLITHIC_DOC} ${HDR}" fi # kate: @KATE_MODELINE@ -# vim: @VIM_MODELINE@ +# vim: syntax=sh:@VIM_MODELINE@ diff --git a/scripts/build.lib.c/config-script b/scripts/build.lib.c/config-script index 39b7ba6..d3e4b02 100644 --- a/scripts/build.lib.c/config-script +++ b/scripts/build.lib.c/config-script @@ -94,5 +94,5 @@ true -# vim: @VIM_MODELINE@ +# vim: syntax=sh:@VIM_MODELINE@ # kate: @KATE_MODELINE@ diff --git a/scripts/build.lib.c/instantiate b/scripts/build.lib.c/instantiate index cd9a400..e533e63 100644 --- a/scripts/build.lib.c/instantiate +++ b/scripts/build.lib.c/instantiate @@ -28,4 +28,4 @@ add_config_option "FINALINCLUDEDIR" "${COPT_FINALINCLUDEDIR_DEFAULT}" true # kate: replace-trailing-space-save true; space-indent true; tab-width 4; -# vim: expandtab:ts=4:sw=4 +# vim: syntax=sh:expandtab:ts=4:sw=4 diff --git a/scripts/build.module.c/TopSource.c b/scripts/build.module.c/000_TopSource.c similarity index 88% rename from scripts/build.module.c/TopSource.c rename to scripts/build.module.c/000_TopSource.c index 2eb68a0..d1fdb98 100644 --- a/scripts/build.module.c/TopSource.c +++ b/scripts/build.module.c/000_TopSource.c @@ -1,4 +1,4 @@ -/* @P@/src/@NAME@/TopSource.c +/* @P@/src/@NAME@/000_TopSource.c * * (c)2007, @AUTHOR@, <@EMAIL@>. * Released under the GNU GPLv2. See file COPYING or diff --git a/scripts/build.module.c/build.install-module b/scripts/build.module.c/build.install-module index c6254d6..0ecbca0 100644 --- a/scripts/build.module.c/build.install-module +++ b/scripts/build.module.c/build.install-module @@ -9,4 +9,4 @@ install_file ${@CNAME@} ${MODULEDIR} 0755 || return 1 print_success "Done" # kate: @KATE_MODELINE@ -# vim: @VIM_MODELINE@ +# vim: syntax=sh:@VIM_MODELINE@ diff --git a/scripts/build.module.c/build.module b/scripts/build.module.c/build.module index f80b382..cef9c24 100644 --- a/scripts/build.module.c/build.module +++ b/scripts/build.module.c/build.module @@ -36,4 +36,4 @@ then @CNAME@_BUILT=1 fi # kate: @KATE_MODELINE@ -# vim: @VIM_MODELINE@ +# vim: syntax=sh:@VIM_MODELINE@ diff --git a/scripts/build.module.c/build.monolithic b/scripts/build.module.c/build.monolithic index 789dc9e..54fdd56 100644 --- a/scripts/build.module.c/build.monolithic +++ b/scripts/build.module.c/build.monolithic @@ -14,4 +14,4 @@ then @CNAME@_MONOLITHIC=1 fi # kate: @KATE_MODELINE@ -# vim: @VIM_MODELINE@ +# vim: syntax=sh:@VIM_MODELINE@ diff --git a/scripts/build.module.c/instantiate b/scripts/build.module.c/instantiate index 1c99bcd..8061987 100644 --- a/scripts/build.module.c/instantiate +++ b/scripts/build.module.c/instantiate @@ -12,4 +12,4 @@ add_config_option "MODULEDIR" "${COPT_LIBDIR_DEFAULT}/@TODO@/" true # kate: replace-trailing-space-save true; space-indent true; tab-width 4; -# vim: expandtab:ts=4:sw=4 +# vim: syntax=sh:expandtab:ts=4:sw=4 diff --git a/scripts/build.tests.c++/build.default b/scripts/build.tests.c++/build.default index e31fc6a..fb77186 100644 --- a/scripts/build.tests.c++/build.default +++ b/scripts/build.tests.c++/build.default @@ -1,3 +1,3 @@ source src/@NAME@/build.tests # kate: @KATE_MODELINE@ -# vim: @VIM_MODELINE@ +# vim: syntax=sh:@VIM_MODELINE@ diff --git a/scripts/build.tests.c++/build.tests b/scripts/build.tests.c++/build.tests index 3724ef8..de271b3 100644 --- a/scripts/build.tests.c++/build.tests +++ b/scripts/build.tests.c++/build.tests @@ -40,4 +40,4 @@ then fi # kate: @KATE_MODELINE@ -# vim: @VIM_MODELINE@ +# vim: syntax=sh:@VIM_MODELINE@ diff --git a/scripts/build.tests.c++/instantiate b/scripts/build.tests.c++/instantiate index 0e73269..35a2f78 100644 --- a/scripts/build.tests.c++/instantiate +++ b/scripts/build.tests.c++/instantiate @@ -27,4 +27,4 @@ add_config_option "CFLAGS" "${COPT_CFLAGS_DEFAULT}" true # kate: replace-trailing-space-save true; space-indent true; tab-width 4; -# vim: expandtab:ts=4:sw=4 +# vim: syntax=sh:expandtab:ts=4:sw=4 diff --git a/scripts/build.tests.c/build.default b/scripts/build.tests.c/build.default index e31fc6a..fb77186 100644 --- a/scripts/build.tests.c/build.default +++ b/scripts/build.tests.c/build.default @@ -1,3 +1,3 @@ source src/@NAME@/build.tests # kate: @KATE_MODELINE@ -# vim: @VIM_MODELINE@ +# vim: syntax=sh:@VIM_MODELINE@ diff --git a/scripts/build.tests.c/build.tests b/scripts/build.tests.c/build.tests index 97399a8..ff20411 100644 --- a/scripts/build.tests.c/build.tests +++ b/scripts/build.tests.c/build.tests @@ -40,4 +40,4 @@ then fi # kate: @KATE_MODELINE@ -# vim: @VIM_MODELINE@ +# vim: syntax=sh:@VIM_MODELINE@ diff --git a/scripts/build.tests.c/instantiate b/scripts/build.tests.c/instantiate index 9f52395..0d4ab2d 100644 --- a/scripts/build.tests.c/instantiate +++ b/scripts/build.tests.c/instantiate @@ -27,4 +27,4 @@ add_config_option "CFLAGS" "${COPT_CFLAGS_DEFAULT}" true # kate: replace-trailing-space-save true; space-indent true; tab-width 4; -# vim: expandtab:ts=4:sw=4 +# vim: syntax=sh:expandtab:ts=4:sw=4 diff --git a/scripts/module-create.sh b/scripts/module-create.sh index 4fefccb..7c66add 100755 --- a/scripts/module-create.sh +++ b/scripts/module-create.sh @@ -127,4 +127,4 @@ grep -r "@TODO@" . true # kate: replace-trailing-space-save true; space-indent true; tab-width 4; -# vim: expandtab:ts=4:sw=4 +# vim: syntax=sh:expandtab:ts=4:sw=4 diff --git a/scripts/release.sh b/scripts/release.sh index 66d5498..4279441 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -89,4 +89,4 @@ fi rm -rf "${PKGNAME}" "${PKGNAME}-doc" # kate: replace-trailing-space-save true; space-indent true; tab-width 4; -# vim: ts=4:sw=4:expandtab +# vim: syntax=sh:ts=4:sw=4:expandtab From 0bc48fd499ff2911bccbacd9d84d21cbace94215 Mon Sep 17 00:00:00 2001 From: Laurence Withers Date: Wed, 8 Aug 2007 12:09:22 +0000 Subject: [PATCH 2/6] Update build.monolithic files to use wildcards --- scripts/build.app.c++-qt/build.monolithic | 2 +- scripts/build.app.c++/build.monolithic | 2 +- scripts/build.firmware.gpasm/build.monolithic | 2 +- scripts/build.firmware.sdcc/build.monolithic | 2 +- scripts/build.lib.c++/build.monolithic | 4 ++-- scripts/build.lib.c/build.monolithic | 4 ++-- scripts/build.module.c/build.monolithic | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/build.app.c++-qt/build.monolithic b/scripts/build.app.c++-qt/build.monolithic index 9fb05f8..3f5ef15 100644 --- a/scripts/build.app.c++-qt/build.monolithic +++ b/scripts/build.app.c++-qt/build.monolithic @@ -8,7 +8,7 @@ MONOLITHIC_TESTS="src/@NAME@/build.app src/@NAME@/build.monolithic" if [ -z "${@CNAME@_MONOLITHIC}" ] then PREMOC="${SRC}.premoc.cpp" - MONOLITHIC_SOURCE="$(echo src/@NAME@/TopSource.cpp)" + MONOLITHIC_SOURCE="$(echo src/@NAME@/*.cpp)" make_monolithic ${PREMOC} C || return 1 if [ "${PREMOC}" -nt "${SRC}" ] diff --git a/scripts/build.app.c++/build.monolithic b/scripts/build.app.c++/build.monolithic index ba32701..162bbbd 100644 --- a/scripts/build.app.c++/build.monolithic +++ b/scripts/build.app.c++/build.monolithic @@ -7,7 +7,7 @@ MONOLITHIC_TESTS="src/@NAME@/build.app src/@NAME@/build.monolithic" if [ -z "${@CNAME@_MONOLITHIC}" ] then - MONOLITHIC_SOURCE="$(echo src/@NAME@/TopSource.cpp)" + MONOLITHIC_SOURCE="$(echo src/@NAME@/*.cpp)" make_monolithic ${SRC} C || return 1 @CNAME@_MONOLITHIC=1 diff --git a/scripts/build.firmware.gpasm/build.monolithic b/scripts/build.firmware.gpasm/build.monolithic index 68df7a9..a264ab1 100644 --- a/scripts/build.firmware.gpasm/build.monolithic +++ b/scripts/build.firmware.gpasm/build.monolithic @@ -7,7 +7,7 @@ MONOLITHIC_TESTS="src/@NAME@/build.firmware src/@NAME@/build.monolithic" if [ -z "${@CNAME@_MONOLITHIC}" ] then - MONOLITHIC_SOURCE="$(echo src/@NAME@/{TopSource,BottomSource}.asm)" + MONOLITHIC_SOURCE="$(echo src/@NAME@/*.asm)" make_monolithic ${SRC} none || return 1 @CNAME@_MONOLITHIC=1 diff --git a/scripts/build.firmware.sdcc/build.monolithic b/scripts/build.firmware.sdcc/build.monolithic index 9065ded..bab3dcb 100644 --- a/scripts/build.firmware.sdcc/build.monolithic +++ b/scripts/build.firmware.sdcc/build.monolithic @@ -7,7 +7,7 @@ MONOLITHIC_TESTS="src/@NAME@/build.firmware src/@NAME@/build.monolithic" if [ -z "${@CNAME@_MONOLITHIC}" ] then - MONOLITHIC_SOURCE="$(echo src/@NAME@/TopSource.c)" + MONOLITHIC_SOURCE="$(echo src/@NAME@/*.c)" make_monolithic ${SRC} C || return 1 @CNAME@_MONOLITHIC=1 diff --git a/scripts/build.lib.c++/build.monolithic b/scripts/build.lib.c++/build.monolithic index 5435506..56f3024 100644 --- a/scripts/build.lib.c++/build.monolithic +++ b/scripts/build.lib.c++/build.monolithic @@ -8,10 +8,10 @@ MONOLITHIC_TESTS="src/@NAME@/build.lib src/@NAME@/build.monolithic" if [ -z "${@CNAME@_MONOLITHIC}" ] then - MONOLITHIC_SOURCE="$(echo src/@NAME@/{TopHeader,BottomHeader}.h)" + MONOLITHIC_SOURCE="$(echo src/@NAME@/*.h)" make_monolithic ${HDR} Ch || return 1 - MONOLITHIC_SOURCE="$(echo src/@NAME@/TopSource.cpp)" + MONOLITHIC_SOURCE="$(echo src/@NAME@/*.cpp)" make_monolithic ${SRC} C || return 1 @CNAME@_MONOLITHIC=1 diff --git a/scripts/build.lib.c/build.monolithic b/scripts/build.lib.c/build.monolithic index ef8f88d..5a934b5 100644 --- a/scripts/build.lib.c/build.monolithic +++ b/scripts/build.lib.c/build.monolithic @@ -8,10 +8,10 @@ MONOLITHIC_TESTS="src/@NAME@/build.lib src/@NAME@/build.monolithic" if [ -z "${@CNAME@_MONOLITHIC}" ] then - MONOLITHIC_SOURCE="$(echo src/@NAME@/{TopHeader,BottomHeader}.h)" + MONOLITHIC_SOURCE="$(echo src/@NAME@/*.h)" make_monolithic ${HDR} Ch || return 1 - MONOLITHIC_SOURCE="$(echo src/@NAME@/TopSource.c)" + MONOLITHIC_SOURCE="$(echo src/@NAME@/*.c)" make_monolithic ${SRC} C || return 1 @CNAME@_MONOLITHIC=1 diff --git a/scripts/build.module.c/build.monolithic b/scripts/build.module.c/build.monolithic index 54fdd56..f85cdda 100644 --- a/scripts/build.module.c/build.monolithic +++ b/scripts/build.module.c/build.monolithic @@ -8,7 +8,7 @@ MONOLITHIC_TESTS="src/@NAME@/build.module src/@NAME@/build.monolithic" if [ -z "${@CNAME@_MONOLITHIC}" ] then - MONOLITHIC_SOURCE="$(echo src/@NAME@/TopSource.c)" + MONOLITHIC_SOURCE="$(echo src/@NAME@/*.c)" make_monolithic ${SRC} C || return 1 @CNAME@_MONOLITHIC=1 From ccd9533217b3479381385d059eef396783c26508 Mon Sep 17 00:00:00 2001 From: Laurence Withers Date: Wed, 8 Aug 2007 12:10:53 +0000 Subject: [PATCH 3/6] Don't alphabetically sort member/group documentation --- scripts/build.docs.doxygen/Doxyfile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build.docs.doxygen/Doxyfile.in b/scripts/build.docs.doxygen/Doxyfile.in index d641e07..51f9bd4 100644 --- a/scripts/build.docs.doxygen/Doxyfile.in +++ b/scripts/build.docs.doxygen/Doxyfile.in @@ -46,7 +46,7 @@ CASE_SENSE_NAMES = YES HIDE_SCOPE_NAMES = NO SHOW_INCLUDE_FILES = NO INLINE_INFO = YES -SORT_MEMBER_DOCS = YES +SORT_MEMBER_DOCS = NO SORT_BRIEF_DOCS = NO SORT_BY_SCOPE_NAME = NO GENERATE_TODOLIST = YES From ee5d77d3e0cd9f1d12f166dc82361425e2d2e0b2 Mon Sep 17 00:00:00 2001 From: Laurence Withers Date: Mon, 13 Aug 2007 18:56:44 +0000 Subject: [PATCH 4/6] Allow creation of project using only name and place it in pwd --- create.sh | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/create.sh b/create.sh index 38ed309..85c3d5e 100755 --- a/create.sh +++ b/create.sh @@ -13,14 +13,23 @@ # Sanity checks -if [ $# -ne 2 ] -then +case "$#" in +1) + DEST_DIR="$(pwd)" + P="$1" + ;; +2) + DEST_DIR="$1" + P="$2" + ;; +**) echo "Creates a new project using lw-build-system." - echo "Usage: $0 path/to/projects @P@" + echo "Usage: $0 [path/to/projects] @P@" echo " path/to/projects directory in which project subdir will be created" echo " @P@ package name" exit 1 -fi + ;; +esac cd "$(dirname $0)" TEMPLATE="$(pwd)/skel" @@ -30,15 +39,12 @@ DEVSCRIPTS="$(pwd)/scripts" # Get arguments, include standard functions source ${TEMPLATE}/scripts/functions.sh || exit 1 -DEST_DIR="$1"; shift -P="$1"; shift - DEST_DIR="${DEST_DIR}/${P}" # Ensure that we have our .lwbuildrc set up correctly. -LWBUILDRC=~/.lwbuildrc +LWBUILDRC="~/.lwbuildrc" if [ ! -e ${LWBUILDRC} ] then echo "You don't have a ${LWBUILDRC}, so I'll create a blank one for you." From 11d716798dcd111d64f52c648a85b52a49fac425 Mon Sep 17 00:00:00 2001 From: Laurence Withers Date: Mon, 13 Aug 2007 18:58:20 +0000 Subject: [PATCH 5/6] Translate - or + in package names to _ in variable name --- scripts/config-printflags.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/config-printflags.sh b/scripts/config-printflags.sh index 05ddee5..55b0345 100755 --- a/scripts/config-printflags.sh +++ b/scripts/config-printflags.sh @@ -2,7 +2,7 @@ for pkg in $@ do - varname="$(echo "${pkg}" | tr a-z A-Z)" + varname="$(echo "${pkg}" | tr 'a-z-+' 'A-Z__')" echo '[ -z "${'${varname}'_CFLAGS}" ] && '${varname}'_CFLAGS="$('${pkg}'-config --cflags)"' echo '[ -z "${'${varname}'_LIBS}" ] && '${varname}'_LIBS="$('${pkg}'-config --libs)"' done From 9eb4fecb6cc61afe6eb5135e7e3453f45ec20bb2 Mon Sep 17 00:00:00 2001 From: Laurence Withers Date: Tue, 14 Aug 2007 13:34:41 +0000 Subject: [PATCH 6/6] Tidy up a little bit --- create.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/create.sh b/create.sh index 85c3d5e..27c2f2b 100755 --- a/create.sh +++ b/create.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # # (c)2006, Laurence Withers. Released under the GNU GPL. See file # COPYING for details. @@ -38,14 +38,14 @@ DEVSCRIPTS="$(pwd)/scripts" # Get arguments, include standard functions -source ${TEMPLATE}/scripts/functions.sh || exit 1 +source "${TEMPLATE}/scripts/functions.sh" || exit 1 DEST_DIR="${DEST_DIR}/${P}" # Ensure that we have our .lwbuildrc set up correctly. -LWBUILDRC="~/.lwbuildrc" -if [ ! -e ${LWBUILDRC} ] +LWBUILDRC="${HOME}/.lwbuildrc" +if [ ! -e "${LWBUILDRC}" ] then echo "You don't have a ${LWBUILDRC}, so I'll create a blank one for you." do_cmd cp skel-.lwbuildrc ${LWBUILDRC}