webservices/safechat
1
0
Fork 0
Code Issues Pull Requests Releases Activity

distinguish by hw arch

Browse Source
This commit is contained in:
Marc Wäckerlin
2015-12-04 08:36:08 +00:00
parent b3ea67b7d8
commit b58db7cc17
5 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
COPYING
View File

@@ -1 +1 @@
/usr/share/automake-1.15/COPYING /usr/share/automake-1.14/COPYING

10
ChangeLog
View File

@@ -1,3 +1,13 @@
2015-12-04 07:05 marc
* COPYING, ChangeLog, INSTALL, build-in-docker.conf,
build-in-docker.sh, cordova/makefile.am,
cordova/platforms/android/AndroidManifest.xml,
cordova/platforms/android/assets/www/cordova_plugins.js,
cordova/platforms/android/res/xml/config.xml,
cordova/plugins/android.json, cordova/plugins/fetch.json,
html/index.html.in: build all in docker
2015-12-02 15:58 marc 2015-12-02 15:58 marc
* build-in-docker.conf, build-in-docker.sh, * build-in-docker.conf, build-in-docker.sh,

2
INSTALL
View File

@@ -1 +1 @@
/usr/share/automake-1.15/INSTALL /usr/share/automake-1.14/INSTALL

3
build-in-docker.conf
View File

@@ -3,7 +3,8 @@
if test -n "${ANDROID_HOME}"; then if test -n "${ANDROID_HOME}"; then
# all this is needed for android through cordova (phonegap) only # all this is needed for android through cordova (phonegap) only
packages+=("wheezy:::curl:::npm") packages+=("wheezy:::curl:::npm")
packages+=("git nodejs default-jdk libc6-i386 lib32stdc++6 lib32gcc1 lib32ncurses5 lib32z1") packages+=("amd64:::libc6-i386 lib32stdc++6 lib32gcc1 lib32ncurses5 lib32z1")
packages+=("git nodejs default-jdk")
repos+=("Ubuntu-precise:::'deb http://archive.ubuntu.com precise universe'") repos+=("Ubuntu-precise:::'deb http://archive.ubuntu.com precise universe'")
repos+=("Debian|Ubuntu-precise::::::universe") repos+=("Debian|Ubuntu-precise::::::universe")
repos+=("wheezy:::'deb http://ftp.is.debian.org/debian wheezy-backports main'") repos+=("wheezy:::'deb http://ftp.is.debian.org/debian wheezy-backports main'")

6
build-in-docker.sh
View File

@@ -136,14 +136,14 @@ function ifthenelse() {
os="${arg%%:::*}" os="${arg%%:::*}"
thenpart="${arg#*:::}" thenpart="${arg#*:::}"
if test "${thenpart/:::/}" = "${thenpart}"; then if test "${thenpart/:::/}" = "${thenpart}"; then
docker exec ${DOCKER_ID} bash -c 'os="'$os'"; if [[ "$(lsb_release -is)-$(lsb_release -cs)" =~ ${os} ]]; then '"${cmd//ARG/${thenpart}}"'; fi' docker exec ${DOCKER_ID} bash -c 'os="'$os'"; if [[ "$(lsb_release -is)-$(lsb_release -cs)-$(dpkg --print-architecture)" =~ ${os} ]]; then '"${cmd//ARG/${thenpart}}"'; fi'
else else
elsepart="${thenpart##*:::}" elsepart="${thenpart##*:::}"
thenpart="${thenpart%:::*}" thenpart="${thenpart%:::*}"
if test -n "${thenpart}"; then if test -n "${thenpart}"; then
docker exec ${DOCKER_ID} bash -c 'os="'$os'"; if [[ "$(lsb_release -is)-$(lsb_release -cs)" =~ ${os} ]]; then '"${cmd//ARG/${thenpart}}"'; else '"${cmd//ARG/${elsepart}}"'; fi' docker exec ${DOCKER_ID} bash -c 'os="'$os'"; if [[ "$(lsb_release -is)-$(lsb_release -cs)-$(dpkg --print-architecture)" =~ ${os} ]]; then '"${cmd//ARG/${thenpart}}"'; else '"${cmd//ARG/${elsepart}}"'; fi'
else else
docker exec ${DOCKER_ID} bash -c 'os="'$os'"; if [[ "$(lsb_release -is)-$(lsb_release -cs)" =~ ${os} ]]; then true; else '"${cmd//ARG/${elsepart}}"'; fi' docker exec ${DOCKER_ID} bash -c 'os="'$os'"; if [[ "$(lsb_release -is)-$(lsb_release -cs)-$(dpkg --print-architecture)" =~ ${os} ]]; then true; else '"${cmd//ARG/${elsepart}}"'; fi'
fi fi
fi fi
fi fi