X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=Releasing;h=a570645a860ab67252902115ca349ce33c9f3a03;hp=d7b337e625fd97aed61e708ed94df9dd0e45abd4;hb=64adfbbb80c90dfe244179d81beaef8a84ed8bd6;hpb=5d4f912bcc6784f975c82f7b0ed8dc360e60aae8

diff --git a/Releasing b/Releasing
index d7b337e6..a570645a 100644
--- a/Releasing
+++ b/Releasing
@@ -1,58 +1,58 @@
 These are Bdale's notes on how to do a release.
 
+	- make sure build environment is up to date
+		sudo cowbuilder --update
+
 	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
+	- update the version in configure.ac if Keith hasn't already
+
+	- make sure the Google Maps API key is in the build chroot and root
+	    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-<version>
+
+	- if this is an x.y.z release, then:
+		git checkout branch-<version>		# the x.y parts only
+		- cherry-pick or merge appropriate content from master
+	
 	- make sure there is a doc/release-notes-<version>.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-<version>
-		git tag -a <version>
-		- edit .git/gbp.conf to use branch-<version> as upstream
+        git log > ChangeLog
+	git commit -a
+	git tag -a <version>			# full x.y.z version
 
-	- if this is an x.y.z release, then:
-		git checkout branch-<version>		# the x.y parts only
-		git merge master
-		git tag -a <version>			# full x.y.z version
+	- make sure .git/gbp.conf set to use branch-<version> as upstream
 
 	git checkout debian
 	git merge branch-<version>
 
 	- verify debian/changelog is "clean" ending in last release version
 	- craft a suitable debian/changelog entry, possibly using:
-	git-dch --release --new-version=<version>-1 --multimaint-merge
+	gbp dch --release --new-version=<version>-1 --multimaint-merge
 
         git commit -n debian/changelog -m "update changelog for Debian build"
 
 	- if this is a -1 release, then
-		git-buildpackage --git-no-pristine-tar --git-submodules \
+		gbp buildpackage --git-no-pristine-tar --git-submodules \
 			--git-upstream-branch=branch-<version> \ # eg 1.3
 			--git-upstream-tag=<version>	         # eg 1.3.1
 		pristine-tar commit \
 			../build-area/altos_<version>.orig.tar.gz \
 			branch-<version>
 	  else if this is not a -1 release
-		git-buildpackage --git-submodules
+		gbp buildpackage --git-submodules
 
 	git tag debian/<version>
 
@@ -61,38 +61,48 @@ These are Bdale's notes on how to do a release.
 
 	make distclean
 
-	./autogen.sh --with-fat-dir=/home/bdale/web/altusmetrum/AltOS/releases
+	./autogen.sh --enable-multi-arch \
+		--with-fat-dir=/home/bdale/web/altusmetrum/AltOS/releases
 	make && make fat
 
 		this pushes packages for each platform to web site
 
 	# store a stable copy of ARM binaries for production use
-	cp src/easymini-v1.0/*.elf \
+	cp src/easymega-v1.0/*.elf \
+	   src/easymini-v1.0/*.elf \
+	   src/telebt-v3.0/*.elf \
+	   src/teledongle-v3.0/*.elf \
 	   src/telegps-v1.0/*.elf \
 	   src/telemega-v1.0/*.elf \
 	   src/telemetrum-v2.0/*.elf \
 	   ~/altusmetrumllc/Binaries/
-	cp src/easymini-v1.0/flash-loader/*.elf \
+	cp src/easymega-v1.0/flash-loader/*.elf \
+	   src/easymini-v1.0/flash-loader/*.elf \
+	   src/telebt-v3.0/flash-loader/*.elf \
+	   src/teledongle-v3.0/flash-loader/*.elf \
 	   src/telegps-v1.0/flash-loader/*.elf \
 	   src/telemega-v1.0/flash-loader/*.elf \
 	   src/telemetrum-v2.0/flash-loader/*.elf \
 	   ~/altusmetrumllc/Binaries/loaders/
 	(cd ~/altusmetrumllc ; git add Binaries ; git commit -a) 
+	(cd ~/altusmetrumllc ; git push) 
 
 	- copy the relevant release notes file from doc/ to 
 	    /home/bdale/web/altusmetrum/AltOS/releases/<rev>
 
+	(cd ~/web/altusmetrum/AltOS/releases/<rev> ; rm *.tar.bz2)
+
 	- create /home/bdale/web/altusmetrum/MicroPeak/releases/<rev>,
 	  and move the MicroPeak installers from AltOS/releases to there
 		
 	- create /home/bdale/web/altusmetrum/TeleGPS/releases/<rev>,
-	  and move the MicroPeak installers from AltOS/releases to there
+	  and move the TeleGPS installers from AltOS/releases to there
 		
 	- go edit ~/web/altusmetrum/AltOS/releases/<rev>.mdwn, 
 	  /home/bdale/web/altusmetrum/MicroPeak/releases/<rev>.mdwn, and
-	  /home/bdale/web/altusmetrum/TeleGPS/releases/<rev>.mdwn, to 
-	  include release date and explicit ref to dir contents so the 
-	  web pages shows versioned links, commit and push
+	  /home/bdale/web/altusmetrum/TeleGPS/releases/<rev>.mdwn
+
+		- make sure the Windows stuff is like 1-4-1, not 1.4.1!
 
 	(cd doc ; make publish)