X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=Releasing;h=a1c510fdbabbdecf94c03560403ca261cfb4a969;hp=8627d864da6e107e0f8a8a68a8fff99385182491;hb=5a51efd7f9b49ffadc91ccaf7a0d69566301c009;hpb=ac12e77e3dffc9e9ddb1578a38b32783ad64e940

diff --git a/Releasing b/Releasing
index 8627d864..a1c510fd 100644
--- a/Releasing
+++ b/Releasing
@@ -1,29 +1,39 @@
 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 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
+	
+	- update the version in configure.ac
+
 	- 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)
-
-	- 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>
@@ -36,7 +46,8 @@ These are Bdale's notes on how to do a release.
 
 	- if this is a -1 release, then
 		git-buildpackage --git-no-pristine-tar --git-submodules \
-			--git-upstream-branch=branch-<version>
+			--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>
@@ -55,23 +66,41 @@ These are Bdale's notes on how to do a release.
 
 		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 \
+	   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 \
+	   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>
 
 	- create /home/bdale/web/altusmetrum/MicroPeak/releases/<rev>,
 	  and move the MicroPeak installers from AltOS/releases to there
 		
-	- go edit ~/web/altusmetrum/AltOS/releases/<rev>.mdwn and 
-	  /home/bdale/web/altusmetrum/MicroPeak/releases/<rev>.mdwn, to 
-	  include release date and explicit ref to dir contents so the 
-	  web pages shows versioned links, commit and push
+	- create /home/bdale/web/altusmetrum/TeleGPS/releases/<rev>,
+	  and move the MicroPeak 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
+
+		- make sure the Windows stuff is like 1-4-1, not 1.4.1!
 
 	(cd doc ; make publish)
 
 		this pushes fresh documents to the web site
 
 	sudo debian/rules clean
-	git push origin master branch-<version> debian
+	git push origin master branch-<version> debian pristine-tar
 	git push --tags
 
 		push commits and leave the build tree in an uncluttered state