X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=support%2Fscripts%2Fsdcc.nsi;h=a91433f4ce673c86625b8ec3588616fc454cccf7;hb=5682577164cf23e4c6663decdfcad7846d0aa10c;hp=3558502c0bc255c917c73a826bc369614f4e1730;hpb=6b254e91f09e95facab6d922b64cdf95d0233386;p=fw%2Fsdcc

diff --git a/support/scripts/sdcc.nsi b/support/scripts/sdcc.nsi
index 3558502c..a91433f4 100644
--- a/support/scripts/sdcc.nsi
+++ b/support/scripts/sdcc.nsi
@@ -1,6 +1,6 @@
 # sdcc.nsi - NSIS installer script for SDCC
 #
-# Copyright (c) 2003 Borut Razem
+# Copyright (c) 2003,2004 Borut Razem
 #
 # This file is part of sdcc.
 #
@@ -23,21 +23,39 @@
 #  Borut Razem
 #  borut.razem@siol.net
 
-!include "MUI.nsh"
+# How to create WIN32 setup.exe
+#
+# - unpack WIN32 mingw daily snapshot sdcc-snapshot-i586-mingw32msvc-yyyymmdd.zip
+#   to a clean directory (the option to create directories should be enambled).
+#   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 CVS snapshot to the PKGDIR directory
+# - copy file COPYING from the sdcc CVS snapshot to the PKGDIR directory,
+#   rename it to COPYING.TXT and convert file COPYING to DOS format:
+#   unix2dos COPYING.TXT
+# - run NSIS installer from PKGDIR directory:
+#   "c:\Program Files\NSIS\makensis.exe" sdcc.nsi
+# - A setup file setup.exe is created in PKGDIR directory.
+#   Rename it to sdcc_yyyymmdd_setup.exe and upload it
+#   to sdcc download repository at sourceforge.net
+#
+#
+# How to upload secc setup.exe tosourceforge.net
+#
+# Execute following commands from the cmd prompt:
+# - sftp sdcc.sourceforge.net
+# - cd /home/groups/s/sd/sdcc/htdocs/snapshots/i586-mingw32msvc-setup
+# - put sdcc_yyyymmdd_setup.exe
+# - quit
+
 
-SetCompressor lzma
+!include "MUI.nsh"
 
-!define SDCC_ROOT "..\.."
+SetCompressor /SOLID lzma
 
-!define FROM_SNAPSHOT
+!define SDCC_ROOT "."
 
-!ifdef FROM_SNAPSHOT
-!system "dir ${SDCC_ROOT}\device > NUL" <> 0
 !define DEV_ROOT "${SDCC_ROOT}"
-!else
-!system "dir ${SDCC_ROOT}\device > NUL" = 0
-!define DEV_ROOT "${SDCC_ROOT}\device"
-!endif
 
 !system "unix2dos ${SDCC_ROOT}\doc\ChangeLog_head.txt" = 0
 !system "unix2dos ${SDCC_ROOT}\doc\README.TXT" = 0
@@ -53,8 +71,8 @@ Var MUI_STARTMENUPAGE_VARIABLE
 
 ;--------------------------------
 !define MUI_ABORTWARNING
+
 !insertmacro MUI_PAGE_WELCOME
-!define MUI_LICENSEPAGE_RADIOBUTTONS
 !insertmacro MUI_PAGE_LICENSE "${SDCC_ROOT}\COPYING.TXT"
 !define MUI_STARTMENUPAGE_DEFAULTFOLDER "SDCC"
 !define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKLM"
@@ -66,7 +84,9 @@ Var MUI_STARTMENUPAGE_VARIABLE
 !insertmacro MUI_PAGE_DIRECTORY
 !insertmacro MUI_PAGE_INSTFILES
 !insertmacro MUI_PAGE_FINISH
+
 !insertmacro MUI_UNPAGE_INSTFILES
+
 !insertmacro MUI_LANGUAGE "English"
 
 Name "SDCC"
@@ -77,8 +97,38 @@ ShowInstDetails show
 ShowUnInstDetails show
 
 Function .onInit
+  ;Uninstall the old version, if present
+  ReadRegStr $R0 HKLM \
+  "Software\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" \
+  "UninstallString"
+  StrCmp $R0 "" inst
+
+  MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \
+  "$(^Name) is already installed. $\n$\nClick 'OK' to remove the \
+  previous version or 'Cancel' to cancel this upgrade." \
+  IDOK uninst
+  Abort
+
+uninst:
+  ; Run the uninstaller
+  ClearErrors
+  ExecWait '$R0 _?=$INSTDIR' ;Do not copy the uninstaller to a temp file
+
+  ;IfErrors no_remove_uninstaller
+  ;  ;You can either use Delete /REBOOTOK in the uninstaller or add some code
+  ;  ;here to remove to remove the uninstaller. Use a registry key to check
+  ;  ;whether the user has chosen to uninstall. If you are using an uninstaller
+  ;  ;components page, make sure all sections are uninstalled.
+  ;no_remove_uninstaller:
+
+  Goto done
+inst:
+
+  ; Install the new version
   MessageBox MB_YESNO|MB_ICONQUESTION "This will install $(^Name). Do you wish to continue?" IDYES +2
   Abort
+
+done:
 FunctionEnd
 
 Section -Common
@@ -104,10 +154,28 @@ Section "SDCC include files"
   SectionIn 1 2
   SetOutPath "$INSTDIR\include\asm\default"
   File "${DEV_ROOT}\include\asm\default\features.h"
+  SetOutPath "$INSTDIR\include\asm\ds390"
+  File "${DEV_ROOT}\include\asm\ds390\features.h"
   SetOutPath "$INSTDIR\include\asm\gbz80"
   File "${DEV_ROOT}\include\asm\gbz80\features.h"
+  SetOutPath "$INSTDIR\include\asm\mcs51"
+  File "${DEV_ROOT}\include\asm\mcs51\features.h"
+  SetOutPath "$INSTDIR\include\asm\pic16"
+  File "${DEV_ROOT}\include\asm\pic16\features.h"
   SetOutPath "$INSTDIR\include\asm\z80"
   File "${DEV_ROOT}\include\asm\z80\features.h"
+  SetOutPath "$INSTDIR\include\hc08"
+  File "${DEV_ROOT}\include\hc08\*.h"
+  SetOutPath "$INSTDIR\include\mcs51"
+  File "${DEV_ROOT}\include\mcs51\*.h"
+  SetOutPath "$INSTDIR\include\pic"
+  File "${DEV_ROOT}\include\pic\*.h"
+  File "${DEV_ROOT}\include\pic\*.txt"
+  File "${DEV_ROOT}\include\pic\*.inc"
+  SetOutPath "$INSTDIR\include\pic16"
+  File "${DEV_ROOT}\include\pic16\*.h"
+  SetOutPath "$INSTDIR\include\z80"
+  File "${DEV_ROOT}\include\z80\*.h"
   SetOutPath "$INSTDIR\include"
   File "${DEV_ROOT}\include\*.h"
 SectionEnd
@@ -115,7 +183,6 @@ SectionEnd
 Section "SDCC DS390 library"
   SectionIn 1 2
   SetOutPath "$INSTDIR\lib\ds390"
-  File "${DEV_ROOT}\lib\ds390\*.asm"
   File "${DEV_ROOT}\lib\ds390\*.rel"
   File "${DEV_ROOT}\lib\ds390\*.lib"
 SectionEnd
@@ -123,7 +190,6 @@ SectionEnd
 Section "SDCC DS400 library"
   SectionIn 1 2
   SetOutPath "$INSTDIR\lib\ds400"
-  File "${DEV_ROOT}\lib\ds400\*.asm"
   File "${DEV_ROOT}\lib\ds400\*.rel"
   File "${DEV_ROOT}\lib\ds400\*.lib"
 SectionEnd
@@ -131,7 +197,6 @@ SectionEnd
 Section "SDCC GBZ80 library"
   SectionIn 1 2
   SetOutPath "$INSTDIR\lib\gbz80"
-  File "${DEV_ROOT}\lib\gbz80\*.asm"
   File "${DEV_ROOT}\lib\gbz80\*.o"
   File "${DEV_ROOT}\lib\gbz80\*.lib"
 SectionEnd
@@ -139,35 +204,59 @@ SectionEnd
 Section "SDCC Z80 library"
   SectionIn 1 2
   SetOutPath "$INSTDIR\lib\z80"
-  File "${DEV_ROOT}\lib\z80\*.asm"
   File "${DEV_ROOT}\lib\z80\*.o"
   File "${DEV_ROOT}\lib\z80\*.lib"
 SectionEnd
 
+Section "SDCC small model library"
+  SectionIn 1 2
+  SetOutPath "$INSTDIR\lib\small"
+  File "${DEV_ROOT}\lib\small\*.rel"
+  File "${DEV_ROOT}\lib\small\*.lib"
+SectionEnd
+
+Section "SDCC medium model library"
+  SectionIn 1 2
+  SetOutPath "$INSTDIR\lib\medium"
+  File "${DEV_ROOT}\lib\medium\*.rel"
+  File "${DEV_ROOT}\lib\medium\*.lib"
+SectionEnd
+
 Section "SDCC large model library"
   SectionIn 1 2
   SetOutPath "$INSTDIR\lib\large"
-  File "${DEV_ROOT}\lib\large\*.asm"
   File "${DEV_ROOT}\lib\large\*.rel"
   File "${DEV_ROOT}\lib\large\*.lib"
 SectionEnd
 
-Section "SDCC small model library"
+Section "SDCC small-stack-auto model library"
   SectionIn 1 2
-  SetOutPath "$INSTDIR\lib\small"
-  File "${DEV_ROOT}\lib\small\*.asm"
-  File "${DEV_ROOT}\lib\small\*.rel"
-  File "${DEV_ROOT}\lib\small\*.lib"
+  SetOutPath "$INSTDIR\lib\small-stack-auto"
+  File "${DEV_ROOT}\lib\small-stack-auto\*.rel"
+  File "${DEV_ROOT}\lib\small-stack-auto\*.lib"
 SectionEnd
 
 Section "SDCC HC08 library"
   SectionIn 1 2
   SetOutPath "$INSTDIR\lib\hc08"
-  File "${DEV_ROOT}\lib\hc08\*.asm"
   File "${DEV_ROOT}\lib\hc08\*.rel"
   File "${DEV_ROOT}\lib\hc08\*.lib"
 SectionEnd
 
+Section "SDCC PIC16 library"
+  SectionIn 1 2
+  SetOutPath "$INSTDIR\lib\pic16"
+  File "${DEV_ROOT}\lib\pic16\*.o"
+  File "${DEV_ROOT}\lib\pic16\*.lib"
+SectionEnd
+
+Section "SDCC PIC library"
+  SectionIn 1 2
+  SetOutPath "$INSTDIR\lib\pic"
+  File "${DEV_ROOT}\lib\pic\*.o"
+  File "${DEV_ROOT}\lib\pic\*.lib"
+SectionEnd
+
 Section "SDCC library sources"
   SectionIn 1
   SetOutPath "$INSTDIR\lib\src\ds390\examples"
@@ -175,20 +264,17 @@ Section "SDCC library sources"
 
   SetOutPath "$INSTDIR\lib\src\ds390"
   File "${DEV_ROOT}\lib\src\ds390\*.c"
-  File "${DEV_ROOT}\lib\src\ds390\libds390.lib"
   File "${DEV_ROOT}\lib\src\ds390\Makefile"
   File "${DEV_ROOT}\lib\src\ds390\Makefile.dep"
 
   SetOutPath "$INSTDIR\lib\src\ds400"
   File "${DEV_ROOT}\lib\src\ds400\*.c"
-  File "${DEV_ROOT}\lib\src\ds400\libds400.lib"
   File "${DEV_ROOT}\lib\src\ds400\Makefile"
   File "${DEV_ROOT}\lib\src\ds400\Makefile.dep"
 
   SetOutPath "$INSTDIR\lib\src\gbz80"
   File "${DEV_ROOT}\lib\src\gbz80\*.c"
   File "${DEV_ROOT}\lib\src\gbz80\*.s"
-  File "${DEV_ROOT}\lib\src\gbz80\gbz80.lib"
   File "${DEV_ROOT}\lib\src\gbz80\Makefile"
   File "${DEV_ROOT}\lib\src\gbz80\README"
 
@@ -197,12 +283,160 @@ Section "SDCC library sources"
   File "${DEV_ROOT}\lib\src\z80\*.s"
   File "${DEV_ROOT}\lib\src\z80\Makefile"
   File "${DEV_ROOT}\lib\src\z80\README"
-  File "${DEV_ROOT}\lib\src\z80\z80.lib"
 
   SetOutPath "$INSTDIR\lib\src\hc08"
   File "${DEV_ROOT}\lib\src\hc08\*.c"
   File "${DEV_ROOT}\lib\src\hc08\Makefile"
-  File "${DEV_ROOT}\lib\src\hc08\hc08.lib"
+
+  SetOutPath "$INSTDIR\lib\src\mcs51"
+  File "${DEV_ROOT}\lib\src\mcs51\*.asm"
+  File "${DEV_ROOT}\lib\src\mcs51\Makefile"
+  File "${DEV_ROOT}\lib\src\mcs51\README"
+
+  SetOutPath "$INSTDIR\lib\src\small"
+  File "${DEV_ROOT}\lib\src\small\Makefile"
+
+  SetOutPath "$INSTDIR\lib\src\medium"
+  File "${DEV_ROOT}\lib\src\medium\Makefile"
+
+  SetOutPath "$INSTDIR\lib\src\large"
+  File "${DEV_ROOT}\lib\src\large\Makefile"
+
+  SetOutPath "$INSTDIR\lib\src\pic"
+  File "${DEV_ROOT}\lib\src\pic\configure"
+  File "${DEV_ROOT}\lib\src\pic\configure.in"
+  File "${DEV_ROOT}\lib\src\pic\GPL"
+  File "${DEV_ROOT}\lib\src\pic\LGPL"
+  File "${DEV_ROOT}\lib\src\pic\Makefile"
+  File "${DEV_ROOT}\lib\src\pic\Makefile.common"
+  File "${DEV_ROOT}\lib\src\pic\Makefile.common.in"
+  File "${DEV_ROOT}\lib\src\pic\Makefile.rules"
+  File "${DEV_ROOT}\lib\src\pic\Makefile.subdir"
+  File "${DEV_ROOT}\lib\src\pic\NEWS"
+  File "${DEV_ROOT}\lib\src\pic\README"
+  File "${DEV_ROOT}\lib\src\pic\TEMPLATE.c"
+  File "${DEV_ROOT}\lib\src\pic\TEMPLATE.S"
+
+  SetOutPath "$INSTDIR\lib\src\pic\libsdcc"
+  File "${DEV_ROOT}\lib\src\pic\libsdcc\*.c"
+  File "${DEV_ROOT}\lib\src\pic\libsdcc\*.S"
+  File "${DEV_ROOT}\lib\src\pic\libsdcc\*.inc"
+  File "${DEV_ROOT}\lib\src\pic\libsdcc\Makefile"
+  
+  SetOutPath "$INSTDIR\lib\src\pic\libdev"
+  File "${DEV_ROOT}\lib\src\pic\libdev\*.c"
+  File "${DEV_ROOT}\lib\src\pic\libdev\*.S"
+  File "${DEV_ROOT}\lib\src\pic\libdev\*.inc"
+  File "${DEV_ROOT}\lib\src\pic\libdev\Makefile"
+
+  SetOutPath "$INSTDIR\lib\src\pic16"
+  File "${DEV_ROOT}\lib\src\pic16\configure"
+  File "${DEV_ROOT}\lib\src\pic16\configure.in"
+  File "${DEV_ROOT}\lib\src\pic16\COPYING"
+  File "${DEV_ROOT}\lib\src\pic16\Makefile"
+  File "${DEV_ROOT}\lib\src\pic16\Makefile.common"
+  File "${DEV_ROOT}\lib\src\pic16\Makefile.common.in"
+  File "${DEV_ROOT}\lib\src\pic16\Makefile.rules"
+  File "${DEV_ROOT}\lib\src\pic16\Makefile.subdir"
+  File "${DEV_ROOT}\lib\src\pic16\pics.all"
+  File "${DEV_ROOT}\lib\src\pic16\pics.build"
+  File "${DEV_ROOT}\lib\src\pic16\README"
+
+  SetOutPath "$INSTDIR\lib\src\pic16\debug"
+  File "${DEV_ROOT}\lib\src\pic16\debug\Makefile"
+
+  SetOutPath "$INSTDIR\lib\src\pic16\debug\gstack"
+  File "${DEV_ROOT}\lib\src\pic16\debug\gstack\Makefile"
+  File "${DEV_ROOT}\lib\src\pic16\debug\gstack\*.c"
+
+  SetOutPath "$INSTDIR\lib\src\pic16\libc"
+  File "${DEV_ROOT}\lib\src\pic16\libc\Makefile"
+
+  SetOutPath "$INSTDIR\lib\src\pic16\libc\ctype"
+  File "${DEV_ROOT}\lib\src\pic16\libc\ctype\*.c"
+  File "${DEV_ROOT}\lib\src\pic16\libc\ctype\Makefile"
+
+  SetOutPath "$INSTDIR\lib\src\pic16\libc\delay"
+  File "${DEV_ROOT}\lib\src\pic16\libc\delay\*.S"
+  File "${DEV_ROOT}\lib\src\pic16\libc\delay\Makefile"
+
+  SetOutPath "$INSTDIR\lib\src\pic16\libc\stdio"
+  File "${DEV_ROOT}\lib\src\pic16\libc\stdio\*.c"
+  File "${DEV_ROOT}\lib\src\pic16\libc\stdio\Makefile"
+
+  SetOutPath "$INSTDIR\lib\src\pic16\libc\stdlib"
+  File "${DEV_ROOT}\lib\src\pic16\libc\stdlib\*.c"
+  File "${DEV_ROOT}\lib\src\pic16\libc\stdlib\*.S"
+  File "${DEV_ROOT}\lib\src\pic16\libc\stdlib\Makefile"
+
+  SetOutPath "$INSTDIR\lib\src\pic16\libc\string"
+  File "${DEV_ROOT}\lib\src\pic16\libc\string\*.c"
+  File "${DEV_ROOT}\lib\src\pic16\libc\string\Makefile"
+
+  SetOutPath "$INSTDIR\lib\src\pic16\libc\utils"
+  File "${DEV_ROOT}\lib\src\pic16\libc\utils\*.S"
+  File "${DEV_ROOT}\lib\src\pic16\libc\utils\Makefile"
+
+  SetOutPath "$INSTDIR\lib\src\pic16\libdev"
+  File "${DEV_ROOT}\lib\src\pic16\libdev\*.c"
+  File "${DEV_ROOT}\lib\src\pic16\libdev\Makefile"
+
+  SetOutPath "$INSTDIR\lib\src\pic16\libio"
+  File "${DEV_ROOT}\lib\src\pic16\libio\*.ignore"
+  File "${DEV_ROOT}\lib\src\pic16\libio\Makefile"
+
+  SetOutPath "$INSTDIR\lib\src\pic16\libio\adc"
+  File "${DEV_ROOT}\lib\src\pic16\libio\adc\*.c"
+  File "${DEV_ROOT}\lib\src\pic16\libio\adc\Makefile"
+
+  SetOutPath "$INSTDIR\lib\src\pic16\libio\i2c"
+  File "${DEV_ROOT}\lib\src\pic16\libio\i2c\*.c"
+  File "${DEV_ROOT}\lib\src\pic16\libio\i2c\Makefile"
+
+  SetOutPath "$INSTDIR\lib\src\pic16\libio\usart"
+  File "${DEV_ROOT}\lib\src\pic16\libio\usart\*.c"
+  File "${DEV_ROOT}\lib\src\pic16\libio\usart\Makefile"
+
+  SetOutPath "$INSTDIR\lib\src\pic16\libm"
+  File "${DEV_ROOT}\lib\src\pic16\libm\*.c"
+  File "${DEV_ROOT}\lib\src\pic16\libm\Makefile"
+
+  SetOutPath "$INSTDIR\lib\src\pic16\libsdcc"
+  File "${DEV_ROOT}\lib\src\pic16\libsdcc\Makefile"
+
+  SetOutPath "$INSTDIR\lib\src\pic16\libsdcc\char"
+  File "${DEV_ROOT}\lib\src\pic16\libsdcc\char\*.c"
+  File "${DEV_ROOT}\lib\src\pic16\libsdcc\char\Makefile"
+
+  SetOutPath "$INSTDIR\lib\src\pic16\libsdcc\fixed16x16"
+  File "${DEV_ROOT}\lib\src\pic16\libsdcc\fixed16x16\*.c"
+  File "${DEV_ROOT}\lib\src\pic16\libsdcc\fixed16x16\*.S"
+  File "${DEV_ROOT}\lib\src\pic16\libsdcc\fixed16x16\Makefile"
+
+  SetOutPath "$INSTDIR\lib\src\pic16\libsdcc\float"
+  File "${DEV_ROOT}\lib\src\pic16\libsdcc\float\*.c"
+  File "${DEV_ROOT}\lib\src\pic16\libsdcc\float\Makefile"
+
+  SetOutPath "$INSTDIR\lib\src\pic16\libsdcc\gptr"
+  File "${DEV_ROOT}\lib\src\pic16\libsdcc\gptr\*.c"
+  File "${DEV_ROOT}\lib\src\pic16\libsdcc\gptr\Makefile"
+
+  SetOutPath "$INSTDIR\lib\src\pic16\libsdcc\int"
+  File "${DEV_ROOT}\lib\src\pic16\libsdcc\int\*.c"
+  File "${DEV_ROOT}\lib\src\pic16\libsdcc\int\Makefile"
+
+  SetOutPath "$INSTDIR\lib\src\pic16\libsdcc\long"
+  File "${DEV_ROOT}\lib\src\pic16\libsdcc\long\*.c"
+  File "${DEV_ROOT}\lib\src\pic16\libsdcc\long\Makefile"
+
+  SetOutPath "$INSTDIR\lib\src\pic16\libsdcc\lregs"
+  File "${DEV_ROOT}\lib\src\pic16\libsdcc\lregs\*.c"
+  File "${DEV_ROOT}\lib\src\pic16\libsdcc\lregs\Makefile"
+
+  SetOutPath "$INSTDIR\lib\src\pic16\startup"
+  File "${DEV_ROOT}\lib\src\pic16\startup\*.c"
+  File "${DEV_ROOT}\lib\src\pic16\startup\Makefile"
+  File "${DEV_ROOT}\lib\src\pic16\startup\README"
 
   SetOutPath "$INSTDIR\lib\src"
   File "${DEV_ROOT}\lib\src\*.c"
@@ -233,8 +467,14 @@ Section -PostInstall
   WriteUninstaller "$INSTDIR\uninstall.exe"
 SectionEnd
 
+Section -AddToPath
+  MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Do you want to add $INSTDIR\bin to the PATH?" IDNO +3
+    Push "$INSTDIR\bin"
+    Call AddToPath
+SectionEnd
 
-#### Uninstaller code ####
+
+;;;; Uninstaller code ;;;;
 
 Function un.onInit
   MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Are you sure you want to completely remove $(^Name) and all of its components?" IDYES +2
@@ -261,6 +501,16 @@ Section Uninstall
   Delete "$SMPROGRAMS\$MUI_STARTMENUPAGE_VARIABLE\Uninstall SDCC.lnk"
   Delete "$SMPROGRAMS\$MUI_STARTMENUPAGE_VARIABLE\SDCC on the Web.lnk"
 
+  Delete "$INSTDIR\lib\src\large\Makefile"
+
+  Delete "$INSTDIR\lib\src\medium\Makefile"
+
+  Delete "$INSTDIR\lib\src\small\Makefile"
+
+  Delete "$INSTDIR\lib\src\mcs51\*.asm"
+  Delete "$INSTDIR\lib\src\mcs51\Makefile"
+  Delete "$INSTDIR\lib\src\mcs51\README"
+
   Delete "$INSTDIR\lib\src\hc08\*.c"
   Delete "$INSTDIR\lib\src\hc08\hc08.lib"
   Delete "$INSTDIR\lib\src\hc08\Makefile"
@@ -290,37 +540,52 @@ Section Uninstall
 
   Delete "$INSTDIR\lib\src\*.c"
 
+  Delete "$INSTDIR\lib\pic\*.o"
+  Delete "$INSTDIR\lib\pic\*.lib"
+
+  Delete "$INSTDIR\lib\pic16\*.o"
+  Delete "$INSTDIR\lib\pic16\*.lib"
+
   Delete "$INSTDIR\lib\hc08\*.rel"
-  Delete "$INSTDIR\lib\hc08\*.asm"
   Delete "$INSTDIR\lib\hc08\*.lib"
 
   Delete "$INSTDIR\lib\z80\*.o"
-  Delete "$INSTDIR\lib\z80\*.asm"
   Delete "$INSTDIR\lib\z80\*.lib"
 
-  Delete "$INSTDIR\lib\small\*.asm"
   Delete "$INSTDIR\lib\small\*.rel"
   Delete "$INSTDIR\lib\small\*.lib"
 
-  Delete "$INSTDIR\lib\large\*.asm"
+  Delete "$INSTDIR\lib\medium\*.rel"
+  Delete "$INSTDIR\lib\medium\*.lib"
+
   Delete "$INSTDIR\lib\large\*.rel"
   Delete "$INSTDIR\lib\large\*.lib"
 
-  Delete "$INSTDIR\lib\gbz80\*.asm"
+  Delete "$INSTDIR\lib\small-stack-auto\*.rel"
+  Delete "$INSTDIR\lib\small-stack-auto\*.lib"
+
   Delete "$INSTDIR\lib\gbz80\*.o"
   Delete "$INSTDIR\lib\gbz80\*.lib"
 
-  Delete "$INSTDIR\lib\ds390\*.asm"
   Delete "$INSTDIR\lib\ds390\*.rel"
   Delete "$INSTDIR\lib\ds390\*.lib"
 
-  Delete "$INSTDIR\lib\ds400\*.asm"
   Delete "$INSTDIR\lib\ds400\*.rel"
   Delete "$INSTDIR\lib\ds400\*.lib"
 
   Delete "$INSTDIR\include\asm\z80\*.h"
+  Delete "$INSTDIR\include\asm\pic16\*.h"
+  Delete "$INSTDIR\include\asm\mcs51\*.h"
   Delete "$INSTDIR\include\asm\gbz80\*.h"
+  Delete "$INSTDIR\include\asm\ds390\*.h"
   Delete "$INSTDIR\include\asm\default\*.h"
+  Delete "$INSTDIR\include\z80\*.h"
+  Delete "$INSTDIR\include\pic\*.h"
+  Delete "$INSTDIR\include\pic\*.txt"
+  Delete "$INSTDIR\include\pic\*.inc"
+  Delete "$INSTDIR\include\pic16\*.h"
+  Delete "$INSTDIR\include\mcs51\*.h"
+  Delete "$INSTDIR\include\hc08\*.h"
   Delete "$INSTDIR\include\*.h"
 
   Delete "$INSTDIR\doc\README.TXT"
@@ -333,6 +598,12 @@ Section Uninstall
 
   RMDir "$SMPROGRAMS\$MUI_STARTMENUPAGE_VARIABLE"
 
+  RMDir /r "$INSTDIR\lib\src\pic"
+  RMDir /r "$INSTDIR\lib\src\pic16"
+  RMDir "$INSTDIR\lib\src\small"
+  RMDir "$INSTDIR\lib\src\medium"
+  RMDir "$INSTDIR\lib\src\large"
+  RMDir "$INSTDIR\lib\src\mcs51"
   RMDir "$INSTDIR\lib\src\z80"
   RMDir "$INSTDIR\lib\src\gbz80"
   RMDir "$INSTDIR\lib\src\ds390\examples"
@@ -341,9 +612,13 @@ Section Uninstall
   RMDir "$INSTDIR\lib\src\hc08"
   RMDir "$INSTDIR\lib\src"
 
+  RMDir "$INSTDIR\lib\pic"
+  RMDir "$INSTDIR\lib\pic16"
   RMDir "$INSTDIR\lib\z80"
   RMDir "$INSTDIR\lib\small"
+  RMDir "$INSTDIR\lib\medium"
   RMDir "$INSTDIR\lib\large"
+  RMDir "$INSTDIR\lib\small-stack-auto"
   RMDir "$INSTDIR\lib\gbz80"
   RMDir "$INSTDIR\lib\ds390"
   RMDir "$INSTDIR\lib\ds400"
@@ -351,9 +626,17 @@ Section Uninstall
   RMDir "$INSTDIR\lib"
 
   RMDir "$INSTDIR\include\asm\z80"
+  RMDir "$INSTDIR\include\asm\pic16"
+  RMDir "$INSTDIR\include\asm\mcs51"
   RMDir "$INSTDIR\include\asm\gbz80"
+  RMDir "$INSTDIR\include\asm\ds390"
   RMDir "$INSTDIR\include\asm\default"
   RMDir "$INSTDIR\include\asm"
+  RMDir "$INSTDIR\include\z80"
+  RMDir "$INSTDIR\include\pic"
+  RMDir "$INSTDIR\include\pic16"
+  RMDir "$INSTDIR\include\mcs51"
+  RMDir "$INSTDIR\include\hc08"
   RMDir "$INSTDIR\include"
 
   RMDir "$INSTDIR\doc"
@@ -362,6 +645,261 @@ Section Uninstall
 
   RMDir "$INSTDIR"
 
+  Push "$INSTDIR\bin"
+  Call un.RemoveFromPath
+
   SetAutoClose true
 SectionEnd
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; Path Manipulation functions                                                 ;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+!verbose 3
+!include "WinMessages.nsh"
+!verbose 4
+
+; AddToPath - Adds the given dir to the search path.
+;        Input - head of the stack
+;        Note - Win9x systems requires reboot
+
+Function AddToPath
+  Exch $0
+  Push $1
+  Push $2
+  Push $3
+  Push $4
+
+  ; don't add if the path doesn't exist
+  IfFileExists $0 "" AddToPath_done
+
+  Call IsNT
+  Pop $4
+  StrCmp $4 1 +3
+    ; Not on NT: read PATH from environment variable
+    ReadEnvStr $1 PATH
+    Goto +2
+    ; On NT: read PATH from registry
+    ReadRegStr $1 HKCU "Environment" "PATH"
+  Push "$1;"
+  Push "$0;"
+  Call StrStr
+  Pop $2
+  StrCmp $2 "" "" AddToPath_done
+  Push "$1;"
+  Push "$0\;"
+  Call StrStr
+  Pop $2
+  StrCmp $2 "" "" AddToPath_done
+  GetFullPathName /SHORT $3 $0
+  Push "$1;"
+  Push "$3;"
+  Call StrStr
+  Pop $2
+  StrCmp $2 "" "" AddToPath_done
+  Push "$1;"
+  Push "$3\;"
+  Call StrStr
+  Pop $2
+  StrCmp $2 "" "" AddToPath_done
+
+  StrCmp $4 1 AddToPath_NT
+    ; Not on NT
+    StrCpy $1 $WINDIR 2
+    FileOpen $1 "$1\autoexec.bat" a
+    FileSeek $1 -1 END
+    FileReadByte $1 $2
+    IntCmp $2 26 0 +2 +2 ; DOS EOF
+      FileSeek $1 -1 END ; write over EOF
+    FileWrite $1 "$\r$\nSET PATH=%PATH%;$3$\r$\n"
+    FileClose $1
+    SetRebootFlag true
+    Goto AddToPath_done
+
+  AddToPath_NT:
+    ReadRegStr $1 HKCU "Environment" "PATH"
+    StrCpy $2 $1 1 -1  ; copy last char
+    StrCmp $2 ";" 0 +2 ; if last char == ;
+      StrCpy $1 $1 -1  ; remove last char
+    StrCmp $1 "" AddToPath_NTdoIt
+      StrCpy $0 "$1;$0"
+    AddToPath_NTdoIt:
+      WriteRegExpandStr HKCU "Environment" "PATH" $0
+      SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000
+
+  AddToPath_done:
+    Pop $4
+    Pop $3
+    Pop $2
+    Pop $1
+    Pop $0
+FunctionEnd
+
+; RemoveFromPath - Remove a given dir from the path
+;     Input: head of the stack
+
+Function un.RemoveFromPath
+  Exch $0
+  Push $1
+  Push $2
+  Push $3
+  Push $4
+  Push $5
+  Push $6
+
+  IntFmt $6 "%c" 26 ; DOS EOF
+
+  Call un.IsNT
+  Pop $1
+  StrCmp $1 1 unRemoveFromPath_NT
+    ; Not on NT
+    StrCpy $1 $WINDIR 2
+    FileOpen $1 "$1\autoexec.bat" r
+    GetTempFileName $4
+    FileOpen $2 $4 w
+    GetFullPathName /SHORT $0 $0
+    StrCpy $0 "SET PATH=%PATH%;$0"
+    Goto unRemoveFromPath_dosLoop
+
+    unRemoveFromPath_dosLoop:
+      FileRead $1 $3
+      StrCpy $5 $3 1 -1 ; read last char
+      StrCmp $5 $6 0 +2 ; if DOS EOF
+        StrCpy $3 $3 -1 ; remove DOS EOF so we can compare
+      StrCmp $3 "$0$\r$\n" unRemoveFromPath_dosLoopRemoveLine
+      StrCmp $3 "$0$\n" unRemoveFromPath_dosLoopRemoveLine
+      StrCmp $3 "$0" unRemoveFromPath_dosLoopRemoveLine
+      StrCmp $3 "" unRemoveFromPath_dosLoopEnd
+      FileWrite $2 $3
+      Goto unRemoveFromPath_dosLoop
+      unRemoveFromPath_dosLoopRemoveLine:
+        SetRebootFlag true
+        Goto unRemoveFromPath_dosLoop
+
+    unRemoveFromPath_dosLoopEnd:
+      FileClose $2
+      FileClose $1
+      StrCpy $1 $WINDIR 2
+      Delete "$1\autoexec.bat"
+      CopyFiles /SILENT $4 "$1\autoexec.bat"
+      Delete $4
+      Goto unRemoveFromPath_done
+
+  unRemoveFromPath_NT:
+    ReadRegStr $1 HKCU "Environment" "PATH"
+    StrCpy $5 $1 1 -1 ; copy last char
+    StrCmp $5 ";" +2  ; if last char != ;
+      StrCpy $1 "$1;" ; append ;
+    Push $1
+    Push "$0;"
+    Call un.StrStr    ; Find `$0;` in $1
+    Pop $2            ; pos of our dir
+    StrCmp $2 "" unRemoveFromPath_done
+      ; else, it is in path
+      ; $0 - path to add
+      ; $1 - path var
+      StrLen $3 "$0;"
+      StrLen $4 $2
+      StrCpy $5 $1 -$4   ; $5 is now the part before the path to remove
+      StrCpy $6 $2 "" $3 ; $6 is now the part after the path to remove
+      StrCpy $3 $5$6
+
+      StrCpy $5 $3 1 -1  ; copy last char
+      StrCmp $5 ";" 0 +2 ; if last char == ;
+        StrCpy $3 $3 -1  ; remove last char
+
+      StrCmp $3 "" +3
+        ; New PATH not empty: update the registry
+        WriteRegExpandStr HKCU "Environment" "PATH" $3
+        Goto +2
+        ; New PATH empty: remove from the registry
+        DeleteRegValue HKCU "Environment" "PATH"
+      SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000
+
+  unRemoveFromPath_done:
+    Pop $6
+    Pop $5
+    Pop $4
+    Pop $3
+    Pop $2
+    Pop $1
+    Pop $0
+FunctionEnd
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;            Utility Functions            ;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+; IsNT
+; no input
+; output, top of the stack = 1 if NT or 0 if not
+;
+; Usage:
+;   Call IsNT
+;   Pop $R0
+;  ($R0 at this point is 1 or 0)
+
+!macro IsNT un
+Function ${un}IsNT
+  Push $0
+  ReadRegStr $0 HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion
+  StrCmp $0 "" 0 IsNT_yes
+  ; we are not NT.
+  Pop $0
+  Push 0
+  Return
+
+  IsNT_yes:
+    ; NT!!!
+    Pop $0
+    Push 1
+FunctionEnd
+!macroend
+!insertmacro IsNT ""
+!insertmacro IsNT "un."
+
+; StrStr
+; input, top of stack = string to search for
+;        top of stack-1 = string to search in
+; output, top of stack (replaces with the portion of the string remaining)
+; modifies no other variables.
+;
+; Usage:
+;   Push "this is a long ass string"
+;   Push "ass"
+;   Call StrStr
+;   Pop $R0
+;  ($R0 at this point is "ass string")
+
+!macro StrStr un
+Function ${un}StrStr
+Exch $R1   ; st=haystack,old$R1, $R1=needle
+  Exch     ; st=old$R1,haystack
+  Exch $R2 ; st=old$R1,old$R2, $R2=haystack
+  Push $R3
+  Push $R4
+  Push $R5
+  StrLen $R3 $R1
+  StrCpy $R4 0
+  ; $R1=needle
+  ; $R2=haystack
+  ; $R3=len(needle)
+  ; $R4=cnt
+  ; $R5=tmp
+  loop:
+    StrCpy $R5 $R2 $R3 $R4
+    StrCmp $R5 $R1 done
+    StrCmp $R5 "" done
+    IntOp $R4 $R4 + 1
+    Goto loop
+done:
+  StrCpy $R1 $R2 "" $R4
+  Pop $R5
+  Pop $R4
+  Pop $R3
+  Pop $R2
+  Exch $R1
+FunctionEnd
+!macroend
+!insertmacro StrStr ""
+!insertmacro StrStr "un."