[pywin32-checkins] pywin32/Pythonwin/Scintilla License.txt,1.3,1.4 README,1.8,1.9

[<mha...@us...>]

Update of /cvsroot/pywin32/pywin32/Pythonwin/Scintilla
In directory sc8-pr-cvs1:/tmp/cvs-serv12826

Modified Files:
	License.txt README 
Log Message:
New scintilla version.


Index: License.txt
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/Scintilla/License.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** License.txt	15 Apr 2002 15:11:50 -0000	1.3
--- License.txt	25 Nov 2003 10:45:20 -0000	1.4
***************
*** 1,5 ****
  License for Scintilla and SciTE
  
! Copyright 1998-2002 by Neil Hodgson <ne...@sc...>
  
  All Rights Reserved 
--- 1,5 ----
  License for Scintilla and SciTE
  
! Copyright 1998-2003 by Neil Hodgson <ne...@sc...>
  
  All Rights Reserved 

Index: README
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/Scintilla/README,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** README	2 Aug 2002 12:53:10 -0000	1.8
--- README	25 Nov 2003 10:45:20 -0000	1.9
***************
*** 7,11 ****
  *** GTK+/Linux version ***
  
! You must first have GTK+ 1.2x and GCC (2.8 or better) installed.
  GTK+ 1.0x will not work and when it did it was very slow.
  Other C++ compilers may work but may require tweaking the make file.
--- 7,11 ----
  *** GTK+/Linux version ***
  
! You must first have GTK+ 1.2 or later and GCC (3.1 or better) installed.
  GTK+ 1.0x will not work and when it did it was very slow.
  Other C++ compilers may work but may require tweaking the make file.
***************
*** 15,19 ****
  	make
  	cd ../..
! 	
  To build and install SciTE, use the makefile located in the scite/gtk directory
  	cd scite/gtk
--- 15,19 ----
  	make
  	cd ../..
! 
  To build and install SciTE, use the makefile located in the scite/gtk directory
  	cd scite/gtk
***************
*** 22,46 ****
  
  This installs SciTE into $prefix/bin. The value of $prefix is determined from
! the location of Gnome if it is installed. This is usually /usr if installed 
! with Linux or /usr/local if built from source. If Gnome is not installed 
! /usr/bin is used as the prefix. The prefix can be overridden on the command 
! line like "make prefix=/opt" but the same value should be used for both make 
! and make install as this location is compiled into the executable. The global 
  properties file is installed at $prefix/share/scite/SciTEGlobal.properties.
  The language specific properties files are also installed into this directory.
  
! If Gnome is installed then a .desktop file and icon are installed into the 
! correct Gnome places so that SciTE will be in the Gnome Applications menu.
! 
! To build Scintilla for GTK+ 2, define GTK2 on the make command line:
! 	make GTK2=1
! SciTE does not support GTK+ 2.
  
  To remove SciTE
  	make uninstall
! 	
  To clean the object files which may be needed to change $prefix
  	make clean
! 	
  The current make file only supports static linking between SciTE and Scintilla.
  
--- 22,43 ----
  
  This installs SciTE into $prefix/bin. The value of $prefix is determined from
! the location of Gnome if it is installed. This is usually /usr if installed
! with Linux or /usr/local if built from source. If Gnome is not installed
! /usr/bin is used as the prefix. The prefix can be overridden on the command
! line like "make prefix=/opt" but the same value should be used for both make
! and make install as this location is compiled into the executable. The global
  properties file is installed at $prefix/share/scite/SciTEGlobal.properties.
  The language specific properties files are also installed into this directory.
  
! To build Scintilla for GTK+ 1 rather than the default GTK+ 2, define GTK1 on
! the make command line:
! 	make GTK1=1
  
  To remove SciTE
  	make uninstall
! 
  To clean the object files which may be needed to change $prefix
  	make clean
! 
  The current make file only supports static linking between SciTE and Scintilla.
  
***************
*** 48,67 ****
  *** Windows version ***
  
! A C++ compiler is required. Mingw32 GCC 2.95.3 is the compiler used
! for most development although Visual C++ and Borland C++ are also supported.
! For older versions of Borland make such as version 5.02, add the -l option. 
  
  To build Scintilla, make in the scintilla/win32 directory
  		cd scintilla\win32
! GCC:		make
! VC++:	nmake -f scintilla.mak
  Borland: 	make -fscintilla.mak
  		cd ..\..
! 	
  To build SciTE, use the makefiles located in the scite/win32 directory
  		cd scite\win32
! GCC:		make
! VC++: 	nmake -f scite.mak
  Borland:	make -fscite.mak
  
! An executable SciTE will now be in scite\bin.
\ No newline at end of file
--- 45,69 ----
  *** Windows version ***
  
! A C++ compiler is required. Visual Studio .NET 2003 is the development system
! used for most development although Mingw32 3.1 and Borland C++ are also
! supported.
! For older versions of Borland make such as version 5.02, add the -l option.
  
  To build Scintilla, make in the scintilla/win32 directory
  		cd scintilla\win32
! GCC:		mingw32-make
! VS .NET:	nmake -f scintilla.mak
! VC++ 6:	nmake -f scintilla_vc6.mak
  Borland: 	make -fscintilla.mak
  		cd ..\..
! 
  To build SciTE, use the makefiles located in the scite/win32 directory
  		cd scite\win32
! GCC:		mingw32-make
! VS .NET: 	nmake -f scite.mak
  Borland:	make -fscite.mak
  
! An executable SciTE will now be in scite\bin.
! 
! The Visual C++ 6.0 project (.dsp) files are no longer supported but are left
! in the download for people that are prepared to update them.