more stable build - cordova often crashes, so retry

php
Marc Wäckerlin 9 years ago
parent 4749851f7c
commit ce729ef46c
  1. 293
      ChangeLog
  2. 4
      cordova/makefile.am
  3. 2
      cordova/platforms/android/AndroidManifest.xml
  4. 2
      cordova/platforms/android/res/xml/config.xml

@ -1,3 +1,296 @@
2015-09-21 14:44 marc
* html/index.html.in: added menu about
2015-09-20 20:45 marc
* configure.ac, cordova/makefile.am,
cordova/platforms/android/AndroidManifest.xml,
cordova/platforms/android/res/xml/config.xml, html/index.html.in,
html/safechat.css: build debian packages should work now
2015-09-20 13:13 marc
* configure.ac, cordova/makefile.am, debian/control.in: build for
cordova an android is now optional, only if tools are available
2015-09-19 13:24 marc
* ax_init_standard_project.m4, cordova/makefile.am: make distcheck
is now successful
2015-09-19 08:42 marc
* ax_check_qt.m4, ax_init_standard_project.m4, bootstrap.sh,
build-resource-file.sh, cordova/logo.png, cordova/makefile.am,
cordova/platforms/android/.gradle,
cordova/platforms/android/res/drawable-hdpi/icon.png,
cordova/platforms/android/res/drawable-ldpi/icon.png,
cordova/platforms/android/res/drawable-mdpi/icon.png,
cordova/platforms/android/res/drawable-xhdpi/icon.png,
cordova/platforms/android/res/drawable/icon.png,
resolve-debbuilddeps.sh, resolve-rpmbuilddeps.sh: basic android
abb works, distcheck fails; refs #24
2015-09-15 19:24 marc
* configure.ac, cordova, cordova/config.xml.in, cordova/hooks,
cordova/hooks/README.md, cordova/makefile.am, cordova/platforms,
cordova/platforms/android, cordova/platforms/android/.gitignore,
cordova/platforms/android/.gradle,
cordova/platforms/android/.gradle/2.2.1,
cordova/platforms/android/.gradle/2.2.1/taskArtifacts,
cordova/platforms/android/.project,
cordova/platforms/android/AndroidManifest.xml,
cordova/platforms/android/CordovaLib,
cordova/platforms/android/CordovaLib/.project,
cordova/platforms/android/CordovaLib/AndroidManifest.xml,
cordova/platforms/android/CordovaLib/build.gradle,
cordova/platforms/android/CordovaLib/cordova.gradle,
cordova/platforms/android/CordovaLib/project.properties,
cordova/platforms/android/CordovaLib/src,
cordova/platforms/android/CordovaLib/src/org,
cordova/platforms/android/CordovaLib/src/org/apache,
cordova/platforms/android/CordovaLib/src/org/apache/cordova,
cordova/platforms/android/CordovaLib/src/org/apache/cordova/AuthenticationToken.java,
cordova/platforms/android/CordovaLib/src/org/apache/cordova/CallbackContext.java,
cordova/platforms/android/CordovaLib/src/org/apache/cordova/Config.java,
cordova/platforms/android/CordovaLib/src/org/apache/cordova/ConfigXmlParser.java,
cordova/platforms/android/CordovaLib/src/org/apache/cordova/CordovaActivity.java,
cordova/platforms/android/CordovaLib/src/org/apache/cordova/CordovaArgs.java,
cordova/platforms/android/CordovaLib/src/org/apache/cordova/CordovaBridge.java,
cordova/platforms/android/CordovaLib/src/org/apache/cordova/CordovaClientCertRequest.java,
cordova/platforms/android/CordovaLib/src/org/apache/cordova/CordovaDialogsHelper.java,
cordova/platforms/android/CordovaLib/src/org/apache/cordova/CordovaHttpAuthHandler.java,
cordova/platforms/android/CordovaLib/src/org/apache/cordova/CordovaInterface.java,
cordova/platforms/android/CordovaLib/src/org/apache/cordova/CordovaInterfaceImpl.java,
cordova/platforms/android/CordovaLib/src/org/apache/cordova/CordovaPlugin.java,
cordova/platforms/android/CordovaLib/src/org/apache/cordova/CordovaPreferences.java,
cordova/platforms/android/CordovaLib/src/org/apache/cordova/CordovaResourceApi.java,
cordova/platforms/android/CordovaLib/src/org/apache/cordova/CordovaWebView.java,
cordova/platforms/android/CordovaLib/src/org/apache/cordova/CordovaWebViewEngine.java,
cordova/platforms/android/CordovaLib/src/org/apache/cordova/CordovaWebViewImpl.java,
cordova/platforms/android/CordovaLib/src/org/apache/cordova/CoreAndroid.java,
cordova/platforms/android/CordovaLib/src/org/apache/cordova/ExposedJsApi.java,
cordova/platforms/android/CordovaLib/src/org/apache/cordova/ICordovaClientCertRequest.java,
cordova/platforms/android/CordovaLib/src/org/apache/cordova/ICordovaCookieManager.java,
cordova/platforms/android/CordovaLib/src/org/apache/cordova/ICordovaHttpAuthHandler.java,
cordova/platforms/android/CordovaLib/src/org/apache/cordova/LOG.java,
cordova/platforms/android/CordovaLib/src/org/apache/cordova/NativeToJsMessageQueue.java,
cordova/platforms/android/CordovaLib/src/org/apache/cordova/PluginEntry.java,
cordova/platforms/android/CordovaLib/src/org/apache/cordova/PluginManager.java,
cordova/platforms/android/CordovaLib/src/org/apache/cordova/PluginResult.java,
cordova/platforms/android/CordovaLib/src/org/apache/cordova/Whitelist.java,
cordova/platforms/android/CordovaLib/src/org/apache/cordova/engine,
cordova/platforms/android/CordovaLib/src/org/apache/cordova/engine/SystemCookieManager.java,
cordova/platforms/android/CordovaLib/src/org/apache/cordova/engine/SystemExposedJsApi.java,
cordova/platforms/android/CordovaLib/src/org/apache/cordova/engine/SystemWebChromeClient.java,
cordova/platforms/android/CordovaLib/src/org/apache/cordova/engine/SystemWebView.java,
cordova/platforms/android/CordovaLib/src/org/apache/cordova/engine/SystemWebViewClient.java,
cordova/platforms/android/CordovaLib/src/org/apache/cordova/engine/SystemWebViewEngine.java,
cordova/platforms/android/assets,
cordova/platforms/android/assets/_where-is-www.txt,
cordova/platforms/android/assets/www,
cordova/platforms/android/assets/www/cordova.js,
cordova/platforms/android/assets/www/cordova_plugins.js,
cordova/platforms/android/assets/www/css,
cordova/platforms/android/assets/www/css/index.css,
cordova/platforms/android/assets/www/img,
cordova/platforms/android/assets/www/img/logo.png,
cordova/platforms/android/assets/www/index.html,
cordova/platforms/android/assets/www/js,
cordova/platforms/android/assets/www/js/index.js,
cordova/platforms/android/assets/www/plugins,
cordova/platforms/android/assets/www/plugins/cordova-plugin-whitelist,
cordova/platforms/android/assets/www/plugins/cordova-plugin-whitelist/whitelist.js,
cordova/platforms/android/build.gradle,
cordova/platforms/android/cordova,
cordova/platforms/android/cordova/android_sdk_version,
cordova/platforms/android/cordova/build,
cordova/platforms/android/cordova/build.bat,
cordova/platforms/android/cordova/check_reqs,
cordova/platforms/android/cordova/clean,
cordova/platforms/android/cordova/clean.bat,
cordova/platforms/android/cordova/defaults.xml,
cordova/platforms/android/cordova/lib,
cordova/platforms/android/cordova/lib/android_sdk_version.js,
cordova/platforms/android/cordova/lib/appinfo.js,
cordova/platforms/android/cordova/lib/build.js,
cordova/platforms/android/cordova/lib/check_reqs.js,
cordova/platforms/android/cordova/lib/device.js,
cordova/platforms/android/cordova/lib/emulator.js,
cordova/platforms/android/cordova/lib/exec.js,
cordova/platforms/android/cordova/lib/install-device,
cordova/platforms/android/cordova/lib/install-device.bat,
cordova/platforms/android/cordova/lib/install-emulator,
cordova/platforms/android/cordova/lib/install-emulator.bat,
cordova/platforms/android/cordova/lib/list-devices,
cordova/platforms/android/cordova/lib/list-devices.bat,
cordova/platforms/android/cordova/lib/list-emulator-images,
cordova/platforms/android/cordova/lib/list-emulator-images.bat,
cordova/platforms/android/cordova/lib/list-started-emulators,
cordova/platforms/android/cordova/lib/list-started-emulators.bat,
cordova/platforms/android/cordova/lib/log.js,
cordova/platforms/android/cordova/lib/plugin-build.gradle,
cordova/platforms/android/cordova/lib/run.js,
cordova/platforms/android/cordova/lib/spawn.js,
cordova/platforms/android/cordova/lib/start-emulator,
cordova/platforms/android/cordova/lib/start-emulator.bat,
cordova/platforms/android/cordova/log,
cordova/platforms/android/cordova/log.bat,
cordova/platforms/android/cordova/node_modules,
cordova/platforms/android/cordova/node_modules/.bin,
cordova/platforms/android/cordova/node_modules/.bin/shjs,
cordova/platforms/android/cordova/node_modules/nopt,
cordova/platforms/android/cordova/node_modules/nopt/LICENSE,
cordova/platforms/android/cordova/node_modules/nopt/lib,
cordova/platforms/android/cordova/node_modules/nopt/lib/nopt.js,
cordova/platforms/android/cordova/node_modules/nopt/node_modules,
cordova/platforms/android/cordova/node_modules/nopt/node_modules/abbrev,
cordova/platforms/android/cordova/node_modules/nopt/node_modules/abbrev/LICENSE,
cordova/platforms/android/cordova/node_modules/nopt/node_modules/abbrev/abbrev.js,
cordova/platforms/android/cordova/node_modules/nopt/node_modules/abbrev/package.json,
cordova/platforms/android/cordova/node_modules/nopt/package.json,
cordova/platforms/android/cordova/node_modules/q,
cordova/platforms/android/cordova/node_modules/q/CONTRIBUTING.md,
cordova/platforms/android/cordova/node_modules/q/LICENSE,
cordova/platforms/android/cordova/node_modules/q/README.md,
cordova/platforms/android/cordova/node_modules/q/benchmark,
cordova/platforms/android/cordova/node_modules/q/benchmark/compare-with-callbacks.js,
cordova/platforms/android/cordova/node_modules/q/benchmark/scenarios.js,
cordova/platforms/android/cordova/node_modules/q/package.json,
cordova/platforms/android/cordova/node_modules/q/q.js,
cordova/platforms/android/cordova/node_modules/q/queue.js,
cordova/platforms/android/cordova/node_modules/shelljs,
cordova/platforms/android/cordova/node_modules/shelljs/.documentup.json,
cordova/platforms/android/cordova/node_modules/shelljs/.jshintrc,
cordova/platforms/android/cordova/node_modules/shelljs/.npmignore,
cordova/platforms/android/cordova/node_modules/shelljs/.travis.yml,
cordova/platforms/android/cordova/node_modules/shelljs/LICENSE,
cordova/platforms/android/cordova/node_modules/shelljs/README.md,
cordova/platforms/android/cordova/node_modules/shelljs/bin,
cordova/platforms/android/cordova/node_modules/shelljs/bin/shjs,
cordova/platforms/android/cordova/node_modules/shelljs/global.js,
cordova/platforms/android/cordova/node_modules/shelljs/make.js,
cordova/platforms/android/cordova/node_modules/shelljs/package.json,
cordova/platforms/android/cordova/node_modules/shelljs/scripts,
cordova/platforms/android/cordova/node_modules/shelljs/scripts/generate-docs.js,
cordova/platforms/android/cordova/node_modules/shelljs/scripts/run-tests.js,
cordova/platforms/android/cordova/node_modules/shelljs/shell.js,
cordova/platforms/android/cordova/node_modules/shelljs/src,
cordova/platforms/android/cordova/node_modules/shelljs/src/cat.js,
cordova/platforms/android/cordova/node_modules/shelljs/src/cd.js,
cordova/platforms/android/cordova/node_modules/shelljs/src/chmod.js,
cordova/platforms/android/cordova/node_modules/shelljs/src/common.js,
cordova/platforms/android/cordova/node_modules/shelljs/src/cp.js,
cordova/platforms/android/cordova/node_modules/shelljs/src/dirs.js,
cordova/platforms/android/cordova/node_modules/shelljs/src/echo.js,
cordova/platforms/android/cordova/node_modules/shelljs/src/error.js,
cordova/platforms/android/cordova/node_modules/shelljs/src/exec.js,
cordova/platforms/android/cordova/node_modules/shelljs/src/find.js,
cordova/platforms/android/cordova/node_modules/shelljs/src/grep.js,
cordova/platforms/android/cordova/node_modules/shelljs/src/ls.js,
cordova/platforms/android/cordova/node_modules/shelljs/src/mkdir.js,
cordova/platforms/android/cordova/node_modules/shelljs/src/mv.js,
cordova/platforms/android/cordova/node_modules/shelljs/src/popd.js,
cordova/platforms/android/cordova/node_modules/shelljs/src/pushd.js,
cordova/platforms/android/cordova/node_modules/shelljs/src/pwd.js,
cordova/platforms/android/cordova/node_modules/shelljs/src/rm.js,
cordova/platforms/android/cordova/node_modules/shelljs/src/sed.js,
cordova/platforms/android/cordova/node_modules/shelljs/src/tempdir.js,
cordova/platforms/android/cordova/node_modules/shelljs/src/test.js,
cordova/platforms/android/cordova/node_modules/shelljs/src/to.js,
cordova/platforms/android/cordova/node_modules/shelljs/src/toEnd.js,
cordova/platforms/android/cordova/node_modules/shelljs/src/which.js,
cordova/platforms/android/cordova/node_modules/which,
cordova/platforms/android/cordova/node_modules/which/LICENSE,
cordova/platforms/android/cordova/node_modules/which/README.md,
cordova/platforms/android/cordova/node_modules/which/bin,
cordova/platforms/android/cordova/node_modules/which/bin/which,
cordova/platforms/android/cordova/node_modules/which/package.json,
cordova/platforms/android/cordova/node_modules/which/which.js,
cordova/platforms/android/cordova/run,
cordova/platforms/android/cordova/run.bat,
cordova/platforms/android/cordova/version,
cordova/platforms/android/cordova/version.bat,
cordova/platforms/android/gradle,
cordova/platforms/android/gradle/wrapper,
cordova/platforms/android/gradle/wrapper/gradle-wrapper.jar,
cordova/platforms/android/gradle/wrapper/gradle-wrapper.properties,
cordova/platforms/android/gradlew,
cordova/platforms/android/libs,
cordova/platforms/android/platform_www,
cordova/platforms/android/platform_www/cordova.js,
cordova/platforms/android/project.properties,
cordova/platforms/android/res,
cordova/platforms/android/res/drawable,
cordova/platforms/android/res/drawable-hdpi,
cordova/platforms/android/res/drawable-hdpi/icon.png,
cordova/platforms/android/res/drawable-land-hdpi,
cordova/platforms/android/res/drawable-land-hdpi/screen.png,
cordova/platforms/android/res/drawable-land-ldpi,
cordova/platforms/android/res/drawable-land-ldpi/screen.png,
cordova/platforms/android/res/drawable-land-mdpi,
cordova/platforms/android/res/drawable-land-mdpi/screen.png,
cordova/platforms/android/res/drawable-land-xhdpi,
cordova/platforms/android/res/drawable-land-xhdpi/screen.png,
cordova/platforms/android/res/drawable-ldpi,
cordova/platforms/android/res/drawable-ldpi/icon.png,
cordova/platforms/android/res/drawable-mdpi,
cordova/platforms/android/res/drawable-mdpi/icon.png,
cordova/platforms/android/res/drawable-port-hdpi,
cordova/platforms/android/res/drawable-port-hdpi/screen.png,
cordova/platforms/android/res/drawable-port-ldpi,
cordova/platforms/android/res/drawable-port-ldpi/screen.png,
cordova/platforms/android/res/drawable-port-mdpi,
cordova/platforms/android/res/drawable-port-mdpi/screen.png,
cordova/platforms/android/res/drawable-port-xhdpi,
cordova/platforms/android/res/drawable-port-xhdpi/screen.png,
cordova/platforms/android/res/drawable-xhdpi,
cordova/platforms/android/res/drawable-xhdpi/icon.png,
cordova/platforms/android/res/drawable/icon.png,
cordova/platforms/android/res/values,
cordova/platforms/android/res/values/strings.xml,
cordova/platforms/android/res/xml,
cordova/platforms/android/res/xml/config.xml,
cordova/platforms/android/settings.gradle,
cordova/platforms/android/src, cordova/platforms/android/src/ch,
cordova/platforms/android/src/ch/safechat,
cordova/platforms/android/src/ch/safechat/MainActivity.java,
cordova/platforms/android/src/org,
cordova/platforms/android/src/org/apache,
cordova/platforms/android/src/org/apache/cordova,
cordova/platforms/android/src/org/apache/cordova/whitelist,
cordova/platforms/android/src/org/apache/cordova/whitelist/WhitelistPlugin.java,
cordova/platforms/platforms.json, cordova/plugins,
cordova/plugins/android.json,
cordova/plugins/cordova-plugin-whitelist,
cordova/plugins/cordova-plugin-whitelist/CONTRIBUTING.md,
cordova/plugins/cordova-plugin-whitelist/LICENSE,
cordova/plugins/cordova-plugin-whitelist/NOTICE,
cordova/plugins/cordova-plugin-whitelist/README.md,
cordova/plugins/cordova-plugin-whitelist/RELEASENOTES.md,
cordova/plugins/cordova-plugin-whitelist/package.json,
cordova/plugins/cordova-plugin-whitelist/plugin.xml,
cordova/plugins/cordova-plugin-whitelist/src,
cordova/plugins/cordova-plugin-whitelist/src/android,
cordova/plugins/cordova-plugin-whitelist/src/android/WhitelistPlugin.java,
cordova/plugins/cordova-plugin-whitelist/src/ios,
cordova/plugins/cordova-plugin-whitelist/src/ios/CDVNavigationWhitelistPlugin.h,
cordova/plugins/cordova-plugin-whitelist/src/ios/CDVNavigationWhitelistPlugin.m,
cordova/plugins/cordova-plugin-whitelist/whitelist.js,
cordova/plugins/fetch.json, cordova/www, cordova/www/css,
cordova/www/css/index.css, cordova/www/img,
cordova/www/img/logo.png, cordova/www/index.html, cordova/www/js,
cordova/www/js/index.js, html/index.html.in, html/makefile.am,
html/safechat.js, makefile.am: added first try of an android app
using cordova; refs #24
2015-08-27 20:55 marc
* ChangeLog, html/safechat.css, html/safechat.js: need to make sure
that get loop runs only once; closes #20
2015-08-26 22:43 marc 2015-08-26 22:43 marc
* ax_init_standard_project.m4, bootstrap.sh, configure.ac, * ax_init_standard_project.m4, bootstrap.sh, configure.ac,

@ -20,12 +20,12 @@ ${ANDROID_SRC}:
chmod -R u+w "$${file}" ); \ chmod -R u+w "$${file}" ); \
done done
if [ "$$(whoami)" != "root" ]; then \ if [ "$$(whoami)" != "root" ]; then \
cordova build --debug; \ cordova build --debug || cordova build --debug; \
fi fi
${ANDROID}: ${ANDROID_SRC} ${ANDROID}: ${ANDROID_SRC}
if [ "$$(whoami)" != "root" ]; then \ if [ "$$(whoami)" != "root" ]; then \
mv $< $@; \ cp $< $@; \
fi fi
clean-local: clean-local:

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?> <?xml version='1.0' encoding='utf-8'?>
<manifest android:hardwareAccelerated="true" android:versionCode="223" android:versionName="0.2.23" package="ch.safechat" xmlns:android="http://schemas.android.com/apk/res/android"> <manifest android:hardwareAccelerated="true" android:versionCode="230" android:versionName="0.2.30" package="ch.safechat" xmlns:android="http://schemas.android.com/apk/res/android">
<supports-screens android:anyDensity="true" android:largeScreens="true" android:normalScreens="true" android:resizeable="true" android:smallScreens="true" android:xlargeScreens="true" /> <supports-screens android:anyDensity="true" android:largeScreens="true" android:normalScreens="true" android:resizeable="true" android:smallScreens="true" android:xlargeScreens="true" />
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?> <?xml version='1.0' encoding='utf-8'?>
<widget id="ch.safechat" version="0.2.23" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> <widget id="ch.safechat" version="0.2.30" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<preference name="loglevel" value="DEBUG" /> <preference name="loglevel" value="DEBUG" />
<feature name="Whitelist"> <feature name="Whitelist">
<param name="android-package" value="org.apache.cordova.whitelist.WhitelistPlugin" /> <param name="android-package" value="org.apache.cordova.whitelist.WhitelistPlugin" />

Loading…
Cancel
Save