From 4b672a1f3c6e12136faa06d32ab94c0a14250fdf Mon Sep 17 00:00:00 2001 From: Dirk Ziegelmeier Date: Tue, 2 Oct 2018 12:42:14 +0200 Subject: [PATCH] Adapt several comments to contrib rep move --- CHANGELOG | 3 +++ contrib/Filelists.cmake | 2 +- contrib/ports/Common.allports.mk | 2 +- contrib/ports/unix/Filelists.cmake | 2 +- contrib/ports/unix/check/README | 2 +- contrib/ports/win32/Filelists.cmake | 2 +- doc/contrib.txt | 2 +- doc/doxygen/main_page.h | 2 +- src/apps/snmp/snmp_core.c | 4 ++-- src/include/lwip/arch.h | 2 +- 10 files changed, 13 insertions(+), 10 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 032cfa3e..53af5484 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -6,6 +6,9 @@ HISTORY * [Enter new changes just after this line - do not remove this line] + 2018-10-02: Dirk Ziegelmeier + * Integrate contrib repository into main lwIP rep, tag STABLE-2_1_0_RELEASE + (STABLE-2.1.0): ++ New features: diff --git a/contrib/Filelists.cmake b/contrib/Filelists.cmake index 2181707b..ce1af3d6 100644 --- a/contrib/Filelists.cmake +++ b/contrib/Filelists.cmake @@ -1,7 +1,7 @@ # This file is indended to be included in end-user CMakeLists.txt # include(/path/to/Filelists.cmake) # It assumes the variable LWIP_CONTRIB_DIR is defined pointing to the -# root path of lwIP contrib sources. +# root path of lwIP/contrib sources. # # This file is NOT designed (on purpose) to be used as cmake # subdir via add_subdirectory() diff --git a/contrib/ports/Common.allports.mk b/contrib/ports/Common.allports.mk index ee4a0bfb..862324e9 100644 --- a/contrib/ports/Common.allports.mk +++ b/contrib/ports/Common.allports.mk @@ -55,7 +55,7 @@ CONTRIBDIR?=../../.. ARFLAGS?=rs #Set this to where you have the lwip core module checked out from git -#default assumes it's a dir named lwip at the same level as the contrib module +#default assumes it's a dir above the contrib module LWIPDIR?=$(CONTRIBDIR)/.. CFLAGS+=-I. \ diff --git a/contrib/ports/unix/Filelists.cmake b/contrib/ports/unix/Filelists.cmake index f0542fb1..83f02956 100644 --- a/contrib/ports/unix/Filelists.cmake +++ b/contrib/ports/unix/Filelists.cmake @@ -1,7 +1,7 @@ # This file is indended to be included in end-user CMakeLists.txt # include(/path/to/Filelists.cmake) # It assumes the variable LWIP_CONTRIB_DIR is defined pointing to the -# root path of lwIP contrib sources. +# root path of lwIP/contrib sources. # # This file is NOT designed (on purpose) to be used as cmake # subdir via add_subdirectory() diff --git a/contrib/ports/unix/check/README b/contrib/ports/unix/check/README index 421ae3b7..3d678663 100644 --- a/contrib/ports/unix/check/README +++ b/contrib/ports/unix/check/README @@ -2,7 +2,7 @@ Helper files to run lwIP unit tests on unix-like systems. 1. Install the check library, through a package manager or from http://check.sourceforge.net/ -2. Put the lwip code in a directory called 'lwip' in the same directory as lwip-contrib is +2. Put the lwip code in a directory called 'lwip' 3. Run `make check` 4. Make sure all tests pass diff --git a/contrib/ports/win32/Filelists.cmake b/contrib/ports/win32/Filelists.cmake index 487f0226..03096abb 100644 --- a/contrib/ports/win32/Filelists.cmake +++ b/contrib/ports/win32/Filelists.cmake @@ -1,7 +1,7 @@ # This file is indended to be included in end-user CMakeLists.txt # include(/path/to/Filelists.cmake) # It assumes the variable LWIP_CONTRIB_DIR is defined pointing to the -# root path of lwIP contrib sources. +# root path of lwIP/contrib sources. # # This file is NOT designed (on purpose) to be used as cmake # subdir via add_subdirectory() diff --git a/doc/contrib.txt b/doc/contrib.txt index 6f0d7bc5..2a44857e 100644 --- a/doc/contrib.txt +++ b/doc/contrib.txt @@ -55,4 +55,4 @@ features of Savannah help us not lose users' input. 1. If you have ported lwIP to a platform (an OS, a uC/processor or a combination of these) and you think it could benefit others[1] you might want discuss this on the mailing list. You - can also ask for Git access to submit and maintain your port in the contrib Git module. + can also ask for Git access to submit and maintain your port in the lwIP/contrib subdir. diff --git a/doc/doxygen/main_page.h b/doc/doxygen/main_page.h index 89d86f82..883112e2 100644 --- a/doc/doxygen/main_page.h +++ b/doc/doxygen/main_page.h @@ -354,7 +354,7 @@ Call these functions in the order of appearance: * several places where a check for a correct thread context is * implemented which greatly helps the user to get threading done right. * See the example sys_arch.c files in unix and Win32 port - * in the contrib repository. + * in the lwIP/contrib subdirectory. * * In short: Copy the functions sys_mark_tcpip_thread() and * sys_check_core_locking() to your port and modify them to work with your OS. diff --git a/src/apps/snmp/snmp_core.c b/src/apps/snmp/snmp_core.c index 987f1066..95d0ff78 100644 --- a/src/apps/snmp/snmp_core.c +++ b/src/apps/snmp/snmp_core.c @@ -37,8 +37,8 @@ * @defgroup snmp SNMPv2c/v3 agent * @ingroup apps * SNMPv2c and SNMPv3 compatible agent\n - * There is also a MIB compiler and a MIB viewer in lwIP contrib repository - * (lwip-contrib/apps/LwipMibCompiler).\n + * There is also a MIB compiler and a MIB viewer in lwIP/contrib subdir + * (lwip/contrib/apps/LwipMibCompiler).\n * The agent implements the most important MIB2 MIBs including IPv6 support * (interfaces, UDP, TCP, SNMP, ICMP, SYSTEM). IP MIB is an older version * without IPv6 statistics (TODO).\n diff --git a/src/include/lwip/arch.h b/src/include/lwip/arch.h index 58dae33a..f5164cc6 100644 --- a/src/include/lwip/arch.h +++ b/src/include/lwip/arch.h @@ -360,7 +360,7 @@ extern "C" { * The file included BEFORE the struct is "arch/bpstruct.h".\n * The file included AFTER the struct is "arch/epstruct.h".\n * This can be used to implement struct packing on MS Visual C compilers, see - * the Win32 port in the lwIP contrib repository for reference. + * the Win32 port in the lwIP/contrib subdir for reference. * For examples of packed struct declarations, see include/lwip/prot/ subfolder.\n * A port to GCC/clang is included in lwIP, if you use these compilers there is nothing to do here. */