From: borutr Date: Sun, 8 Feb 2009 08:36:48 +0000 (+0000) Subject: * as/COPYING3: added X-Git-Url: https://git.gag.com/?p=fw%2Fsdcc;a=commitdiff_plain;h=b9edfec99e2616ac718eb8fddb64c53954634127 * as/COPYING3: added * support/scripts/sdcc.nsi: added COPYING3.txt to the package git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@5361 4a8a32a2-be11-0410-ad9d-d568d2c75423 --- diff --git a/ChangeLog b/ChangeLog index 1a3b6043..8db54598 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,12 @@ +2009-02-08 Borut Razem + + * as/COPYING3: added + * support/scripts/sdcc.nsi: added COPYING3.txt to the package + 2009-02-07 Borut Razem * asranlib/asranlib.c: fixed BSD header length calculation - * .version, doc/sdccman.lyx: bumped sdcc version to 2.8.8 + * .version, doc/sdccman.lyx: bumped sdcc version to 2.8.9 due sdcc asxxxx license change to GPLv3 2009-02-05 Borut Razem diff --git a/support/scripts/sdcc.nsi b/support/scripts/sdcc.nsi index fcad17a8..3abb5d20 100644 --- a/support/scripts/sdcc.nsi +++ b/support/scripts/sdcc.nsi @@ -30,9 +30,10 @@ # A sub directory sdcc is created (referenced as PKGDIR in continuation). # - copy files sdcc/support/scripts/sdcc.ico and sdcc/support/scripts/sdcc.nsi # (this file) from the sdcc Subversion snapshot to the PKGDIR directory -# - copy file COPYING from the sdcc Subversion snapshot to the PKGDIR directory, -# rename it to COPYING.txt and convert it to DOS format: +# - copy file COPYING and COPYING3 from the sdcc Subversion snapshot to the PKGDIR directory, +# rename it to COPYING.txt and COPYING3.txt and convert it to DOS format: # unix2dos COPYING.txt +# unix2dos COPYING3.txt # - copy readline5.dll to PKGDIR/bin/readline5.dll # - run NSIS installer from PKGDIR directory: # "c:\Program Files\NSIS\makensis.exe" -DVER_MAJOR= -DVER_MINOR= -DVER_REVISION= -DVER_BUILD= sdcc.nsi @@ -55,9 +56,10 @@ # - unpack sdcc-doc-yyyymmdd-rrrr.zip to the PKGDIR/doc directory # - copy files sdcc/support/scripts/sdcc.ico and sdcc/support/scripts/sdcc.nsi # (this file) from the sdcc Subversion snapshot to the PKGDIR directory -# - copy file COPYING from the sdcc Subversion snapshot to the PKGDIR directory, -# rename it to COPYING.txt and convert it to DOS format: +# - copy file COPYING and COPYING3 from the sdcc Subversion snapshot to the PKGDIR directory, +# rename it to COPYING.txt and COPYING3.txt and convert it to DOS format: # unix2dos COPYING.txt +# unix2dos COPYING3.txt # - copy readline5.dll to PKGDIR/bin/readline5.dll # - run NSIS installer from PKGDIR directory: # "c:\Program Files\NSIS\makensis.exe" -DFULL_DOC -DVER_MAJOR= -DVER_MINOR= -DVER_REVISION= -DVER_BUILD= sdcc.nsi @@ -352,6 +354,7 @@ ${Section} -Common SECCOMMON SetOutPath "$INSTDIR" File ".\sdcc.ico" File "${SDCC_ROOT}\COPYING.txt" + File "${SDCC_ROOT}\COPYING3.txt" ${SectionEnd} ${Section} "SDCC application files" SEC01 @@ -908,6 +911,7 @@ ${Section} Uninstall SECUNINSTALL Delete "$INSTDIR\bin\sdcdbsrc.el" Delete "$INSTDIR\COPYING.txt" + Delete "$INSTDIR\COPYING3.txt" Delete "$INSTDIR\sdcc.ico" Delete "$INSTDIR\uninstall.exe"