dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

Fix a bug in 'make export' introduced recently 

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4265 7fd9a85b-ad96-42d3-883c-3090e2eb8679
This commit is contained in:
patacongo 2012-01-05 18:27:26 +00:00
parent 03121710b5
commit f16e231491
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nuttx/Makefile
View File

@ -518,7 +518,7 @@ pass2dep: context
# that the archiver is 'ar' # that the archiver is 'ar'
export: pass2deps export: pass2deps
@tools/mkexport.sh -t "$(TOPDIR)" -l "$(NUTTXLIBS)" @tools/mkexport.sh -w$(WINTOOL) -t "$(TOPDIR)" -l "$(NUTTXLIBS)"
# General housekeeping targets: dependencies, cleaning, etc. # General housekeeping targets: dependencies, cleaning, etc.
# #

27
nuttx/tools/mkexport.sh
View File

@ -1,8 +1,8 @@
#!/bin/bash #!/bin/bash
# tools/mkexport.sh # tools/mkexport.sh
# #
# Copyright (C) 2011 Gregory Nutt. All rights reserved. # Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <spudmonkey@racsa.co.cr> # Author: Gregory Nutt <gnutt@nuttx.org>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions # modification, are permitted provided that the following conditions
@ -41,10 +41,11 @@
# Get the input parameter list # Get the input parameter list
USAGE="USAGE: $0 [-d] [-z] -t <top-dir> [-x <lib-ext>] -l \"lib1 [lib2 [lib3 ...]]\"" USAGE="USAGE: $0 [-d] [-z] [-w|wy|wn] -t <top-dir> [-x <lib-ext>] -l \"lib1 [lib2 [lib3 ...]]\""
unset TOPDIR unset TOPDIR
unset LIBLIST unset LIBLIST
unset TGZ unset TGZ
WINTOOL=n
LIBEXT=.a LIBEXT=.a
while [ ! -z "$1" ]; do while [ ! -z "$1" ]; do
@ -56,6 +57,12 @@ while [ ! -z "$1" ]; do
shift shift
LIBLIST=$1 LIBLIST=$1
;; ;;
-wy )
WINTOOL=y
;;
-w | -wn )
WINTOOL=n
;;
-t ) -t )
shift shift
TOPDIR=$1 TOPDIR=$1
@ -277,14 +284,24 @@ for lib in ${LIBLIST}; do
{ echo "MK: 'mkdir ${EXPORTDIR}/tmp' failed"; exit 1; } { echo "MK: 'mkdir ${EXPORTDIR}/tmp' failed"; exit 1; }
cd "${EXPORTDIR}/tmp" || \ cd "${EXPORTDIR}/tmp" || \
{ echo "MK: 'cd ${EXPORTDIR}/tmp' failed"; exit 1; } { echo "MK: 'cd ${EXPORTDIR}/tmp' failed"; exit 1; }
${AR} x "${TOPDIR}/${lib}" if [ "X${WINTOOL}" = "Xy" ]; then
WLIB=`cygpath -w "${TOPDIR}/${lib}"`
${AR} x "${WLIB}"
else
${AR} x "${TOPDIR}/${lib}"
fi
# Rename each object file (to avoid collision when they are combined) # Rename each object file (to avoid collision when they are combined)
# and add the file to libnuttx # and add the file to libnuttx
for file in `ls`; do for file in `ls`; do
mv "${file}" "${shortname}-${file}" mv "${file}" "${shortname}-${file}"
${AR} rcs "${EXPORTDIR}/libs/libnuttx${LIBEXT}" "${shortname}-${file}" if [ "X${WINTOOL}" = "Xy" ]; then
WLIB=`cygpath -w "${EXPORTDIR}/libs/libnuttx${LIBEXT}"`
${AR} rcs "${WLIB}" "${shortname}-${file}"
else
${AR} rcs "${EXPORTDIR}/libs/libnuttx${LIBEXT}" "${shortname}-${file}"
fi
done done
cd "${TOPDIR}" || \ cd "${TOPDIR}" || \