Multiarch builds, mk. 1

TheAssassin · TheAssassin · commit 08a1bf9b6909 · 2018-06-29T21:00:23.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -6,9 +6,16 @@ addons:
     update: true
     packages:
       - libmagic-dev
+      - libmagic-dev:i386
+      - libjpeg-dev
+      - libjpeg-dev:i386
       - cimg-dev
       - automake  # required for patchelf
 
+environment:
+  - ARCH=x86_64
+  - ARCH=i386
+
 install:
   - git clone https://github.com/NixOS/patchelf.git
   - cd patchelf
diff --git a/travis/build.sh b/travis/build.sh
@@ -26,7 +26,16 @@ OLD_CWD=$(readlink -f .)
 
 pushd "$BUILD_DIR"
 
-cmake "$REPO_ROOT"
+if [ "$ARCH" == "x86_64" ]; then
+    EXTRA_CMAKE_ARGS=()
+elif [ "$ARCH" == "i386" ]; then
+    EXTRA_CMAKE_ARGS=("-DCMAKE_TOOLCHAIN_FILE=$REPO_ROOT/cmake/toolchains/i386-linux-gnu.cmake")
+else
+    echo "Architecture not supported: $ARCH" 1>&2
+    exit 1
+fi
+
+cmake "$REPO_ROOT" "${EXTRA_CMAKE_ARGS[@]}"
 
 make VERBOSE=1
 
@@ -37,12 +46,12 @@ LINUXDEPLOY_ARGS=("--init-appdir" "--appdir" "AppDir" "-e" "bin/linuxdeploy" "-i
 bin/linuxdeploy "${LINUXDEPLOY_ARGS[@]}"
 
 # bundle AppImage plugin
-wget https://github.com/TheAssassin/linuxdeploy-plugin-appimage/releases/download/continuous/linuxdeploy-plugin-appimage-x86_64.AppImage
-chmod +x linuxdeploy-plugin-appimage*.AppImage
-mv linuxdeploy-plugin-appimage*.AppImage AppDir/usr/bin/
+wget https://github.com/TheAssassin/linuxdeploy-plugin-appimage/releases/download/continuous/linuxdeploy-plugin-appimage-"$ARCH".AppImage
+chmod +x linuxdeploy-plugin-appimage-"$ARCH".AppImage
+mv linuxdeploy-plugin-appimage-"$ARCH".AppImage AppDir/usr/bin/
 
 # build AppImage using plugin
-AppDir/usr/bin/linuxdeploy-plugin-appimage*.AppImage --appdir AppDir/
+AppDir/usr/bin/linuxdeploy-plugin-appimage-"$ARCH".AppImage --appdir AppDir/
 
 # rename AppImage to avoid "Text file busy" issues when using it to create another one
 mv ./linuxdeploy*.AppImage test.AppImage
