Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-22 22:20:01 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

This commit moves all of the libraries under a common directory called libs/. This most certainly break libcxx and uClibc++ for now.

Browse Source 
Squashed commit of the following:

    libs/libxx:  Fix some confusing in naming.  If the directory is called libxx, then the library must be libxx.a (unless perhaps LIBCXX is selected).
    libs/:  Fix paths in moved library directories.
    libs:  Brute force move of libc, libnx, and libxx to libs.  Cannot yet build it in that configuration.
This commit is contained in:
Gregory Nutt
2018-05-29 13:21:26 -06:00
parent 53a4408428
commit cf99fb40c9
836 changed files with 987 additions and 974 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Kconfig
+3 -3
View File
@@ -1662,7 +1662,7 @@ endmenu
menu "Graphics Support"
source graphics/Kconfig
source libnx/Kconfig
source libs/libnx/Kconfig
endmenu
menu "Memory Management"
@@ -1682,8 +1682,8 @@ source binfmt/Kconfig
endmenu
menu "Library Routines"
source libc/Kconfig
source libxx/Kconfig
source libs/libc/Kconfig
source libs/libxx/Kconfig
endmenu
menu "Application Configuration"
libc/Kconfig
-26
View File
@@ -1,26 +0,0 @@
#
# For a description of the syntax of this configuration file,
# see the file kconfig-language.txt in the NuttX tools repository.
#
comment "Standard C Library Options"
source libc/stdio/Kconfig
source libc/math/Kconfig
source libc/machine/Kconfig
source libc/stdlib/Kconfig
source libc/unistd/Kconfig
source libc/string/Kconfig
source libc/dllfcn/Kconfig
source libc/modlib/Kconfig
source libc/wchar/Kconfig
source libc/locale/Kconfig
source libc/lzf/Kconfig
source libc/time/Kconfig
source libc/tls/Kconfig
source libc/net/Kconfig
source libc/netdb/Kconfig
source libc/misc/Kconfig
source libc/wqueue/Kconfig
source libc/hex2bin/Kconfig
source libc/userfs/Kconfig
libnx/Kconfig
-10
View File
@@ -1,10 +0,0 @@
#
# For a description of the syntax of this configuration file,
# see the file kconfig-language.txt in the NuttX tools repository.
#
source libnx/nx/Kconfig
source libnx/nxfonts/Kconfig
source libnx/nxglib/Kconfig
source libnx/nxmu/Kconfig
source libnx/nxtk/Kconfig
libnx/kbin/Makefile
-48
View File
@@ -1,48 +0,0 @@
############################################################################
# libnx/kbin/Makefile
#
# Copyright (C) 2013 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 nor the names of its contributors may 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.
#
###########################################################################
-include $(TOPDIR)/Make.defs
all:
.PHONY: clean distclean
# Clean Targets:
clean:
$(call CLEAN)
# Deep clean -- removes all traces of the configuration
distclean: clean
libnx/ubin/Makefile
-48
View File
@@ -1,48 +0,0 @@
############################################################################
# libnx/ubin/Makefile
#
# Copyright (C) 2013 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 nor the names of its contributors may 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.
#
###########################################################################
-include $(TOPDIR)/Make.defs
all:
.PHONY: clean distclean
# Clean Targets:
clean:
$(call CLEAN)
# Deep clean -- removes all traces of the configuration
distclean: clean
libc/.gitignore → libs/libc/.gitignore
View File
libs/libc/Kconfig
+26
View File
@@ -0,0 +1,26 @@
#
# For a description of the syntax of this configuration file,
# see the file kconfig-language.txt in the NuttX tools repository.
#
comment "Standard C Library Options"
source libs/libc/stdio/Kconfig
source libs/libc/math/Kconfig
source libs/libc/machine/Kconfig
source libs/libc/stdlib/Kconfig
source libs/libc/unistd/Kconfig
source libs/libc/string/Kconfig
source libs/libc/dllfcn/Kconfig
source libs/libc/modlib/Kconfig
source libs/libc/wchar/Kconfig
source libs/libc/locale/Kconfig
source libs/libc/lzf/Kconfig
source libs/libc/time/Kconfig
source libs/libc/tls/Kconfig
source libs/libc/net/Kconfig
source libs/libc/netdb/Kconfig
source libs/libc/misc/Kconfig
source libs/libc/wqueue/Kconfig
source libs/libc/hex2bin/Kconfig
source libs/libc/userfs/Kconfig
libc/Makefile → libs/libc/Makefile
+1 -1
View File
@@ -1,5 +1,5 @@
############################################################################
# libc/Makefile
# libs/libc/Makefile
#
# Copyright (C) 2007-2014, 2016-2017 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
libc/README.txt → libs/libc/README.txt
+1 -1
View File
@@ -24,7 +24,7 @@ with no applications.
Sub-Directories
===============
The files in the libc/ directory are organized (mostly) according which file
The files in the libs/libc/ directory are organized (mostly) according which file
in the include/ directory provides the prototype for library functions. So
we have:
libc/aio/Make.defs → libs/libc/aio/Make.defs
+1 -1
View File
@@ -1,5 +1,5 @@
############################################################################
# libc/aio/Make.defs
# libs/libc/aio/Make.defs
#
# Copyright (C) 2014 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
libc/aio/aio.h → libs/libc/aio/aio.h
+1 -1
View File
@@ -1,5 +1,5 @@
/****************************************************************************
* libc/aio/aio.h
* libs/libc/aio/aio.h
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
libc/aio/aio_error.c → libs/libc/aio/aio_error.c
+1 -1
View File
@@ -1,5 +1,5 @@
/****************************************************************************
* libc/aio/aio_error.c
* libs/libc/aio/aio_error.c
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
libc/aio/aio_return.c → libs/libc/aio/aio_return.c
+1 -1
View File
@@ -1,5 +1,5 @@
/****************************************************************************
* libc/aio/aio_return.c
* libs/libc/aio/aio_return.c
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
libc/aio/aio_suspend.c → libs/libc/aio/aio_suspend.c
+1 -1
View File
@@ -1,5 +1,5 @@
/****************************************************************************
* libc/aio/aio_suspend.c
* libs/libc/aio/aio_suspend.c
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
libc/aio/lio_listio.c → libs/libc/aio/lio_listio.c
+1 -1
View File
@@ -1,5 +1,5 @@
/****************************************************************************
* libc/aio/lio_listio.c
* libs/libc/aio/lio_listio.c
*
* Copyright (C) 2014-2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
libc/audio/Make.defs → libs/libc/audio/Make.defs
+1 -1
View File
@@ -1,5 +1,5 @@
############################################################################
# libc/audio/Make.defs
# libs/libc/audio/Make.defs
#
# Copyright (C) 2013 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
libc/audio/lib_buffer.c → libs/libc/audio/lib_buffer.c
+1 -1
View File
@@ -1,5 +1,5 @@
/****************************************************************************
* libc/audio/lib_buffer.c
* libs/libc/audio/lib_buffer.c
*
* Copyright (C) 2013 Ken Pettit. All rights reserved.
* Author: Ken Pettit <pettitkd@gmail.com>
libc/bin/.gitignore → libs/libc/bin/.gitignore
View File
libnx/bin/Makefile → libs/libc/bin/Makefile
+1 -1
View File
@@ -1,5 +1,5 @@
############################################################################
# libnx/bin/Makefile
# libs/libc/bin/Makefile
#
# Copyright (C) 2013 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
libc/dirent/Make.defs → libs/libc/dirent/Make.defs
+1 -1
View File
@@ -1,5 +1,5 @@
############################################################################
# libc/dirent/Make.defs
# libs/libc/dirent/Make.defs
#
# Copyright (C) 2012 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
libc/dirent/lib_readdirr.c → libs/libc/dirent/lib_readdirr.c
+1 -1
View File
@@ -1,5 +1,5 @@
/****************************************************************************
* libc/dirent/lib_readdirr.c
* libs/libc/dirent/lib_readdirr.c
*
* Copyright (C) 2007-2009, 2011-2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
libc/dirent/lib_telldir.c → libs/libc/dirent/lib_telldir.c
+1 -1
View File
@@ -1,5 +1,5 @@
/****************************************************************************
* libc/dirent/fs_telldir.c
* libs/libc/dirent/fs_telldir.c
*
* Copyright (C) 2007-2008, 2011-2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
libc/dllfcn/Kconfig → libs/libc/dllfcn/Kconfig
View File
libc/dllfcn/Make.defs → libs/libc/dllfcn/Make.defs
+1 -1
View File
@@ -1,5 +1,5 @@
############################################################################
# libc/dllfcn/Make.defs
# libs/libc/dllfcn/Make.defs
#
# Copyright (C) 2017 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
libc/dllfcn/lib_dlclose.c → libs/libc/dllfcn/lib_dlclose.c
+1 -1
View File
@@ -1,5 +1,5 @@
/****************************************************************************
* libc/dllfcn/lib_dlclose.c
* libs/libc/dllfcn/lib_dlclose.c
*
* Copyright (C) 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
libc/dllfcn/lib_dlerror.c → libs/libc/dllfcn/lib_dlerror.c
+1 -1
View File
@@ -1,5 +1,5 @@
/****************************************************************************
* libc/dllfcn/lib_dlerror.c
* libs/libc/dllfcn/lib_dlerror.c
*
* Copyright (C) 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
libc/dllfcn/lib_dlopen.c → libs/libc/dllfcn/lib_dlopen.c
+1 -1
View File
@@ -1,5 +1,5 @@
/****************************************************************************
* libc/dllfcn/lib_dlopen.c
* libs/libc/dllfcn/lib_dlopen.c
*
* Copyright (C) 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
libc/dllfcn/lib_dlsym.c → libs/libc/dllfcn/lib_dlsym.c
+1 -1
View File
@@ -1,5 +1,5 @@
/****************************************************************************
* libc/dllfcn/lib_dlsym.c
* libs/libc/dllfcn/lib_dlsym.c
*
* Copyright (C) 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
libc/dllfcn/lib_dlsymtab.c → libs/libc/dllfcn/lib_dlsymtab.c
+1 -1
View File
@@ -1,5 +1,5 @@
/****************************************************************************
* libc/dllfcn/lib_symtab.c
* libs/libc/dllfcn/lib_symtab.c
*
* Copyright (C) 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
libc/fixedmath/Make.defs → libs/libc/fixedmath/Make.defs
+1 -1
View File
@@ -1,5 +1,5 @@
############################################################################
# libc/fixedmath/Make.defs
# libs/libc/fixedmath/Make.defs
#
# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
libc/fixedmath/lib_b16atan2.c → libs/libc/fixedmath/lib_b16atan2.c
+1 -1
View File
@@ -1,5 +1,5 @@
/****************************************************************************
* libc/fixedmath/lib_b16atan2.c
* libs/libc/fixedmath/lib_b16atan2.c
*
* Copyright (C) 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
libc/fixedmath/lib_b16cos.c → libs/libc/fixedmath/lib_b16cos.c
+1 -1
View File
@@ -1,5 +1,5 @@
/****************************************************************************
* libc/fixedmath/lib_b16cos.c
* libs/libc/fixedmath/lib_b16cos.c
*
* Copyright (C) 2007, 2008, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
libc/fixedmath/lib_b16sin.c → libs/libc/fixedmath/lib_b16sin.c
+1 -1
View File
@@ -1,5 +1,5 @@
/****************************************************************************
* libc/fixedmath/lib_b16sin.c
* libs/libc/fixedmath/lib_b16sin.c
*
* Copyright (C) 2008, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
libc/fixedmath/lib_fixedmath.c → libs/libc/fixedmath/lib_fixedmath.c
+1 -1
View File
@@ -1,5 +1,5 @@
/****************************************************************************
* libc/math/lib_fixedmath.c
* libs/libc/math/lib_fixedmath.c
*
* Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
libc/fixedmath/lib_ubsqrt.c → libs/libc/fixedmath/lib_ubsqrt.c
+1 -1
View File
@@ -1,5 +1,5 @@
/****************************************************************************
* libc/fixedmath/lib_ubsqrt.c
* libs/libc/fixedmath/lib_ubsqrt.c
*
* Copyright (C) 2014,2017 Jussi Kivilinna <jussi.kivilinna@haltian.com>
*
libc/hex2bin/Kconfig → libs/libc/hex2bin/Kconfig
View File
libc/hex2bin/Make.defs → libs/libc/hex2bin/Make.defs
+1 -1
View File
@@ -1,5 +1,5 @@
############################################################################
# libc/hex2bin/Make.defs
# libs/libc/hex2bin/Make.defs
#
# Copyright (C) 2016 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
libc/hex2bin/lib_fhex2mem.c → libs/libc/hex2bin/lib_fhex2mem.c
+1 -1
View File
@@ -1,5 +1,5 @@
/****************************************************************************
* libc/hex2bin/fhex2mem.c
* libs/libc/hex2bin/fhex2mem.c
*
* Copyright (C) 2014, 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
libc/hex2bin/lib_hex2bin.c → libs/libc/hex2bin/lib_hex2bin.c
+1 -1
View File
@@ -1,5 +1,5 @@
/****************************************************************************
* libc/hex2bin/hex2bin.c
* libs/libc/hex2bin/hex2bin.c
*
* Copyright (C) 2014, 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
libc/hex2bin/lib_hex2mem.c → libs/libc/hex2bin/lib_hex2mem.c
+1 -1
View File
@@ -1,5 +1,5 @@
/****************************************************************************
* libc/hex2bin/hex2mem.c
* libs/libc/hex2bin/hex2mem.c
*
* Copyright (C) 2014, 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
libc/inttypes/Make.defs → libs/libc/inttypes/Make.defs
+1 -1
View File
@@ -1,5 +1,5 @@
############################################################################
# libc/inttypes/Make.defs
# libs/libc/inttypes/Make.defs
#
# Copyright (C) 2017 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
libc/inttypes/lib_imaxabs.c → libs/libc/inttypes/lib_imaxabs.c
+1 -1
View File
@@ -1,5 +1,5 @@
/****************************************************************************
* libc/inttypes/lib_imaxabs.c
* libs/libc/inttypes/lib_imaxabs.c
*
* Copyright (C) 2010-2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
libc/inttypes/lib_strtoimax.c → libs/libc/inttypes/lib_strtoimax.c
+1 -1
View File
@@ -1,5 +1,5 @@
/****************************************************************************
* libc/inttypes/lib_strtoimax.c
* libs/libc/inttypes/lib_strtoimax.c
*
* Copyright (C) 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
libc/inttypes/lib_strtoumax.c → libs/libc/inttypes/lib_strtoumax.c
+1 -1
View File
@@ -1,5 +1,5 @@
/****************************************************************************
* /libc/inttypes/lib_strtoumax.c
* /libs/libc/inttypes/lib_strtoumax.c
*
* Copyright (C) 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
libc/kbin/.gitignore → libs/libc/kbin/.gitignore
View File
libc/kbin/Makefile → libs/libc/kbin/Makefile
+1 -1
View File
@@ -1,5 +1,5 @@
############################################################################
# libc/kbin/Makefile
# libs/libc/kbin/Makefile
#
# Copyright (C) 2013 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
libc/libc.csv → libs/libc/libc.csv
View File
libc/libc.h → libs/libc/libc.h
+1 -1
View File
@@ -1,5 +1,5 @@
/****************************************************************************
* libc/libc.h
* libs/libc/libc.h
*
* Copyright (C) 2007-2014, 2016-2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
libc/libgen/Make.defs → libs/libc/libgen/Make.defs
+1 -1
View File
@@ -1,5 +1,5 @@
############################################################################
# libc/libgen/Make.defs
# libs/libc/libgen/Make.defs
#
# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
libc/libgen/lib_basename.c → libs/libc/libgen/lib_basename.c
+1 -1
View File
@@ -1,5 +1,5 @@
/****************************************************************************
* libc/libgen/lib_basename.c
* libs/libc/libgen/lib_basename.c
*
* Copyright (C) 2007, 2009, 2011-2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

Some files were not shown because too many files have changed in this diff Show More