You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by bt...@apache.org on 2020/06/23 07:49:40 UTC
[incubator-nuttx] branch master updated (e538198 -> f3c0461)
This is an automated email from the ASF dual-hosted git repository.
btashton pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git.
from e538198 Update ReleaseNotes in preparation for the 9.1 release.
new 062373a tools/zipme.sh: Fix the typo error
new 9bf4b55 tools/zipme.sh: Don't move the directory to nuttx/Documentation
new 8b98768 tools/zipme.sh: Add executable bit
new f3c0461 tools/version.sh: Make it invokable from everywhere
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
tools/version.sh | 8 ++++----
tools/zipme.sh | 10 +---------
2 files changed, 5 insertions(+), 13 deletions(-)
mode change 100644 => 100755 tools/zipme.sh
[incubator-nuttx] 04/04: tools/version.sh: Make it invokable from
everywhere
Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
btashton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit f3c046175d46367e2c770565ab5312320ec82df2
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Tue Jun 23 06:33:43 2020 +0800
tools/version.sh: Make it invokable from everywhere
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
tools/version.sh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tools/version.sh b/tools/version.sh
index d5574d3..8467cbd 100755
--- a/tools/version.sh
+++ b/tools/version.sh
@@ -32,7 +32,7 @@
# POSSIBILITY OF SUCH DAMAGE.
#
-WD=`pwd`
+WD=$(dirname $0)
# Get command line parameters
@@ -86,7 +86,7 @@ done
OUTFILE=$1
if [ -z ${VERSION} ] ; then
- VERSION=`git tag --sort=taggerdate | tail -1 | cut -d'-' -f2`
+ VERSION=`git -C ${WD} tag --sort=taggerdate | tail -1 | cut -d'-' -f2`
# Earlier tags used the format "major.minor", append a "0" for a patch.
@@ -133,12 +133,12 @@ PATCH=`echo ${VERSION} | cut -d'.' -f3`
# Get GIT information (if not provided on the command line)
if [ -z "${BUILD}" ]; then
- BUILD=`git log --oneline -1 | cut -d' ' -f1 2>/dev/null`
+ BUILD=`git -C ${WD} log --oneline -1 | cut -d' ' -f1 2>/dev/null`
if [ -z "${BUILD}" ]; then
echo "GIT version information is not available"
exit 5
fi
- if [ -n "`git diff-index --name-only HEAD | head -1`" ]; then
+ if [ -n "`git -C ${WD} diff-index --name-only HEAD | head -1`" ]; then
BUILD=${BUILD}-dirty
fi
fi
[incubator-nuttx] 03/04: tools/zipme.sh: Add executable bit
Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
btashton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 8b9876830e661fb7ce513236da3b69421e888543
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Tue Jun 23 05:10:53 2020 +0800
tools/zipme.sh: Add executable bit
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
tools/zipme.sh | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/tools/zipme.sh b/tools/zipme.sh
old mode 100644
new mode 100755
[incubator-nuttx] 02/04: tools/zipme.sh: Don't move the directory
to nuttx/Documentation
Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
btashton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 9bf4b55073a717be2d592c071d926b954c2a32d2
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Tue Jun 23 06:35:44 2020 +0800
tools/zipme.sh: Don't move the directory to nuttx/Documentation
and remove the redundancy of "cd ${TRUNKDIR}"
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
tools/zipme.sh | 8 --------
1 file changed, 8 deletions(-)
diff --git a/tools/zipme.sh b/tools/zipme.sh
index 3e2728a..f7863c1 100644
--- a/tools/zipme.sh
+++ b/tools/zipme.sh
@@ -184,9 +184,6 @@ fi
# Perform a full clean for the distribution
-cd ${TRUNKDIR} || \
- { echo "Failed to cd to ${TRUNKDIR}" ; exit 1 ; }
-
echo "Cleaning the repositories"
if [ $verbose != 0 ] ; then
@@ -197,11 +194,6 @@ fi
# Prepare the nuttx directory
-# Make sure that versioned copies of certain files are in place
-
-cd ${NUTTXDIR}/Documentation || \
- { echo "Failed to cd to ${NUTTXDIR}/Documentation" ; exit 1 ; }
-
# Write a version file into the NuttX directory. The syntax of file is such that it
# may be sourced by a bash script or included by a Makefile.
[incubator-nuttx] 01/04: tools/zipme.sh: Fix the typo error
Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
btashton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 062373af201cbfb6feec43c18856c16f0f866129
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Tue Jun 23 05:09:59 2020 +0800
tools/zipme.sh: Fix the typo error
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
tools/zipme.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/zipme.sh b/tools/zipme.sh
index 5e0a199..3e2728a 100644
--- a/tools/zipme.sh
+++ b/tools/zipme.sh
@@ -121,7 +121,7 @@ done
VERSION=$1
if [ -n ${VERSION} ] ; then
VERSIONOPT="-v ${VERSION}"
-if
+fi
# Full tar options