release 1.6 - no functional code changes, just distribution and versioning - see CHANGELOG for details

Author: [email protected]

CHANGELOG

@@ -1,3 +1,10 @@
+2014-07-07  Adam Laurie
+	* Release 1.6
+	* Move versioning into Makefile
+	* Move executables into binaries sub-dir
+	* Add pre-compiled linux-32/64, osx-32/64 and win-32 executables to repo
+	* Create dist sub-dir for tarball and zipfile (as google code no longer supports downloads)
+
 2014-07-02
 	* Issue #12 - improve readability of address checking routine [tonynaggs]
 	* Re-implement setting of bytes per address according to device family, 

Makefile

@@ -1,6 +1,10 @@
-CC    = gcc
-EXECS = mphidflash
-OBJS  = main.o hex.o
+VERSION_MAIN = 1
+VERSION_SUB  = 6
+
+CC       = gcc
+OBJS     = main.o hex.o
+EXECPATH = binaries
+DISTPATH = dist
 
 ifeq ($(shell uname -s),Darwin)
 # Rules for Mac OS X
@@ -16,28 +20,53 @@ else
   SYSTEM = linux
 endif
 
-all: $(EXECS)
+CFLAGS += -DVERSION_MAIN=$(VERSION_MAIN) -DVERSION_SUB=$(VERSION_SUB)
+
+all: 
+	@echo
+	@echo Please make 'mphidflash32' or 'mphidflash64' for 32 or 64 bit version
+	@echo
 
 *.o: mphidflash.h
 
 .c.o:
 	$(CC) $(CFLAGS) -c $*.c
 
+mphidflash64: CFLAGS += -m64
+mphidflash64: LDFLAGS += -m64
+mphidflash64: EXEC = mphidflash-$(VERSION_MAIN).$(VERSION_SUB)-$(SYSTEM)-64
+mphidflash64: mphidflash
+
 mphidflash32: CFLAGS += -m32 
 mphidflash32: LDFLAGS += -m32
+mphidflash32: EXEC = mphidflash-$(VERSION_MAIN).$(VERSION_SUB)-$(SYSTEM)-32
 mphidflash32: mphidflash
 
 mphidflash: $(OBJS)
-	$(CC) $(OBJS) $(LDFLAGS) -o mphidflash
-	strip mphidflash
+	$(CC) $(OBJS) $(LDFLAGS) -o $(EXECPATH)/$(EXEC)
+	strip $(EXECPATH)/$(EXEC)
+
+install:
+	@echo
+	@echo Please make 'install32 or install64' to install 32 or 64 bit target
+	@echo
 
 # Must install as root; e.g. 'sudo make install'
-install: mphidflash
-	cp mphidflash /usr/local/bin
+install32: mphidflash32
+	cp $(EXECPATH)/mphidflash-$(VERSION_MAIN).$(VERSION_SUB)-$(SYSTEM)-32 /usr/local/bin/mphidflash
+
+install64: mphidflash64
+	cp $(EXECPATH)/mphidflash-$(VERSION_MAIN).$(VERSION_SUB)-$(SYSTEM)-64 /usr/local/bin/mphidflash
 
 clean:
-	rm -f $(EXECS) *.o core
+	rm -f *.o core
+
+bindist: tarball zipfile
+
+tarball:
+	tar cvzf $(DISTPATH)/mphidflash-$(VERSION_MAIN).$(VERSION_SUB)-bin.tar.gz README.txt CHANGELOG COPYING $(EXECPATH)/*$(VERSION_MAIN).$(VERSION_SUB)*
 
-bindist: $(EXECS)
-	tar cvzf mphidflash-bin-$(SYSTEM).tar.gz README.txt CHANGELOG COPYING $(EXECS)
+zipfile:
+	rm -f $(DISTPATH)/mphidflash-$(VERSION_MAIN).$(VERSION_SUB)-bin.zip
+	zip $(DISTPATH)/mphidflash-$(VERSION_MAIN).$(VERSION_SUB)-bin.zip README.txt CHANGELOG COPYING $(EXECPATH)/*$(VERSION_MAIN).$(VERSION_SUB)*
 

Makefile.win

@@ -1,7 +1,10 @@
+VERSION_MAIN = 1
+VERSION_SUB  = 6
+
 CC    = i586-mingw32msvc-gcc
 EXECS = mphidflash.exe
 OBJS  = main.o hex.o usb-windows.o
-CFLAGS = -DWIN
+CFLAGS = -DWIN -DVERSION_MAIN=$(VERSION_MAIN) -DVERSION_SUB=$(VERSION_SUB)
 LDFLAGS = -lhid -lsetupapi 
 
 all: $(EXECS)
@@ -10,13 +13,25 @@ all: $(EXECS)
 
 .c.o:
 	$(CC) $(CFLAGS) -c $*.c
- 
+
+# todo: add 64 bit target (low priority as 32 bit works on all platforms)
+
+mphidflash32: CFLAGS += -m32 
+mphidflash32: LDFLAGS += -m32
+mphidflash32: mphidflash.exe
+
 mphidflash.exe: $(OBJS)
-	$(CC) $(OBJS) $(LDFLAGS) -o mphidflash.exe
+	$(CC) $(OBJS) $(LDFLAGS) -o binaries/mphidflash-$(VERSION_MAIN).$(VERSION_SUB)-win-32.exe
 
 clean:
 	rm -f $(EXECS) *.o core
 
-bindist: $(EXECS)
-	zip mphidflash-bin-win.zip README.txt CHANGELOG COPYING $(EXECS)
+bindist:
+	make bindist
+
+tarball:
+	make tarball
+
+zipfile:
+	make zipfile
 

README.txt

@@ -17,16 +17,24 @@ from the command line:
 	sudo apt-get install libhid-dev
 
 Assuming you're reading this as the README.txt alongside the source code,
-to compile mphidflash, in the Terminal window type:
+to compile mphidflash for a 32 or 64 bit system, in the Terminal window type:
+
+	make mphidflash32
+
+  or
 
-	make
+	make mphidflash64
 
 Then install with the command:
 
-	sudo make install
+	sudo make install32
+
+  or
+
+	sudo make install64
 
-This will copy the 'mphidflash' executable to /usr/local/bin so you don't need
-to specify a complete path to the program each time.
+This will copy the appropriate executable to /usr/local/bin/mphidflash so you 
+don't need to specify a complete path to the program each time.
 
 
 Mac OS X
@@ -36,16 +44,24 @@ developer tools) already installed.  The IDE portion is not used here, just
 the command line interface.
 
 Assuming you're reading this as the README.txt alongside the source code,
-to compile mphidflash, in the Terminal window type:
+to compile mphidflash for a 32 or 64 bit system, in the Terminal window type:
+
+	make mphidflash32
+
+  or
 
-	make
+	make mphidflash64
 
 Then install with the command:
 
-	sudo make install
+	sudo make install32
+
+  or
+
+	sudo make install64
 
-This will copy the 'mphidflash' executable to /usr/local/bin so you don't need
-to specify a complete path to the program each time.
+This will copy the appropriate executable to /usr/local/bin/mphidflash so you
+don't need to specify a complete path to the program each time.
 
 
 Windows
@@ -62,8 +78,9 @@ to compile mphidflash, in the Terminal window type:
 
 	make -f Makefile.win
 
-This will create 'mphidflash.exe' which can called from the Windows commmand
-line.
+This will create a .exe in the binaries sub-directory, which can be called
+from the Windows commmand line - e.g. 'mphidflash-1.6-win-32.exe'. You should 
+copy this file somewhere on your executable path and rename it to 'mphidflash.exe'.
 
 
 Usage

binaries/mphidflash-1.6-linux-32

@@ -37,9 +37,6 @@
 #ifndef _MPHIDFLASH_H_
 #define _MPHIDFLASH_H_
 
-#define VERSION_MAIN 1
-#define VERSION_SUB 5
-
 #ifdef DEBUG
 #define DEBUGMSG(str) (void)puts(str); fflush(stdout);
 #else