diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-03-22 22:41:11 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-03-22 22:41:11 +0000 |
commit | ef0b23ea7dba56647ceffa0b561d971f7f963540 (patch) | |
tree | aa2fdfc42b8d3994288a6dc854163e993ac5b1bf /NxWidgets/tools | |
parent | 4dedf494c242b2c4b52707441eefe2a36fbacf0f (diff) | |
download | nuttx-ef0b23ea7dba56647ceffa0b561d971f7f963540.tar.gz nuttx-ef0b23ea7dba56647ceffa0b561d971f7f963540.tar.bz2 nuttx-ef0b23ea7dba56647ceffa0b561d971f7f963540.zip |
Prep for NxWidgets 1.0 release
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4506 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'NxWidgets/tools')
-rwxr-xr-x | NxWidgets/tools/addobjs.sh | 141 | ||||
-rwxr-xr-x | NxWidgets/tools/indent.sh | 45 | ||||
-rwxr-xr-x | NxWidgets/tools/install.sh | 152 | ||||
-rwxr-xr-x | NxWidgets/tools/zipme.sh | 125 |
4 files changed, 463 insertions, 0 deletions
diff --git a/NxWidgets/tools/addobjs.sh b/NxWidgets/tools/addobjs.sh new file mode 100755 index 000000000..5ccb289c5 --- /dev/null +++ b/NxWidgets/tools/addobjs.sh @@ -0,0 +1,141 @@ +#!/bin/bash +################################################################################# +# NxWidgets/tools/addobjs.sh +# +# Copyright (C) 2012 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt <gnutt@nuttx.org> +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX, NxWidgets, nor the names of its contributors +# me be used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +################################################################################# + +# set -x + +# Get input parameters + +usage="Usage: $0 [OPTIONS] <lib-path> <obj-dir>" +advice="Try '$0 -h' for more information" + +unset prefix +wintool=n + +while [ ! -z "$1" ]; do + case $1 in + -d ) + set -x + ;; + -p ) + shift + prefix=$1 + ;; + -w ) + wintool=y + ;; + -h ) + echo "$0 will add all object (.o) files in directory to an archive." + echo "" + echo $usage + echo "" + echo "Where:" + echo " <lib-path> is the full, absolute path to the library to use" + echo " <obj-dir> is full path to the directory containing the object files to be added" + echo "OPTIONS include:" + echo " -p Prefix to use. For example, to use arm-elf-ar, add '-p arm-elf-'" + echo " -w Use Windows style paths insted of POSIX paths" + echo " -d Enable script debug" + echo " -h Show this usage information" + exit 0 + ;; + * ) + break; + ;; + esac + shift +done + +libpath=$1 +objdir=$2 +archiver="${prefix}"ar + +# Verify input parameters + +if [ -z "${libpath}" ]; then + echo "Missing required arguments" + echo "" + echo $usage + echo $advice + exit 1 +fi + +if [ -z "${objdir}" ]; then + echo "Missing required argument <obj-dir>" + echo "" + echo $usage + echo $advice + exit 1 +fi + +if [ ! -w ${libpath} ]; then + if [ -e ${libpath} ]; then + echo "${libpath} exists but is not a write-able file" + echo $advice + else + echo "${libpath} does not exist" + echo $advice + fi + exit 1 +fi + +if [ ! -d ${objdir} ]; then + if [ -e ${objdir} ]; then + echo "${objdir} exists but is not a directory" + echo $advice + else + echo "${objdir} does not exist" + echo $advice + fi + exit 1 +fi + +# Add each object file in <obj-dir> to the archive at <lib-path> + +for obj in `ls "${objdir}"/*.o`; do + name=`basename "${obj}"` + if [ "X${wintool}" = "Xy" ]; then + objpath=`cygpath -w "${obj}"` + else + objpath=${obj} + fi + echo "AR: ${name}" + ${archiver} rcs ${libpath} ${objpath} || \ + { echo "Failed to archive the object file:"; \ + echo " Archive: ${libpath}"; \ + echo " Object: ${obj}"; \ + exit 1; \ + } +done
\ No newline at end of file diff --git a/NxWidgets/tools/indent.sh b/NxWidgets/tools/indent.sh new file mode 100755 index 000000000..e763cff37 --- /dev/null +++ b/NxWidgets/tools/indent.sh @@ -0,0 +1,45 @@ +#!/bin/sh +################################################################################# +# NxWidgets/tools/install.sh +# +# Copyright (C) 2012 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt <gnutt@nuttx.org> +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX, NxWidgets, nor the names of its contributors +# me be used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +################################################################################# +# +# This script uses the Linux 'indent' utility to re-format C source files +# to match the coding style that I use. It differs from my coding style in that +# +# - I normally put the traiing */ of a multi-line comment on a separate line, +# - I usually align things vertically (like '='in assignments. +# + +indent -nbad -bap -bbb -nbbo -nbc -bl -bl2 -bls -nbs -cbi2 -ncdw -nce -ci2 -cli0 -cp40 -ncs -nbfda -nbfde -di1 -nfc1 -fca -i2 -l80 -lp -ppi2 -lps -npcs -pmt -nprs -npsl -saf -sai -sbi2 -saw -sc -sob -nss -nut "$@" + diff --git a/NxWidgets/tools/install.sh b/NxWidgets/tools/install.sh new file mode 100755 index 000000000..6917b4b03 --- /dev/null +++ b/NxWidgets/tools/install.sh @@ -0,0 +1,152 @@ +#!/bin/bash +################################################################################# +# NxWidgets/tools/install.sh +# +# Copyright (C) 2012 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt <gnutt@nuttx.org> +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX, NxWidgets, nor the names of its contributors +# me be used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +################################################################################# +# +# set -x +# Functions + +function ShowUsage() +{ + echo "" + echo "USAGE: $0 <apps-directory-path> <test-sub-directory>" + echo "" + echo "Where:" + echo " <apps-directory-path> is the full, absolute path to the NuttX apps/ directory" + echo " <test-sub-directory> is the name of a sub-directory in the UnitTests directory" + echo "" +} + +function ShowTests() +{ + for testdir in ${UNITTEST_DIRPATH}/*; do + subdir=`basename ${testdir}` + if [ -d "${UNITTEST_DIRPATH}/${subdir}" ]; then + if [ -f "${UNITTEST_DIRPATH}/${subdir}/Makefile" ]; then + echo $subdir + fi + fi + done +} + +# Input parameters + +APPS_DIRPATH=$1 +TEST_SUBDIR=$2 + +if [ -z "${APPS_DIRPATH}" ]; then + echo "Missing required arguments" + ShowUsage + exit 1 +fi + +if [ -z "${TEST_SUBDIR}" ]; then + echo "Missing required argument <test-sub-directory>" + ShowUsage + exit 1 +fi + +# Make sure that we know where we are and where we are going + +WD=`pwd` +if [ -x install.sh ]; then + UNITTEST_DIRPATH="${WD}/../UnitTests" + TOOLS_DIRPATH="${WD}" +else + if [ -x tools/install.sh ]; then + UNITTEST_DIRPATH="${WD}/UnitTests" + TOOLS_DIRPATH="${WD}/tools" + else + echo "This script must be executed in the NxWidgets or NxWidgets/tools directory" + ShowUsage + exit 1 + fi +fi + +if [ ! -d "${APPS_DIRPATH}" ]; then + echo "Directory ${APPS_DIRPATH} does not exist" + ShowUsage + exit 1 +fi + +if [ ! -f "${APPS_DIRPATH}/Makefile" ]; then + echo "Directory ${APPS_DIRPATH} does not look like a NuttX apps directory" + ShowUsage + exit 1 +fi + +TEST_PATH="${UNITTEST_DIRPATH}/${TEST_SUBDIR}" +if [ ! -d "${TEST_PATH}" ]; then + echo "Directory ${TEST_PATH} does not exist" + ShowUsage + ShowTests + exit 1 +fi + +if [ ! -f "${TEST_PATH}/Makefile" ]; then + echo "Directory ${TEST_PATH} does not look like a unit test directory" + ShowUsage + ShowTests + exit 1 +fi + +# Check if the symbolic link "external" exists in the NuttX apps directory + +if [ -e "${APPS_DIRPATH}/external" ]; then + echo "${APPS_DIRPATH}/external already exists..." + if [ -h "${APPS_DIRPATH}/external" ]; then + echo " Removing the old symbolic link." + rm "${APPS_DIRPATH}/external" || \ + { echo " ERROR: Failed to remove old symbolic link"; \ + exit 1; + } + else + echo " ERROR: But it is not a symbolic link!" + echo " Please remove ${APPS_DIRPATH}/external" + echo " and run this script again" + fi +fi + +# Then set up the symbolic link "external" in the NuttX apps to point to the +# UnitTest subdirectory + +echo "Creating symbolic link" +echo " - To ${TEST_PATH}" +echo " - At ${APPS_DIRPATH}/external" + +ln -s "${TEST_PATH}" "${APPS_DIRPATH}/external" || \ + { echo "Failed to create symbollic link"; \ + exit 1; + } + diff --git a/NxWidgets/tools/zipme.sh b/NxWidgets/tools/zipme.sh new file mode 100755 index 000000000..a77748c3b --- /dev/null +++ b/NxWidgets/tools/zipme.sh @@ -0,0 +1,125 @@ +#!/bin/bash +################################################################################# +# NxWidgets/tools/zipme.sh +# +# Copyright (C) 2012 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt <gnutt@nuttx.org> +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX, NxWidgets, nor the names of its contributors +# me be used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +################################################################################# + +#set -x + +WD=`pwd` +VERSION=$1 + +TAR="tar cvf" +ZIP=gzip + +# Make sure we know what is going on + +if [ -z ${VERSION} ] ; then + echo "You must supply a version like xx.yy as a parameter" + exit 1; +fi + +# Find the directory we were executed from and were we expect to +# see the directory to tar up + +MYNAME=`basename $0` + +if [ -x ${WD}/${MYNAME} ] ; then + NXWIDGETS=`dirname ${WD}` +else + if [ -x ${WD}/tools/${MYNAME} ] ; then + NXWIDGETS=${WD} + else + echo "You must cd into the NxWidgets or NxWidgets/tools directory to execute this script." + exit 1 + fi +fi + +# Get the NxWidgets directory name and the path to the parent directory + +NXWIDGETSDIR=`basename ${NXWIDGETS}` +PROJECTS=`dirname ${NXWIDGETS}` + +# The name of the directory must match the version number + +if [ "X${NXWIDGETSDIR}" != "Xupthreads-${VERSION}" ]; then + echo "Expected directory name to be NxWidgets-${VERSION} found ${NXWIDGETSDIR}" + exit 1 +fi + +cd ${PROJECTS} || \ + { echo "Failed to cd to ${PROJECTS}" ; exit 1 ; } + +if [ ! -d ${NXWIDGETSDIR} ] ; then + echo "${PROJECTS}/${NXWIDGETSDIR} does not exist!" + exit 1 +fi + +TAR_NAME=NxWidgets-${VERSION}.tar +ZIP_NAME=${TAR_NAME}.gz + +# Prepare the NxWidgets directory -- Remove editor garbage + +find ${NXWIDGETSDIR} -name '*~' -exec rm -f '{}' ';' || \ + { echo "Removal of emacs garbage failed!" ; exit 1 ; } + +find ${NXWIDGETSDIR} -name '#*' -exec rm -f '{}' ';' || \ + { echo "Removal of VI garbage failed!" ; exit 1 ; } + +find ${NXWIDGETSDIR} -name '*.swp' -exec rm -f '{}' ';' || \ + { echo "Removal of VI garbage failed!" ; exit 1 ; } + +# Perform a full clean for the distribution + +make -C ${NXWIDGETSDIR} distclean + +# Remove any previous tarballs + +if [ -f ${TAR_NAME} ] ; then + echo "Removing ${PROJECTS}/${TAR_NAME}" + rm -f ${TAR_NAME} || \ + { echo "rm ${TAR_NAME} failed!" ; exit 1 ; } +fi + +if [ -f ${ZIP_NAME} ] ; then + echo "Removing ${PROJECTS}/${ZIP_NAME}" + rm -f ${ZIP_NAME} || \ + { echo "rm ${ZIP_NAME} failed!" ; exit 1 ; } +fi + +# Then zip it + +${TAR} ${TAR_NAME} ${NXWIDGETSDIR} || \ + { echo "tar of ${NXWIDGETSDIR} failed!" ; exit 1 ; } +${ZIP} ${TAR_NAME} || \ + { echo "zip of ${TAR_NAME} failed!" ; exit 1 ; } |