Commit 10e96a3b authored by devsaurus's avatar devsaurus
Browse files

fix travis build

parent a8ff8f05
...@@ -13,7 +13,7 @@ install: ...@@ -13,7 +13,7 @@ install:
- export PATH=$PWD/tools/toolchains/esp8266/bin:$PWD/tools/toolchains/esp32/bin:$PATH - export PATH=$PWD/tools/toolchains/esp8266/bin:$PWD/tools/toolchains/esp32/bin:$PATH
script: script:
- export BUILD_DATE=$(date +%Y%m%d) - export BUILD_DATE=$(date +%Y%m%d)
- env BUILD_DIR_BASE=build/float make MORE_CFLAGS="-DBUILD_DATE='\"'$BUILD_DATE'\"'" defconfig all - env BUILD_DIR_BASE=`pwd`/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 - env BUILD_DIR_BASE=`pwd`/build/integer make MORE_CFLAGS="-DLUA_NUMBER_INTEGRAL -DBUILD_DATE='\"'$BUILD_DATE'\"'" defconfig all
# http://docs.travis-ci.com/user/environment-variables/#Convenience-Variables # 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
...@@ -160,7 +160,7 @@ config LUA_MODULE_U8G2 ...@@ -160,7 +160,7 @@ config LUA_MODULE_U8G2
help help
Includes the u8g2 module. Includes the u8g2 module.
source "../components/u8g2/u8g2.kconfig" source "$PROJECT_PATH/components/u8g2/u8g2.kconfig"
config LUA_MODULE_WIFI config LUA_MODULE_WIFI
bool "WiFi module" bool "WiFi module"
......
...@@ -105,7 +105,7 @@ config U8G2_I2C_UC1611_EA_DOGXL240 ...@@ -105,7 +105,7 @@ config U8G2_I2C_UC1611_EA_DOGXL240
menuconfig U8G2_COMM_SPI menuconfig U8G2_COMM_SPI
bool "SPI" bool "SPI"
select LUA_MODULE_SPI select LUA_MODULE_SPI
default "n" default "y"
config U8G2_SPI_IST3020_ERC19264 config U8G2_SPI_IST3020_ERC19264
depends on U8G2_COMM_SPI depends on U8G2_COMM_SPI
...@@ -315,7 +315,7 @@ menu "Fonts" ...@@ -315,7 +315,7 @@ menu "Fonts"
config U8G2_FONT_SELECTION config U8G2_FONT_SELECTION
depends on LUA_MODULE_U8G2 depends on LUA_MODULE_U8G2
string "Font list" string "Font list"
default "font_6x10_tf" default "font_6x10_tf,font_unifont_t_symbols"
help help
Enter a comma-separated list of fonts. Enter a comma-separated list of fonts.
......
...@@ -13,8 +13,7 @@ while (<STDIN>) { ...@@ -13,8 +13,7 @@ while (<STDIN>) {
} }
if (@i2c_displays > 0 || @spi_displays > 0) { print << 'HEADER';
print << 'HEADER';
#ifndef _U8G2_DISPLAYS_H #ifndef _U8G2_DISPLAYS_H
#define _U8G2_DISPLAYS_H #define _U8G2_DISPLAYS_H
...@@ -23,20 +22,19 @@ if (@i2c_displays > 0 || @spi_displays > 0) { ...@@ -23,20 +22,19 @@ if (@i2c_displays > 0 || @spi_displays > 0) {
HEADER HEADER
print("#define U8G2_DISPLAY_TABLE_I2C \\\n"); print("#define U8G2_DISPLAY_TABLE_I2C \\\n");
foreach my $display (@i2c_displays) { foreach my $display (@i2c_displays) {
print(" U8G2_DISPLAY_TABLE_ENTRY(u8g2_Setup_${display}_f, $display) \\\n"); print(" U8G2_DISPLAY_TABLE_ENTRY(u8g2_Setup_${display}_f, $display) \\\n");
} }
print("\n"); print("\n");
print("#define U8G2_DISPLAY_TABLE_SPI \\\n"); print("#define U8G2_DISPLAY_TABLE_SPI \\\n");
foreach my $display (@spi_displays) { foreach my $display (@spi_displays) {
print(" U8G2_DISPLAY_TABLE_ENTRY(u8g2_Setup_${display}_f, $display) \\\n"); print(" U8G2_DISPLAY_TABLE_ENTRY(u8g2_Setup_${display}_f, $display) \\\n");
} }
print("\n"); print("\n");
print << 'FOOTER'; print << 'FOOTER';
#endif /* _U8G2_DISPLAYS_H */ #endif /* _U8G2_DISPLAYS_H */
FOOTER FOOTER
}
...@@ -10,8 +10,7 @@ while (<STDIN>) { ...@@ -10,8 +10,7 @@ while (<STDIN>) {
} }
} }
if (@font_selection > 0) { print << 'HEADER';
print << 'HEADER';
#ifndef _U8G2_FONTS_H #ifndef _U8G2_FONTS_H
#define _U8G2_FONTS_H #define _U8G2_FONTS_H
...@@ -21,13 +20,12 @@ if (@font_selection > 0) { ...@@ -21,13 +20,12 @@ if (@font_selection > 0) {
#define U8G2_FONT_TABLE \ #define U8G2_FONT_TABLE \
HEADER HEADER
foreach my $font (@font_selection) { foreach my $font (@font_selection) {
print(" U8G2_FONT_TABLE_ENTRY($font) \\\n"); print(" U8G2_FONT_TABLE_ENTRY($font) \\\n");
} }
print << 'FOOTER'; print << 'FOOTER';
#endif /* _U8G2_FONTS_H */ #endif /* _U8G2_FONTS_H */
FOOTER FOOTER
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment