[Win32forth-cvs] win32forth-extsrc/extsrc/installer Files.nsi, 1.11, 1.12 Uninstall.nsi, 1.11, 1.12

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/win32forth/win32forth-extsrc/extsrc/installer
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18143

Modified Files:
	Files.nsi Uninstall.nsi Win32Forth.nsi 
Log Message:
Versions for V615xx (work in progress)

Index: Files.nsi
===================================================================
RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/installer/Files.nsi,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Files.nsi	9 Mar 2013 17:33:58 -0000	1.11
--- Files.nsi	9 Mar 2013 18:15:33 -0000	1.12
***************
*** 680,712 ****
  	SetOutPath "$INSTDIR\Help\html\"
  	File "..\..\..\win32forth\Help\html\anew-w32f.htm"
! 	File "..\..\..\win32forth\Help\html\clas-Ado.htm"
! 	File "..\..\..\win32forth\Help\html\clas-AXControl.htm"
! 	File "..\..\..\win32forth\Help\html\clas-BitmapDC.htm"
! 	File "..\..\..\win32forth\Help\html\clas-childwnd.htm"
! 	File "..\..\..\win32forth\Help\html\clas-control.htm"
! 	File "..\..\..\win32forth\Help\html\clas-controls.htm"
! 	File "..\..\..\win32forth\Help\html\clas-dialog.htm"
! 	File "..\..\..\win32forth\Help\html\clas-ExtDC.htm"
! 	File "..\..\..\win32forth\Help\html\clas-file.htm"
! 	File "..\..\..\win32forth\Help\html\clas-gdiBase.htm"
! 	File "..\..\..\win32forth\Help\html\clas-gdiBitmap.htm"
! 	File "..\..\..\win32forth\Help\html\clas-gdiBrush.htm"
! 	File "..\..\..\win32forth\Help\html\clas-gdiDC.htm"
! 	File "..\..\..\win32forth\Help\html\clas-gdiFont.htm"
! 	File "..\..\..\win32forth\Help\html\clas-gdiMetafile.htm"
! 	File "..\..\..\win32forth\Help\html\clas-gdiMetafileDC.htm"
! 	File "..\..\..\win32forth\Help\html\clas-gdiPen.htm"
! 	File "..\..\..\win32forth\Help\html\clas-gdiStruct.htm"
! 	File "..\..\..\win32forth\Help\html\clas-gdiWindowDC.htm"
! 	File "..\..\..\win32forth\Help\html\clas-generic.htm"
! 	File "..\..\..\win32forth\Help\html\clas-HTMLcontrol.htm"
! 	File "..\..\..\win32forth\Help\html\clas-Mdi.htm"
! 	File "..\..\..\win32forth\Help\html\clas-MdiDialog.htm"
! 	File "..\..\..\win32forth\Help\html\clas-Sock.htm"
! 	File "..\..\..\win32forth\Help\html\clas-sockserv.htm"
! 	File "..\..\..\win32forth\Help\html\clas-SQLite.htm"
! 	File "..\..\..\win32forth\Help\html\clas-TimerWindow.htm"
! 	File "..\..\..\win32forth\Help\html\clas-TrayWindow.htm"
! 	File "..\..\..\win32forth\Help\html\clas-window.htm"
  	File "..\..\..\win32forth\Help\html\dexh-AcceleratorTables.htm"
  	File "..\..\..\win32forth\Help\html\dexh-ansfile.htm"
--- 680,712 ----
  	SetOutPath "$INSTDIR\Help\html\"
  	File "..\..\..\win32forth\Help\html\anew-w32f.htm"
! 	File "..\..\..\win32forth\Help\html\class-Ado.htm"
! 	File "..\..\..\win32forth\Help\html\class-AXControl.htm"
! 	File "..\..\..\win32forth\Help\html\class-BitmapDC.htm"
! 	File "..\..\..\win32forth\Help\html\class-childwnd.htm"
! 	File "..\..\..\win32forth\Help\html\class-control.htm"
! 	File "..\..\..\win32forth\Help\html\class-controls.htm"
! 	File "..\..\..\win32forth\Help\html\class-dialog.htm"
! 	File "..\..\..\win32forth\Help\html\class-ExtDC.htm"
! 	File "..\..\..\win32forth\Help\html\class-file.htm"
! 	File "..\..\..\win32forth\Help\html\class-gdiBase.htm"
! 	File "..\..\..\win32forth\Help\html\class-gdiBitmap.htm"
! 	File "..\..\..\win32forth\Help\html\class-gdiBrush.htm"
! 	File "..\..\..\win32forth\Help\html\class-gdiDC.htm"
! 	File "..\..\..\win32forth\Help\html\class-gdiFont.htm"
! 	File "..\..\..\win32forth\Help\html\class-gdiMetafile.htm"
! 	File "..\..\..\win32forth\Help\html\class-gdiMetafileDC.htm"
! 	File "..\..\..\win32forth\Help\html\class-gdiPen.htm"
! 	File "..\..\..\win32forth\Help\html\class-gdiStruct.htm"
! 	File "..\..\..\win32forth\Help\html\class-gdiWindowDC.htm"
! 	File "..\..\..\win32forth\Help\html\class-generic.htm"
! 	File "..\..\..\win32forth\Help\html\class-HTMLcontrol.htm"
! 	File "..\..\..\win32forth\Help\html\class-Mdi.htm"
! 	File "..\..\..\win32forth\Help\html\class-MdiDialog.htm"
! 	File "..\..\..\win32forth\Help\html\class-Sock.htm"
! 	File "..\..\..\win32forth\Help\html\class-sockserv.htm"
! 	File "..\..\..\win32forth\Help\html\class-SQLite.htm"
! 	File "..\..\..\win32forth\Help\html\class-TimerWindow.htm"
! 	File "..\..\..\win32forth\Help\html\class-TrayWindow.htm"
! 	File "..\..\..\win32forth\Help\html\class-window.htm"
  	File "..\..\..\win32forth\Help\html\dexh-AcceleratorTables.htm"
  	File "..\..\..\win32forth\Help\html\dexh-ansfile.htm"
***************
*** 953,956 ****
--- 953,957 ----
  	File "..\..\..\win32forth\src\CALLBACK.f"
  	File "..\..\..\win32forth\src\CHILDWND.F"
+ 	File "..\..\..\win32forth\src\Class-errs.f"
  	File "..\..\..\win32forth\src\Class.f"
  	File "..\..\..\win32forth\src\CLASSDBG.F"
***************
*** 959,962 ****
--- 960,964 ----
  	File "..\..\..\win32forth\src\CONTROL.F"
  	File "..\..\..\win32forth\src\CONTROLS.F"
+ 	File "..\..\..\win32forth\src\CreateProcess.f"
  	File "..\..\..\win32forth\src\DBGSRC1.F"
  	File "..\..\..\win32forth\src\DBGSRC2.F"
***************
*** 987,990 ****
--- 989,993 ----
  	File "..\..\..\win32forth\src\paths.f"
  	File "..\..\..\win32forth\src\POINTER.F"
+ 	File "..\..\..\win32forth\src\presave.F"
  	File "..\..\..\win32forth\src\PRIMHASH.F"
  	File "..\..\..\win32forth\src\Primutil.f"
***************
*** 994,998 ****
  	File "..\..\..\win32forth\src\SEE.F"
  	File "..\..\..\win32forth\src\Shell.f"
! 	File "..\..\..\win32forth\src\sysload.f"
  	File "..\..\..\win32forth\src\transient.f"
  	File "..\..\..\win32forth\src\Utils.f"
--- 997,1001 ----
  	File "..\..\..\win32forth\src\SEE.F"
  	File "..\..\..\win32forth\src\Shell.f"
! 	File "..\..\..\win32forth\src\Struct200X.f"
  	File "..\..\..\win32forth\src\transient.f"
  	File "..\..\..\win32forth\src\Utils.f"

Index: Uninstall.nsi
===================================================================
RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/installer/Uninstall.nsi,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Uninstall.nsi	9 Mar 2013 17:33:58 -0000	1.11
--- Uninstall.nsi	9 Mar 2013 18:15:33 -0000	1.12
***************
*** 653,685 ****
  	Delete "$INSTDIR\Help\hdb\HelpWrd.txt"
  	Delete "$INSTDIR\Help\html\anew-w32f.htm"
! 	Delete "$INSTDIR\Help\html\clas-Ado.htm"
! 	Delete "$INSTDIR\Help\html\clas-AXControl.htm"
! 	Delete "$INSTDIR\Help\html\clas-BitmapDC.htm"
! 	Delete "$INSTDIR\Help\html\clas-childwnd.htm"
! 	Delete "$INSTDIR\Help\html\clas-control.htm"
! 	Delete "$INSTDIR\Help\html\clas-controls.htm"
! 	Delete "$INSTDIR\Help\html\clas-dialog.htm"
! 	Delete "$INSTDIR\Help\html\clas-ExtDC.htm"
! 	Delete "$INSTDIR\Help\html\clas-file.htm"
! 	Delete "$INSTDIR\Help\html\clas-gdiBase.htm"
! 	Delete "$INSTDIR\Help\html\clas-gdiBitmap.htm"
! 	Delete "$INSTDIR\Help\html\clas-gdiBrush.htm"
! 	Delete "$INSTDIR\Help\html\clas-gdiDC.htm"
! 	Delete "$INSTDIR\Help\html\clas-gdiFont.htm"
! 	Delete "$INSTDIR\Help\html\clas-gdiMetafile.htm"
! 	Delete "$INSTDIR\Help\html\clas-gdiMetafileDC.htm"
! 	Delete "$INSTDIR\Help\html\clas-gdiPen.htm"
! 	Delete "$INSTDIR\Help\html\clas-gdiStruct.htm"
! 	Delete "$INSTDIR\Help\html\clas-gdiWindowDC.htm"
! 	Delete "$INSTDIR\Help\html\clas-generic.htm"
! 	Delete "$INSTDIR\Help\html\clas-HTMLcontrol.htm"
! 	Delete "$INSTDIR\Help\html\clas-Mdi.htm"
! 	Delete "$INSTDIR\Help\html\clas-MdiDialog.htm"
! 	Delete "$INSTDIR\Help\html\clas-Sock.htm"
! 	Delete "$INSTDIR\Help\html\clas-sockserv.htm"
! 	Delete "$INSTDIR\Help\html\clas-SQLite.htm"
! 	Delete "$INSTDIR\Help\html\clas-TimerWindow.htm"
! 	Delete "$INSTDIR\Help\html\clas-TrayWindow.htm"
! 	Delete "$INSTDIR\Help\html\clas-window.htm"
  	Delete "$INSTDIR\Help\html\dexh-AcceleratorTables.htm"
  	Delete "$INSTDIR\Help\html\dexh-ansfile.htm"
--- 653,685 ----
  	Delete "$INSTDIR\Help\hdb\HelpWrd.txt"
  	Delete "$INSTDIR\Help\html\anew-w32f.htm"
! 	Delete "$INSTDIR\Help\html\class-Ado.htm"
! 	Delete "$INSTDIR\Help\html\class-AXControl.htm"
! 	Delete "$INSTDIR\Help\html\class-BitmapDC.htm"
! 	Delete "$INSTDIR\Help\html\class-childwnd.htm"
! 	Delete "$INSTDIR\Help\html\class-control.htm"
! 	Delete "$INSTDIR\Help\html\class-controls.htm"
! 	Delete "$INSTDIR\Help\html\class-dialog.htm"
! 	Delete "$INSTDIR\Help\html\class-ExtDC.htm"
! 	Delete "$INSTDIR\Help\html\class-file.htm"
! 	Delete "$INSTDIR\Help\html\class-gdiBase.htm"
! 	Delete "$INSTDIR\Help\html\class-gdiBitmap.htm"
! 	Delete "$INSTDIR\Help\html\class-gdiBrush.htm"
! 	Delete "$INSTDIR\Help\html\class-gdiDC.htm"
! 	Delete "$INSTDIR\Help\html\class-gdiFont.htm"
! 	Delete "$INSTDIR\Help\html\class-gdiMetafile.htm"
! 	Delete "$INSTDIR\Help\html\class-gdiMetafileDC.htm"
! 	Delete "$INSTDIR\Help\html\class-gdiPen.htm"
! 	Delete "$INSTDIR\Help\html\class-gdiStruct.htm"
! 	Delete "$INSTDIR\Help\html\class-gdiWindowDC.htm"
! 	Delete "$INSTDIR\Help\html\class-generic.htm"
! 	Delete "$INSTDIR\Help\html\class-HTMLcontrol.htm"
! 	Delete "$INSTDIR\Help\html\class-Mdi.htm"
! 	Delete "$INSTDIR\Help\html\class-MdiDialog.htm"
! 	Delete "$INSTDIR\Help\html\class-Sock.htm"
! 	Delete "$INSTDIR\Help\html\class-sockserv.htm"
! 	Delete "$INSTDIR\Help\html\class-SQLite.htm"
! 	Delete "$INSTDIR\Help\html\class-TimerWindow.htm"
! 	Delete "$INSTDIR\Help\html\class-TrayWindow.htm"
! 	Delete "$INSTDIR\Help\html\class-window.htm"
  	Delete "$INSTDIR\Help\html\dexh-AcceleratorTables.htm"
  	Delete "$INSTDIR\Help\html\dexh-ansfile.htm"
***************
*** 920,923 ****
--- 920,924 ----
  	Delete "$INSTDIR\src\CALLBACK.f"
  	Delete "$INSTDIR\src\CHILDWND.F"
+ 	Delete "$INSTDIR\src\Class-errs.f"
  	Delete "$INSTDIR\src\Class.f"
  	Delete "$INSTDIR\src\CLASSDBG.F"
***************
*** 926,929 ****
--- 927,931 ----
  	Delete "$INSTDIR\src\CONTROL.F"
  	Delete "$INSTDIR\src\CONTROLS.F"
+ 	Delete "$INSTDIR\src\CreateProcess.f"
  	Delete "$INSTDIR\src\DBGSRC1.F"
  	Delete "$INSTDIR\src\DBGSRC2.F"
***************
*** 954,957 ****
--- 956,960 ----
  	Delete "$INSTDIR\src\paths.f"
  	Delete "$INSTDIR\src\POINTER.F"
+ 	Delete "$INSTDIR\src\presave.f
  	Delete "$INSTDIR\src\PRIMHASH.F"
  	Delete "$INSTDIR\src\Primutil.f"
***************
*** 961,965 ****
  	Delete "$INSTDIR\src\SEE.F"
  	Delete "$INSTDIR\src\Shell.f"
! 	Delete "$INSTDIR\src\sysload.f"
  	Delete "$INSTDIR\src\transient.f"
  	Delete "$INSTDIR\src\Utils.f"
--- 964,968 ----
  	Delete "$INSTDIR\src\SEE.F"
  	Delete "$INSTDIR\src\Shell.f"
! 	Delete "$INSTDIR\src\Struct200X.f"
  	Delete "$INSTDIR\src\transient.f"
  	Delete "$INSTDIR\src\Utils.f"
***************
*** 1222,1248 ****
  	Delete "$INSTDIR\extsrc\installer\WinEd.exe"
  	Delete "$INSTDIR\extsrc\installer\WinEd.ndx"
! 	Delete "$INSTDIR\extsrc\w32fConsole\Console.cpp"
! 	Delete "$INSTDIR\extsrc\w32fConsole\Console.def"
! 	Delete "$INSTDIR\extsrc\w32fConsole\Console.dsp"
! 	Delete "$INSTDIR\extsrc\w32fConsole\Console.dsw"
! 	Delete "$INSTDIR\extsrc\w32fConsole\Console.rc"
! 	Delete "$INSTDIR\extsrc\w32fConsole\HAND.CUR"
! 	Delete "$INSTDIR\extsrc\w32fConsole\harrow.cur"
! 	Delete "$INSTDIR\extsrc\w32fConsole\Keyboard.cpp"
! 	Delete "$INSTDIR\extsrc\w32fConsole\MAGNIFY.CUR"
! 	Delete "$INSTDIR\extsrc\w32fConsole\resource.h"
! 	Delete "$INSTDIR\extsrc\w32fConsole\SPLITH.CUR"
! 	Delete "$INSTDIR\extsrc\w32fConsole\SPLITV.CUR"
! 	Delete "$INSTDIR\extsrc\w32fConsole\StdAfx.cpp"
! 	Delete "$INSTDIR\extsrc\w32fConsole\StdAfx.h"
! 	Delete "$INSTDIR\extsrc\w32fConsole\Term.cpp"
! 	Delete "$INSTDIR\extsrc\w32fConsole\Term.h"
! 	Delete "$INSTDIR\extsrc\w32fHtmlDisplay\resource.h"
! 	Delete "$INSTDIR\extsrc\w32fHtmlDisplay\w32fHtmlDisplay.c"
! 	Delete "$INSTDIR\extsrc\w32fHtmlDisplay\w32fHtmlDisplay.def"
! 	Delete "$INSTDIR\extsrc\w32fHtmlDisplay\w32fHtmlDisplay.dsp"
! 	Delete "$INSTDIR\extsrc\w32fHtmlDisplay\w32fHtmlDisplay.dsw"
! 	Delete "$INSTDIR\extsrc\w32fHtmlDisplay\w32fHtmlDisplay.h"
! 	Delete "$INSTDIR\extsrc\w32fHtmlDisplay\w32fHtmlDisplay.rc"
  	Delete "$INSTDIR\extsrc\w32fScintilla\delbin.bat"
  	Delete "$INSTDIR\extsrc\w32fScintilla\delcvs.bat"
--- 1225,1251 ----
  	Delete "$INSTDIR\extsrc\installer\WinEd.exe"
  	Delete "$INSTDIR\extsrc\installer\WinEd.ndx"
! ;	Delete "$INSTDIR\extsrc\w32fConsole\Console.cpp"
! ;	Delete "$INSTDIR\extsrc\w32fConsole\Console.def"
! ;	Delete "$INSTDIR\extsrc\w32fConsole\Console.dsp"
! ;	Delete "$INSTDIR\extsrc\w32fConsole\Console.dsw"
! ;	Delete "$INSTDIR\extsrc\w32fConsole\Console.rc"
! ;	Delete "$INSTDIR\extsrc\w32fConsole\HAND.CUR"
! ;	Delete "$INSTDIR\extsrc\w32fConsole\harrow.cur"
! ;	Delete "$INSTDIR\extsrc\w32fConsole\Keyboard.cpp"
! ;	Delete "$INSTDIR\extsrc\w32fConsole\MAGNIFY.CUR"
! ;	Delete "$INSTDIR\extsrc\w32fConsole\resource.h"
! ;	Delete "$INSTDIR\extsrc\w32fConsole\SPLITH.CUR"
! ;	Delete "$INSTDIR\extsrc\w32fConsole\SPLITV.CUR"
! ;	Delete "$INSTDIR\extsrc\w32fConsole\StdAfx.cpp"
! ;	Delete "$INSTDIR\extsrc\w32fConsole\StdAfx.h"
! ;	Delete "$INSTDIR\extsrc\w32fConsole\Term.cpp"
! ;	Delete "$INSTDIR\extsrc\w32fConsole\Term.h"
! ;	Delete "$INSTDIR\extsrc\w32fHtmlDisplay\resource.h"
! ;	Delete "$INSTDIR\extsrc\w32fHtmlDisplay\w32fHtmlDisplay.c"
! ;	Delete "$INSTDIR\extsrc\w32fHtmlDisplay\w32fHtmlDisplay.def"
! ;	Delete "$INSTDIR\extsrc\w32fHtmlDisplay\w32fHtmlDisplay.dsp"
! ;	Delete "$INSTDIR\extsrc\w32fHtmlDisplay\w32fHtmlDisplay.dsw"
! ;	Delete "$INSTDIR\extsrc\w32fHtmlDisplay\w32fHtmlDisplay.h"
! ;	Delete "$INSTDIR\extsrc\w32fHtmlDisplay\w32fHtmlDisplay.rc"
  	Delete "$INSTDIR\extsrc\w32fScintilla\delbin.bat"
  	Delete "$INSTDIR\extsrc\w32fScintilla\delcvs.bat"
***************
*** 1434,1439 ****
  	RMDir "$INSTDIR\extsrc\w32fScintilla\doc\"
  	RMDir "$INSTDIR\extsrc\w32fScintilla\"
! 	RMDir "$INSTDIR\extsrc\w32fHtmlDisplay\"
! 	RMDir "$INSTDIR\extsrc\w32fConsole\"
  	RMDir "$INSTDIR\extsrc\installer\"
  	RMDir "$INSTDIR\extsrc\"
--- 1437,1442 ----
  	RMDir "$INSTDIR\extsrc\w32fScintilla\doc\"
  	RMDir "$INSTDIR\extsrc\w32fScintilla\"
! ;	RMDir "$INSTDIR\extsrc\w32fHtmlDisplay\"
! ;	RMDir "$INSTDIR\extsrc\w32fConsole\"
  	RMDir "$INSTDIR\extsrc\installer\"
  	RMDir "$INSTDIR\extsrc\"

Index: Win32Forth.nsi
===================================================================
RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/installer/Win32Forth.nsi,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Win32Forth.nsi	9 Mar 2013 17:33:58 -0000	1.14
--- Win32Forth.nsi	9 Mar 2013 18:15:33 -0000	1.15
***************
*** 7,18 ****
  ; Define your application version
  !define VER_MAJOR          6
! !define VER_MINOR         14
! !define VER_REVISION      02
! !define VER_DISPLAY       "6.14.02"
! !define VER_FILE          "61402"
  
  ; Define your application name
  !define APPNAME              "Win32Forth"
  !define APPNAMEANDVERSION    "${APPNAME} ${VER_DISPLAY}"
  
  !define PUBISHER       		"Win32Forth Project Group"
--- 7,22 ----
  ; Define your application version
  !define VER_MAJOR          6
! !define VER_MINOR          15
! !define VER_REVISION      01
! !define VER_DISPLAY       "6.15.01"
! !define VER_FILE             "61501"
! !define VER_FOLDER         "615xx"
! 
  
  ; Define your application name
  !define APPNAME              "Win32Forth"
  !define APPNAMEANDVERSION    "${APPNAME} ${VER_DISPLAY}"
+ !define APPFOLDER                  "${APPNAME} ${VER_FOLDER}"
+ 
  
  !define PUBISHER       		"Win32Forth Project Group"
***************
*** 22,27 ****
  ; Main Install settings
  Name             "${APPNAMEANDVERSION}"
! ; InstallDir       "$PROGRAMFILES\${APPNAMEANDVERSION}"
! InstallDir       "c:\${APPNAMEANDVERSION}"
  InstallDirRegKey HKLM "Software\${APPNAMEANDVERSION}" ""
  OutFile          "w32f${VER_FILE}.exe"
--- 26,31 ----
  ; Main Install settings
  Name             "${APPNAMEANDVERSION}"
! ; InstallDir       "$PROGRAMFILES\${APPFOLDER}"
! InstallDir       "c:\${APPFOLDER}"
  InstallDirRegKey HKLM "Software\${APPNAMEANDVERSION}" ""
  OutFile          "w32f${VER_FILE}.exe"

[Win32forth-cvs] win32forth-extsrc/extsrc/installer Files.nsi, 1.11, 1.12 Uninstall.nsi, 1.11, 1.12

[Win32forth-cvs] win32forth-extsrc/extsrc/installer Files.nsi, 1.11, 1.12 Uninstall.nsi, 1.11, 1.12 Win32Forth.nsi, 1.14, 1.15