X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=Releasing;h=613635ce4f1dc76c83e5baae9eda0c19e50ac9dd;hp=a20b6dc084e0d461eafb68422e0917ca6bdc48ac;hb=a2df970fca0e719e4b32e1642803590ff7bbd1ee;hpb=54838e3d523953e3ce4cea2319b2820c21d2c576

diff --git a/Releasing b/Releasing
index a20b6dc0..613635ce 100644
--- a/Releasing
+++ b/Releasing
@@ -3,6 +3,8 @@ Adding a product to the release
 	Make sure the firmware and loader get built by default in
 	src/Makefile
 
+	Add firmware targets to fat_altos target in Makefile.am
+	
 	Add the firmware to altosui/Makefile.am
 
 	Add the firmware to altosui/altos-windows.nsi.in
@@ -25,15 +27,14 @@ These are Keith's notes on how to do a release
 
 	- make sure doc/Makefile points at that too
 
-	- make sure that doc/altusmetrum-docinfo.xml has the right copyright 
-	  year, and add release to the revision history at the front (release 
-	  notes will be pulled in by release-notes.inc)
-
 These are Bdale's notes on how to do a release.
 
-	- make sure build environment is up to date
+	- make sure Debian build environment is up to date
 		sudo cowbuilder --update
 
+	- make sure fat build environment is up to date
+		sudo apt update && sudo apt upgrade
+
 	- ensure i386 build support is available, and we have tools to build
 	  installers for Windows and Mac OS X
 
@@ -48,14 +49,6 @@ These are Bdale's notes on how to do a release.
 
 	- 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
-	    (cd ~/altusmetrumllc; git pull)
-	    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>
 
@@ -64,12 +57,9 @@ These are Bdale's notes on how to do a release.
 		- cherry-pick or merge appropriate content from master
 	
 	- make sure there is a doc/release-notes-<version>.inc
-	- make sure that doc/altusmetrum-docinfo.xml has the right copyright 
-	  year, and add release to the revision history at the front (release 
-	  notes will be pulled in automatically)
+	- make sure that doc/*.txt have the right copyright year and the
+	  new release is included
 	- make absolutely sure checked-out tree is "clean" 
-	- make absolutely sure the pdclib/ submodule is on the master branch,
-	  up to date, and "clean"
 
         git log > ChangeLog
 	git commit -a
@@ -87,14 +77,14 @@ These are Bdale's notes on how to do a release.
         git commit -n debian/changelog -m "update changelog for Debian build"
 
 	- if this is a -1 release, then
-		gbp buildpackage --git-no-pristine-tar --git-submodules \
+		gbp buildpackage --git-no-pristine-tar \
 			--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
-		gbp buildpackage --git-submodules
+		gbp buildpackage
 
 	git tag debian/<version>
 
@@ -111,6 +101,7 @@ These are Bdale's notes on how to do a release.
 
 	cp src/chaoskey-v1.0/{*.elf,*.ihx,*.bin} \
 	   src/easymega-v1.0/{*.elf,*.ihx} \
+	   src/easymega-v2.0/{*.elf,*.ihx} \
 	   src/easymini-v1.0/{*.elf,*.ihx} \
 	   src/easymini-v2.0/{*.elf,*.ihx} \
 	   src/telebt-v3.0/{*.elf,*.ihx} \
@@ -125,9 +116,11 @@ These are Bdale's notes on how to do a release.
 	   src/telemini-v3.0/{*.elf,*.ihx} \
 	   src/telelco-v2.0/{*.elf,*.ihx} \
 	   src/telefireeight-v1.0/{*.elf,*.ihx} \
+	   src/telefireeight-v2.0/{*.elf,*.ihx} \
 	   ~/altusmetrumllc/Binaries/
 	cp src/chaoskey-v1.0/flash-loader/{*.elf,*.bin} \
 	   src/easymega-v1.0/flash-loader/*.elf \
+	   src/easymega-v2.0/flash-loader/*.elf \
 	   src/easymini-v1.0/flash-loader/*.elf \
 	   src/easymini-v2.0/flash-loader/{*.elf,*.bin} \
 	   src/telebt-v3.0/flash-loader/*.elf \
@@ -142,6 +135,7 @@ These are Bdale's notes on how to do a release.
 	   src/telemini-v3.0/flash-loader/{*.elf,*.bin} \
 	   src/telelco-v2.0/flash-loader/*.elf \
 	   src/telefireeight-v1.0/flash-loader/*.elf \
+	   src/telefireeight-v2.0/flash-loader/*.elf \
 	   ~/altusmetrumllc/Binaries/loaders/
 	(cd ~/altusmetrumllc ; git add Binaries ; git commit -a) 
 	- remove previous versions (only keep latest release)