From 4a2ee2bca181b3919a16264a7eed7fdb57b8674d Mon Sep 17 00:00:00 2001 From: slaff Date: Thu, 9 Feb 2017 10:27:26 +0100 Subject: [PATCH 1/5] Added two targets: (#934) third-party-clean: cleans all third-party code and its patches dist-clean: cleans all samples, third-party code and its patches, compiler libraries and intermediate files. --- Sming/Makefile | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/Sming/Makefile b/Sming/Makefile index b785fb5694..fcd7a24b63 100644 --- a/Sming/Makefile +++ b/Sming/Makefile @@ -116,6 +116,7 @@ SPIFF_FILES = files BUILD_BASE = out/build FW_BASE = out/firmware +USER_LIBDIR = compiler/lib LIBSMING = libsming ifeq ($(ENABLE_SSL),1) @@ -176,7 +177,6 @@ ifeq ($(ENABLE_CUSTOM_LWIP), 1) endif # libraries used in this project, mainly provided by the SDK -USER_LIBDIR = compiler/lib LIBS = microc microgcc hal phy pp net80211 $(LIBLWIP) wpa main ifeq ($(ENABLE_CUSTOM_PWM), 1) THIRD_PARTY_DATA += third-party/pwm/pwm.c @@ -262,6 +262,7 @@ EXTRA_INCDIR := $(addprefix -I,$(EXTRA_INCDIR)) MODULE_INCDIR := $(addsuffix /include,$(INCDIR)) SAMPLES_DIRS := $(shell ls -1 ../samples) +THIRD_PARTY_DIRS := $(shell ls -1 third-party ) DOXYGEN := $(shell command -v doxygen 2> /dev/null) V ?= $(VERBOSE) @@ -409,6 +410,18 @@ samples-clean: $(Q) for dir in $(SAMPLES_DIRS); do \ $(MAKE) -C $(SMING_HOME)/../samples/$$dir clean; \ done + +third-party-clean: + $(Q) for dir in $(THIRD_PARTY_DIRS); do \ + $(Q) rm -rf third-party/$$dir; \ + done + $(Q) $(GIT) checkout third-party + +dist-clean: clean samples-clean third-party-clean + $(Q) for file in $(shell ls $(USER_LIBDIR)/lib*.a ); do \ + rm $$file; \ + done + $(Q) $(GIT) checkout $(USER_LIBDIR) $(foreach bdir,$(BUILD_DIR),$(eval $(call compile-objects,$(bdir)))) From caf31c5c44204f99cad6b0caab34f988b5bc8261 Mon Sep 17 00:00:00 2001 From: Skurydin Alexey Date: Fri, 10 Feb 2017 21:59:23 +0500 Subject: [PATCH 2/5] * Fix whitespace issue (#939) --- Sming/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sming/Makefile b/Sming/Makefile index fcd7a24b63..b3d8ab80b2 100644 --- a/Sming/Makefile +++ b/Sming/Makefile @@ -395,7 +395,7 @@ third-party/%: $(vecho) "Fetching $(dir $@) ..." $(Q) $(GIT) submodule update --init --recursive $(dir $@) $(Q) touch $(patsubst third-party/%/,third-party/.patches/%.patch, $(dir $@)) - $(Q) -cd $(dir $@); $(GIT) apply -v $(patsubst third-party/%/,$(SMING_HOME)/third-party/.patches/%.patch, $(dir $@)) + $(Q) -cd $(dir $@); $(GIT) apply -v $(patsubst third-party/%/,$(SMING_HOME)/third-party/.patches/%.patch, $(dir $@)) --ignore-whitespace --whitespace=nowarn # if the new submodule brings source code files that need to be compiled inside Sming # then we need somehow to be able to "see" these new files. # For now we solve this by "reloading" the makefile after fetching a module. From 464bf490dd9664288cd7838da0a71fe462e83f81 Mon Sep 17 00:00:00 2001 From: slaff Date: Sat, 11 Feb 2017 22:04:33 +0100 Subject: [PATCH 3/5] Ignore changes in submodules. (#940) Ignore local library files. --- .gitignore | 2 +- .gitmodules | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 02306a3e6d..0d2f7063da 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,4 @@ language.settings.xml .settings nbproject .*.swp -Sming.wiki +Sming/compiler/lib/lib*.a diff --git a/.gitmodules b/.gitmodules index f0eae41c30..890a61d9b1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -5,6 +5,7 @@ [submodule "Sming.wiki"] path = docs/wiki url = https://github.com/SmingHub/Sming.wiki.git + ignore = dirty [submodule "Sming/third-party/esp-gdbstub"] path = Sming/third-party/esp-gdbstub url = https://github.com/espressif/esp-gdbstub.git @@ -27,3 +28,4 @@ [submodule "Sming/third-party/esp-open-lwip"] path = Sming/third-party/esp-open-lwip url = https://github.com/pfalcon/esp-open-lwip.git + ignore = dirty From 40b6d30c06a924a088d50c381c0c656e5cc1e0a9 Mon Sep 17 00:00:00 2001 From: slaff Date: Sat, 11 Feb 2017 22:14:53 +0100 Subject: [PATCH 4/5] Fixes to third-party-clean target. (#943) --- Sming/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Sming/Makefile b/Sming/Makefile index b3d8ab80b2..77d8857f28 100644 --- a/Sming/Makefile +++ b/Sming/Makefile @@ -413,14 +413,14 @@ samples-clean: third-party-clean: $(Q) for dir in $(THIRD_PARTY_DIRS); do \ - $(Q) rm -rf third-party/$$dir; \ + rm -rf third-party/$$dir; \ done $(Q) $(GIT) checkout third-party dist-clean: clean samples-clean third-party-clean $(Q) for file in $(shell ls $(USER_LIBDIR)/lib*.a ); do \ - rm $$file; \ - done + rm $$file; \ + done $(Q) $(GIT) checkout $(USER_LIBDIR) $(foreach bdir,$(BUILD_DIR),$(eval $(call compile-objects,$(bdir)))) From 841688d9658606add619d2cc5f5312b45ef1747b Mon Sep 17 00:00:00 2001 From: slaff Date: Sat, 11 Feb 2017 22:15:14 +0100 Subject: [PATCH 5/5] Preparation for release 3.1.0. (#935) --- Readme.md | 4 ++-- Sming/SmingCore/SmingCore.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Readme.md b/Readme.md index 5d5579e589..db35b33871 100644 --- a/Readme.md +++ b/Readme.md @@ -42,8 +42,8 @@ OS = Operating System SDK = Software Development Kit n/a = The selected SDK is not available on that OS -## Latest Release -- [Sming V3.0.1](https://github.com/SmingHub/Sming/releases/tag/3.0.1) +## Latest Stable Release +- [Sming V3.1.0](https://github.com/SmingHub/Sming/releases/tag/3.1.0) ## Getting started - [Windows](https://github.com/SmingHub/Sming/wiki/Windows-Quickstart) diff --git a/Sming/SmingCore/SmingCore.h b/Sming/SmingCore/SmingCore.h index 6b83a14375..b703bf91f2 100644 --- a/Sming/SmingCore/SmingCore.h +++ b/Sming/SmingCore/SmingCore.h @@ -8,7 +8,7 @@ #ifndef _NET_WIRING_ #define _NET_WIRING_ -#define SMING_VERSION "3.0.1" // Major Minor Sub +#define SMING_VERSION "3.1.0" // Major Minor Sub #include "../Wiring/WiringFrameworkIncludes.h"