From 9a78df4ea121d1d3c14da2abae1a82c34121e13c Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Sun, 15 Jun 2014 18:41:25 -0600 Subject: notes updated for TeleGPS and 1.4 release learnings --- Releasing | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'Releasing') diff --git a/Releasing b/Releasing index 1822efbe..5827f21d 100644 --- a/Releasing +++ b/Releasing @@ -73,7 +73,7 @@ These are Bdale's notes on how to do a release. src/telemega-v1.0/flash-loader/*.elf \ src/telemetrum-v2.0/flash-loader/*.elf \ ~/altusmetrumllc/Binaries/loaders/ - (cd ~/altusmetrumllc ; git commit -a) + (cd ~/altusmetrumllc ; git add Binaries ; git commit -a) - copy the relevant release notes file from doc/ to /home/bdale/web/altusmetrum/AltOS/releases/ @@ -81,8 +81,12 @@ These are Bdale's notes on how to do a release. - create /home/bdale/web/altusmetrum/MicroPeak/releases/, and move the MicroPeak installers from AltOS/releases to there - - go edit ~/web/altusmetrum/AltOS/releases/.mdwn and - /home/bdale/web/altusmetrum/MicroPeak/releases/.mdwn, to + - create /home/bdale/web/altusmetrum/TeleGPS/releases/, + and move the MicroPeak installers from AltOS/releases to there + + - go edit ~/web/altusmetrum/AltOS/releases/.mdwn, + /home/bdale/web/altusmetrum/MicroPeak/releases/.mdwn, and + /home/bdale/web/altusmetrum/TeleGPS/releases/.mdwn, to include release date and explicit ref to dir contents so the web pages shows versioned links, commit and push -- cgit v1.2.3 From 42fd93b67af396b0478e9e795026cf1a5312e5c9 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Tue, 24 Jun 2014 21:12:59 -0600 Subject: make sure to use Google Maps API key for official builds --- Releasing | 4 ++++ debian/rules | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'Releasing') diff --git a/Releasing b/Releasing index 5827f21d..d7b337e6 100644 --- a/Releasing +++ b/Releasing @@ -2,6 +2,10 @@ These are Bdale's notes on how to do a release. git checkout master + - make sure the Google Maps API key is in the build chroot + mkdir -p /var/cache/pbuilder/base.cow/opt/google + cp ~/altusmetrumllc/google-maps-api-key \ + /var/cache/pbuilder/base.cow/opt/google/maps-api-key - make sure there is a doc/release-notes-.xsl - make sure that doc/altusmetrum.xsl has the right copyright year, and add release to the revision history at the front (release notes diff --git a/debian/rules b/debian/rules index 2b798464..ebcb3b80 100755 --- a/debian/rules +++ b/debian/rules @@ -18,7 +18,8 @@ prebuild: configure: configure-stamp configure-stamp: dh_testdir - PKG_CONFIG_PATH=/opt/stlink/lib/pkgconfig ./autogen.sh --prefix=/usr + PKG_CONFIG_PATH=/opt/stlink/lib/pkgconfig ./autogen.sh \ + --prefix=/usr --with-google-key=/opt/google/maps-api-key touch configure-stamp build: build-arch build-indep -- cgit v1.2.3 From 5f6059a9273dfe557145a9f620db81693f3bc27e Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Tue, 24 Jun 2014 21:22:26 -0600 Subject: need the api key in Bdale's root too --- Releasing | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'Releasing') diff --git a/Releasing b/Releasing index d7b337e6..8c1787ee 100644 --- a/Releasing +++ b/Releasing @@ -2,10 +2,13 @@ These are Bdale's notes on how to do a release. git checkout master - - make sure the Google Maps API key is in the build chroot - mkdir -p /var/cache/pbuilder/base.cow/opt/google + - make sure the Google Maps API key is in the build chroot and root + mkdir -p /var/cache/pbuilder/base.cow/opt/google /opt/google cp ~/altusmetrumllc/google-maps-api-key \ /var/cache/pbuilder/base.cow/opt/google/maps-api-key + ln -sf /home/bdale/altusmetrumllc/google-maps-api-key \ + /opt/google/maps-api-key + - make sure there is a doc/release-notes-.xsl - make sure that doc/altusmetrum.xsl has the right copyright year, and add release to the revision history at the front (release notes -- cgit v1.2.3 From 1517ad263ba4c0b8c9251a726cce1ed8a86a634c Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Tue, 24 Jun 2014 21:54:30 -0600 Subject: releasing 1.4.1 --- Releasing | 42 ++++++++++++++++++------------------------ configure.ac | 2 +- doc/altusmetrum.xsl | 2 +- 3 files changed, 20 insertions(+), 26 deletions(-) (limited to 'Releasing') diff --git a/Releasing b/Releasing index 8c1787ee..c04a1de8 100644 --- a/Releasing +++ b/Releasing @@ -3,40 +3,34 @@ These are Bdale's notes on how to do a release. git checkout master - make sure the Google Maps API key is in the build chroot and root - mkdir -p /var/cache/pbuilder/base.cow/opt/google /opt/google - cp ~/altusmetrumllc/google-maps-api-key \ - /var/cache/pbuilder/base.cow/opt/google/maps-api-key - ln -sf /home/bdale/altusmetrumllc/google-maps-api-key \ - /opt/google/maps-api-key + sudo mkdir -p /var/cache/pbuilder/base.cow/opt/google /opt/google + sudo cp ~/altusmetrumllc/google-maps-api-key \ + /var/cache/pbuilder/base.cow/opt/google/maps-api-key + sudo ln -sf /home/bdale/altusmetrumllc/google-maps-api-key \ + /opt/google/maps-api-key + + - if this is an x.y release, then: + git checkout -b branch- + + - if this is an x.y.z release, then: + git checkout branch- # the x.y parts only + - cherry-pick or merge appropriate content from master + + - update the version in configure.ac - make sure there is a doc/release-notes-.xsl - make sure that doc/altusmetrum.xsl has the right copyright year, and add release to the revision history at the front (release notes will be pulled in automatically) - - - get a Google Maps API key and install it in - ~/altusmetrumllc/google-maps-api-key. If you don't have a - key, the app will still work, but downloading map tiles will - be slow, and you will only be able to download a limited - number per day. - - - update the version in configure.ac - git log > ChangeLog - git commit -a - - make absolutely sure checked-out tree is "clean" - make absolutely sure the pdclib/ submodule is on the master branch, up to date, and "clean" - - if this is an x.y release, then: - git checkout -b branch- - git tag -a - - edit .git/gbp.conf to use branch- as upstream + git log > ChangeLog + git commit -a + git tag -a # full x.y.z version - - if this is an x.y.z release, then: - git checkout branch- # the x.y parts only - git merge master - git tag -a # full x.y.z version + - make sure .git/gbp.conf set to use branch- as upstream git checkout debian git merge branch- diff --git a/configure.ac b/configure.ac index 23dc9d82..fdae9b6f 100644 --- a/configure.ac +++ b/configure.ac @@ -18,7 +18,7 @@ dnl dnl Process this file with autoconf to create configure. AC_PREREQ(2.57) -AC_INIT([altos], 1.4) +AC_INIT([altos], 1.4.1) AC_CONFIG_SRCDIR([src/kernel/ao.h]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE diff --git a/doc/altusmetrum.xsl b/doc/altusmetrum.xsl index 082271d7..c68bbac9 100644 --- a/doc/altusmetrum.xsl +++ b/doc/altusmetrum.xsl @@ -42,7 +42,7 @@ 1.4.1 - 20 June 2014 + 24 June 2014 Minor release fixing some installation bugs. -- cgit v1.2.3