CVS: packaging README-MAINTAINER.txt,1.1,1.2 files_to_nsh.py,1.1,1.2 makefile,1.11,1.12 mspgcc-full-install.nsi,1.9,1.10
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-serv29185/packaging
Modified Files:
README-MAINTAINER.txt files_to_nsh.py makefile
mspgcc-full-install.nsi
Log Message:
- move some temp files to the build folder
- build the HTML docs using docutils
- install a link to the examples readme html in the startmenu
Index: README-MAINTAINER.txt
===================================================================
RCS file: /cvsroot/mspgcc/packaging/README-MAINTAINER.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -d -r1.1 -r1.2
--- README-MAINTAINER.txt 13 Oct 2005 02:00:00 -0000 1.1
+++ README-MAINTAINER.txt 5 Jan 2006 01:37:11 -0000 1.2
@@ -1,6 +1,22 @@
+.. note::
+
This readme is for mspgcc package maintainers and system admins that want
to install mspgcc from the sources.
+Dependencies
+============
+- binutils, gcc on the host system. debian/ubuntu: "buildessentials"
+
+- Python with the following extensions:
+
+ - doctuils http://docutils.sf.net debian/ubuntu: "python-docutils"
+
+ additional, on Windows only:
+
+ - ctypes
+ - py2exe
+
+
mspgcc Linux howto
==================
@@ -61,6 +77,7 @@
take care of everything, given that cygwin, python (with ctypes and py2exe)
and NSIS are installed and available on the ``PATH``.
+
Notes
=====
Index: files_to_nsh.py
===================================================================
RCS file: /cvsroot/mspgcc/packaging/files_to_nsh.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -d -r1.1 -r1.2
--- files_to_nsh.py 26 Sep 2005 22:02:31 -0000 1.1
+++ files_to_nsh.py 5 Jan 2006 01:37:11 -0000 1.2
@@ -1,12 +1,15 @@
import os, sys, time, fnmatch
-included = [path.strip() for path in file(sys.argv[1])]
+def fix_path(p):
+ if p.startswith('/'): #cygwin path specs?
+ return os.popen('cygpath -w "%s"' % p).read().strip()
+ return p
+
+included = [path.strip() for path in file(fix_path(sys.argv[1]))]
mspgccpart = sys.argv[2]
sourcepath = sys.argv[3]
-if sourcepath.startswith('/'): #cygwin path specs?
- sourcepath = os.popen('cygpath -w "%s"' % sourcepath).read().strip()
-
+sourcepath = fix_path(sourcepath)
EXCLUDES = [
"*/info/*",
Index: makefile
===================================================================
RCS file: /cvsroot/mspgcc/packaging/makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -w -d -r1.11 -r1.12
--- makefile 30 Dec 2005 04:48:56 -0000 1.11
+++ makefile 5 Jan 2006 01:37:11 -0000 1.12
@@ -199,7 +199,7 @@
@echo binutils compiled
binutils-install:
cd $(BUILDDIR)/$(BINUTILS); make install >>$(BUILDDIR)/binutils-build.log 2>&1
- $(FILELIST) $(INSTALLDIR) >files-binutils.txt
+ $(FILELIST) $(INSTALLDIR) >$(BUILDDIR)/files-binutils.txt
# The compiler
# optional --program-suffix=-x.x --enable-languages=c,c++,ada,f77
@@ -229,7 +229,7 @@
$(FILELIST) $(INSTALLDIR) >files-before.txt
cd $(BUILDDIR)/$(GCC); make install >>$(BUILDDIR)/gcc-build.log 2>&1
$(FILELIST) $(INSTALLDIR) >files-after.txt
- $(FILEDIFF) files-before.txt files-after.txt >files-gcc.txt
+ $(FILEDIFF) files-before.txt files-after.txt >$(BUILDDIR)/files-gcc.txt
$(FILELIST_RM) files-before.txt files-after.txt
# The debugger
@@ -249,7 +249,7 @@
$(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 >files-gdb.txt
+ $(FILEDIFF) files-before.txt files-after.txt >$(BUILDDIR)/files-gdb.txt
$(FILELIST_RM) files-before.txt files-after.txt
# C library for the cross compiler
@@ -266,7 +266,7 @@
$(FILELIST) $(INSTALLDIR) >files-before.txt
cd $(BUILDDIR)/msp430-libc/src; make install >>$(BUILDDIR)/libc-build.log 2>&1
$(FILELIST) $(INSTALLDIR) >files-after.txt
- $(FILEDIFF) files-before.txt files-after.txt >files-libc.txt
+ $(FILEDIFF) files-before.txt files-after.txt >$(BUILDDIR)/files-libc.txt
$(FILELIST_RM) files-before.txt files-after.txt
@@ -299,7 +299,7 @@
rm -rf $(BUILDDIR)/examples
mkdir $(BUILDDIR)/examples
cp -r $(CVSFILES)/examples/* $(BUILDDIR)/examples
- cd $(BUILDDIR)/examples; make clean >$(BUILDDIR)/examples.log 2>&1
+ cd $(BUILDDIR)/examples; make clean doc >$(BUILDDIR)/examples.log 2>&1
rm -rf `find $(BUILDDIR)/examples/ -name CVS -type d`
examples-install:
ifdef WINDOWS
@@ -308,7 +308,7 @@
mkdir -p $(INSTALLDIR)/share/doc/mspgcc-examples
cp -r $(BUILDDIR)/examples/* $(INSTALLDIR)/share/doc/mspgcc-examples >>$(BUILDDIR)/examples.log 2>&1
endif
- $(FILELIST) $(INSTALLDIR)/examples >files-examples.txt
+ $(FILELIST) $(INSTALLDIR)/examples >$(BUILDDIR)/files-examples.txt
# Addon mspgcc libraries: libmspgcc libcommandline and more
libraries-build:
@@ -320,7 +320,7 @@
$(FILELIST) $(INSTALLDIR) >files-before.txt
cd $(BUILDDIR)/libraries; make PREFIX=$(INSTALLDIR) install >>$(BUILDDIR)/libraries.log 2>&1
$(FILELIST) $(INSTALLDIR) >files-after.txt
- $(FILEDIFF) files-before.txt files-after.txt >files-libraries.txt
+ $(FILEDIFF) files-before.txt files-after.txt >$(BUILDDIR)/files-libraries.txt
$(FILELIST_RM) files-before.txt files-after.txt
# Documenation. Currently depends on prebuilt PDFs
@@ -329,7 +329,7 @@
mkdir $(INSTALLDIR)/docs
ifdef WINDOWS
cp mspgcc-manual.pdf mspgcc-faq.pdf $(INSTALLDIR)/docs
- $(FILELIST) $(INSTALLDIR)/docs >files-docs.txt
+ $(FILELIST) $(INSTALLDIR)/docs >$(BUILDDIR)/files-docs.txt
else
mkdir -p $(INSTALLDIR)/share/doc/mspgcc-doc
cp mspgcc-manual.pdf mspgcc-faq.pdf $(INSTALLDIR)/share/doc/mspgcc-doc
@@ -415,7 +415,7 @@
build-addon: examples-build examples-install docs-install gdbproxy-install
# Build everything and the windows installer
-build-installer: build build-addon windows-installer
+build-installer: clean-installdir build build-addon windows-installer
ifdef WINDOWS
# Remove the installation directory. Only useful Windows, where the install
@@ -443,30 +443,31 @@
# file list -> NSIS include conversion
-msp430-binutils-install.nsh: files-binutils.txt
- python files_to_nsh.py files-binutils.txt binutils $(INSTALLDIR)
+msp430-binutils-install.nsh: $(BUILDDIR)/files-binutils.txt
+ python files_to_nsh.py $(BUILDDIR)/files-binutils.txt binutils $(INSTALLDIR)
-msp430-gcc-install.nsh: files-gcc.txt
- python files_to_nsh.py files-gcc.txt gcc $(INSTALLDIR)
+msp430-gcc-install.nsh: $(BUILDDIR)/files-gcc.txt
+ python files_to_nsh.py $(BUILDDIR)/files-gcc.txt gcc $(INSTALLDIR)
-msp430-gdb-install.nsh: files-gdb.txt
- python files_to_nsh.py files-gdb.txt gdb $(INSTALLDIR)
+msp430-gdb-install.nsh: $(BUILDDIR)/files-gdb.txt
+ python files_to_nsh.py $(BUILDDIR)/files-gdb.txt gdb $(INSTALLDIR)
-msp430-libc-install.nsh: files-libc.txt
- python files_to_nsh.py files-libc.txt libc $(INSTALLDIR)
+msp430-libc-install.nsh: $(BUILDDIR)/files-libc.txt
+ python files_to_nsh.py $(BUILDDIR)/files-libc.txt libc $(INSTALLDIR)
-msp430-docs-install.nsh: files-docs.txt
- python files_to_nsh.py files-docs.txt docs $(INSTALLDIR)
+msp430-docs-install.nsh: $(BUILDDIR)/files-docs.txt
+ python files_to_nsh.py $(BUILDDIR)/files-docs.txt docs $(INSTALLDIR)
-msp430-examples-install.nsh: files-examples.txt
- python files_to_nsh.py files-examples.txt examples $(INSTALLDIR)
+msp430-examples-install.nsh: $(BUILDDIR)/files-examples.txt
+ python files_to_nsh.py $(BUILDDIR)/files-examples.txt examples $(INSTALLDIR)
-msp430-libraries-install.nsh: files-libraries.txt
- python files_to_nsh.py files-libraries.txt libraries $(INSTALLDIR)
+msp430-libraries-install.nsh: $(BUILDDIR)/files-libraries.txt
+ python files_to_nsh.py $(BUILDDIR)/files-libraries.txt libraries $(INSTALLDIR)
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
# process all the file lists, build installer
windows-installer: stamp msp430-binutils-install.nsh msp430-gcc-install.nsh \
Index: mspgcc-full-install.nsi
===================================================================
RCS file: /cvsroot/mspgcc/packaging/mspgcc-full-install.nsi,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -w -d -r1.9 -r1.10
--- mspgcc-full-install.nsi 4 Jan 2006 00:09:55 -0000 1.9
+++ mspgcc-full-install.nsi 5 Jan 2006 01:37:11 -0000 1.10
@@ -4,6 +4,7 @@
#where to get the binaries in SRCDIR
#build date in VERSION
+#file lists are in BUILDDIR
!include "variables.nsh"
!define VERSION_MAJOR 0
@@ -155,7 +156,8 @@
!include "msp430-examples-install.nsh"
!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER"
- CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\examples.lnk" "$INSTDIR\examples" "" "$INSTDIR\examples" 0
+ CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\examples.lnk" "$INSTDIR\examples"
+ CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\examples README.lnk" "$INSTDIR\examples\README.html"
!insertmacro MUI_STARTMENU_WRITE_END
SectionEnd
SubSectionEnd
@@ -436,6 +438,7 @@
Delete "$SMPROGRAMS\$MUI_TEMP\mspgcc-faq.lnk"
Delete "$SMPROGRAMS\$MUI_TEMP\Documentation.lnk"
Delete "$SMPROGRAMS\$MUI_TEMP\examples.lnk"
+ Delete "$SMPROGRAMS\$MUI_TEMP\examples README.lnk"
Delete "$SMPROGRAMS\$MUI_TEMP\GiveIO\Status Giveio Service.lnk"
Delete "$SMPROGRAMS\$MUI_TEMP\GiveIO\Install Giveio Service.lnk"
Delete "$SMPROGRAMS\$MUI_TEMP\GiveIO\Remove Giveio Service.lnk"
-------------------------------------------------------
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