From 8cbf7fc2927a982b93afadcfa64141de10133b42 Mon Sep 17 00:00:00 2001
From: Ciro Santilli <ciro.santilli@savoirfairelinux.com>
Date: Mon, 1 Feb 2016 21:42:46 +0100
Subject: [PATCH] Install apt-get android dependencies on android compile as
well
---
ubuntu-15.10-android-install-all-devices.sh | 1 +
ubuntu-15.10-dependencies.sh | 50 +++++++++++++++++++++
ubuntu-15.10-local-install.sh | 47 +------------------
3 files changed, 52 insertions(+), 46 deletions(-)
create mode 100755 ubuntu-15.10-dependencies.sh
diff --git a/ubuntu-15.10-android-install-all-devices.sh b/ubuntu-15.10-android-install-all-devices.sh
index 502e28e2..ec091837 100755
--- a/ubuntu-15.10-android-install-all-devices.sh
+++ b/ubuntu-15.10-android-install-all-devices.sh
@@ -1,6 +1,7 @@
#!/usr/bin/env bash
# Build the Android app and install it on all connected devices.
set -e
+./ubuntu-15.10-dependencies.sh
cd client-android
./compile.sh
# From: http://stackoverflow.com/questions/8610733/how-can-i-adb-install-an-apk-to-multiple-connected-devices
diff --git a/ubuntu-15.10-dependencies.sh b/ubuntu-15.10-dependencies.sh
new file mode 100755
index 00000000..1bf18f3f
--- /dev/null
+++ b/ubuntu-15.10-dependencies.sh
@@ -0,0 +1,50 @@
+#!/usr/bin/env bash
+
+# All dependencies and development dependencies for all repositories.
+
+sudo apt-get install \
+ autoconf \
+ automake \
+ autopoint \
+ cmake \
+ dbus \
+ doxygen \
+ g++ \
+ gettext \
+ gnome-icon-theme-symbolic \
+ libasound2-dev \
+ libavcodec-dev \
+ libavcodec-extra \
+ libavdevice-dev \
+ libavformat-dev \
+ libboost-dev \
+ libclutter-gtk-1.0-dev \
+ libcppunit-dev \
+ libdbus-1-dev \
+ libdbus-c++-dev \
+ libebook1.2-dev \
+ libexpat1-dev \
+ libgnutls-dev \
+ libgsm1-dev \
+ libgtk-3-dev \
+ libjack-dev \
+ libnotify-dev \
+ libopus-dev \
+ libpcre3-dev \
+ libpulse-dev \
+ libsamplerate0-dev \
+ libsndfile1-dev \
+ libspeex-dev \
+ libspeexdsp-dev \
+ libsrtp-dev \
+ libswscale-dev \
+ libtool \
+ libudev-dev \
+ libupnp-dev \
+ libyaml-cpp-dev \
+ openjdk-7-jdk \
+ qtbase5-dev \
+ sip-tester \
+ swig \
+ uuid-dev \
+ yasm
diff --git a/ubuntu-15.10-local-install.sh b/ubuntu-15.10-local-install.sh
index c3ba5e21..8315ccb7 100755
--- a/ubuntu-15.10-local-install.sh
+++ b/ubuntu-15.10-local-install.sh
@@ -4,52 +4,7 @@
set -e
-sudo apt-get install \
- autoconf \
- automake \
- autopoint \
- cmake \
- dbus \
- doxygen \
- g++ \
- gettext \
- gnome-icon-theme-symbolic \
- libasound2-dev \
- libavcodec-dev \
- libavcodec-extra \
- libavdevice-dev \
- libavformat-dev \
- libboost-dev \
- libclutter-gtk-1.0-dev \
- libcppunit-dev \
- libdbus-1-dev \
- libdbus-c++-dev \
- libebook1.2-dev \
- libexpat1-dev \
- libgnutls-dev \
- libgsm1-dev \
- libgtk-3-dev \
- libjack-dev \
- libnotify-dev \
- libopus-dev \
- libpcre3-dev \
- libpulse-dev \
- libsamplerate0-dev \
- libsndfile1-dev \
- libspeex-dev \
- libspeexdsp-dev \
- libsrtp-dev \
- libswscale-dev \
- libtool \
- libudev-dev \
- libupnp-dev \
- libyaml-cpp-dev \
- openjdk-7-jdk \
- qtbase5-dev \
- sip-tester \
- swig \
- uuid-dev \
- yasm
+./ubuntu-15.10-dependencies.sh
TOP="$(pwd)"
INSTALL="${TOP}/install"
--
GitLab