CVS: packaging makefile, 1.31, 1.32 mspgcc-base.nsh, 1.5, 1.6 mspgcc-full-install.nsi, 1.21, 1.22

Chris Liechti <[email protected]> Tue, 03 Jun 2008 19:58:29 -0700
Newsgroups gmane.comp.hardware.texas-instruments.msp430.gcc.cvs
Message-ID <[email protected]>
Update of /cvsroot/mspgcc/packaging
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv28577

Modified Files:
	makefile mspgcc-base.nsh mspgcc-full-install.nsi 
Log Message:
complete build with mingw (msp403-insight is missing, gdb is there)
move some generated build files to subfolder
remove cygwin (currently no make included at all)

Index: makefile
===================================================================
RCS file: /cvsroot/mspgcc/packaging/makefile,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -w -d -r1.31 -r1.32
--- makefile	31 May 2008 16:45:28 -0000	1.31
+++ makefile	4 Jun 2008 02:58:26 -0000	1.32
@@ -46,6 +46,7 @@
 #~ GDB_VERSION             := 6.0
 #~ GDB_VERSION             := 6.7.1
 GDB_VERSION             := 6.8
+#~ GDB_VERSION             := weekly-6.8.50-20080421
 
 # location of the gnu source tarballs
 ARCHIVES        = $(PWD)/archives
@@ -64,20 +65,23 @@
 BUILDDATE      := $(shell date +%Y%m%d)
 BUILDDIR       := $(PWD)/build
 
-ifdef WINDOWS
+ifdef WINDIR
 INSTALLDIR      = $(BUILDDIR)/installed
+PREFIX          = $(shell pwd -W)/build/installed
 else
 # installation target directory
 INSTALLDIR      = /opt/mspgcc
+PREFIX          = $(INSTALLDIR)
 endif
 
 # sites where the files are downloaded from
-MIRROR          = ftp://sources.redhat.com/pub
-MIRROR_BINUTILS = $(MIRROR)/binutils/releases
-#MIRROR_BINUTILS = $(MIRROR)/binutils/snapshots
-#~ MIRROR_GDB      = $(MIRROR)/gdb/old-releases
-#~ MIRROR_GDB      = $(MIRROR)/gdb/releases
-MIRROR_GDB      = $(MIRROR)/insight/releases
+MIRROR_BINUTILS = ftp://sources.redhat.com/pub/binutils/releases
+#MIRROR_BINUTILS = ftp://sources.redhat.com/pub/binutils/snapshots
+ifdef WINDIR
+MIRROR_GDB      = ftp://sources.redhat.com/pub/insight/snapshots/current
+else
+MIRROR_GDB      = ftp://sources.redhat.com/pub/insight/releases
+endif
 MIRROR_GCC      = ftp://ftp.gnu.org/gnu/gcc
 
 # inernal
@@ -109,35 +113,36 @@
 	@echo "/---------------------------------+"
 	@echo "| mspgcc build and install script |"
 	@echo "+---------------------------------/"
-	@echo 
+	@echo ""
 	@echo "Possible targets:"
 	@echo "folders  create the folders for the archives and CVS files"
 	@echo "sf       retrieve mspgcc patches with CVS (anonymous)"
 	@echo "build    download build and install binutils, gcc, gdb, libraries"
-	@echo 
+	@echo ""
 	@echo "INSTALLDIR defaults to /opt/mspgcc. Edit this makefile if"
 	@echo "this is not suitable."
-	@echo 
+	@echo ""
 	@echo "The installation target directory INSTALLDIR has to be writable"
 	@echo "by the user that runs make. On Linux e.g. run as root:"
 	@echo "# mkdir /opt/mspgcc; chown username.username /opt/mspgcc"
-	@echo 
+	@echo ""
 	@echo "Building everything, starting in an otherwise empty folder,"
 	@echo "just the makefile in it:"
 	@echo "# make folders sf build"
-	@echo 
+	@echo ""
 	@echo "If building from a CVS checkout ("make folders" has to be run"
 	@echo "the very first time only):"
 	@echo "# make build"
-	@echo 
+	@echo ""
 	@echo "Windows installer (from a CVS checkout):"
 	@echo "# make build-installer"
-	@echo
+	@echo ""
 	@echo "Settings (edit makefile if not appropriate)"
 	@echo "    Files are installed to '$(INSTALLDIR)'"
 	@echo "    Archives are kept in '$(ARCHIVES)'"
 	@echo "    mspgcc patches are located in '$(CVSFILES)'"
-	@echo
+	@echo "    working PATH is set to '$(PATH)'"
+	@echo ""
 	@echo "    Versions: $(BINUTILS) $(GCC) insight-$(GDB_VERSION)"
 
 debug:
@@ -220,7 +225,7 @@
 	cd $(BUILDDIR)/$(BINUTILS); patch -p1 < $(PATCHES)/binutils-2.18-msp430x24x-msp430x26x.patch
 	cd $(BUILDDIR)/$(BINUTILS); patch -p1 < $(PATCHES)/binutils-ld_scripts.patch
 	@echo "## Configure and building binutils (this takes a while)"
-	cd $(BUILDDIR)/$(BINUTILS) && ./configure --target=msp430 $(CROSSOPT) --prefix=$(INSTALLDIR) \
+	cd $(BUILDDIR)/$(BINUTILS) && ./configure --target=msp430 $(CROSSOPT) --prefix=$(PREFIX) \
                 --disable-nls --disable-shared --enable-debug --disable-threads \
                 --with-gcc --with-gnu-as --with-gnu-ld --with-stabs \
                 --disable-multilib \
@@ -261,7 +266,7 @@
 endif
 	cd $(BUILDDIR)/$(GCC); patch -p1 < $(PATCHES)/gcc-3.2.3-__FUNCTION__.patch
 	@echo "## Configuring and building msp430-gcc (this takes a while)"
-	cd $(BUILDDIR)/$(GCC) && ./configure --target=msp430 $(CROSSOPT) --prefix=$(INSTALLDIR) \
+	cd $(BUILDDIR)/$(GCC) && ./configure --target=msp430 $(CROSSOPT) --prefix=$(PREFIX) \
                 --disable-multilib \
                 --disable-libc --disable-libssp --disable-intl --disable-libiberty \
                 --with-gcc --with-gnu-ld --with-gnu-as --with-stabs \
@@ -288,16 +293,19 @@
 gdb-build: gdb-clean \
             $(ARCHIVES)/insight-$(GDB_VERSION).tar.bz2
 	cd $(BUILDDIR) && tar xjf $(ARCHIVES)/insight-$(GDB_VERSION).tar.bz2
+	#~ cd $(BUILDDIR) && mv src insight-$(GDB_VERSION) # needed for snapshot only
 	@echo "## Applying mspgcc patches"
 	#~ cp -r $(CVSFILES)/gdb/gdb-$(GDB_VERSION)/* $(BUILDDIR)/insight-$(GDB_VERSION)
 	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.8-mingw.patch
+	#~ cd $(BUILDDIR)/insight-$(GDB_VERSION) && patch -p1 < $(PATCHES)/insight-weekly-20080602-doc.patch # snapshot only
 	#~ 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 \
-            --prefix=$(INSTALLDIR) \
+            --prefix=$(PREFIX) \
             --disable-nls \
             >$(BUILDDIR)/gdb-build.log 2>&1
 	cd $(BUILDDIR)/insight-$(GDB_VERSION)&& make >>$(BUILDDIR)/gdb-build.log 2>&1
@@ -557,42 +565,42 @@
 
 # file list -> NSIS include conversion
 
-msp430-binutils-install.nsh: $(BUILDDIR)/files-binutils.txt
-	python files_to_nsh.py $(BUILDDIR)/files-binutils.txt binutils $(INSTALLDIR)
+$(BUILDDIR)/msp430-binutils-install.nsh: $(BUILDDIR)/files-binutils.txt
+	cd $(BUILDDIR) && python ../files_to_nsh.py files-binutils.txt binutils $(INSTALLDIR)
 
-msp430-gcc-install.nsh: $(BUILDDIR)/files-gcc.txt
-	python files_to_nsh.py $(BUILDDIR)/files-gcc.txt gcc $(INSTALLDIR)
+$(BUILDDIR)/msp430-gcc-install.nsh: $(BUILDDIR)/files-gcc.txt
+	cd $(BUILDDIR) && python ../files_to_nsh.py files-gcc.txt gcc $(INSTALLDIR)
 
-msp430-gdb-install.nsh: $(BUILDDIR)/files-gdb.txt
-	python files_to_nsh.py $(BUILDDIR)/files-gdb.txt gdb $(INSTALLDIR)
+$(BUILDDIR)/msp430-gdb-install.nsh: $(BUILDDIR)/files-gdb.txt
+	cd $(BUILDDIR) && python ../files_to_nsh.py files-gdb.txt gdb $(INSTALLDIR)
 
-msp430-libc-install.nsh: $(BUILDDIR)/files-libc.txt
-	python files_to_nsh.py $(BUILDDIR)/files-libc.txt libc $(INSTALLDIR)
+$(BUILDDIR)/msp430-libc-install.nsh: $(BUILDDIR)/files-libc.txt
+	cd $(BUILDDIR) && python ../files_to_nsh.py files-libc.txt libc $(INSTALLDIR)
 
-msp430-docs-install.nsh: $(BUILDDIR)/files-docs.txt
-	python files_to_nsh.py $(BUILDDIR)/files-docs.txt docs $(INSTALLDIR)
+$(BUILDDIR)/msp430-docs-install.nsh: $(BUILDDIR)/files-docs.txt
+	cd $(BUILDDIR) && python ../files_to_nsh.py files-docs.txt docs $(INSTALLDIR)
 
-msp430-examples-install.nsh: $(BUILDDIR)/files-examples.txt
-	python files_to_nsh.py $(BUILDDIR)/files-examples.txt examples $(INSTALLDIR)
+$(BUILDDIR)/msp430-examples-install.nsh: $(BUILDDIR)/files-examples.txt
+	cd $(BUILDDIR) && python ../files_to_nsh.py files-examples.txt examples $(INSTALLDIR)
 
-msp430-libraries-install.nsh: $(BUILDDIR)/files-libraries.txt
-	python files_to_nsh.py $(BUILDDIR)/files-libraries.txt libraries $(INSTALLDIR)
+$(BUILDDIR)/msp430-libraries-install.nsh: $(BUILDDIR)/files-libraries.txt
+	cd $(BUILDDIR) && python ../files_to_nsh.py files-libraries.txt libraries $(INSTALLDIR)
 
+$(BUILDDIR)/variables.nsh: FORCE
 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
+	echo '!define VERSION "$(BUILDDATE)"' >$@
+	echo '!define SRCDIR "$(shell cygpath -w $(INSTALLDIR))"' >>$@
+	echo '!define BUILDDIR "$(shell cygpath -w $(BUILDDIR))"' >>$@
 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
+	python -c 'import sys;print """!define VERSION "%s" """ % (sys.argv[1])' $(BUILDDATE) >$@
+	python -c 'import sys;print """!define SRCDIR "%s" """ % (sys.argv[1])' $(INSTALLDIR) >>$@
+	python -c 'import sys;print """!define BUILDDIR "%s" """ % (sys.argv[1])' $(BUILDDIR) >>$@
 endif
 
 # process all the file lists, build installer
-windows-installer: stamp msp430-binutils-install.nsh msp430-gcc-install.nsh \
-            msp430-gdb-install.nsh msp430-libc-install.nsh \
-            msp430-docs-install.nsh msp430-examples-install.nsh \
-            msp430-libraries-install.nsh installer-variables
+windows-installer: stamp $(BUILDDIR)/variables.nsh \
+            $(BUILDDIR)/msp430-binutils-install.nsh $(BUILDDIR)/msp430-gcc-install.nsh \
+            $(BUILDDIR)/msp430-gdb-install.nsh $(BUILDDIR)/msp430-libc-install.nsh \
+            $(BUILDDIR)/msp430-docs-install.nsh $(BUILDDIR)/msp430-examples-install.nsh \
+            $(BUILDDIR)/msp430-libraries-install.nsh 
 	$(NSIS) mspgcc-full-install.nsi

Index: mspgcc-base.nsh
===================================================================
RCS file: /cvsroot/mspgcc/packaging/mspgcc-base.nsh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -d -r1.5 -r1.6
--- mspgcc-base.nsh	6 Jan 2006 23:35:52 -0000	1.5
+++ mspgcc-base.nsh	4 Jun 2008 02:58:26 -0000	1.6
@@ -91,19 +91,6 @@
 # overwrite the old one automatically)
 InstallDirRegKey HKCU "Software\${PRODUCT}" ""
 
-
-Function DoCygwinDll
-  IfFileExists cygwin1.dll mis_cygwin
-  File c:\cygwin\bin\cygwin1.dll
-  File c:\cygwin\bin\cygintl-2.dll
-  File c:\cygwin\bin\cygiconv-2.dll
-  Goto cygwin_ok
-mis_cygwin:
-  MessageBox MB_OK "found a version of cygwin1.dll not replacing (may cause problems)"
-cygwin_ok:
-FunctionEnd
-
-
 Function AddPath
   ClearErrors
   # Add the program directory to the search path, if necessary 

Index: mspgcc-full-install.nsi
===================================================================
RCS file: /cvsroot/mspgcc/packaging/mspgcc-full-install.nsi,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -w -d -r1.21 -r1.22
--- mspgcc-full-install.nsi	29 May 2008 15:07:16 -0000	1.21
+++ mspgcc-full-install.nsi	4 Jun 2008 02:58:26 -0000	1.22
@@ -5,7 +5,7 @@
 #where to get the binaries in SRCDIR
 #build date in VERSION
 #file lists are in BUILDDIR
-!include "variables.nsh"
+!include "build\variables.nsh"
 
 !define VERSION_MAJOR 0
 !define VERSION_MINOR 5
@@ -66,41 +66,29 @@
 
 #----------------------------------------------------------------------------
 InstType "Full"
-InstType "without make and cygwin"
+InstType "without make and shell utilties"
 #   -   -   -   -   -   -   -   -   -   -   -   -   -   -   -   -   -   -   -
 
 
-SubSection "Make utilities & libs" SecMakeAndLibs
-    Section "Make utilities" SecMake
-        SectionIn 1
-        SetOutPath "$INSTDIR\bin"
-        ;~ Call DoCygwinDll
-        File c:\cygwin\bin\make.exe
-        File c:\cygwin\bin\diff.exe
-        File c:\cygwin\bin\patch.exe
-        File c:\cygwin\bin\mkdir.exe
-        File c:\cygwin\bin\cp.exe
-        File c:\cygwin\bin\mv.exe
-        File c:\cygwin\bin\rm.exe
-    SectionEnd
-    
-    Section "Cygwin libs" SecCygwin
-        SectionIn 1
-        SetOutPath "$INSTDIR\bin"
-        File c:\cygwin\bin\cygwin1.dll
-        File c:\cygwin\bin\cygintl-2.dll
-        File c:\cygwin\bin\cygintl-3.dll
-        File c:\cygwin\bin\cygintl-8.dll
-        File c:\cygwin\bin\cygiconv-2.dll
-        File c:\cygwin\bin\cygncurses-8.dll
-    SectionEnd
-SubSectionEnd
+; SubSection "Make and shell utilities" SecMakeAndLibs
+;     SectionIn 1
+;     SetOutPath "$INSTDIR\bin"
+;     File c:\msys\1.0\bin\msys-1.0.dll
+;     File c:\msys\1.0\bin\make.exe
+;     File c:\msys\1.0\bin\diff.exe
+;     File c:\msys\1.0\bin\patch.exe
+;     File c:\msys\1.0\bin\mkdir.exe
+;     File c:\msys\1.0\bin\cp.exe
+;     File c:\msys\1.0\bin\mv.exe
+;     File c:\msys\1.0\bin\rm.exe
+;     File c:\msys\1.0\bin\touch.exe
+; SubSectionEnd
 
 
 Section "Binutils" SecBinutils
     SectionIn 1 2 RO
     
-    !include "msp430-binutils-install.nsh"
+    !include "${BUILDDIR}\msp430-binutils-install.nsh"
     
     SetOutPath "$INSTDIR\docs"
     File "README.txt"
@@ -127,14 +115,14 @@
 SubSection "C Compiler" SecCompiler
     Section "C compiler" SecGcc
         SectionIn 1 2
-        !include "msp430-gcc-install.nsh"
+        !include "${BUILDDIR}\msp430-gcc-install.nsh"
         SetOutPath $INSTDIR\docs
         File README-msp430-gcc.txt
     SectionEnd
     
     Section "Target C library" SecLibc
         SectionIn 1 2
-        !include "msp430-libc-install.nsh"
+        !include "${BUILDDIR}\msp430-libc-install.nsh"
         SetOutPath $INSTDIR\docs
         File "README-msp430-libc.txt"
     SectionEnd
@@ -143,7 +131,7 @@
 SubSection "Documentation" SecDocs
     Section "Documentation" SecDocsSub
         SectionIn 1 2
-        !include "msp430-docs-install.nsh"
+        !include "${BUILDDIR}\msp430-docs-install.nsh"
         SetOutPath $INSTDIR\docs
         File "${SRCDIR}\stamp.txt"
         !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
@@ -157,7 +145,7 @@
 
     Section "Examples" SecExamples
         SectionIn 1 2
-        !include "msp430-examples-install.nsh"
+        !include "${BUILDDIR}\msp430-examples-install.nsh"
         !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
         CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER"
         CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\examples.lnk"    "$INSTDIR\examples"
@@ -169,7 +157,7 @@
 
 Section "Debugger" SecGdb
     SectionIn 1 2
-    !include "msp430-gdb-install.nsh"
+    !include "${BUILDDIR}\msp430-gdb-install.nsh"
     SetOutPath "$INSTDIR\docs"
     File "README-msp430-gdb.txt"
     File "README-msp430-insight.txt"
@@ -297,7 +285,7 @@
 
 Section "Addon Libraries" SecLibraries
     SectionIn 1 2
-    !include "msp430-libraries-install.nsh"
+    !include "${BUILDDIR}\msp430-libraries-install.nsh"
 SectionEnd
 
 Section "Addon Tools" SecAddonTools
@@ -375,39 +363,39 @@
 
 Section "Uninstall"
     #binutils
-    !include "msp430-binutils-uninstall.nsh"
+    !include "${BUILDDIR}\msp430-binutils-uninstall.nsh"
     Delete "$INSTDIR\docs\README-msp430-binutils.txt"
     Delete "$INSTDIR\docs\README.txt"
     Delete "$INSTDIR\docs\licence.txt"
     
-    #make utilities
-    Delete "$INSTDIR\bin\make.exe"
-    Delete "$INSTDIR\bin\diff.exe"
-    Delete "$INSTDIR\bin\patch.exe"
-    Delete "$INSTDIR\bin\mkdir.exe"
-    Delete "$INSTDIR\bin\cp.exe"
-    Delete "$INSTDIR\bin\mv.exe"
-    Delete "$INSTDIR\bin\rm.exe"
-    RMDir  "$INSTDIR\bin"
-    RMDir  "$INSTDIR"
+;     #make utilities
+;     Delete "$INSTDIR\bin\make.exe"
+;     Delete "$INSTDIR\bin\diff.exe"
+;     Delete "$INSTDIR\bin\patch.exe"
+;     Delete "$INSTDIR\bin\mkdir.exe"
+;     Delete "$INSTDIR\bin\cp.exe"
+;     Delete "$INSTDIR\bin\mv.exe"
+;     Delete "$INSTDIR\bin\rm.exe"
+;     RMDir  "$INSTDIR\bin"
+;     RMDir  "$INSTDIR"
 
     #gcc
-    !include "msp430-gcc-uninstall.nsh"
+    !include "${BUILDDIR}\msp430-gcc-uninstall.nsh"
     Delete "$INSTDIR\docs\README-msp430-gcc.txt"
     
     #gdb
-    !include "msp430-gdb-uninstall.nsh"
+    !include "${BUILDDIR}\msp430-gdb-uninstall.nsh"
     Delete "$INSTDIR\docs\README-msp430-gdb.txt"
     Delete "$INSTDIR\docs\README-msp430-insight.txt"
     
     #libc etc
-    !include "msp430-libc-uninstall.nsh"
+    !include "${BUILDDIR}\msp430-libc-uninstall.nsh"
     Delete "$INSTDIR\docs\README-msp430-libc.txt"
     #addon libs
-    !include "msp430-libraries-uninstall.nsh"
+    !include "${BUILDDIR}\msp430-libraries-uninstall.nsh"
     #examples
     ClearErrors
-    !include "msp430-examples-uninstall.nsh"
+    !include "${BUILDDIR}\msp430-examples-uninstall.nsh"
     IfErrors 0 examples_cont
     MessageBox MB_YESNO|MB_DEFBUTTON2 \
         "The examples folder could not be removed. Probably because there are build files left.$\n$\n\
@@ -416,7 +404,7 @@
     RMdir /r "$INSTDIR\examples"
 examples_cont:
     #docs
-    !include "msp430-docs-uninstall.nsh"
+    !include "${BUILDDIR}\msp430-docs-uninstall.nsh"
     Delete "$INSTDIR\docs\stamp.txt"
 
     #jtag and bsl
@@ -487,14 +475,6 @@
 
 ;     DeleteRegKey ${MUI_STARTMENUPAGE_REGISTRY_ROOT} ${MUI_STARTMENUPAGE_REGISTRY_KEY}
 
-    #support
-    Delete "$INSTDIR\bin\cygwin1.dll"
-    Delete "$INSTDIR\bin\cygintl-2.dll"
-    Delete "$INSTDIR\bin\cygintl-3.dll"
-    Delete "$INSTDIR\bin\cygintl-8.dll"
-    Delete "$INSTDIR\bin\cygncurses-8.dll"
-    Delete "$INSTDIR\bin\cygiconv-2.dll"
-
     ; addons
     RMDir /r "$INSTDIR\addons"
 
@@ -538,7 +518,7 @@
 
 
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecBinutils}      "The GNU binutils package, version 2.17, for the MSP430. This includes the assember, linker, and librarian."
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecBinutils}      "The GNU binutils package, version 2.17, for the MSP430. This includes the assembler, linker, and librarian."
   !insertmacro MUI_DESCRIPTION_TEXT ${SecCompiler}      "The GNU C/C++ compiler (GCC) and C library for the MSP430."
   !insertmacro MUI_DESCRIPTION_TEXT ${SecGcc}           "The GNU C/C++ compiler (GCC), version 3.2.3, for the MSP430."
   !insertmacro MUI_DESCRIPTION_TEXT ${SecLibc}          "libc, for the MSP430."
@@ -550,8 +530,6 @@
   !insertmacro MUI_DESCRIPTION_TEXT ${SecGdb}           "The GNU command line debugger (GDB) for the MSP430."
   !insertmacro MUI_DESCRIPTION_TEXT ${SecDownloader}    "gdbproxy, msp430-jtag, msp430-bsl. Interface to the MSP430 FET JTAG tool and BSL."
   !insertmacro MUI_DESCRIPTION_TEXT ${SecGiveio}        "A parallel port access driver for Windows NT, 2000 and XP (needed for the JTAG adaptor). Note: this is NOT needed for Windows 95, 98 or Me."
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecMakeAndLibs}   "The GNU make utilities - make, diff, patch, rm, mv, mkdir, cp and the cygwin libraries."
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecMake}          "The GNU make utilities - make, diff, patch, rm, mv, mkdir, cp."
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecCygwin}        "Cygwin DLLs required for the tools. Can be left out if a recent Cygwin is already installed."
+;~   !insertmacro MUI_DESCRIPTION_TEXT ${SecMakeAndLibs}   "The GNU make utilities - make, diff, patch, rm, mv, mkdir, cp and the cygwin libraries."
   !insertmacro MUI_DESCRIPTION_TEXT ${SecPath}          "Set the PATH environment variable so that the msp430-* tools are found."
 !insertmacro MUI_FUNCTION_DESCRIPTION_END


-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php