[Win32forth-cvs] win32forth/apps/Setup Setup.f,1.11,1.12

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

Update of /cvsroot/win32forth/win32forth/apps/Setup
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16266/apps/Setup

Modified Files:
	Setup.f 
Log Message:
Build process updated, to set the current dir correctly when compiling an application with the Setup.

Index: Setup.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/Setup/Setup.f,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Setup.f	28 Sep 2006 10:16:47 -0000	1.11
--- Setup.f	2 Dec 2006 10:17:30 -0000	1.12
***************
*** 4,12 ****
  \  Author: Andrew Stephenson
  \ Created: February 14th, 2004 - andrew
! \ Updated: Samstag, May 15 2004 - 12:15 - dbu
  \
  \ Setup for Win32Forth

! \ this is all we of win32forth to create a smal Setup.exe
      FLOAD ..\..\src\comment.f
      FLOAD ..\..\src\numconv.f
--- 4,12 ----
  \  Author: Andrew Stephenson
  \ Created: February 14th, 2004 - andrew
! \ Updated: Samstag, Dezember 02 2006 - dbu
  \
  \ Setup for Win32Forth

! \ This is all we need of win32forth to create a smal Setup.exe
      FLOAD ..\..\src\comment.f
      FLOAD ..\..\src\numconv.f
***************
*** 77,82 ****
          unload-forth 0 Call ExitProcess ; \ exit setup

! : wait&bye cr
!            ." Press any key to exit..." ekey drop setup-bye ;

  3 proc CopyFile
--- 77,82 ----
          unload-forth 0 Call ExitProcess ; \ exit setup

! : wait&bye
!         cr ." Press any key to exit..." ekey drop setup-bye ;

  3 proc CopyFile
***************
*** 103,108 ****

  : dashline
!  ." ----------------------------------------------------------------------- " cr
!   ;

  : SetUpForth    ( -- f )
--- 103,107 ----

  : dashline
!         ." ----------------------------------------------------------------------- " cr ;

  : SetUpForth    ( -- f )
***************
*** 125,130 ****
               ."      P  Rebuild Project Manager." cr cr
               ."      G  Rebuild Win32forth IDE." cr cr
!              ."      A  Rebuild sample applications (Player4, Solipon2, Sudoku and" cr
!              ."         PlayVirginRadio)" cr cr
               ."      D  Copy Win32Forth dll files (w32fConsole.dll, w32fScintilla.dll," cr
               ."         wincon.dll and Zip32.dll) into the Windows system folder:" cr
--- 124,129 ----
               ."      P  Rebuild Project Manager." cr cr
               ."      G  Rebuild Win32forth IDE." cr cr
!              ."      A  Rebuild sample applications (Player4, Solipon2, Sudoku," cr
!              ."         PlayVirginRadio and PictureViewer)" cr cr
               ."      D  Copy Win32Forth dll files (w32fConsole.dll, w32fScintilla.dll," cr
               ."         wincon.dll and Zip32.dll) into the Windows system folder:" cr
***************
*** 200,292 ****

  : cleanbuild ( f -- ) \ clean up the files before install
!   cls cr
!       c" WIN32FOR.EXE"   filedelete
!       c" WIN32FOR.DBG"   filedelete
!       c" WINED.EXE"      filedelete
!       if   c" HYPER.NDX" filedelete
!            c" HELP.NDX"  filedelete
!       then
!       c" FORTHFORM.EXE"  filedelete
!       c" PROJECT.EXE"    filedelete
!       C" SciEditMdi.EXE" filedelete
!   ;

  : buildstage1
!       ." -- Stage 1" cr
!       c" FKERNEL.EXE  fload src\extend.f bye"       procexec
!       c" WIN32FOR.EXE"  filecheck
!   ;

  : buildmeta
!       ." -- Meta Compile" cr
!       c" WIN32FOR.EXE fload src\kernel\meta.f bye"  procexec
!       c" FKERNEL.EXE"   filecheck
!   ;

  : buildmetafixed
!       ." -- Meta Compile (fixed loadpoint)" cr
!       c" WIN32FOR.EXE fload src\kernel\meta.f setsize bye" procexec
!       c" FKERNEL.EXE"   filecheck
!   ;

  : buildextend
!       ." -- Extend" cr
!       c" FKERNEL.EXE  fload src\extend.f bye"       procexec
!       c" WIN32FOR.EXE"  filecheck
!   ;

  : buildwined
!       ." -- WinEd" cr
!       c" WIN32FOR.EXE fload apps\wined\wined.f bye"  procexec
!       c" WINED.EXE"     filecheck
!   ;

  : buildindex
! 	." -- Hyper link indices" cr
! 	." -- building HELP.NDX" cr
! 	s" HELP.CFG" &WINED.CFG place
! 	s" HELP.NDX" &WINED.NDX place
! 	build-index c" HELP.NDX" filecheck
! 	." -- building HYPER.NDX" cr
! 	s" WINED.CFG" &WINED.CFG place
! 	s" HYPER.NDX" &WINED.NDX place
! 	build-index c" HYPER.NDX" filecheck
!   ;

  : buildforthform
!       ." -- ForthForm" cr
!       c" WIN32FOR.EXE fload apps\forthform\forthform.f bye"     procexec
!       c" FORTHFORM.EXE" filecheck
!   ;

  : buildproject
!       ." -- ProjectManager" cr
!       c" WIN32FOR.EXE fload apps\ProMgr\ProjectManager.f bye"   procexec
!       c" PROJECT.EXE" filecheck
!   ;

  : buildscintilla
!        ." -- SciEdit" cr
!        c" WIN32FOR.EXE fload apps\SciEdit\Main.f bye"     procexec
!        c" SciEditMdi.EXE" filecheck
!   ;

  : buildide
!        ." -- Win32Forth IDE" cr
!        c" WIN32FOR.EXE fload apps\Win32ForthIDE\Main.f bye"     procexec
!        c" Win32ForthIde.exe" filecheck
!   ;

  : buildsamples
!        ." -- Sample applications" cr
!        c" WIN32FOR.EXE fload apps\Player4\Player4.f bye"   procexec
!        c" Player4.EXE" filecheck
!        c" WIN32FOR.EXE fload apps\Solipon2\SOLIPION.F bye" procexec
!        c" SOLIPION.EXE" filecheck
!        c" WIN32FOR.EXE fload apps\Sudoku\Sudoku.F bye" procexec
!        c" Sudoku.EXE" filecheck
!        c" WIN32FOR.EXE fload apps\PlayVirginRadio\PlayVirginRadio.F bye" procexec
!        c" PlayVirginRadio.EXE" filecheck
!   ;

  : copydll { addr \ buf$ } \ copy a dll into the windows system folder
--- 199,303 ----

  : cleanbuild ( f -- ) \ clean up the files before install
!         cls cr
!         if   c" HYPER.NDX" filedelete
!              c" HELP.NDX"  filedelete
!         then
!         c" FORTHFORM.EXE"       filedelete
!         C" Player4.exe"         filedelete
!         C" PlayVirginRadio.exe" filedelete
!         c" PROJECT.EXE"         filedelete
!         C" SciEditMdi.EXE"      filedelete
!         C" solipion.exe"        filedelete
!         C" Sudoku.exe"          filedelete
!         c" WIN32FOR.EXE"        filedelete
!         c" WIN32FOR.DBG"        filedelete
!         c" Win32ForthIde.exe"   filedelete
!         c" WINED.EXE"           filedelete
!         c" PictureViewer.EXE"   filedelete
! ;

  : buildstage1
!         ." -- Stage 1" cr
!         c" FKERNEL.EXE  fload src\extend.f bye"       procexec
!         c" WIN32FOR.EXE"  filecheck
! ;

  : buildmeta
!         ." -- Meta Compile" cr
!         c" WIN32FOR.EXE fload src\kernel\meta.f bye"  procexec
!         c" FKERNEL.EXE"   filecheck
! ;

  : buildmetafixed
!         ." -- Meta Compile (fixed loadpoint)" cr
!         c" WIN32FOR.EXE fload src\kernel\meta.f setsize bye" procexec
!         c" FKERNEL.EXE"   filecheck
! ;

  : buildextend
!         ." -- Extend" cr
!         c" FKERNEL.EXE  fload src\extend.f bye"       procexec
!         c" WIN32FOR.EXE"  filecheck
! ;

  : buildwined
!         ." -- WinEd" cr
!         c" WIN32FOR.EXE chdir apps\wined fload wined.f bye"  procexec
!         c" WINED.EXE"     filecheck
! ;

  : buildindex
!         ." -- Hyper link indices" cr
!         ." -- building HELP.NDX" cr
!         s" HELP.CFG" &WINED.CFG place
!         s" HELP.NDX" &WINED.NDX place
!         build-index c" HELP.NDX" filecheck
!         ." -- building HYPER.NDX" cr
!         s" WINED.CFG" &WINED.CFG place
!         s" HYPER.NDX" &WINED.NDX place
!         build-index c" HYPER.NDX" filecheck
! ;

  : buildforthform
!         ." -- ForthForm" cr
!         c" WIN32FOR.EXE chdir apps\forthform fload forthform.f bye"     procexec
!         c" FORTHFORM.EXE" filecheck
! ;

  : buildproject
!         ." -- ProjectManager" cr
!         c" WIN32FOR.EXE chdir apps\ProMgr fload ProjectManager.f bye"   procexec
!         c" PROJECT.EXE" filecheck
! ;

  : buildscintilla
!         ." -- SciEdit" cr
!         c" WIN32FOR.EXE chdir apps\SciEdit fload Main.f bye"     procexec
!         c" SciEditMdi.EXE" filecheck
! ;

  : buildide
!         ." -- Win32Forth IDE" cr
!         c" WIN32FOR.EXE chdir apps\Win32ForthIDE fload main.f bye"     procexec
!         c" Win32ForthIde.exe" filecheck
! ;

  : buildsamples
!         ." -- Sample applications" cr
!         c" WIN32FOR.EXE chdir apps\Player4 fload Player4.f bye"   procexec
!         c" Player4.EXE" filecheck
! 
!         c" WIN32FOR.EXE chdir apps\Solipon2 fload SOLIPION.F bye" procexec
!         c" SOLIPION.EXE" filecheck
! 
!         c" WIN32FOR.EXE chdir apps\Sudoku fload Sudoku.F bye" procexec
!         c" Sudoku.EXE" filecheck
! 
!         c" WIN32FOR.EXE chdir apps\PlayVirginRadio fload PlayVirginRadio.F bye" procexec
!         c" PlayVirginRadio.EXE" filecheck
! 
!         c" WIN32FOR.EXE chdir apps\PictureViewer fload PictureViewer.f bye" procexec
!         c" PictureViewer.EXE" filecheck
! ;

  : copydll { addr \ buf$ } \ copy a dll into the windows system folder
***************
*** 299,303 ****
               buf$ filecheck
          then
!   ;

  : copywindowdll ( -- ) \ copy the win32forth dll's to the windows system folder
--- 310,314 ----
               buf$ filecheck
          then
! ;

  : copywindowdll ( -- ) \ copy the win32forth dll's to the windows system folder
***************
*** 306,429 ****
          c" wincon.dll"          copydll
          c" Zip32.dll"           copydll
!   ;

  \ install processing
  : (install)	 ( f -- )
!       dup cleanbuild \ delete old EXE, DBG and NDX files
!       buildstage1    \ create a temporary win32for.exe (used to metacompile the kernel)
!       buildmeta      \ metacompile the kernel (build fkernel.exe)
!       buildextend    \ extend the kernel (build win32forth.exe)
!       buildwined     \ build WinEd
!       if  buildindex \ build the index files for WinEd
!       then
!       buildforthform \ build ForthForm
!       buildproject   \ build ProjectManager
! \       buildscintilla \ build SciEdit
!       buildsamples   \ build sample applications
!       buildide       \ build Win32Forth IDE
  ;

  : install-silent ( f -- )
!   cls cr
!       ." INSTALL SILENT requested" cr cr
!       dashline cr
!       (install)
!       setup-bye
  ;

  \ install processing
  : install
! 
!   cls cr
!       ." INSTALL requested" cr cr
!       dashline cr
!       ." We are going to briefly recompile Win32Forth from scratch. " cr
!       ." If you don't wish to do this right now you can press ESC or" cr
!       ." CTRL-C to abort now.                                       " cr
!       cr
!       ." GO AHEAD, touch enter, we think you will enjoy it. There is" cr
!       ." an active group of us here to answer questions & help you. " cr
!       ." Some do it for fun, some do it for intellectual stimulation." cr
!       ." You can try again when ever you want, by running Setup.exe" cr
!       ." again before using Win32Forth as this is a required step.  " cr
!       cr dashline cr
!       ." During the setup process, you will NOT be required to make " cr
!       ." any interaction with the process. We will set your internal" cr
!       ." user paths to your new configuration. We will be surprised " cr
!       ." if it does not complete successfully.                      " cr
!       cr
!       ." Please make sure you're not running any other versions of  " cr
!       ." Win32Forth; that is, you should save your work and end any " cr
!       ." WIN3FOR.EXE, WINED.EXE, or FORTHFORM.EXE that might be     " cr
!       ." running.  This is required for a successful meta-compile.  " cr
!       cr
!       ." If the above is not the cause of the problem, the task in  " cr
!       ." error will wait for you to acknowledge it by pressing the  " cr
!       ." <enter> key. Please note the error information (use copy)  " cr
!       ." and paste into an email. Send this to us at the news group " cr
!       ." win...@ya..., where we will attempt to fix   " cr
!       ." the problem.  Generally all goes well. :-)                 " cr
!       cr
!       ." Your USER PREFERENCES are set by clicking on the little man" cr
!       ." in the green shirt on the menu bar at the top of WinEd.    " cr
!       cr
!       checkcont
!       true (install)
!       endedok
  ;

  \ meta compile, full processing
  : makeall
!   cls cr
!       ." MAKEALL requested" cr
!       dashline
!       ." Your system will be rebuilt, and you can change the size of the" cr
!       ." Application-, System- and Codespace." cr
!       checkcont
!       buildmetafixed
!       buildextend
!       buildwined
!       buildindex
!       buildforthform
!       buildproject
! \       buildscintilla \ build SciEdit
!       buildsamples \ build sample applications
!       buildide       \ build Win32Forth IDE
!       endedok
  ;

  \ meta only
! : meta
!   cls cr
!       ." META requested" cr
!       dashline
!       ." Rebuilding FKERNEL.EXE" cr
!       checkcont
!       buildmeta
!       endedok
  ;

  \ extend
  : extend
!   cls cr
!       ." EXTEND requested" cr
!       dashline
!       ." Rebuilding WIN32FOR.EXE" cr
!       checkcont
!       buildextend
!       endedok
  ;

  \ metaextend
  : metaextend
!   cls cr
!       ." METAEXTEND requested" cr
!       dashline
!       ." Rebuilding FKERNEL.EXE and" cr
!       ." Rebuilding WIN32FOR.EXE" cr
!       checkcont
!       buildmetafixed
!       buildextend
!       endedok
  ;

--- 317,439 ----
          c" wincon.dll"          copydll
          c" Zip32.dll"           copydll
! ;

  \ install processing
  : (install)	 ( f -- )
!         dup cleanbuild \ delete old EXE, DBG and NDX files
!         buildstage1    \ create a temporary win32for.exe (used to metacompile the kernel)
!         buildmeta      \ metacompile the kernel (build fkernel.exe)
!         buildextend    \ extend the kernel (build win32forth.exe)
!         buildwined     \ build WinEd
!         if  buildindex \ build the index files for WinEd
!         then
!         buildforthform \ build ForthForm
!         buildproject   \ build ProjectManager
!         buildscintilla \ build SciEdit
!         buildsamples   \ build sample applications
!         buildide       \ build Win32Forth IDE
  ;

  : install-silent ( f -- )
!         cls cr
!         ." INSTALL SILENT requested" cr cr
!         dashline cr
!         (install)
!         setup-bye
  ;

  \ install processing
  : install
!         cls cr
!         ." INSTALL requested" cr cr
!         dashline cr
!         ." We are going to briefly recompile Win32Forth from scratch. " cr
!         ." If you don't wish to do this right now you can press ESC or" cr
!         ." CTRL-C to abort now.                                       " cr
!         cr
!         ." GO AHEAD, touch enter, we think you will enjoy it. There is" cr
!         ." an active group of us here to answer questions & help you. " cr
!         ." Some do it for fun, some do it for intellectual stimulation." cr
!         ." You can try again when ever you want, by running Setup.exe" cr
!         ." again before using Win32Forth as this is a required step.  " cr
!         cr dashline cr
!         ." During the setup process, you will NOT be required to make " cr
!         ." any interaction with the process. We will set your internal" cr
!         ." user paths to your new configuration. We will be surprised " cr
!         ." if it does not complete successfully.                      " cr
!         cr
!         ." Please make sure you're not running any other versions of  " cr
!         ." Win32Forth; that is, you should save your work and end any " cr
!         ." WIN3FOR.EXE, WINED.EXE, or FORTHFORM.EXE that might be     " cr
!         ." running.  This is required for a successful meta-compile.  " cr
!         cr
!         ." If the above is not the cause of the problem, the task in  " cr
!         ." error will wait for you to acknowledge it by pressing the  " cr
!         ." <enter> key. Please note the error information (use copy)  " cr
!         ." and paste into an email. Send this to us at the news group " cr
!         ." win...@ya..., where we will attempt to fix   " cr
!         ." the problem.  Generally all goes well. :-)                 " cr
!         cr
!         ." Your USER PREFERENCES are set by clicking on the little man" cr
!         ." in the green shirt on the menu bar at the top of WinEd.    " cr
!         cr
!         checkcont
!         true (install)
!         endedok
  ;

  \ meta compile, full processing
  : makeall
!         cls cr
!         ." MAKEALL requested" cr
!         dashline
!         ." Your system will be rebuilt, and you can change the size of the" cr
!         ." Application-, System- and Codespace." cr
!         checkcont
!         buildmetafixed
!         buildextend
!         buildwined
!         buildindex
!         buildforthform
!         buildproject
!         buildscintilla \ build SciEdit
!         buildsamples   \ build sample applications
!         buildide       \ build Win32Forth IDE
!         endedok
  ;

  \ meta only
! : meta  ( -- )
!         cls cr
!         ." META requested" cr
!         dashline
!         ." Rebuilding FKERNEL.EXE" cr
!         checkcont
!         buildmeta
!         endedok
  ;

  \ extend
  : extend
!         cls cr
!         ." EXTEND requested" cr
!         dashline
!         ." Rebuilding WIN32FOR.EXE" cr
!         checkcont
!         buildextend
!         endedok
  ;

  \ metaextend
  : metaextend
!         cls cr
!         ." METAEXTEND requested" cr
!         dashline
!         ." Rebuilding FKERNEL.EXE and" cr
!         ." Rebuilding WIN32FOR.EXE" cr
!         checkcont
!         buildmetafixed
!         buildextend
!         endedok
  ;

***************
*** 431,441 ****
  \ changed September 10th, 2003 - 12:51 dbu
  : wined
!   cls cr
!       ." WINED requested" cr
!       dashline
!       ." Rebuilding WINED.EXE" cr
!       checkcont
!       buildwined
!       endedok
  ;

--- 441,451 ----
  \ changed September 10th, 2003 - 12:51 dbu
  : wined
!         cls cr
!         ." WINED requested" cr
!         dashline
!         ." Rebuilding WINED.EXE" cr
!         checkcont
!         buildwined
!         endedok
  ;

***************
*** 443,453 ****
  \ new September 10th, 2003 - 12:51 dbu
  : index
!   cls cr
!       ." INDEX requested" cr
!       dashline
!       ." Rebuilding index files" cr
!       checkcont
!       buildindex
!       endedok
  ;

--- 453,463 ----
  \ new September 10th, 2003 - 12:51 dbu
  : index
!         cls cr
!         ." INDEX requested" cr
!         dashline
!         ." Rebuilding index files" cr
!         checkcont
!         buildindex
!         endedok
  ;

***************
*** 455,465 ****
  \ new September 16th, 2003 dbu
  : forthform
!   cls cr
!       ." ForthForm requested" cr
!       dashline
!       ." Rebuilding ForthForm" cr
!       checkcont
!       buildforthform
!       endedok
  ;

--- 465,475 ----
  \ new September 16th, 2003 dbu
  : forthform
!         cls cr
!         ." ForthForm requested" cr
!         dashline
!         ." Rebuilding ForthForm" cr
!         checkcont
!         buildforthform
!         endedok
  ;

***************
*** 467,477 ****
  \ Sonntag, May 30 2004 - 9:50 dbu
  : project
!   cls cr
!       ." ProjectManager requested" cr
!       dashline
!       ." Rebuilding ProjectManager" cr
!       checkcont
!       buildproject
!       endedok
  ;

--- 477,487 ----
  \ Sonntag, May 30 2004 - 9:50 dbu
  : project
!         cls cr
!         ." ProjectManager requested" cr
!         dashline
!         ." Rebuilding ProjectManager" cr
!         checkcont
!         buildproject
!         endedok
  ;

***************
*** 479,532 ****
  \ new June 26th, 2004 - 6:50  aws
  : scintilla
!   cls cr
!       ." Scintilla Editor requested" cr
!       dashline
!       ." Rebuilding Scintilla Editor" cr
!       checkcont
!       buildscintilla \ build SciEdit
!       endedok
  ;

! \ Scintilla Editor
  \ Mittwoch, Juni 07 2006 - 18:01 dbu
  : ide
!   cls cr
!       ." Win32Forth IDE requested" cr
!       dashline
!       ." Rebuilding Win32Forth IDE" cr
!       checkcont
!       buildide       \ build Win32Forth IDE
!       endedok
  ;

  \ Sample applications
  \ new Samstag, Juni 11 2005 - 8:41  dbu
! : samples
!   cls cr
!       ." Sample applications requested" cr
!       dashline
!       ." Rebuilding Sample applications" cr
!       checkcont
!       buildsamples
!       endedok
  ;

  : dllcopy
!   cls cr
!       ." DLL copy requested" cr
!       dashline
!       ." Copy Win32Forth dll's to the windows system folder '"
!       SystemDirectory$ count type ." '" cr
!       false (checkcont)
!       copywindowdll
!       endedok
  ;

  : create-links
!   cls cr
!       ." Createing of shortcuts requested" cr
!       false (checkcont)
!       create_links_on_desktop
!       endedok
  ;

--- 489,542 ----
  \ new June 26th, 2004 - 6:50  aws
  : scintilla
!         cls cr
!         ." Scintilla Editor requested" cr
!         dashline
!         ." Rebuilding Scintilla Editor" cr
!         checkcont
!         buildscintilla \ build SciEdit
!         endedok
  ;

! \ Win32ForthIDE Editor
  \ Mittwoch, Juni 07 2006 - 18:01 dbu
  : ide
!         cls cr
!         ." Win32Forth IDE requested" cr
!         dashline
!         ." Rebuilding Win32Forth IDE" cr
!         checkcont
!         buildide       \ build Win32Forth IDE
!         endedok
  ;

  \ Sample applications
  \ new Samstag, Juni 11 2005 - 8:41  dbu
!         : samples
!         cls cr
!         ." Sample applications requested" cr
!         dashline
!         ." Rebuilding Sample applications" cr
!         checkcont
!         buildsamples
!         endedok
  ;

  : dllcopy
!         cls cr
!         ." DLL copy requested" cr
!         dashline
!         ." Copy Win32Forth dll's to the windows system folder '"
!         SystemDirectory$ count type ." '" cr
!         false (checkcont)
!         copywindowdll
!         endedok
  ;

  : create-links
!         cls cr
!         ." Createing of shortcuts requested" cr
!         false (checkcont)
!         create_links_on_desktop
!         endedok
  ;