From b550bdda5cab7586200e92335e6ad2a947424782 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Fri, 8 Jun 2012 18:06:34 +0900 Subject: [PATCH] initial stab at forking SDCC 2.9.0-5 to create a cc1111 package --- README | 5 +- debian/README.Debian | 12 ---- debian/cc1111.dirs | 2 + .../{sdcc-ucsim.doc-base => cc1111.doc-base} | 9 +++ debian/cc1111.install | 32 ++++++++++ debian/{sdcc.manpages => cc1111.manpages} | 6 ++ ...c-libraries.overrides => cc1111.overrides} | 0 debian/changelog | 8 +++ debian/control | 59 +++++-------------- debian/sdcc-doc.dirs | 5 -- debian/sdcc-doc.doc-base | 8 --- debian/sdcc-doc.install | 6 -- debian/sdcc-libraries.install | 2 - debian/sdcc-ucsim.dirs | 2 - debian/sdcc-ucsim.install | 9 --- debian/sdcc-ucsim.manpages | 6 -- debian/sdcc.dirs | 3 - debian/sdcc.install | 15 ----- debian/watch | 2 - 19 files changed, 75 insertions(+), 116 deletions(-) delete mode 100644 debian/README.Debian create mode 100644 debian/cc1111.dirs rename debian/{sdcc-ucsim.doc-base => cc1111.doc-base} (56%) create mode 100644 debian/cc1111.install rename debian/{sdcc.manpages => cc1111.manpages} (72%) rename debian/{sdcc-libraries.overrides => cc1111.overrides} (100%) delete mode 100644 debian/sdcc-doc.dirs delete mode 100644 debian/sdcc-doc.doc-base delete mode 100644 debian/sdcc-doc.install delete mode 100644 debian/sdcc-libraries.install delete mode 100644 debian/sdcc-ucsim.dirs delete mode 100644 debian/sdcc-ucsim.install delete mode 100644 debian/sdcc-ucsim.manpages delete mode 100644 debian/sdcc.dirs delete mode 100644 debian/sdcc.install delete mode 100644 debian/watch diff --git a/README b/README index 4e35d99..fda324c 100644 --- a/README +++ b/README @@ -1 +1,4 @@ -This file is depreciated. Please see doc/README.txt. +This is a fork of SDCC 2.9.0, initialized from the Debian 2.9.0-5 package, +intended for use with the TI/Chipcon RF System on Chip products that are +based around the 8051 processor core. See doc/README.txt for upstream's +README. diff --git a/debian/README.Debian b/debian/README.Debian deleted file mode 100644 index e30450b..0000000 --- a/debian/README.Debian +++ /dev/null @@ -1,12 +0,0 @@ -sdcc for Debian ---------------- - -SDCDB, the source debugger for SDCC, is included in the simulator package -(sdcc-ucsim), since it can only work with a simulator. - -The SDCDB manual is included in the SDCC one (section 7), which it is located -in /usr/share/doc/sdcc. You can also access it using dhelp (in the programming -section). - - - -- Aurelien Jarno , Sat, 19 Jan 2002 14:14:00 +0100 diff --git a/debian/cc1111.dirs b/debian/cc1111.dirs new file mode 100644 index 0000000..2a6e1f9 --- /dev/null +++ b/debian/cc1111.dirs @@ -0,0 +1,2 @@ +usr/bin +usr/share/cc1111/scripts diff --git a/debian/sdcc-ucsim.doc-base b/debian/cc1111.doc-base similarity index 56% rename from debian/sdcc-ucsim.doc-base rename to debian/cc1111.doc-base index 5656450..9ff7e31 100644 --- a/debian/sdcc-ucsim.doc-base +++ b/debian/cc1111.doc-base @@ -1,3 +1,12 @@ +Document: sdcc +Title: SDCC Compiler User Guide +Author: Johan Knol +Abstract: This is the user manual for the SDCC Compiler. +Section: Programming + +Format: postscript +Files: /usr/share/doc/sdcc-doc/sdccman.ps.gz + Document: ucsim-user Title: uCsim simulator User Guide Author: Daniel Drotos diff --git a/debian/cc1111.install b/debian/cc1111.install new file mode 100644 index 0000000..82ff6d9 --- /dev/null +++ b/debian/cc1111.install @@ -0,0 +1,32 @@ +#usr/share/doc/sdcc-doc/*.txt +#usr/share/doc/sdcc-doc/*.pdf +#usr/share/doc/sdcc-doc/aslink +#usr/share/doc/sdcc-doc/avr/ +#usr/share/doc/sdcc-doc/z80/*.pdf +usr/share/doc/sdcc-doc/sdccman.ps +usr/bin/aslink +usr/bin/asx8051 +usr/bin/as-gbz80 +usr/bin/as-hc08 +usr/bin/as-z80 +usr/bin/asranlib +usr/bin/link-gbz80 +usr/bin/link-hc08 +usr/bin/link-z80 +usr/bin/makebin +usr/bin/packihx +usr/bin/sdcc +usr/bin/sdcclib +usr/bin/sdcpp +usr/share/sdcc/scripts +usr/share/sdcc/include/ +usr/share/sdcc/lib/ +usr/bin/s51 +usr/bin/savr +usr/bin/shc08 +usr/bin/sdcdb +usr/bin/sz80 +usr/bin/*.el usr/share/emacs/site-lisp/sdcc-ucsim/ +usr/share/doc/ucsim/*.html usr/share/doc/sdcc-ucsim/ +usr/share/doc/ucsim/*.gif usr/share/doc/sdcc-ucsim/ +usr/share/doc/ucsim/*.jpg usr/share/doc/sdcc-ucsim/ diff --git a/debian/sdcc.manpages b/debian/cc1111.manpages similarity index 72% rename from debian/sdcc.manpages rename to debian/cc1111.manpages index 3724667..d0b4bb8 100644 --- a/debian/sdcc.manpages +++ b/debian/cc1111.manpages @@ -12,3 +12,9 @@ debian/manpages/packihx.1 debian/manpages/sdcc.1 debian/manpages/sdcclib.1 debian/manpages/sdcpp.1 +debian/manpages/s51.1 +debian/manpages/savr.1 +debian/manpages/shc08.1 +debian/manpages/sdcdb.1 +debian/manpages/sz80.1 +debian/manpages/ucsim.1 diff --git a/debian/sdcc-libraries.overrides b/debian/cc1111.overrides similarity index 100% rename from debian/sdcc-libraries.overrides rename to debian/cc1111.overrides diff --git a/debian/changelog b/debian/changelog index 1b6235c..c0e57ff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +cc1111 (2.9.0-6) unstable; urgency=low + + * fork SDCC since 3.X break the build of AltOS, and upstream remains + uninterested in our TI/Chipcon SOC-specific source-level debugging + support + + -- Bdale Garbee Fri, 08 Jun 2012 17:38:37 +0900 + sdcc (2.9.0-5) unstable; urgency=low * Add patch 03_fix_cmdlex to fix compilation (Closes: #560520) diff --git a/debian/control b/debian/control index eff80fc..19e081a 100644 --- a/debian/control +++ b/debian/control @@ -1,55 +1,24 @@ -Source: sdcc +Source: cc1111 Section: electronics Priority: optional -Maintainer: Gudjon I. Gudjonsson -Uploaders: Bdale Garbee +Maintainer: Bdale Garbee +Uploaders: Keith Packard Build-Depends: debhelper (>=7), autoconf, autotools-dev, libtool, flex, bison, libncurses5-dev, gputils, lyx, texlive, ghostscript, quilt Standards-Version: 3.8.3 Homepage: http://sdcc.sourceforge.net -Package: sdcc +Package: cc1111 Architecture: any -Depends: sdcc-libraries (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends} -Recommends: sdcc-doc -Suggests: sdcc-ucsim -Conflicts: sdcc-libraries (<< 2.9.0) -Description: Small Device C Compiler - SDCC is a C compiler for the Intel MCS51 family, AVR, HC08, PIC - and Z80 microcontrollers. - . - This package includes the compiler, assemblers and linkers. - -Package: sdcc-libraries -Architecture: all Depends: ${shlibs:Depends}, ${misc:Depends} -Recommends: gputils -Conflicts: sdcc (<< 2.3.8+cvs20040218-1) -Description: Small Device C Compiler (libraries) - SDCC is a C compiler for the Intel MCS51 family, AVR, HC08, PIC - and Z80 microcontrollers. - . - This package contains the core library for SDCC. - -Package: sdcc-ucsim -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Suggests: sdcc -Replaces: sdcc-ucsim-snapshot -Description: Micro-controller simulator for SDCC - uCsim is a microcontroller simulator. It is extensible to support - different microcontroller families. It currently supports Intel - MCS51 family, HC08 and Z80 microcontrollers. - -Package: sdcc-doc -Section: doc -Architecture: all -Depends: ${misc:Depends} -Conflicts: sdcc (<= 2.3.3+cvs20030131-4) -Suggests: sdcc -Description: Small Device C Compiler (documentation) - SDCC is a C compiler for the Intel MCS51 family, AVR, HC08, PIC - and Z80 microcontrollers. +Conflicts: sdcc, sdcc-libraries, sdcc-ucsim, sdcc-doc +Description: C Compiler for TI/Chipcon 8051-based RF SOCs + This is a C compiler and related tools for developing firmware for + TI/Chipcon RF System on Chip (SOC) parts based on the 8051 processing + core. These include at least the CC1110, CC1111, CC2510, and CC2511, + CC2530, CC2531, CC2533, CC2543, and CC2544. . - This package provides the documentation and examples for the - SDCC compiler. + This package started as a fork of Debian SDCC 2.9.0-5, motivated both + as a workaround for increases in the size of 8051 code generated by later + versions of SDCC that cause AltOS to fail to build successfully, and a + desire to incorporate support for source-level debugging on real hardware. diff --git a/debian/sdcc-doc.dirs b/debian/sdcc-doc.dirs deleted file mode 100644 index 8879575..0000000 --- a/debian/sdcc-doc.dirs +++ /dev/null @@ -1,5 +0,0 @@ -usr/share/doc/sdcc-doc -usr/share/doc/sdcc-doc/aslink -usr/share/doc/sdcc-doc/avr -usr/share/doc/sdcc-doc/z80 -usr/share/doc/sdcc-doc/examples diff --git a/debian/sdcc-doc.doc-base b/debian/sdcc-doc.doc-base deleted file mode 100644 index 3ba4eca..0000000 --- a/debian/sdcc-doc.doc-base +++ /dev/null @@ -1,8 +0,0 @@ -Document: sdcc -Title: SDCC Compiler User Guide -Author: Johan Knol -Abstract: This is the user manual for the SDCC Compiler. -Section: Programming - -Format: postscript -Files: /usr/share/doc/sdcc-doc/sdccman.ps.gz diff --git a/debian/sdcc-doc.install b/debian/sdcc-doc.install deleted file mode 100644 index f24aefd..0000000 --- a/debian/sdcc-doc.install +++ /dev/null @@ -1,6 +0,0 @@ -#usr/share/doc/sdcc-doc/*.txt -#usr/share/doc/sdcc-doc/*.pdf -#usr/share/doc/sdcc-doc/aslink -#usr/share/doc/sdcc-doc/avr/ -#usr/share/doc/sdcc-doc/z80/*.pdf -usr/share/doc/sdcc-doc/sdccman.ps diff --git a/debian/sdcc-libraries.install b/debian/sdcc-libraries.install deleted file mode 100644 index cb75395..0000000 --- a/debian/sdcc-libraries.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/share/sdcc/include/ -usr/share/sdcc/lib/ diff --git a/debian/sdcc-ucsim.dirs b/debian/sdcc-ucsim.dirs deleted file mode 100644 index 8656649..0000000 --- a/debian/sdcc-ucsim.dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/bin -usr/share/doc/ucsim diff --git a/debian/sdcc-ucsim.install b/debian/sdcc-ucsim.install deleted file mode 100644 index b1cd4f2..0000000 --- a/debian/sdcc-ucsim.install +++ /dev/null @@ -1,9 +0,0 @@ -usr/bin/s51 -usr/bin/savr -usr/bin/shc08 -usr/bin/sdcdb -usr/bin/sz80 -usr/bin/*.el usr/share/emacs/site-lisp/sdcc-ucsim/ -usr/share/doc/ucsim/*.html usr/share/doc/sdcc-ucsim/ -usr/share/doc/ucsim/*.gif usr/share/doc/sdcc-ucsim/ -usr/share/doc/ucsim/*.jpg usr/share/doc/sdcc-ucsim/ diff --git a/debian/sdcc-ucsim.manpages b/debian/sdcc-ucsim.manpages deleted file mode 100644 index bd91f84..0000000 --- a/debian/sdcc-ucsim.manpages +++ /dev/null @@ -1,6 +0,0 @@ -debian/manpages/s51.1 -debian/manpages/savr.1 -debian/manpages/shc08.1 -debian/manpages/sdcdb.1 -debian/manpages/sz80.1 -debian/manpages/ucsim.1 diff --git a/debian/sdcc.dirs b/debian/sdcc.dirs deleted file mode 100644 index 1ab8f4c..0000000 --- a/debian/sdcc.dirs +++ /dev/null @@ -1,3 +0,0 @@ -usr/bin -usr/share/sdcc/scripts - diff --git a/debian/sdcc.install b/debian/sdcc.install deleted file mode 100644 index 03c99b3..0000000 --- a/debian/sdcc.install +++ /dev/null @@ -1,15 +0,0 @@ -usr/bin/aslink -usr/bin/asx8051 -usr/bin/as-gbz80 -usr/bin/as-hc08 -usr/bin/as-z80 -usr/bin/asranlib -usr/bin/link-gbz80 -usr/bin/link-hc08 -usr/bin/link-z80 -usr/bin/makebin -usr/bin/packihx -usr/bin/sdcc -usr/bin/sdcclib -usr/bin/sdcpp -usr/share/sdcc/scripts diff --git a/debian/watch b/debian/watch deleted file mode 100644 index c07c577..0000000 --- a/debian/watch +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://qa.debian.org/watch/sf.php/sdcc/sdcc-src-(.*)\.tar\.bz2 debian uupdate -- 2.30.2