diff options
| author | Luke Shumaker <lukeshu@lukeshu.com> | 2017-03-03 23:45:33 -0500 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@lukeshu.com> | 2017-03-03 23:45:33 -0500 |
| commit | 69e7f3432cec7b2371a6a9ee9c66c9ac14b158c5 (patch) | |
| tree | 68733adcfa7ed61528442ebaa3a00f467017e420 | |
| parent | cfb528255da8bedbbc61dec38feca4ee2e64778b (diff) | |
Fix the Makefile
| -rw-r--r-- | Makefile | 12 |
1 files changed, 8 insertions, 4 deletions
@@ -7,7 +7,7 @@ pdfjs_ver = 1.6.210 pdfjs = https://github.com/mozilla/pdf.js/releases/download/v$(pdfjs_ver)/pdfjs-$(pdfjs_ver)-dist.zip frc_safety_manual = http://www.firstinspires.org/sites/default/files/uploads/resource_library/frc/team-resources/safety/2017/2017-safety-manual.pdf -platforms = android@5.0.0 browser +platforms = android browser sources = \ www/FIRST_Safety_Manual.pdf \ @@ -16,8 +16,12 @@ sources = \ www/MSDS.html \ www/checklists.html +browser-platform = browser + browser-targets = platforms/browser/build/package.zip +android-platform = android@5.0.0 + android-targets = platforms/android/build/outputs/apk/android-debug.apk android-resources = \ @@ -63,8 +67,8 @@ $(foreach platform,$(platforms),\ upload: PHONY build git push - rsync -rv --delete -e ssh platforms/browser/www/ $(USER)@www.team4272.com:/srv/http/www.team4272.com/src/safety/web - rsync -v -e ssh platforms/android/build/outputs/apk/android-debug.apk $(USER)@www.team4272.com:/srv/http/www.team4272.com/src/releases/SafetyApp-latest.apk + rsync -rv --delete -e 'ssh -p 1863' platforms/browser/www/ $(USER)@www.team4272.com:/srv/http/www.team4272.com/src/safety/web + rsync -v -e 'ssh -p 1863' platforms/android/build/outputs/apk/android-debug.apk $(USER)@www.team4272.com:/srv/http/www.team4272.com/src/releases/SafetyApp-latest.apk DEP_DIR = $1 $(shell find $1) @@ -80,7 +84,7 @@ platforms/android/build/outputs/apk/android-debug.apk: platforms/android config. test -f $@ platforms/%: - $(CORDOVA) platform add $(filter $*@% $*,$(platforms)) + $(CORDOVA) platform add $($*-platform) www/FIRST_Safety_Manual.pdf: $(WGET) -O $@ $(frc_safety_manual) |