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

build for cordova an android is now optional, only if tools are available

Browse Source
This commit is contained in:
Marc Wäckerlin
2015-09-20 13:13:27 +00:00
parent a0a9d8cca3
commit 2d48d657b6
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
configure.ac
View File

@@ -29,9 +29,12 @@ AX_BUILD_HTML
#AX_CHECK_QT([QT], [QtCore QtGui QtNetwork], [QtWidgets]) #AX_CHECK_QT([QT], [QtCore QtGui QtNetwork], [QtWidgets])
#AX_QT_NO_KEYWORDS #AX_QT_NO_KEYWORDS
AC_CHECK_PROG(CORDOVA, [cordova android], [yes], [no],
[${PATH}${PATH_SEPARATOR}${ANDROID_HOME}/tools])
AM_CONDITIONAL(CORDOVA, [test ${CORDOVA} = "yes"])
AC_CONFIG_FILES([html/index.html]) AC_CONFIG_FILES([html/index.html])
AC_CONFIG_FILES([cordova/config.xml])
AC_CONFIG_FILES([cordova/makefile]) AC_CONFIG_FILES([cordova/makefile])
AC_CONFIG_FILES([cordova/config.xml])
# create output # create output
AC_OUTPUT AC_OUTPUT

2
cordova/makefile.am
View File

@@ -8,8 +8,10 @@ EXTRA_DIST = config.xml.in ${cordova_sources}
ANDROID = safechat.apk ANDROID = safechat.apk
#ANDROID_SRC = platforms/android/build/outputs/apk/android-release-unsigned.apk #ANDROID_SRC = platforms/android/build/outputs/apk/android-release-unsigned.apk
ANDROID_SRC = platforms/android/build/outputs/apk/android-debug.apk ANDROID_SRC = platforms/android/build/outputs/apk/android-debug.apk
if CORDOVA
wwwdir = ${pkgdatadir}/html wwwdir = ${pkgdatadir}/html
www_DATA = ${ANDROID} www_DATA = ${ANDROID}
endif
${ANDROID_SRC}: ${ANDROID_SRC}:
for file in ${cordova_sources}; do \ for file in ${cordova_sources}; do \