From c89dea110b12340b52ad61c3b5fbd9860d8c0eed Mon Sep 17 00:00:00 2001
From: Atsushi Watanabe <atsushi.w@ieee.org>
Date: Sat, 10 Nov 2018 20:51:21 +0900
Subject: [PATCH 1/9] Fix finding readline in cmake

---
 CMakeLists.txt                   |  9 ++++-----
 cmake/modules/FindReadline.cmake | 20 ++++++++++++++++++++
 2 files changed, 24 insertions(+), 5 deletions(-)
 create mode 100644 cmake/modules/FindReadline.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d318a8d..f980b34 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -50,7 +50,6 @@ if(CMAKE_THREAD_LIBS_INIT)
   set(THREAD_LIBRARIES ${CMAKE_THREAD_LIBS_INIT} ${THREAD_LIBRARIES})
 endif(CMAKE_THREAD_LIBS_INIT)
 
-
 find_package(PkgConfig)
 if(PKGCONFIG_FOUND)
   set(HAVE_PKG_CONFIG 1)
@@ -60,11 +59,11 @@ if(USE_SSM)
   find_package(SSM)
 endif(USE_SSM)
 
-set(READLINE_LIBRARIES "")
-find_library(READLINE_LIBRARIES readline)
-if(READLINE_LIBRARIES )
+find_package(Readline)
+
+if(READLINE_FOUND)
   add_definitions(-DHAVE_LIBREADLINE=1)
-endif(READLINE_LIBRARIES )
+endif(READLINE_FOUND)
 
 include(CheckFunctionExists)
 check_function_exists(longjmp HAVE_LONGJMP)
diff --git a/cmake/modules/FindReadline.cmake b/cmake/modules/FindReadline.cmake
new file mode 100644
index 0000000..2be8bac
--- /dev/null
+++ b/cmake/modules/FindReadline.cmake
@@ -0,0 +1,20 @@
+# Find readline library
+
+find_path(READLINE_INCLUDE_DIRS readline/readline.h
+	HINTS ENV READLINE_DIR
+	PATH_SUFFIXES include
+)
+find_library(READLINE_LIBRARIES_FOUND
+	NAMES readline
+	HINTS ENV READLINE_DIR
+)
+if(READLINE_LIBRARIES_FOUND)
+	set(READLINE_LIBRARIES readline)
+endif(READLINE_LIBRARIES_FOUND)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(READLINE
+	DEFAULT_MSG READLINE_LIBRARIES
+	READLINE_INCLUDE_DIRS
+)
+

From d08e07db567877cc868d5e044af5873c4cb3cb78 Mon Sep 17 00:00:00 2001
From: Atsushi Watanabe <atsushi.w@ieee.org>
Date: Sat, 10 Nov 2018 20:58:45 +0900
Subject: [PATCH 2/9] Add dependency to libreadline

---
 package.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package.xml b/package.xml
index b0d0da4..1dba4ef 100644
--- a/package.xml
+++ b/package.xml
@@ -7,7 +7,11 @@
   <license>MIT</license>
 
   <buildtool_depend>cmake</buildtool_depend>
+
+  <build_depend>libreadline-dev</build_depend>
+
   <exec_depend>catkin</exec_depend>
+  <exec_depend>libreadline</exec_depend>
 
   <export>
     <build_type>cmake</build_type>

From 8611415eee33b55203b9e10fde9ee3d2531a92a9 Mon Sep 17 00:00:00 2001
From: Atsushi Watanabe <atsushi.w@ieee.org>
Date: Sat, 10 Nov 2018 23:44:15 +0900
Subject: [PATCH 3/9] Remove unnecessary newline

---
 CMakeLists.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f980b34..3152637 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,7 +60,6 @@ if(USE_SSM)
 endif(USE_SSM)
 
 find_package(Readline)
-
 if(READLINE_FOUND)
   add_definitions(-DHAVE_LIBREADLINE=1)
 endif(READLINE_FOUND)

From 8916793b2db1ba2c5dd1392116be4a989a3f50bc Mon Sep 17 00:00:00 2001
From: Atsushi Watanabe <atsushi.w@ieee.org>
Date: Sun, 11 Nov 2018 22:56:44 +0900
Subject: [PATCH 4/9] Check build with readline

---
 .travis.yml       |  6 +++---
 Dockerfile.bionic | 22 ----------------------
 Dockerfile.test   | 32 ++++++++++++++++++++++++++++++++
 Dockerfile.trusty | 22 ----------------------
 Dockerfile.xenial | 22 ----------------------
 5 files changed, 35 insertions(+), 69 deletions(-)
 delete mode 100644 Dockerfile.bionic
 create mode 100644 Dockerfile.test
 delete mode 100644 Dockerfile.trusty
 delete mode 100644 Dockerfile.xenial

diff --git a/.travis.yml b/.travis.yml
index d7d3d6f..8ac87b8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,9 +10,9 @@ before_install:
   - sudo apt-get update -y
   - sudo apt-get install -y gcc-mingw-w64-x86-64 gcc-mingw-w64-i686 g++-mingw-w64-x86-64 g++-mingw-w64-i686
 script:
-  - docker build -t yp-spur:xenial -f Dockerfile.xenial --pull=true ${TRAVIS_BUILD_DIR}
-  - docker build -t yp-spur:trusty -f Dockerfile.trusty --pull=true ${TRAVIS_BUILD_DIR}
-  - docker build -t yp-spur:bionic -f Dockerfile.bionic --pull=true ${TRAVIS_BUILD_DIR}
+  - docker build -t yp-spur:xenial -f Dockerfile.test --pull=true --build-arg UBUNTU_VERSION=xenial ${TRAVIS_BUILD_DIR}
+  - docker build -t yp-spur:trusty -f Dockerfile.test --pull=true --build-arg UBUNTU_VERSION=trusty ${TRAVIS_BUILD_DIR}
+  - docker build -t yp-spur:bionic -f Dockerfile.test --pull=true --build-arg UBUNTU_VERSION=bionic ${TRAVIS_BUILD_DIR}
   - (mkdir -p ${TRAVIS_BUILD_DIR}/build-win64/install && cd ${TRAVIS_BUILD_DIR}/build-win64 && cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/toolchain-mingw-x86_64.cmake -DCMAKE_INSTALL_PREFIX=`pwd`/install -DENABLE_ALL_STATIC=ON .. && make && make install)
   - (mkdir -p ${TRAVIS_BUILD_DIR}/build-win32/install && cd ${TRAVIS_BUILD_DIR}/build-win32 && cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/toolchain-mingw-i686.cmake -DCMAKE_INSTALL_PREFIX=`pwd`/install -DENABLE_ALL_STATIC=ON .. && make && make install)
 
diff --git a/Dockerfile.bionic b/Dockerfile.bionic
deleted file mode 100644
index fdf4a11..0000000
--- a/Dockerfile.bionic
+++ /dev/null
@@ -1,22 +0,0 @@
-FROM ubuntu:bionic
-
-RUN apt-get -qq update \
-  && apt-get install -y --no-install-recommends build-essential cmake libgtest-dev sudo \
-  && apt-get clean \
-  && rm -rf /var/lib/apt/lists/*
-
-ENV CTEST_OUTPUT_ON_FAILURE=1
-
-RUN mkdir -p /tmp/gtest \
-  && cd /tmp/gtest \
-  && cmake /usr/src/gtest \
-  && make \
-  && cp *.a /usr/lib/ \
-  && rm -rf /tmp/gtest
-
-ENV CTEST_OUTPUT_ON_FAILURE=1
-
-COPY ./ /yp-spur
-RUN mkdir -p /yp-spur/build
-WORKDIR /yp-spur/build
-RUN cmake .. && make && make test && sudo make install
diff --git a/Dockerfile.test b/Dockerfile.test
new file mode 100644
index 0000000..afcf1b5
--- /dev/null
+++ b/Dockerfile.test
@@ -0,0 +1,32 @@
+ARG UBUNTU_VERSION=bionic
+FROM ubuntu:${UBUNTU_VERSION}
+
+RUN apt-get -qq update \
+  && apt-get install -y --no-install-recommends build-essential cmake libgtest-dev
+# don't clean apt-cache to reuse later
+
+ENV CTEST_OUTPUT_ON_FAILURE=1
+
+RUN mkdir -p /tmp/gtest \
+  && cd /tmp/gtest \
+  && cmake /usr/src/gtest \
+  && make \
+  && cp *.a /usr/lib/ \
+  && rm -rf /tmp/gtest
+
+ENV CTEST_OUTPUT_ON_FAILURE=1
+
+COPY ./ /yp-spur
+RUN mkdir -p /yp-spur/build
+WORKDIR /yp-spur/build
+RUN cmake .. && make && make test && make install
+# check that ypspur-interpreter is built without readline
+RUN ldd ypspur-interpreter | grep libreadline.so; test $? -eq 1
+
+RUN apt-get install -y --no-install-recommends libreadline-dev
+
+RUN mkdir -p /yp-spur/build-readline
+WORKDIR /yp-spur/build-readline
+RUN cmake .. && make && make test && make install
+# check that ypspur-interpreter is built with readline
+RUN ldd ypspur-interpreter | grep libreadline.so
diff --git a/Dockerfile.trusty b/Dockerfile.trusty
deleted file mode 100644
index e4640a2..0000000
--- a/Dockerfile.trusty
+++ /dev/null
@@ -1,22 +0,0 @@
-FROM ubuntu:trusty
-
-RUN apt-get -qq update \
-  && apt-get install -y --no-install-recommends build-essential cmake libgtest-dev sudo \
-  && apt-get clean \
-  && rm -rf /var/lib/apt/lists/*
-
-ENV CTEST_OUTPUT_ON_FAILURE=1
-
-RUN mkdir -p /tmp/gtest \
-  && cd /tmp/gtest \
-  && cmake /usr/src/gtest \
-  && make \
-  && cp *.a /usr/lib/ \
-  && rm -rf /tmp/gtest
-
-ENV CTEST_OUTPUT_ON_FAILURE=1
-
-COPY ./ /yp-spur
-RUN mkdir -p /yp-spur/build
-WORKDIR /yp-spur/build
-RUN cmake .. && make && make test && sudo make install
diff --git a/Dockerfile.xenial b/Dockerfile.xenial
deleted file mode 100644
index 8e45274..0000000
--- a/Dockerfile.xenial
+++ /dev/null
@@ -1,22 +0,0 @@
-FROM ubuntu:xenial
-
-RUN apt-get -qq update \
-  && apt-get install -y --no-install-recommends build-essential cmake libgtest-dev sudo \
-  && apt-get clean \
-  && rm -rf /var/lib/apt/lists/*
-
-ENV CTEST_OUTPUT_ON_FAILURE=1
-
-RUN mkdir -p /tmp/gtest \
-  && cd /tmp/gtest \
-  && cmake /usr/src/gtest \
-  && make \
-  && cp *.a /usr/lib/ \
-  && rm -rf /tmp/gtest
-
-ENV CTEST_OUTPUT_ON_FAILURE=1
-
-COPY ./ /yp-spur
-RUN mkdir -p /yp-spur/build
-WORKDIR /yp-spur/build
-RUN cmake .. && make && make test && sudo make install

From 5122a64dc48d2c970d0161b80a1da48cc7b461ed Mon Sep 17 00:00:00 2001
From: Atsushi Watanabe <atsushi.w@ieee.org>
Date: Sun, 11 Nov 2018 23:03:09 +0900
Subject: [PATCH 5/9] Enable parallel build

---
 .travis.yml     | 4 ++--
 Dockerfile.test | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8ac87b8..d80a169 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,8 +13,8 @@ script:
   - docker build -t yp-spur:xenial -f Dockerfile.test --pull=true --build-arg UBUNTU_VERSION=xenial ${TRAVIS_BUILD_DIR}
   - docker build -t yp-spur:trusty -f Dockerfile.test --pull=true --build-arg UBUNTU_VERSION=trusty ${TRAVIS_BUILD_DIR}
   - docker build -t yp-spur:bionic -f Dockerfile.test --pull=true --build-arg UBUNTU_VERSION=bionic ${TRAVIS_BUILD_DIR}
-  - (mkdir -p ${TRAVIS_BUILD_DIR}/build-win64/install && cd ${TRAVIS_BUILD_DIR}/build-win64 && cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/toolchain-mingw-x86_64.cmake -DCMAKE_INSTALL_PREFIX=`pwd`/install -DENABLE_ALL_STATIC=ON .. && make && make install)
-  - (mkdir -p ${TRAVIS_BUILD_DIR}/build-win32/install && cd ${TRAVIS_BUILD_DIR}/build-win32 && cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/toolchain-mingw-i686.cmake -DCMAKE_INSTALL_PREFIX=`pwd`/install -DENABLE_ALL_STATIC=ON .. && make && make install)
+  - (mkdir -p ${TRAVIS_BUILD_DIR}/build-win64/install && cd ${TRAVIS_BUILD_DIR}/build-win64 && cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/toolchain-mingw-x86_64.cmake -DCMAKE_INSTALL_PREFIX=`pwd`/install -DENABLE_ALL_STATIC=ON .. && make -j && make install)
+  - (mkdir -p ${TRAVIS_BUILD_DIR}/build-win32/install && cd ${TRAVIS_BUILD_DIR}/build-win32 && cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/toolchain-mingw-i686.cmake -DCMAKE_INSTALL_PREFIX=`pwd`/install -DENABLE_ALL_STATIC=ON .. && make -j && make install)
 
 before_deploy:
   - sudo apt-get install -y npm
diff --git a/Dockerfile.test b/Dockerfile.test
index afcf1b5..26feddd 100644
--- a/Dockerfile.test
+++ b/Dockerfile.test
@@ -19,7 +19,7 @@ ENV CTEST_OUTPUT_ON_FAILURE=1
 COPY ./ /yp-spur
 RUN mkdir -p /yp-spur/build
 WORKDIR /yp-spur/build
-RUN cmake .. && make && make test && make install
+RUN cmake .. && make -j && make test && make install
 # check that ypspur-interpreter is built without readline
 RUN ldd ypspur-interpreter | grep libreadline.so; test $? -eq 1
 
@@ -27,6 +27,6 @@ RUN apt-get install -y --no-install-recommends libreadline-dev
 
 RUN mkdir -p /yp-spur/build-readline
 WORKDIR /yp-spur/build-readline
-RUN cmake .. && make && make test && make install
+RUN cmake .. && make -j && make test && make install
 # check that ypspur-interpreter is built with readline
 RUN ldd ypspur-interpreter | grep libreadline.so

From eb7e2aa360a4b50dba5ebe361a3080275f119304 Mon Sep 17 00:00:00 2001
From: Atsushi Watanabe <atsushi.w@ieee.org>
Date: Sun, 11 Nov 2018 23:09:15 +0900
Subject: [PATCH 6/9] Revert "Enable parallel build"

This reverts commit 5122a64dc48d2c970d0161b80a1da48cc7b461ed.
---
 .travis.yml     | 4 ++--
 Dockerfile.test | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d80a169..8ac87b8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,8 +13,8 @@ script:
   - docker build -t yp-spur:xenial -f Dockerfile.test --pull=true --build-arg UBUNTU_VERSION=xenial ${TRAVIS_BUILD_DIR}
   - docker build -t yp-spur:trusty -f Dockerfile.test --pull=true --build-arg UBUNTU_VERSION=trusty ${TRAVIS_BUILD_DIR}
   - docker build -t yp-spur:bionic -f Dockerfile.test --pull=true --build-arg UBUNTU_VERSION=bionic ${TRAVIS_BUILD_DIR}
-  - (mkdir -p ${TRAVIS_BUILD_DIR}/build-win64/install && cd ${TRAVIS_BUILD_DIR}/build-win64 && cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/toolchain-mingw-x86_64.cmake -DCMAKE_INSTALL_PREFIX=`pwd`/install -DENABLE_ALL_STATIC=ON .. && make -j && make install)
-  - (mkdir -p ${TRAVIS_BUILD_DIR}/build-win32/install && cd ${TRAVIS_BUILD_DIR}/build-win32 && cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/toolchain-mingw-i686.cmake -DCMAKE_INSTALL_PREFIX=`pwd`/install -DENABLE_ALL_STATIC=ON .. && make -j && make install)
+  - (mkdir -p ${TRAVIS_BUILD_DIR}/build-win64/install && cd ${TRAVIS_BUILD_DIR}/build-win64 && cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/toolchain-mingw-x86_64.cmake -DCMAKE_INSTALL_PREFIX=`pwd`/install -DENABLE_ALL_STATIC=ON .. && make && make install)
+  - (mkdir -p ${TRAVIS_BUILD_DIR}/build-win32/install && cd ${TRAVIS_BUILD_DIR}/build-win32 && cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/toolchain-mingw-i686.cmake -DCMAKE_INSTALL_PREFIX=`pwd`/install -DENABLE_ALL_STATIC=ON .. && make && make install)
 
 before_deploy:
   - sudo apt-get install -y npm
diff --git a/Dockerfile.test b/Dockerfile.test
index 26feddd..afcf1b5 100644
--- a/Dockerfile.test
+++ b/Dockerfile.test
@@ -19,7 +19,7 @@ ENV CTEST_OUTPUT_ON_FAILURE=1
 COPY ./ /yp-spur
 RUN mkdir -p /yp-spur/build
 WORKDIR /yp-spur/build
-RUN cmake .. && make -j && make test && make install
+RUN cmake .. && make && make test && make install
 # check that ypspur-interpreter is built without readline
 RUN ldd ypspur-interpreter | grep libreadline.so; test $? -eq 1
 
@@ -27,6 +27,6 @@ RUN apt-get install -y --no-install-recommends libreadline-dev
 
 RUN mkdir -p /yp-spur/build-readline
 WORKDIR /yp-spur/build-readline
-RUN cmake .. && make -j && make test && make install
+RUN cmake .. && make && make test && make install
 # check that ypspur-interpreter is built with readline
 RUN ldd ypspur-interpreter | grep libreadline.so

From 405bae0e0bf5f5939ae4e32f5250f342e529df38 Mon Sep 17 00:00:00 2001
From: Atsushi Watanabe <atsushi.w@ieee.org>
Date: Mon, 12 Nov 2018 09:29:59 +0900
Subject: [PATCH 7/9] Matrix build

---
 .travis.yml | 82 +++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 61 insertions(+), 21 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8ac87b8..c8ad3c1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,34 +1,73 @@
-dist: trusty
+dist: xenial
+service: docker
 sudo: required
 
 language: c
 compiler: gcc
 
-service: docker
+cache:
+  - apt
+  - npm
+
+env:
+  matrix:
+    - USE_DOCKER=true UBUNTU_VERSION=trusty
+    - USE_DOCKER=true UBUNTU_VERSION=xenial
+    - USE_DOCKER=true UBUNTU_VERSION=bionic
+    - USE_MINGW=true
 
 before_install:
-  - sudo apt-get update -y
-  - sudo apt-get install -y gcc-mingw-w64-x86-64 gcc-mingw-w64-i686 g++-mingw-w64-x86-64 g++-mingw-w64-i686
+  - |
+    if [ ${USE_MINGW} == true ]; then
+      sudo apt-get update -y -qq
+      sudo apt-get install -y --no-install-recommends \
+        gcc-mingw-w64-x86-64 \
+        gcc-mingw-w64-i686 \
+        g++-mingw-w64-x86-64 \
+        g++-mingw-w64-i686 \
+        npm
+      npm config set strict-ssl false  # XXX: workaround for CERT_UNTRUSTED error in npm
+      npm install json
+    fi
+
 script:
-  - docker build -t yp-spur:xenial -f Dockerfile.test --pull=true --build-arg UBUNTU_VERSION=xenial ${TRAVIS_BUILD_DIR}
-  - docker build -t yp-spur:trusty -f Dockerfile.test --pull=true --build-arg UBUNTU_VERSION=trusty ${TRAVIS_BUILD_DIR}
-  - docker build -t yp-spur:bionic -f Dockerfile.test --pull=true --build-arg UBUNTU_VERSION=bionic ${TRAVIS_BUILD_DIR}
-  - (mkdir -p ${TRAVIS_BUILD_DIR}/build-win64/install && cd ${TRAVIS_BUILD_DIR}/build-win64 && cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/toolchain-mingw-x86_64.cmake -DCMAKE_INSTALL_PREFIX=`pwd`/install -DENABLE_ALL_STATIC=ON .. && make && make install)
-  - (mkdir -p ${TRAVIS_BUILD_DIR}/build-win32/install && cd ${TRAVIS_BUILD_DIR}/build-win32 && cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/toolchain-mingw-i686.cmake -DCMAKE_INSTALL_PREFIX=`pwd`/install -DENABLE_ALL_STATIC=ON .. && make && make install)
+  - |
+    if [ ${USE_DOCKER} == true ]; then
+      docker build -t yp-spur:${UBUNTU_VERSION} -f Dockerfile.test --pull=true --build-arg UBUNTU_VERSION .
+    fi
+  - |
+    if [ ${USE_MINGW} == true ]; then
+      (mkdir -p ${TRAVIS_BUILD_DIR}/build-win64/install \
+        && cd ${TRAVIS_BUILD_DIR}/build-win64 \
+        && cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/toolchain-mingw-x86_64.cmake -DCMAKE_INSTALL_PREFIX=`pwd`/install -DENABLE_ALL_STATIC=ON .. \
+        && make \
+        && make install)
+      (mkdir -p ${TRAVIS_BUILD_DIR}/build-win32/install \
+        && cd ${TRAVIS_BUILD_DIR}/build-win32 \
+        && cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/toolchain-mingw-i686.cmake -DCMAKE_INSTALL_PREFIX=`pwd`/install -DENABLE_ALL_STATIC=ON .. \
+        && make \
+        && make install)
+    fi
 
 before_deploy:
-  - sudo apt-get install -y npm
-  - sudo npm config set strict-ssl false  # XXX: workaround for CERT_UNTRUSTED error in npm
-  - sudo npm install -g json
-  - export YPSPUR_GUI_URI=`wget -q -O - https://api.github.com/repos/openspur/ypspur-gui/releases/latest | json assets[0].browser_download_url`
-  - (cd ${TRAVIS_BUILD_DIR} && wget $YPSPUR_GUI_URI)
-  - (cd ${TRAVIS_BUILD_DIR}/build-win64/install/ && unzip ../../$(basename $YPSPUR_GUI_URI))
-  - (cd ${TRAVIS_BUILD_DIR}/build-win32/install/ && unzip ../../$(basename $YPSPUR_GUI_URI))
-  - (cd ${TRAVIS_BUILD_DIR} && mkdir packages)
-  - (cd ${TRAVIS_BUILD_DIR}/build-win64/install/ && zip -q ../../packages/yp-spur.win64.${TRAVIS_TAG}.zip -r $(ls))
-  - (cd ${TRAVIS_BUILD_DIR}/build-win32/install/ && zip -q ../../packages/yp-spur.win32.${TRAVIS_TAG}.zip -r $(ls))
-  - (cd ${TRAVIS_BUILD_DIR}/build-win64/ && zip -q ../packages/yp-spur-samples.win64.${TRAVIS_TAG}.zip -r samples/run-test.exe)
-  - (cd ${TRAVIS_BUILD_DIR}/build-win32/ && zip -q ../packages/yp-spur-samples.win32.${TRAVIS_TAG}.zip -r samples/run-test.exe)
+  - |
+    if [ ${USE_MINGW} == true ]; then
+      export YPSPUR_GUI_URI=`wget -q -O - https://api.github.com/repos/openspur/ypspur-gui/releases/latest | json assets[0].browser_download_url`
+      (cd ${TRAVIS_BUILD_DIR} && wget $YPSPUR_GUI_URI)
+      (cd ${TRAVIS_BUILD_DIR}/build-win64/install/ \
+        && unzip ../../$(basename $YPSPUR_GUI_URI))
+      (cd ${TRAVIS_BUILD_DIR}/build-win32/install/ \
+        && unzip ../../$(basename $YPSPUR_GUI_URI))
+      (cd ${TRAVIS_BUILD_DIR} && mkdir packages)
+      (cd ${TRAVIS_BUILD_DIR}/build-win64/install/ \
+        && zip -q ../../packages/yp-spur.win64.${TRAVIS_TAG}.zip -r $(ls))
+      (cd ${TRAVIS_BUILD_DIR}/build-win32/install/ \
+        && zip -q ../../packages/yp-spur.win32.${TRAVIS_TAG}.zip -r $(ls))
+      (cd ${TRAVIS_BUILD_DIR}/build-win64/ \
+        && zip -q ../packages/yp-spur-samples.win64.${TRAVIS_TAG}.zip -r samples/run-test.exe)
+      (cd ${TRAVIS_BUILD_DIR}/build-win32/ \
+        && zip -q ../packages/yp-spur-samples.win32.${TRAVIS_TAG}.zip -r samples/run-test.exe)
+    fi
 
 deploy:
   provider: releases
@@ -42,3 +81,4 @@ deploy:
     - packages/yp-spur-samples.win32.${TRAVIS_TAG}.zip
   on:
     tags: true
+    condition: ${USE_MINGW} == true

From 3c84a1d949e732ec570899bb72974693d990da22 Mon Sep 17 00:00:00 2001
From: Atsushi Watanabe <atsushi.w@ieee.org>
Date: Mon, 12 Nov 2018 09:46:04 +0900
Subject: [PATCH 8/9] Fix unary operator

---
 .travis.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c8ad3c1..f6c441c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,7 +18,7 @@ env:
 
 before_install:
   - |
-    if [ ${USE_MINGW} == true ]; then
+    if [ x${USE_MINGW} == xtrue ]; then
       sudo apt-get update -y -qq
       sudo apt-get install -y --no-install-recommends \
         gcc-mingw-w64-x86-64 \
@@ -32,11 +32,11 @@ before_install:
 
 script:
   - |
-    if [ ${USE_DOCKER} == true ]; then
+    if [ x${USE_DOCKER} == xtrue ]; then
       docker build -t yp-spur:${UBUNTU_VERSION} -f Dockerfile.test --pull=true --build-arg UBUNTU_VERSION .
     fi
   - |
-    if [ ${USE_MINGW} == true ]; then
+    if [ x${USE_MINGW} == xtrue ]; then
       (mkdir -p ${TRAVIS_BUILD_DIR}/build-win64/install \
         && cd ${TRAVIS_BUILD_DIR}/build-win64 \
         && cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/toolchain-mingw-x86_64.cmake -DCMAKE_INSTALL_PREFIX=`pwd`/install -DENABLE_ALL_STATIC=ON .. \
@@ -51,7 +51,7 @@ script:
 
 before_deploy:
   - |
-    if [ ${USE_MINGW} == true ]; then
+    if [ x${USE_MINGW} == xtrue ]; then
       export YPSPUR_GUI_URI=`wget -q -O - https://api.github.com/repos/openspur/ypspur-gui/releases/latest | json assets[0].browser_download_url`
       (cd ${TRAVIS_BUILD_DIR} && wget $YPSPUR_GUI_URI)
       (cd ${TRAVIS_BUILD_DIR}/build-win64/install/ \
@@ -81,4 +81,4 @@ deploy:
     - packages/yp-spur-samples.win32.${TRAVIS_TAG}.zip
   on:
     tags: true
-    condition: ${USE_MINGW} == true
+    condition: x${USE_MINGW} == xtrue

From 68481729e8f51a0788e023e8849af7da6c6865b8 Mon Sep 17 00:00:00 2001
From: Atsushi Watanabe <atsushi.w@ieee.org>
Date: Mon, 12 Nov 2018 11:28:24 +0900
Subject: [PATCH 9/9] Remove unnecessary newlines

---
 cmake/modules/FindReadline.cmake   | 1 -
 cmake/modules/FindSSM.cmake        | 1 -
 cmake/modules/GetGitRevision.cmake | 1 -
 3 files changed, 3 deletions(-)

diff --git a/cmake/modules/FindReadline.cmake b/cmake/modules/FindReadline.cmake
index 2be8bac..c50a117 100644
--- a/cmake/modules/FindReadline.cmake
+++ b/cmake/modules/FindReadline.cmake
@@ -17,4 +17,3 @@ find_package_handle_standard_args(READLINE
 	DEFAULT_MSG READLINE_LIBRARIES
 	READLINE_INCLUDE_DIRS
 )
-
diff --git a/cmake/modules/FindSSM.cmake b/cmake/modules/FindSSM.cmake
index 3437d31..c50ca22 100644
--- a/cmake/modules/FindSSM.cmake
+++ b/cmake/modules/FindSSM.cmake
@@ -22,4 +22,3 @@ find_package_handle_standard_args(SSM
 	SSM_INCLUDE_DIRS
 	SSM_EXECUTABLE
 )
-
diff --git a/cmake/modules/GetGitRevision.cmake b/cmake/modules/GetGitRevision.cmake
index 0a13659..c4771e9 100644
--- a/cmake/modules/GetGitRevision.cmake
+++ b/cmake/modules/GetGitRevision.cmake
@@ -24,4 +24,3 @@ function(get_git_revision)
 	set(GIT_REVISION ${REVISION} PARENT_SCOPE)
 
 endfunction(get_git_revision)
-