CVS: packaging makefile,1.10,1.11 mspgcc-base.nsh,1.1,1.2 mspgcc-full-install.nsi,1.6,1.7
Chris Liechti <[email protected]>
| Newsgroups | gmane.comp.hardware.texas-instruments.msp430.gcc.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/mspgcc/packaging
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12577/packaging
Modified Files:
makefile mspgcc-base.nsh mspgcc-full-install.nsi
Log Message:
- use combined python tools py2exe
- enable "generate listing" on ELF files
- uninstaller images
- install msp430-dco
Index: makefile
===================================================================
RCS file: /cvsroot/mspgcc/packaging/makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -w -d -r1.10 -r1.11
--- makefile 28 Dec 2005 20:55:27 -0000 1.10
+++ makefile 30 Dec 2005 04:48:56 -0000 1.11
@@ -343,11 +343,7 @@
ifdef WINDOWS
cp $(BUILDDIR)/libmspgcc/msp430/MSP430mspgcc.dll $(BUILDDIR)/python/ >$(BUILDDIR)/pytools.log 2>&1
cp $(BUILDDIR)/libmspgcc/hardware_access/HIL.dll $(BUILDDIR)/python/ >>$(BUILDDIR)/pytools.log 2>&1
- cd $(BUILDDIR)/python/win32 && rm -rf ../build; python setup-bsl-py2exe.py >>$(BUILDDIR)/pytools.log 2>&1
- cd $(BUILDDIR)/python/win32 && rm -rf ../build; python setup-jtag-py2exe.py >>$(BUILDDIR)/pytools.log 2>&1
- cd $(BUILDDIR)/python/win32 && rm -rf ../build; python setup-downloader-py2exe.py >>$(BUILDDIR)/pytools.log 2>&1
- cd $(BUILDDIR)/python/win32 && rm -rf ../build; python setup-ram-usage-py2exe.py >>$(BUILDDIR)/pytools.log 2>&1
- cd $(BUILDDIR)/python/win32 && rm -rf ../build; python setup-titexttools-py2exe.py >>$(BUILDDIR)/pytools.log 2>&1
+ cd $(BUILDDIR)/python/win32 && rm -rf ../build; python setup-combined-tools-py2exe.py >>$(BUILDDIR)/pytools.log 2>&1
else
rm -r $(BUILDDIR)/python/CVS $(BUILDDIR)/python/msp430/CVS
echo "#!/bin/bash" >$(BUILDDIR)/python/msp430-jtag
@@ -373,6 +369,7 @@
install $(BUILDDIR)/python/msp430-ram-usage.py $(INSTALLDIR)/bin/msp430-ram-usage
install $(BUILDDIR)/python/titext2ihex.py $(INSTALLDIR)/bin/titext2ihex
install $(BUILDDIR)/python/ihex2titext.py $(INSTALLDIR)/bin/ihex2titext
+ install $(BUILDDIR)/python/msp430-dco.py $(INSTALLDIR)/bin/msp430-dco
cp -r $(BUILDDIR)/python/msp430 $(INSTALLDIR)/bin
endif
Index: mspgcc-base.nsh
===================================================================
RCS file: /cvsroot/mspgcc/packaging/mspgcc-base.nsh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -d -r1.1 -r1.2
--- mspgcc-base.nsh 26 Sep 2005 22:02:31 -0000 1.1
+++ mspgcc-base.nsh 30 Dec 2005 04:48:56 -0000 1.2
@@ -25,7 +25,11 @@
!define MUI_WELCOMEFINISHPAGE_BITMAP "msp430-image.bmp"
!define MUI_HEADERIMAGE_BITMAP "msp430-header.bmp"
+ !define MUI_UNWELCOMEFINISHPAGE_BITMAP "msp430-image.bmp"
+ !define MUI_HEADERIMAGE_UNBITMAP "msp430-header.bmp"
+ !define MUI_COMPONENTSPAGE_SMALLDESC
+ !define MUI_FINISHPAGE_NOAUTOCLOSE
;--------------------------------
;Pages
Index: mspgcc-full-install.nsi
===================================================================
RCS file: /cvsroot/mspgcc/packaging/mspgcc-full-install.nsi,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -d -r1.6 -r1.7
--- mspgcc-full-install.nsi 29 Dec 2005 01:20:26 -0000 1.6
+++ mspgcc-full-install.nsi 30 Dec 2005 04:48:56 -0000 1.7
@@ -122,30 +122,27 @@
SetOutPath "$INSTDIR\bin"
File "${SRCDIR}\bin\msp430-gdbproxy.exe"
File "${SRCDIR}\bin\python24.dll"
+ File "${SRCDIR}\bin\ihex2titext.exe"
+ File "${SRCDIR}\bin\msp430-dco.exe"
+ File "${SRCDIR}\bin\msp430-downloader.exe"
File "${SRCDIR}\bin\msp430-bsl.exe"
File "${SRCDIR}\bin\msp430-jtag.exe"
- File "${SRCDIR}\bin\msp430-downloader.exe"
File "${SRCDIR}\bin\msp430-ram-usage.exe"
- File "${SRCDIR}\bin\ihex2titext.exe"
- File "${SRCDIR}\bin\titext2ihex.exe"
File "${SRCDIR}\bin\MSP430mspgcc.dll"
+ File "${SRCDIR}\bin\titext2ihex.exe"
File "${SRCDIR}\bin\HIL.dll"
File "${SRCDIR}\bin\w9xpopen.exe"
SetOutPath "$INSTDIR\bin\lib"
- File "${SRCDIR}\bin\lib\shared-bsl.zip"
- File "${SRCDIR}\bin\lib\shared-jtag.zip"
- File "${SRCDIR}\bin\lib\shared-downloader.zip"
- File "${SRCDIR}\bin\lib\shared-ram-usage.zip"
- File "${SRCDIR}\bin\lib\shared-titexttools.zip"
+ File "${SRCDIR}\bin\lib\_ctypes.pyd"
+ File "${SRCDIR}\bin\lib\bz2.pyd"
File "${SRCDIR}\bin\lib\PyWinTypes24.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\select.pyd"
- File "${SRCDIR}\bin\lib\_ctypes.pyd"
- ;~ File "${SRCDIR}\bin\lib\_parjtag.pyd"
- File "${SRCDIR}\bin\lib\bz2.pyd"
File "${SRCDIR}\bin\lib\zlib.pyd"
- File "${SRCDIR}\bin\lib\unicodedata.pyd"
+ ;~ File "${SRCDIR}\bin\lib\_parjtag.pyd"
SetOutPath "$INSTDIR\docs"
File "README-msp430-gdbproxy.txt"
@@ -239,17 +236,27 @@
; OPTIONAL
Section "Associate .elf with mspgcc" SecAssociateELF
SectionIn 1 2
+ #select command processor, used in the registry settings below
+ Call IsNT
+ Pop $0
+ StrCmp $0 1 use_cmd
+ StrCpy $0 "command.com"
+ Goto cmd_done
+use_cmd:
+ StrCpy $0 "cmd"
+cmd_done:
+
; Write the mspgcc.downloader Keys
WriteRegStr HKCR "mspgcc.elffile" "" "MSP430 elf binary"
WriteRegStr HKCR "mspgcc.elffile\DefaultIcon" "" "$INSTDIR\bin\msp430-downloader.exe"
WriteRegStr HKCR "mspgcc.elffile\shell\open" "" "JTAG Download"
WriteRegStr HKCR "mspgcc.elffile\shell\open\command" "" "$INSTDIR\bin\msp430-downloader.exe $\"%1$\""
-; WriteRegStr HKCR "mspgcc.elffile\shell\listing" "" "Generate listing"
-; WriteRegStr HKCR "mspgcc.elffile\shell\listing\command" "" "$INSTDIR\bin\msp430-objdump -dSt $\"%1$\" $\">%1.lst$\" " ;XXX redirection not working here
- WriteRegStr HKCR "mspgcc.elffile\shell\ihex" "" "Convert to IHex"
- WriteRegStr HKCR "mspgcc.elffile\shell\ihex\command" "" "$INSTDIR\bin\msp430-objcopy -O ihex $\"%1$\" $\"%1.a43$\" "
- WriteRegStr HKCR "mspgcc.elffile\shell\totitext" "" "Convert to TI-Text"
- WriteRegStr HKCR "mspgcc.elffile\shell\totitext\command" "" "$INSTDIR\bin\ihex2titext $\"%1$\" -o $\"%1.txt$\""
+ WriteRegStr HKCR "mspgcc.elffile\shell\cihex" "" "Convert to IHex"
+ WriteRegStr HKCR "mspgcc.elffile\shell\cihex\command" "" "$INSTDIR\bin\msp430-objcopy -O ihex $\"%1$\" $\"%1.a43$\" "
+ WriteRegStr HKCR "mspgcc.elffile\shell\ctotitext" "" "Convert to TI-Text"
+ WriteRegStr HKCR "mspgcc.elffile\shell\ctotitext\command" "" "$INSTDIR\bin\ihex2titext $\"%1$\" -o $\"%1.txt$\""
+ WriteRegStr HKCR "mspgcc.elffile\shell\listing" "" "Generate listing"
+ WriteRegStr HKCR "mspgcc.elffile\shell\listing\command" "" "$0 /c $INSTDIR\bin\msp430-objdump -dSt $\"%1$\" > $\"%1.lst$\""
; Write File Associations
WriteRegStr HKCR ".elf" "" "mspgcc.elffile"
WriteRegStr HKCR ".elf" "Content Type" "application/octet-stream"
@@ -298,31 +305,27 @@
#jtag and bsl
Delete "$INSTDIR\bin\msp430-gdbproxy.exe"
- Delete "$INSTDIR\bin\msp430-jtag.exe"
- Delete "$INSTDIR\bin\msp430-bsl.exe"
+ Delete "$INSTDIR\bin\python24.dll"
+ Delete "$INSTDIR\bin\ihex2titext.exe"
+ Delete "$INSTDIR\bin\msp430-dco.exe"
Delete "$INSTDIR\bin\msp430-downloader.exe"
+ Delete "$INSTDIR\bin\msp430-bsl.exe"
+ Delete "$INSTDIR\bin\msp430-jtag.exe"
Delete "$INSTDIR\bin\msp430-ram-usage.exe"
- Delete "$INSTDIR\bin\python24.dll"
Delete "$INSTDIR\bin\MSP430mspgcc.dll"
+ Delete "$INSTDIR\bin\titext2ihex.exe"
Delete "$INSTDIR\bin\HIL.dll"
Delete "$INSTDIR\bin\w9xpopen.exe"
-
- Delete "$INSTDIR\bin\lib\shared-jtag.zip"
- Delete "$INSTDIR\bin\lib\shared-bsl.zip"
- Delete "$INSTDIR\bin\lib\shared-downloader.zip"
- Delete "$INSTDIR\bin\lib\shared-ram-usage.zip"
- Delete "$INSTDIR\bin\lib\shared-titexttools.zip"
- Delete "$INSTDIR\bin\ihex2titext.exe"
- Delete "$INSTDIR\bin\titext2ihex.exe"
+ Delete "$INSTDIR\bin\lib\_ctypes.pyd"
+ Delete "$INSTDIR\bin\lib\bz2.pyd"
Delete "$INSTDIR\bin\lib\PyWinTypes24.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\select.pyd"
- Delete "$INSTDIR\bin\lib\_ctypes.pyd"
-;~ Delete "$INSTDIR\bin\lib\_parjtag.pyd"
- Delete "$INSTDIR\bin\lib\bz2.pyd"
Delete "$INSTDIR\bin\lib\zlib.pyd"
- Delete "$INSTDIR\bin\lib\unicodedata.pyd"
+ ;~ Delete "$INSTDIR\bin\lib\_parjtag.pyd"
RMDir "$INSTDIR\bin\lib"
Delete "$INSTDIR\docs\README-msp430-gdbproxy.txt"
@@ -373,7 +376,7 @@
DeleteRegKey HKCR ".elf"
Skip_Del_elf:
- ; remove the mspgcc.downloader Keys
+ ; remove the mspgcc.* Keys
DeleteRegKey HKCR "mspgcc.ihexfile"
DeleteRegKey HKCR "mspgcc.elffile"
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click