build for cordova an android is now optional, only if tools are available
This commit is contained in:
		@@ -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
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -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 \
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										2
									
								
								debian/control.in
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								debian/control.in
									
									
									
									
										vendored
									
									
								
							@@ -1,7 +1,7 @@
 | 
				
			|||||||
Source: @PACKAGE_NAME@
 | 
					Source: @PACKAGE_NAME@
 | 
				
			||||||
Priority: extra
 | 
					Priority: extra
 | 
				
			||||||
Maintainer: @AUTHOR@
 | 
					Maintainer: @AUTHOR@
 | 
				
			||||||
Build-Depends: debhelper, pkg-config, autotools-dev, lsb-release 
 | 
					Build-Depends: debhelper, pkg-config, autotools-dev, lsb-release
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Package: @PACKAGE_NAME@
 | 
					Package: @PACKAGE_NAME@
 | 
				
			||||||
Section: web
 | 
					Section: web
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user