CVS: packaging makefile,1.30,1.31

Update of /cvsroot/mspgcc/packaging
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv11110

Modified Files:
	makefile 
Log Message:
- switch gdb/insight version
- workaround to trigger msys path translation (don't use echo)
- apply mingw patch to gcc in case of windows build

Index: makefile
===================================================================
RCS file: /cvsroot/mspgcc/packaging/makefile,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -w -d -r1.30 -r1.31
--- makefile	26 May 2008 23:50:28 -0000	1.30
+++ makefile	31 May 2008 16:45:28 -0000	1.31
@@ -44,8 +44,8 @@
 GCC_VERSION             := 3.2.3
 #~ GDB_VERSION             := 5.1.1
 #~ GDB_VERSION             := 6.0
-GDB_VERSION             := 6.7.1
-#~ GDB_VERSION             := 6.8
+#~ GDB_VERSION             := 6.7.1
+GDB_VERSION             := 6.8
 
 # location of the gnu source tarballs
 ARCHIVES        = $(PWD)/archives
@@ -257,6 +257,7 @@
 ifdef WINDOWS
 	@echo "## Applying patch for oooooooold windoze"
 	cd $(BUILDDIR)/$(GCC); patch -p1 < $(PATCHES)/gcc-3.2.3-cygwin.patch #win98 patch
+	cd $(BUILDDIR)/$(GCC); patch -p1 < $(PATCHES)/gcc-3.2.3-mingw.patch
 endif
 	cd $(BUILDDIR)/$(GCC); patch -p1 < $(PATCHES)/gcc-3.2.3-__FUNCTION__.patch
 	@echo "## Configuring and building msp430-gcc (this takes a while)"
@@ -289,8 +290,10 @@
 	cd $(BUILDDIR) && tar xjf $(ARCHIVES)/insight-$(GDB_VERSION).tar.bz2
 	@echo "## Applying mspgcc patches"
 	#~ cp -r $(CVSFILES)/gdb/gdb-$(GDB_VERSION)/* $(BUILDDIR)/insight-$(GDB_VERSION)
-	cd $(BUILDDIR)/insight-$(GDB_VERSION)&& patch -p1 < $(PATCHES)/insight-6.7.1-msp430-20080313.patch
-	uname -a | grep x86_64 && cd $(BUILDDIR)/insight-$(GDB_VERSION)&& patch -p1 < $(PATCHES)/insight-6.7.1-64bit.patch
+	cd $(BUILDDIR)/insight-$(GDB_VERSION)&& patch -p1 < $(PATCHES)/msp430-gdb-6.8.patch
+	cd $(BUILDDIR)/insight-$(GDB_VERSION)&& patch -p1 < $(PATCHES)/msp430-gdb-6.8-fix.patch
+	#~ cd $(BUILDDIR)/insight-$(GDB_VERSION)&& patch -p1 < $(PATCHES)/insight-6.7.1-msp430-20080313.patch
+	#~ uname -a | grep x86_64 && cd $(BUILDDIR)/insight-$(GDB_VERSION)&& patch -p1 < $(PATCHES)/insight-6.7.1-64bit.patch
 	@echo "## Configuring and building msp430-insight (this takes a while)"
 	cd $(BUILDDIR)/insight-$(GDB_VERSION)&& ./configure \
             --enable-targets=msp430 --target=msp430 \
@@ -575,10 +578,17 @@
 msp430-libraries-install.nsh: $(BUILDDIR)/files-libraries.txt
 	python files_to_nsh.py $(BUILDDIR)/files-libraries.txt libraries $(INSTALLDIR)
 
+ifndef MSYSCON
 installer-variables: FORCE
 	echo '!define VERSION "$(BUILDDATE)"' >variables.nsh
 	echo '!define SRCDIR "$(shell cygpath -w $(INSTALLDIR))"' >>variables.nsh
 	echo '!define BUILDDIR "$(shell cygpath -w $(BUILDDIR))"' >>variables.nsh
+else
+installer-variables: FORCE
+	python -c 'import sys;print """!define VERSION "%s" """ % (sys.argv[1])' $(BUILDDATE) >variables.nsh
+	python -c 'import sys;print """!define SRCDIR "%s" """ % (sys.argv[1])' $(INSTALLDIR) >>variables.nsh
+	python -c 'import sys;print """!define BUILDDIR "%s" """ % (sys.argv[1])' $(BUILDDIR) >>variables.nsh
+endif
 
 # process all the file lists, build installer
 windows-installer: stamp msp430-binutils-install.nsh msp430-gcc-install.nsh \


-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/