From 51fabc7439604a11da4db1cb3d9bee2d348f6df6 Mon Sep 17 00:00:00 2001
From: Johny Mattsson <jmattsson@dius.com.au>
Date: Tue, 20 Sep 2016 14:17:17 +1000
Subject: [PATCH] Fixed NodeMCU boot banner.

Build for ESP32 on Travis.
---
 .travis.yml          | 23 ++++-------------------
 Makefile             |  2 +-
 components/lua/lua.c |  2 +-
 3 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4b5954f8..0daf1226 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,30 +5,15 @@ addons:
     packages:
     - python-serial
     - srecord
+    - gperf
 cache:
   directories:
     - cache
 install:
   - export PATH=$PWD/tools/toolchains/esp8266/bin:$PWD/tools/toolchains/esp32/bin:$PATH
 script:
-- exit 0
 - export BUILD_DATE=$(date +%Y%m%d)
-- make EXTRA_CCFLAGS="-DBUILD_DATE='\"'$BUILD_DATE'\"'" all
-- cd bin/esp8266
-- file_name_float="nodemcu_float_${TRAVIS_TAG}.bin"
-- srec_cat -output ${file_name_float} -binary 0x00000.bin -binary -fill 0xff 0x00000 0x10000 0x10000.bin -binary -offset 0x10000
-- cd ../..
-- make clean
-- make EXTRA_CCFLAGS="-DLUA_NUMBER_INTEGRAL -DBUILD_DATE='\"'$BUILD_DATE'\"'"
-- cd bin/esp8266
-- file_name_integer="nodemcu_integer_${TRAVIS_TAG}.bin"
-- srec_cat -output ${file_name_integer} -binary 0x00000.bin -binary -fill 0xff 0x00000 0x10000 0x10000.bin -binary -offset 0x10000
-- cd ../..
-- make clean
-- make HW=ESP32 EXTRA_CCFLAGS="-DBUILD_DATE='\"'$BUILD_DATE'\"'" all
-- mv bin/esp32 bin/esp32-float
-- make clean
-- make HW=ESP32 EXTRA_CCFLAGS="-DLUA_NUMBER_INTEGRAL -DBUILD_DATE='\"'$BUILD_DATE'\"'"
-- mv bin/esp32 bin/esp32-integer
+- env BUILD_DIR_BASE=build/float make MORE_CFLAGS="-DBUILD_DATE='\"'$BUILD_DATE'\"'" defconfig all
+- env BUILD_DIR_BASE=build/integer make MORE_CFLAGS="-DLUA_NUMBER_INTEGRAL -DBUILD_DATE='\"'$BUILD_DATE'\"'" defconfig all
 # http://docs.travis-ci.com/user/environment-variables/#Convenience-Variables
-- if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then bash "$TRAVIS_BUILD_DIR"/tools/pr-build.sh; fi
+#- if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then bash "$TRAVIS_BUILD_DIR"/tools/pr-build.sh; fi
diff --git a/Makefile b/Makefile
index a5367412..c51f8ba3 100644
--- a/Makefile
+++ b/Makefile
@@ -25,6 +25,6 @@ LUA_LTR_DEFINES=\
 	-DMIN_OPT_LEVEL=2 \
 
 # Ensure these overrides are always used
-CC:=$(CC) $(BASIC_TYPES) $(LUA_LTR_DEFINES) -D__ESP32__
+CC:=$(CC) $(BASIC_TYPES) $(LUA_LTR_DEFINES) -D__ESP32__ $(MORE_CFLAGS)
 
 endif
diff --git a/components/lua/lua.c b/components/lua/lua.c
index 227e3485..1f4c8d15 100644
--- a/components/lua/lua.c
+++ b/components/lua/lua.c
@@ -128,7 +128,7 @@ static int docall (lua_State *L, int narg, int clear) {
 
 
 static void print_version (lua_State *L) {
-  lua_pushliteral (L, "\n" NODE_VERSION " build " BUILD_DATE " powered by " LUA_RELEASE " on RTOS-SDK ");
+  lua_pushliteral (L, NODE_VERSION " build " BUILD_DATE " powered by " LUA_RELEASE " on ESP32 IDF ");
   lua_pushstring (L, system_get_sdk_version ());
   lua_concat (L, 2);
   const char *msg = lua_tostring (L, -1);