ci: build binaries for all platforms

igrr · igrr · commit 50fcb01baa9d · 2018-02-12T13:16:51.000+03:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,18 +1,77 @@
-language: cpp
-addons:
-  apt:
-    sources:
-      - ubuntu-toolchain-r-test
-    packages:
-      - g++-4.8
+language: c
+sudo: required
+services:
+  - docker
+
+matrix:
+  include:
+    - env:
+      - TARGET_OS=linux64
+      - DOCKER_IMAGE=multiarch/crossbuild
+      - CROSS_TRIPLE=x86_64-linux-gnu
+      - BUILD_DIR=/workdir
+    - env:
+      - TARGET_OS=linux32
+      # multiarch/crossbuild doesn't come with 32-bit compilers, use a different image
+      - DOCKER_IMAGE=dockcross/linux-x86
+      - CROSS_TRIPLE=i686-linux-gnu
+      - BUILD_DIR=/work
+    - env:
+      - TARGET_OS=linux-armhf
+      - DOCKER_IMAGE=multiarch/crossbuild
+      - CROSS_TRIPLE=arm-linux-gnueabihf
+      - BUILD_DIR=/workdir
+      - EXTRA_ARGS="-e SKIP_TESTS=1"
+    - env:
+      - TARGET_OS=win32
+      - DOCKER_IMAGE=multiarch/crossbuild
+      - CROSS_TRIPLE=i686-w64-mingw32
+      - BUILD_DIR=/workdir
+      # multiarch/crossbuild doesn't come with 'zip',
+      # so we build a tgz archive in the container, and re-package it later in the script.
+      - EXTRA_ARGS='-e ARCHIVE=tar -e SKIP_TESTS=1'
+    - env:
+      - TARGET_OS=osx
+      - DOCKER_IMAGE=multiarch/crossbuild
+      - CROSS_TRIPLE=x86_64-apple-darwin
+      - BUILD_DIR=/workdir
+      - EXTRA_ARGS="-e SKIP_TESTS=1 -e CXX=c++"
+
+
 script:
-  - git submodule update --init --recursive
-  - export CXX="g++-4.8" CC="gcc-4.8"
-  # Build default configuration
-  - make dist
-  # Build configuration with SPIFFS_USE_MAGIC_LENGTH=0 (legacy version)
-  - make clean
-  - make dist BUILD_CONFIG_NAME="-no_magic_length" CPPFLAGS="-DSPIFFS_USE_MAGIC_LENGTH=0 -DSPIFFS_ALIGNED_OBJECT_INDEX_TABLES=1"
+  - export VER=$(git describe)
+  - echo ${VER}
+
+  - >-
+    docker run --rm
+    -v ${PWD}:${BUILD_DIR}
+    -e TARGET_OS=${TARGET_OS}
+    -e CROSS_TRIPLE=${CROSS_TRIPLE}
+    ${EXTRA_ARGS}
+    ${DOCKER_IMAGE}
+    ./build_all_configs.sh
+
+  # Diagnostics
+  - ls -l
+
+  # for windows, prepare zip archives
+  - |
+    if [ $TARGET_OS = "win32" ]; then
+      for dirname in $(ls -d mkspiffs-*/); do
+        name=${dirname%/}
+        zip -r $name.zip $dirname
+        rm -f $name.tar.gz
+      done
+    fi
+
+  # Prepare files with sizes and sha256 hashes
+  - |
+    for name in $(ls -1 mkspiffs-*-${TARGET_OS}.*); do
+      DIST_SIZE=$(wc -c <${name} 2>/dev/null | tr -d ' ')
+      DIST_SHA256=$(shasum -a 256 ${name} | cut -d ' ' -f1)
+      echo ${name} ${DIST_SIZE} ${DIST_SHA256}
+      echo ${name} ${DIST_SIZE} ${DIST_SHA256} >${name}.sha256.txt 
+    done
 
 notifications:
   email:
@@ -26,7 +85,7 @@ deploy:
   api_key:
     secure: "AdgaAHsU3xkyKqcZu6Yp3njmWTXFm/Ggsq9n6cC9byHTDdcQ6UqdX1gPzud53YkSDbUjst5vok0i9xywH2pFWVt6G+FAD5uI/h1IiacQQ9rjnDef++nz+KkZtsPUhAD8LOdKPvJ7TmNNnkN35VFqyQETr/18bdzGC0tEZQK2BFQQrdz6cOGeez1ADYal0LAVHHcfolnwZb9jCT51nPEpSMlhxwSNNFncG2Y8MLDT2Q1y0xR3iI6aSSkMxqWCYYIdEC12rffwyRbC2P+JXp+AXNayLuKjCFnWB/QIyvrvoXtwbAEfW1pZzrWZAI5fI6zQaKKjixhf3Kr1f7y/xSPSdsPemdakRgANRTZW0R6wiXxUsTEjVGV6fWqUKT9pm335k8vWq2i+6exSrIVmYyxz4J3u6+Mgdbij5hI1NLVLq+It0KUVt99IOWaTOy01y6a0m1AprYYPgyw7fwlgChMPsLcaRrq1gtjtJr7wQKLaIlfYdEB4b0DtE/fx+b78mMQqXS/WvwSUGkJ5C2poLX2zdUxFe3phjeL3P0Daa0gLDQ2tCf/VmvPy20//b7MaO10URoeeV16fs+2BFzLjh38kzLRrPaRcBcwQFlzI1P+4mWPRDMuKvBn6i0sodFEzlUQMFSa8xyVtE5wIDLqepeG/9roW8woKIAmwG1k1YtM3XeE="
   file_glob: true
-  file: mkspiffs-$TRAVIS_TAG-*linux64.tar.gz
+  file: mkspiffs-*-$TARGET_OS.*
   on:
     repo: igrr/mkspiffs
     tags: true
diff --git a/Makefile b/Makefile
@@ -1,39 +1,58 @@
+# OS detection. Not used in CI builds
+ifndef TARGET_OS
 ifeq ($(OS),Windows_NT)
-	TARGET_OS := WINDOWS
-	DIST_SUFFIX := windows
-	ARCHIVE_CMD := 7z a
-	ARCHIVE_EXTENSION := zip
-	TARGET := mkspiffs.exe
-	TARGET_CFLAGS := -mno-ms-bitfields
-	TARGET_LDFLAGS := -Wl,-static -static-libgcc
-	CC=gcc
-	CXX=g++
+	TARGET_OS := win32
 else
 	UNAME_S := $(shell uname -s)
 	ifeq ($(UNAME_S),Linux)
-		TARGET_OS := LINUX
-		UNAME_P := $(shell uname -p)
-		ifeq ($(UNAME_P),x86_64)
-			DIST_SUFFIX ?= linux64
+		UNAME_M := $(shell uname -m)
+		ifeq ($(UNAME_M),x86_64)
+			TARGET_OS := linux64
+		endif
+		ifeq ($(UNAME_M),i686)
+			TARGET_OS := linux32
 		endif
-		ifneq ($(filter %86,$(UNAME_P)),)
-			DIST_SUFFIX ?= linux32
+		ifeq ($(UNAME_M),armv6l)
+			TARGET_OS := linux-armhf
 		endif
 	endif
 	ifeq ($(UNAME_S),Darwin)
-		TARGET_OS := OSX
-		DIST_SUFFIX := osx
-		CC=clang
-		CXX=clang++
-		TARGET_CFLAGS   = -mmacosx-version-min=10.7 -arch i386 -arch x86_64
-		TARGET_CXXFLAGS = -mmacosx-version-min=10.7 -arch i386 -arch x86_64 -stdlib=libc++
-		TARGET_LDFLAGS  = -arch i386 -arch x86_64 -stdlib=libc++
+		TARGET_OS := osx
 	endif
+	ifeq ($(UNAME_S),FreeBSD)
+		TARGET_OS := freebsd
+	endif
+endif
+endif # TARGET_OS
+
+# OS-specific settings and build flags
+ifeq ($(TARGET_OS),win32)
+	ARCHIVE ?= zip
+	TARGET := mkspiffs.exe
+	TARGET_CFLAGS = -mno-ms-bitfields
+	TARGET_LDFLAGS = -Wl,-static -static-libgcc -static-libstdc++
+else
+	ARCHIVE ?= tar
+	TARGET := mkspiffs
+endif
+
+ifeq ($(TARGET_OS),osx)
+	TARGET_CFLAGS   = -mmacosx-version-min=10.7 -arch i386 -arch x86_64
+	TARGET_CXXFLAGS = -mmacosx-version-min=10.7 -arch i386 -arch x86_64 -stdlib=libc++
+	TARGET_LDFLAGS  = -mmacosx-version-min=10.7 -arch i386 -arch x86_64 -stdlib=libc++
+endif
+
+# Packaging into archive (for 'dist' target)
+ifeq ($(ARCHIVE), zip)
+	ARCHIVE_CMD := zip -r
+	ARCHIVE_EXTENSION := zip
+endif
+ifeq ($(ARCHIVE), tar)
 	ARCHIVE_CMD := tar czf
 	ARCHIVE_EXTENSION := tar.gz
-	TARGET := mkspiffs
 endif
 
+
 VERSION ?= $(shell git describe --always)
 SPIFFS_VERSION := $(shell git -C spiffs describe --tags || echo "unknown")
 BUILD_CONFIG_NAME ?= -generic
@@ -47,12 +66,14 @@ OBJ		:= main.o \
 
 INCLUDES := -Itclap -Iinclude -Ispiffs/src -I.
 
+# clang doesn't seem to handle -D "ARG=\"foo bar\"" correctly, so replace spaces with \x20:
+BUILD_CONFIG_STR := $(shell echo $(CPPFLAGS) | sed 's- -\\\\x20-')
+
 override CPPFLAGS := \
 	$(INCLUDES) \
-	-D $(TARGET_OS) \
 	-D VERSION=\"$(VERSION)\" \
 	-D SPIFFS_VERSION=\"$(SPIFFS_VERSION)\" \
-	-D "BUILD_CONFIG=\"$(CPPFLAGS)\"" \
+	-D BUILD_CONFIG=\"$(BUILD_CONFIG_STR)\" \
 	-D BUILD_CONFIG_NAME=\"$(BUILD_CONFIG_NAME)\" \
 	-D __NO_INLINE__ \
 	$(CPPFLAGS)
@@ -61,15 +82,19 @@ override CFLAGS := -std=gnu99 -Os -Wall $(TARGET_CFLAGS) $(CFLAGS)
 override CXXFLAGS := -std=gnu++11 -Os -Wall $(TARGET_CXXFLAGS) $(CXXFLAGS)
 override LDFLAGS := $(TARGET_LDFLAGS) $(LDFLAGS)
 
-DIST_NAME := mkspiffs-$(VERSION)$(BUILD_CONFIG_NAME)-$(DIST_SUFFIX)
+DIST_NAME := mkspiffs-$(VERSION)$(BUILD_CONFIG_NAME)-$(TARGET_OS)
 DIST_DIR := $(DIST_NAME)
 DIST_ARCHIVE := $(DIST_NAME).$(ARCHIVE_EXTENSION)
 
 .PHONY: all clean dist
 
 all: $(TARGET)
 
-dist: test $(DIST_ARCHIVE)
+dist: $(DIST_ARCHIVE)
+
+ifndef SKIP_TESTS
+dist: test
+endif
 
 $(DIST_ARCHIVE): $(TARGET) $(DIST_DIR)
 	cp $(TARGET) $(DIST_DIR)/
diff --git a/build_all_configs.sh b/build_all_configs.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+#
+# Script used in CI to build all configurations of mkspiffs
+#
+
+set -e
+
+# Generic (default options)
+make dist
+
+# Arduino ESP8266
+make clean
+make dist BUILD_CONFIG_NAME="-arduino-esp8266" \
+    CPPFLAGS="-DSPIFFS_USE_MAGIC_LENGTH=0 -DSPIFFS_ALIGNED_OBJECT_INDEX_TABLES=1"
+
+# Build configuration for arduino-esp32
+make clean
+make dist BUILD_CONFIG_NAME="-arduino-esp32" \
+    CFLAGS="-DSPIFFS_OBJ_META_LEN=4"
+
+# Build configuration for ESP-IDF (esp32)
+make clean
+make dist BUILD_CONFIG_NAME="-esp-idf" \
+    CFLAGS="-DSPIFFS_OBJ_META_LEN=4"
+
+
+
diff --git a/main.cpp b/main.cpp
@@ -21,6 +21,10 @@
 #include "tclap/CmdLine.h"
 #include "tclap/UnlabeledValueArg.h"
 
+#ifdef _WIN32
+#include <direct.h>
+#endif
+
 static std::vector<uint8_t> s_flashmem;
 
 static std::string s_dirName;
