Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Provide 32bit builds #112

Merged
merged 8 commits into from
Mar 20, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 12 additions & 19 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,17 @@
language: c
compiler: gcc

before_install:
- sudo apt-add-repository -y ppa:vala-team/ppa
- sudo apt-get update -qq
- sudo apt-get install -qq libfuse-dev libglib2.0-dev cmake libc6-dev binutils valac libgee-0.8-dev gcc-multilib g++-multilib libc6-dev-i386
- cd ./LibcWrapGenerator
- valac --pkg gee-0.8 --pkg posix --pkg glib-2.0 --pkg gio-2.0 ./LibcWrapGenerator.vala
- sudo ./LibcWrapGenerator --target 2.14 --libdir /lib --output libcwrap.h
- sudo cp ./libcwrap.h /usr/include/
- cd -

script:
- export CC='gcc -U_FORTIFY_SOURCE -include /usr/include/libcwrap.h'
- cmake . && make
- find . -type f
services:
- docker
env:
- DOCKER_IMAGE=toopher/centos-i386:centos6
- DOCKER_IMAGE=library/centos:6
script:
- docker run -i -v "${PWD}:/AppImageKit" "$DOCKER_IMAGE" /bin/bash -c "/AppImageKit/build.sh"
- file out/*
- sudo chown -R travis:travis out
- wget https://raw.githubusercontent.com/probonopd/AppImages/master/bintray.sh
- for i in out/*; do bash bintray.sh "$i"; done

before_deploy:
git fetch --tags
Expand All @@ -24,11 +21,7 @@ deploy:
secure: Rtz7d+BKUnBT8D5FoE4XXCvVhRSQVdGK/c5VpI6IYuGhwmtx4RIvK78cICFPZq8k1xJm8yOuCOChX6EyElhUkYh5iPzDI/J7IiqBl+z+/V3aXx6W2PKyYLohZW3z9iomQbX2LQ6vHcZsNqQsjKZ2dW7Ja5Q9cZTFKiokMXsAERo=
skip_cleanup: true
file_glob: true
file:
- ./AppImageExtract
- ./AppRun
- ./AppImageAssistant
- ./AppImageMonitor
file: out/*
on:
tags: true
all_branches: true
1 change: 1 addition & 0 deletions AppImageExtract.AppDir/AppImageExtract.desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ Icon=AppImageExtract
Terminal=True
Type=Application
Categories=Development;
Comment=Extract AppImage contents, part of AppImageKit
StartupNotify=true
1 change: 1 addition & 0 deletions AppImageMonitor.AppDir/AppImageMonitor.desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ Icon=AppImageMonitor
Terminal=True
Type=Application
Categories=System;
Comment=AppImage desktop integration daemon
StartupNotify=true
23 changes: 21 additions & 2 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ fi

if [ -e /usr/bin/apt-get ] ; then
$SUDO apt-get update
$SUDO apt-get -y install libfuse-dev libglib2.0-dev cmake git libc6-dev binutils fuse
$SUDO apt-get -y install libfuse-dev libglib2.0-dev cmake git libc6-dev binutils fuse python

fi

Expand All @@ -31,7 +31,7 @@ if [ -e /usr/bin/pacman ] ; then
for i in "${builddeps[@]}" ; do
pacman -Q "$i"
if [ $? != 0 ] ; then
sudo pacman -S "$i"
$SUDO pacman -S "$i"
else
echo "$i is already installed."
fi
Expand All @@ -54,8 +54,27 @@ if [ -e /usr/bin/pacman ] ; then
done
fi

if [ "$1" == "--fetch-dependencies-only" ] ; then
echo "Fetched dependencies. Exiting now."
exit 0
fi

cd "${HERE}"
cmake .
make clean
make

version="$(git describe --tags)"
outdir="$PWD/out"

mkdir -p "$outdir"

for i in AppRun; do
[ -f "$i" ] && mv -v "$i" "${outdir}/${i}_${version}-$(uname -m)"
done

for i in AppImageAssistant AppImageExtract AppImageMonitor AppImageUpdate; do
[ -f "$i" ] && mv -v "$i" "${outdir}/${i}_${version}-$(uname -m).AppImage"
done

cd -