From 0173d8c3968716d0a3831b13df0c749d741f6f11 Mon Sep 17 00:00:00 2001 From: Morgan McMillian Date: Sun, 19 May 2019 08:16:33 -0700 Subject: [PATCH] updated makefile set version number --- Makefile | 31 +++---------------------------- config.xml | 2 +- src/pages/about/about.ts | 2 +- ubuntutouch/manifest.json | 2 +- 4 files changed, 6 insertions(+), 31 deletions(-) diff --git a/Makefile b/Makefile index 29d9a0b..06e5840 100644 --- a/Makefile +++ b/Makefile @@ -12,33 +12,7 @@ KEYSTORE = ~/android-keystore.jks lab: ionic serve -lc -prepare: - ionic cordova prepare android --prod - -device: - ionic cordova run android -lc --address 0.0.0.0 --device - -emulator: - ionic cordova run android -lc --address 0.0.0.0 --emulator - -$(UNALIGNED): - ionic cordova build android --release --prod - -$(ALIGNED): $(UNALIGNED) - cd $(OUT_DIR) - $(ANDROID_HOME)/build-tools/*/zipalign -v -p 4 $< $@ - -$(APK): $(ALIGNED) - cd $(OUT_DIR) - $(ANDROID_HOME)/build-tools/*/apksigner sign --ks $(KEYSTORE) --out $@ $< - ls $@ - -release: $(APK) - -clean: androidclean wwwclean - -androidclean: - cd platforms/android && ./gradlew clean +clean: wwwclean wwwclean: rm -r www @@ -48,7 +22,7 @@ distclean: init: npm install - ionic cordova platform add android + ionic cordova platform add browser ut: npm run ionic:build @@ -57,4 +31,5 @@ ut: pwa: ionic build --prod + cp resources/*.png www/assets/icon cp -r www ~/opt/Goober diff --git a/config.xml b/config.xml index 8660354..89c2dc1 100644 --- a/config.xml +++ b/config.xml @@ -1,5 +1,5 @@ - + Goober Goober, a mobile app for pnut.io Morgan McMillian diff --git a/src/pages/about/about.ts b/src/pages/about/about.ts index d9362aa..af21a80 100644 --- a/src/pages/about/about.ts +++ b/src/pages/about/about.ts @@ -14,7 +14,7 @@ import { NavController, NavParams } from 'ionic-angular'; }) export class AboutPage { - private version: string = '0.7.0'; + private version: string = '0.8.0'; constructor(public navCtrl: NavController, public navParams: NavParams) { } diff --git a/ubuntutouch/manifest.json b/ubuntutouch/manifest.json index c54ee80..ebc8162 100644 --- a/ubuntutouch/manifest.json +++ b/ubuntutouch/manifest.json @@ -9,7 +9,7 @@ "desktop": "goober.desktop" } }, - "version": "0.7.0", + "version": "0.8.0", "maintainer": "Morgan McMillian ", "framework" : "ubuntu-sdk-16.04" }