diff options
| -rw-r--r-- | Makefile | 21 | ||||
| -rwxr-xr-x | hooks/after_platform_add/add_plugins | 2 |
2 files changed, 18 insertions, 5 deletions
@@ -3,7 +3,7 @@ CORDOVA = cordova GSED = sed WGET = wget -c --no-use-server-timestamp -pdfjs = https://github.com/mozilla/pdf.js/releases/download/v1.0.907/pdfjs-1.0.907-dist.zip +pdfjs = https://github.com/mozilla/pdf.js/releases/download/v1.4.20/pdfjs-1.4.20-dist.zip frc_safety_manual = http://www.firstinspires.org/sites/default/files/uploads/resource_library/frc/team-resources/safety/2016/frc-team-safety-manual.pdf platforms = android browser @@ -16,7 +16,7 @@ sources = \ browser-targets = platforms/browser/build/package.zip -android-targets = platforms/android/ant-build/CordovaApp-debug.apk +android-targets = platforms/android/build/outputs/apk/android-debug.apk android-resources = \ platforms/android/res/drawable/icon.png \ @@ -62,7 +62,7 @@ $(foreach platform,$(platforms),\ upload: PHONY build git push rsync -rv --delete -e ssh platforms/browser/www/ lukeshu@lukeshu.com:/srv/frc/app/web - rsync -v -e ssh platforms/android/ant-build/CordovaApp-debug.apk lukeshu@lukeshu.com:/srv/frc/app/SafetyApp.apk + rsync -v -e ssh platforms/android/build/outputs/apk/android-debug.apk lukeshu@lukeshu.com:/srv/frc/app/releases/SafetyApp-latest.apk DEP_DIR = $1 $(shell find $1) @@ -72,7 +72,7 @@ platforms/browser/build/package.zip: platforms/browser config.xml $(sources) $(c $(CORDOVA) build browser test -f $@ -platforms/android/ant-build/CordovaApp-debug.apk: platforms/android config.xml $(sources) $(call DEP_DIR,www) +platforms/android/build/outputs/apk/android-debug.apk: platforms/android config.xml $(sources) $(call DEP_DIR,www) rm -f -- $@ $(CORDOVA) build android test -f $@ @@ -95,32 +95,45 @@ www/MSDS.html: www/MSDS.html.in www/MSDS Makefile platforms/android/res/drawable/icon.png: www/img/logo.png | platforms/android + mkdir -p $(@D) convert $< -resize 96x96 $@ platforms/android/res/drawable-ldpi/icon.png: www/img/logo.png | platforms/android + mkdir -p $(@D) convert $< -resize 36x36 $@ platforms/android/res/drawable-mdpi/icon.png: www/img/logo.png | platforms/android + mkdir -p $(@D) convert $< -resize 48x48 $@ platforms/android/res/drawable-hdpi/icon.png: www/img/logo.png | platforms/android + mkdir -p $(@D) convert $< -resize 72x72 $@ platforms/android/res/drawable-xhdpi/icon.png: www/img/logo.png | platforms/android + mkdir -p $(@D) convert $< -resize 96x96 $@ platforms/android/res/drawable-land-ldpi/screen.png: www/img/screen-landscape.png | platforms/android + mkdir -p $(@D) convert $< -resize 320x200 $@ platforms/android/res/drawable-land-mdpi/screen.png: www/img/screen-landscape.png | platforms/android + mkdir -p $(@D) convert $< -resize 480x320 $@ platforms/android/res/drawable-land-hdpi/screen.png: www/img/screen-landscape.png | platforms/android + mkdir -p $(@D) convert $< -resize 800x480 $@ platforms/android/res/drawable-land-xhdpi/screen.png: www/img/screen-landscape.png | platforms/android + mkdir -p $(@D) convert $< -resize 1280x720 $@ platforms/android/res/drawable-port-ldpi/screen.png: www/img/screen-portrait.png | platforms/android + mkdir -p $(@D) convert $< -resize 200x320 $@ platforms/android/res/drawable-port-mdpi/screen.png: www/img/screen-portrait.png | platforms/android + mkdir -p $(@D) convert $< -resize 320x480 $@ platforms/android/res/drawable-port-hdpi/screen.png: www/img/screen-portrait.png | platforms/android + mkdir -p $(@D) convert $< -resize 480x800 $@ platforms/android/res/drawable-port-xhdpi/screen.png: www/img/screen-portrait.png | platforms/android + mkdir -p $(@D) convert $< -resize 720x1280 $@ diff --git a/hooks/after_platform_add/add_plugins b/hooks/after_platform_add/add_plugins index 15c0af5..802c9bd 100755 --- a/hooks/after_platform_add/add_plugins +++ b/hooks/after_platform_add/add_plugins @@ -1,2 +1,2 @@ #!/bin/sh -cordova plugin add org.apache.cordova.camera +cordova plugin add cordova-plugin-camera |