CVS: packaging README-MAINTAINER.txt, 1.5, 1.6 makefile, 1.28, 1.29 mspgcc-full-install.nsi, 1.17, 1.18

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

Modified Files:
	README-MAINTAINER.txt makefile mspgcc-full-install.nsi 
Log Message:
- updates for Python 2.5
- update build docs
- build insight instead of gdb only

Index: README-MAINTAINER.txt
===================================================================
RCS file: /cvsroot/mspgcc/packaging/README-MAINTAINER.txt,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -d -r1.5 -r1.6
--- README-MAINTAINER.txt	15 May 2008 01:01:48 -0000	1.5
+++ README-MAINTAINER.txt	21 May 2008 02:10:14 -0000	1.6
@@ -13,9 +13,11 @@
 
   additional, on Windows only:
   
-  - ctypes
+  - ctypes (builtin Python 2.5)
   - py2exe
-  - EasyDialogs
+  - EasyDialogs (http://www.averdevelopment.com/python/EasyDialogs.html)
+
+- NSIS (Windows only)
 
 
 mspgcc Linux howto
@@ -99,6 +101,24 @@
 take care of everything, given that cygwin, python (with ctypes and py2exe)
 and NSIS are installed and available on the ``PATH``.
 
+For packagers
+-------------
+- check out the repository with "LF" line endings ("unix sandbox" in TortoiseCVS)
+- set cygwin for "unix style line endings"
+- the pdfs and msp430-gdbproxy and MSP430.dll must be copied manually to
+  ``packaging`` before running the build.
+- makensis and python.exe must be in the ``%PATH``
+- ``make folders``
+- ``make build-installer``
+- to regenrate the installer: ``make clean-installdir windows-installer``
+  the installation has to be repeated completely as the generated file lists
+  get wrong otherwise. The installer would not have all files or put them
+  under wrong sections in the installer.
+- cygwin can be very slow on some machines. i do not have an explanation.
+  "slow" means that building the toolchain takes hours. Normal would be
+  less than one hour. On Linux it only takes a few minutes. Cygwin is a bit
+  slower due to is POSIX emulation layer, but on some machines it is extreme.
+
 
 Notes
 =====

Index: makefile
===================================================================
RCS file: /cvsroot/mspgcc/packaging/makefile,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -w -d -r1.28 -r1.29
--- makefile	15 May 2008 01:01:48 -0000	1.28
+++ makefile	21 May 2008 02:10:21 -0000	1.29
@@ -44,6 +44,7 @@
 GCC_VERSION             := 3.2.3
 #~ GDB_VERSION             := 5.1.1
 GDB_VERSION             := 6.0
+INSIGHT_VERSION         := 6.7.1
 
 # location of the gnu source tarballs
 ARCHIVES        = $(PWD)/archives
@@ -75,15 +76,17 @@
 #MIRROR_BINUTILS = $(MIRROR)/binutils/snapshots
 MIRROR_GDB      = $(MIRROR)/gdb/old-releases
 #~ MIRROR_GDB      = $(MIRROR)/gdb/releases
+MIRROR_INSIGHT  = $(MIRROR)/insight/releases
 MIRROR_GCC      = ftp://ftp.gnu.org/gnu/gcc
 
 # inernal
 BINUTILS        = binutils-$(BINUTILS_VERSION)
 GCC             = gcc-$(GCC_VERSION)
 GDB             = gdb-$(GDB_VERSION)
+INSIGHT         = insight-$(INSIGHT_VERSION)
 
 # external tools
-NSIS           := "/cygdrive/c/Program Files/NSIS/makensis"
+NSIS           := makensis
 DOWONLOAD      := wget
 ifdef WINDIR
 # file lists are used to build the windows installer
@@ -188,6 +191,9 @@
 $(ARCHIVES)/gdb-$(GDB_VERSION).tar.bz2:
 	cd $(ARCHIVES) && $(DOWONLOAD) $(MIRROR_GDB)/gdb-$(GDB_VERSION).tar.bz2
 
+$(ARCHIVES)/insight-$(INSIGHT_VERSION).tar.bz2:
+	cd $(ARCHIVES) && $(DOWONLOAD) $(MIRROR_INSIGHT)/insight-$(INSIGHT_VERSION).tar.bz2
+
 ##############################################################################
 #### Build
 ##############################################################################
@@ -273,24 +279,50 @@
 
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 # The debugger
+#~ gdb-clean:
+	#~ @echo "###############################################################################"
+	#~ @echo "##  msp430-gdb ($(GDB_VERSION))"
+	#~ @echo "###############################################################################"
+	#~ rm -rf $(BUILDDIR)/$(GDB)
+#~ gdb-build: gdb-clean \
+            #~ $(ARCHIVES)/gdb-$(GDB_VERSION).tar.bz2
+	#~ cd $(BUILDDIR) && tar xjf $(ARCHIVES)/gdb-$(GDB_VERSION).tar.bz2
+	#~ @echo "## Applying mspgcc patches"
+	#~ #cp -r $(CVSFILES)/gdb/gdb-$(GDB_VERSION)/* $(BUILDDIR)/$(GDB)
+	#~ cp -r $(CVSFILES)/gdb/gdb-current/* $(BUILDDIR)/$(GDB)
+	#~ @echo "## Configuring and building msp430-gdb (this takes a while)"
+	#~ cd $(BUILDDIR)/$(GDB); ./configure --target=msp430 --prefix=$(INSTALLDIR) --disable-nls >$(BUILDDIR)/gdb-build.log 2>&1
+	#~ cd $(BUILDDIR)/$(GDB); make >>$(BUILDDIR)/gdb-build.log 2>&1
+	#~ @echo "## msp430-gdb done"
+#~ gdb-install:
+	#~ $(FILELIST) $(INSTALLDIR) >files-before.txt
+	#~ cd $(BUILDDIR)/$(GDB); make install >>$(BUILDDIR)/gdb-build.log 2>&1
+	#~ $(FILELIST) $(INSTALLDIR) >files-after.txt
+	#~ $(FILEDIFF) files-before.txt files-after.txt >$(BUILDDIR)/files-gdb.txt
+	#~ $(FILELIST_RM) files-before.txt files-after.txt
+	#~ @echo "## gdb installed"
+
+# alternative
+# provides gdb and insight
 gdb-clean:
 	@echo "###############################################################################"
-	@echo "##  msp430-gdb ($(GDB_VERSION))"
+	@echo "##  msp430-insight ($(INSIGHT_VERSION))"
 	@echo "###############################################################################"
-	rm -rf $(BUILDDIR)/$(GDB)
+	rm -rf $(BUILDDIR)/$(INSIGHT)
 gdb-build: gdb-clean \
-            $(ARCHIVES)/gdb-$(GDB_VERSION).tar.bz2
-	cd $(BUILDDIR) && tar xjf $(ARCHIVES)/gdb-$(GDB_VERSION).tar.bz2
+            $(ARCHIVES)/insight-$(INSIGHT_VERSION).tar.bz2
+	cd $(BUILDDIR) && tar xjf $(ARCHIVES)/insight-$(INSIGHT_VERSION).tar.bz2
 	@echo "## Applying mspgcc patches"
-	#~ cp -r $(CVSFILES)/gdb/gdb-$(GDB_VERSION)/* $(BUILDDIR)/$(GDB)
-	cp -r $(CVSFILES)/gdb/gdb-current/* $(BUILDDIR)/$(GDB)
-	@echo "## Configuring and building msp430-gdb (this takes a while)"
-	cd $(BUILDDIR)/$(GDB); ./configure --target=msp430 --prefix=$(INSTALLDIR) --disable-nls >$(BUILDDIR)/gdb-build.log 2>&1
-	cd $(BUILDDIR)/$(GDB); make >>$(BUILDDIR)/gdb-build.log 2>&1
-	@echo "## msp430-gdb done"
+	#~ cp -r $(CVSFILES)/insight/insight-$(INSIGHT_VERSION)/* $(BUILDDIR)/$(INSIGHT)
+	cd $(BUILDDIR)/$(INSIGHT)&& patch -p1 < $(PATCHES)/insight-6.7.1-msp430-20080313.patch
+	#~ cd $(BUILDDIR)/$(INSIGHT); patch -p1 < $(PATCHES)/insight-6.8-msp430-20080516.patch
+	@echo "## Configuring and building msp430-insight (this takes a while)"
+	cd $(BUILDDIR)/$(INSIGHT)&& ./configure --enable-targets=msp430 --target=msp430 --prefix=$(INSTALLDIR) --disable-nls >$(BUILDDIR)/insight-build.log 2>&1
+	cd $(BUILDDIR)/$(INSIGHT)&& make >>$(BUILDDIR)/insight-build.log 2>&1
+	@echo "## msp430-insight done"
 gdb-install:
 	$(FILELIST) $(INSTALLDIR) >files-before.txt
-	cd $(BUILDDIR)/$(GDB); make install >>$(BUILDDIR)/gdb-build.log 2>&1
+	cd $(BUILDDIR)/$(INSIGHT); make install >>$(BUILDDIR)/insight-build.log 2>&1
 	$(FILELIST) $(INSTALLDIR) >files-after.txt
 	$(FILEDIFF) files-before.txt files-after.txt >$(BUILDDIR)/files-gdb.txt
 	$(FILELIST_RM) files-before.txt files-after.txt

Index: mspgcc-full-install.nsi
===================================================================
RCS file: /cvsroot/mspgcc/packaging/mspgcc-full-install.nsi,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -w -d -r1.17 -r1.18
--- mspgcc-full-install.nsi	16 Feb 2007 16:12:47 -0000	1.17
+++ mspgcc-full-install.nsi	21 May 2008 02:10:22 -0000	1.18
@@ -170,6 +170,10 @@
     !include "msp430-gdb-install.nsh"
     SetOutPath "$INSTDIR\docs"
     File "README-msp430-gdb.txt"
+    !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
+    CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER"
+    CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\msp430-insight.lnk" "$INSTDIR\bin\msp430-insight.exe" "" "$INSTDIR\msp430-insight.exe" 0
+    !insertmacro MUI_STARTMENU_WRITE_END
 SectionEnd
 
 
@@ -177,7 +181,7 @@
     SectionIn 1 2
     SetOutPath "$INSTDIR\bin"
     File "${SRCDIR}\bin\msp430-gdbproxy.exe"
-    File "${SRCDIR}\bin\python24.dll"
+    File "${SRCDIR}\bin\python25.dll"
     File "${SRCDIR}\bin\ihex2titext.exe"
     File "${SRCDIR}\bin\msp430-dco.exe"
     File "${SRCDIR}\bin\msp430-downloader.exe"
@@ -193,13 +197,13 @@
     SetOutPath "$INSTDIR\bin\lib"
     File "${SRCDIR}\bin\lib\_ctypes.pyd"
     File "${SRCDIR}\bin\lib\bz2.pyd"
-    File "${SRCDIR}\bin\lib\PyWinTypes24.dll"
+    File "${SRCDIR}\bin\lib\pywintypes25.dll"
     File "${SRCDIR}\bin\lib\select.pyd"
     File "${SRCDIR}\bin\lib\shared.zip"
     File "${SRCDIR}\bin\lib\unicodedata.pyd"
     File "${SRCDIR}\bin\lib\win32event.pyd"
     File "${SRCDIR}\bin\lib\win32file.pyd"
-    File "${SRCDIR}\bin\lib\zlib.pyd"
+    ;~ File "${SRCDIR}\bin\lib\zlib.pyd"
     ;~ File "${SRCDIR}\bin\lib\_parjtag.pyd"
     
     SetOutPath "$INSTDIR\docs"
@@ -413,7 +417,7 @@
 
     #jtag and bsl
     Delete "$INSTDIR\bin\msp430-gdbproxy.exe"
-    Delete "$INSTDIR\bin\python24.dll"
+    Delete "$INSTDIR\bin\python25.dll"
     Delete "$INSTDIR\bin\ihex2titext.exe"
     Delete "$INSTDIR\bin\msp430-dco.exe"
     Delete "$INSTDIR\bin\msp430-downloader.exe"
@@ -428,13 +432,13 @@
     Delete "$INSTDIR\bin\w9xpopen.exe"
     Delete "$INSTDIR\bin\lib\_ctypes.pyd"
     Delete "$INSTDIR\bin\lib\bz2.pyd"
-    Delete "$INSTDIR\bin\lib\PyWinTypes24.dll"
+    Delete "$INSTDIR\bin\lib\pywintypes25.dll"
     Delete "$INSTDIR\bin\lib\select.pyd"
     Delete "$INSTDIR\bin\lib\shared.zip"
     Delete "$INSTDIR\bin\lib\unicodedata.pyd"
     Delete "$INSTDIR\bin\lib\win32event.pyd"
     Delete "$INSTDIR\bin\lib\win32file.pyd"
-    Delete "$INSTDIR\bin\lib\zlib.pyd"
+    ;~ Delete "$INSTDIR\bin\lib\zlib.pyd"
     ;~ Delete "$INSTDIR\bin\lib\_parjtag.pyd"
     RMDir  "$INSTDIR\bin\lib"
     
@@ -463,6 +467,7 @@
     
     # - - - - - startmenu
     !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
+    Delete "$SMPROGRAMS\$MUI_TEMP\msp430-insight.lnk"
     Delete "$SMPROGRAMS\$MUI_TEMP\msp430-gdbproxy.lnk"
     Delete "$SMPROGRAMS\$MUI_TEMP\msp430-gdbproxy-debug.lnk"
     Delete "$SMPROGRAMS\$MUI_TEMP\mspgcc-manual.lnk"


-------------------------------------------------------------------------
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/