anjuta r4621 - in trunk: . plugins plugins/editor plugins/gbf-am plugins/gbf-mkfile plugins/scintilla plugins/sourceview src



Author: jhs
Date: Tue Jan 20 21:53:35 2009
New Revision: 4621
URL: http://svn.gnome.org/viewvc/anjuta?rev=4621&view=rev

Log:
2009-01-20  Johannes Schmid  <jhs gnome org>

	* configure.in:
	* plugins/Makefile.am:
	* plugins/editor/.cvsignore:
	* plugins/editor/Makefile.am:
	* plugins/editor/aneditor-autocomplete.cxx:
	* plugins/editor/aneditor-calltip.cxx:
	* plugins/editor/aneditor-indent.cxx:
	* plugins/editor/aneditor-priv.h:
	* plugins/editor/aneditor.cxx:
	* plugins/editor/aneditor.h:
	* plugins/editor/anjuta-bookmark-16.xpm:
	* plugins/editor/anjuta-breakpoint-disabled-16.xpm:
	* plugins/editor/anjuta-breakpoint-enabled-16.xpm:
	* plugins/editor/anjuta-editor-scintilla-plugin.svg:
	* plugins/editor/anjuta-editor-scintilla.glade:
	* plugins/editor/anjuta-editor.plugin.in:
	* plugins/editor/anjuta-linemark-16.xpm:
	* plugins/editor/anjuta-pcmark-16.xpm:
	* plugins/editor/lexer.h:
	* plugins/editor/plugin.c:
	* plugins/editor/plugin.h:
	* plugins/editor/print.c:
	* plugins/editor/print.h:
	* plugins/editor/properties.cxx:
	* plugins/editor/properties.h:
	* plugins/editor/properties/.cvsignore:
	* plugins/editor/properties/Makefile.am:
	* plugins/editor/properties/anjuta.properties:
	* plugins/editor/properties/styles.properties:
	* plugins/editor/properties/user.properties:
	* plugins/editor/properties_cxx.h:
	* plugins/editor/scintilla/.cvsignore:
	* plugins/editor/scintilla/AutoComplete.cxx:
	* plugins/editor/scintilla/AutoComplete.h:
	* plugins/editor/scintilla/CallTip.cxx:
	* plugins/editor/scintilla/CallTip.h:
	* plugins/editor/scintilla/CellBuffer.cxx:
	* plugins/editor/scintilla/CellBuffer.h:
	* plugins/editor/scintilla/CharClassify.cxx:
	* plugins/editor/scintilla/CharClassify.h:
	* plugins/editor/scintilla/CharacterSet.h:
	* plugins/editor/scintilla/ContractionState.cxx:
	* plugins/editor/scintilla/ContractionState.h:
	* plugins/editor/scintilla/Converter.h:
	* plugins/editor/scintilla/Decoration.cxx:
	* plugins/editor/scintilla/Decoration.h:
	* plugins/editor/scintilla/Document.cxx:
	* plugins/editor/scintilla/Document.h:
	* plugins/editor/scintilla/DocumentAccessor.cxx:
	* plugins/editor/scintilla/DocumentAccessor.h:
	* plugins/editor/scintilla/Editor.cxx:
	* plugins/editor/scintilla/Editor.h:
	* plugins/editor/scintilla/ExternalLexer.cxx:
	* plugins/editor/scintilla/ExternalLexer.h:
	* plugins/editor/scintilla/Indicator.cxx:
	* plugins/editor/scintilla/Indicator.h:
	* plugins/editor/scintilla/KeyMap.cxx:
	* plugins/editor/scintilla/KeyMap.h:
	* plugins/editor/scintilla/KeyWords.cxx:
	* plugins/editor/scintilla/LexAPDL.cxx:
	* plugins/editor/scintilla/LexASY.cxx:
	* plugins/editor/scintilla/LexAU3.cxx:
	* plugins/editor/scintilla/LexAVE.cxx:
	* plugins/editor/scintilla/LexAbaqus.cxx:
	* plugins/editor/scintilla/LexAda.cxx:
	* plugins/editor/scintilla/LexAsm.cxx:
	* plugins/editor/scintilla/LexAsn1.cxx:
	* plugins/editor/scintilla/LexBaan.cxx:
	* plugins/editor/scintilla/LexBash.cxx:
	* plugins/editor/scintilla/LexBasic.cxx:
	* plugins/editor/scintilla/LexBullant.cxx:
	* plugins/editor/scintilla/LexCLW.cxx:
	* plugins/editor/scintilla/LexCPP.cxx:
	* plugins/editor/scintilla/LexCSS.cxx:
	* plugins/editor/scintilla/LexCaml.cxx:
	* plugins/editor/scintilla/LexCmake.cxx:
	* plugins/editor/scintilla/LexConf.cxx:
	* plugins/editor/scintilla/LexCrontab.cxx:
	* plugins/editor/scintilla/LexCsound.cxx:
	* plugins/editor/scintilla/LexD.cxx:
	* plugins/editor/scintilla/LexEScript.cxx:
	* plugins/editor/scintilla/LexEiffel.cxx:
	* plugins/editor/scintilla/LexErlang.cxx:
	* plugins/editor/scintilla/LexFlagship.cxx:
	* plugins/editor/scintilla/LexForth.cxx:
	* plugins/editor/scintilla/LexFortran.cxx:
	* plugins/editor/scintilla/LexGAP.cxx:
	* plugins/editor/scintilla/LexGui4Cli.cxx:
	* plugins/editor/scintilla/LexHTML.cxx:
	* plugins/editor/scintilla/LexHaskell.cxx:
	* plugins/editor/scintilla/LexInno.cxx:
	* plugins/editor/scintilla/LexKix.cxx:
	* plugins/editor/scintilla/LexLisp.cxx:
	* plugins/editor/scintilla/LexLout.cxx:
	* plugins/editor/scintilla/LexLua.cxx:
	* plugins/editor/scintilla/LexMMIXAL.cxx:
	* plugins/editor/scintilla/LexMPT.cxx:
	* plugins/editor/scintilla/LexMSSQL.cxx:
	* plugins/editor/scintilla/LexMagik.cxx:
	* plugins/editor/scintilla/LexMatlab.cxx:
	* plugins/editor/scintilla/LexMetapost.cxx:
	* plugins/editor/scintilla/LexMySQL.cxx:
	* plugins/editor/scintilla/LexNsis.cxx:
	* plugins/editor/scintilla/LexOpal.cxx:
	* plugins/editor/scintilla/LexOthers.cxx:
	* plugins/editor/scintilla/LexPB.cxx:
	* plugins/editor/scintilla/LexPLM.cxx:
	* plugins/editor/scintilla/LexPOV.cxx:
	* plugins/editor/scintilla/LexPS.cxx:
	* plugins/editor/scintilla/LexPascal.cxx:
	* plugins/editor/scintilla/LexPerl.cxx:
	* plugins/editor/scintilla/LexPowerShell.cxx:
	* plugins/editor/scintilla/LexProgress.cxx:
	* plugins/editor/scintilla/LexPython.cxx:
	* plugins/editor/scintilla/LexR.cxx:
	* plugins/editor/scintilla/LexRebol.cxx:
	* plugins/editor/scintilla/LexRuby.cxx:
	* plugins/editor/scintilla/LexSQL.cxx:
	* plugins/editor/scintilla/LexScriptol.cxx:
	* plugins/editor/scintilla/LexSmalltalk.cxx:
	* plugins/editor/scintilla/LexSpecman.cxx:
	* plugins/editor/scintilla/LexSpice.cxx:
	* plugins/editor/scintilla/LexTADS3.cxx:
	* plugins/editor/scintilla/LexTCL.cxx:
	* plugins/editor/scintilla/LexTeX.cxx:
	* plugins/editor/scintilla/LexVB.cxx:
	* plugins/editor/scintilla/LexVHDL.cxx:
	* plugins/editor/scintilla/LexVerilog.cxx:
	* plugins/editor/scintilla/LexYAML.cxx:
	* plugins/editor/scintilla/LineMarker.cxx:
	* plugins/editor/scintilla/LineMarker.h:
	* plugins/editor/scintilla/Makefile.am:
	* plugins/editor/scintilla/Partitioning.h:
	* plugins/editor/scintilla/PlatGTK.cxx:
	* plugins/editor/scintilla/PositionCache.cxx:
	* plugins/editor/scintilla/PositionCache.h:
	* plugins/editor/scintilla/PropSet.cxx:
	* plugins/editor/scintilla/README.sync:
	* plugins/editor/scintilla/RESearch.cxx:
	* plugins/editor/scintilla/RESearch.h:
	* plugins/editor/scintilla/RunStyles.cxx:
	* plugins/editor/scintilla/RunStyles.h:
	* plugins/editor/scintilla/SVector.h:
	* plugins/editor/scintilla/ScintillaBase.cxx:
	* plugins/editor/scintilla/ScintillaBase.h:
	* plugins/editor/scintilla/ScintillaGTK.cxx:
	* plugins/editor/scintilla/SplitVector.h:
	* plugins/editor/scintilla/Style.cxx:
	* plugins/editor/scintilla/Style.h:
	* plugins/editor/scintilla/StyleContext.cxx:
	* plugins/editor/scintilla/StyleContext.h:
	* plugins/editor/scintilla/UniConversion.cxx:
	* plugins/editor/scintilla/UniConversion.h:
	* plugins/editor/scintilla/ViewStyle.cxx:
	* plugins/editor/scintilla/ViewStyle.h:
	* plugins/editor/scintilla/WindowAccessor.cxx:
	* plugins/editor/scintilla/XPM.cxx:
	* plugins/editor/scintilla/XPM.h:
	* plugins/editor/scintilla/include/.cvsignore:
	* plugins/editor/scintilla/include/Accessor.h:
	* plugins/editor/scintilla/include/Face.py:
	* plugins/editor/scintilla/include/HFacer.py:
	* plugins/editor/scintilla/include/KeyWords.h:
	* plugins/editor/scintilla/include/Makefile.am:
	* plugins/editor/scintilla/include/Platform.h:
	* plugins/editor/scintilla/include/PropSet.h:
	* plugins/editor/scintilla/include/SString.h:
	* plugins/editor/scintilla/include/SciLexer.h:
	* plugins/editor/scintilla/include/Scintilla.h:
	* plugins/editor/scintilla/include/Scintilla.iface:
	* plugins/editor/scintilla/include/ScintillaWidget.h:
	* plugins/editor/scintilla/include/WindowAccessor.h:
	* plugins/editor/scintilla/lexers.make:
	* plugins/editor/scintilla/patches/scintilla-64-bit.diff:
	* plugins/editor/scintilla/patches/scintilla-pango-always.diff:
	* plugins/editor/scintilla/patches/scintilla-string-fix.diff:
	* plugins/editor/scintilla/scintilla-marshal.c:
	* plugins/editor/scintilla/scintilla-marshal.h:
	* plugins/editor/scintilla/scintilla-marshal.list:
	* plugins/editor/scintilla/test-scintilla.cxx:
	* plugins/editor/scintilla/update-properties.pl:
	* plugins/editor/style-editor.c:
	* plugins/editor/style-editor.h:
	* plugins/editor/text-editor-iterable.c:
	* plugins/editor/text-editor-iterable.h:
	* plugins/editor/text_editor.c:
	* plugins/editor/text_editor.h:
	* plugins/editor/text_editor_cbs.c:
	* plugins/editor/text_editor_cbs.h:
	* plugins/editor/text_editor_prefs.c:
	* plugins/editor/text_editor_prefs.h:
	* plugins/gbf-am/gbf-am.plugin.in:
	* plugins/gbf-mkfile/gbf-mkfile.plugin.in:
	* plugins/scintilla/anjuta-editor.plugin.in:
	* plugins/sourceview/sourceview.plugin.in:
	* src/Makefile.am:

  Reenabled scintilla by default and moved it from
  plugins/editor to plugins/scintilla. Also updated the
  plugin descriptions


Added:
   trunk/plugins/scintilla/   (props changed)
      - copied from r4619, /trunk/plugins/editor/
Removed:
   trunk/plugins/editor/
Modified:
   trunk/ChangeLog
   trunk/INSTALL
   trunk/configure.in
   trunk/plugins/Makefile.am
   trunk/plugins/gbf-am/gbf-am.plugin.in
   trunk/plugins/gbf-mkfile/gbf-mkfile.plugin.in
   trunk/plugins/scintilla/anjuta-editor.plugin.in
   trunk/plugins/sourceview/sourceview.plugin.in
   trunk/src/Makefile.am

Modified: trunk/INSTALL
==============================================================================
--- trunk/INSTALL	(original)
+++ trunk/INSTALL	Tue Jan 20 21:53:35 2009
@@ -1,8 +1,8 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006, 2007 Free Software Foundation, Inc.
 
 This file is free documentation; the Free Software Foundation gives
 unlimited permission to copy, distribute and modify it.
@@ -10,7 +10,10 @@
 Basic Installation
 ==================
 
-These are generic installation instructions.
+Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package.  The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
 
    The `configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
@@ -23,9 +26,9 @@
 
    It can also use an optional file (typically called `config.cache'
 and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  (Caching is
+the results of its tests to speed up reconfiguring.  Caching is
 disabled by default to prevent problems with accidental use of stale
-cache files.)
+cache files.
 
    If you need to do unusual things to compile the package, please try
 to figure out how `configure' could check whether to do them, and mail
@@ -35,20 +38,17 @@
 may remove or edit it.
 
    The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
+`configure' by a program called `autoconf'.  You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
 
 The simplest way to compile this package is:
 
   1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.  If you're
-     using `csh' on an old version of System V, you might need to type
-     `sh ./configure' instead to prevent `csh' from trying to execute
-     `configure' itself.
+     `./configure' to configure the package for your system.
 
-     Running `configure' takes awhile.  While running, it prints some
-     messages telling which features it is checking for.
+     Running `configure' might take a while.  While running, it prints
+     some messages telling which features it is checking for.
 
   2. Type `make' to compile the package.
 
@@ -67,6 +67,9 @@
      all sorts of other programs in order to regenerate files that came
      with the distribution.
 
+  6. Often, you can also type `make uninstall' to remove the installed
+     files again.
+
 Compilers and Options
 =====================
 
@@ -78,7 +81,7 @@
 by setting variables in the command line or in the environment.  Here
 is an example:
 
-     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
 
    *Note Defining Variables::, for more details.
 
@@ -87,17 +90,15 @@
 
 You can compile the package for more than one kind of computer at the
 same time, by placing the object files for each architecture in their
-own directory.  To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'.  `cd' to the
+own directory.  To do this, you can use GNU `make'.  `cd' to the
 directory where you want the object files and executables to go and run
 the `configure' script.  `configure' automatically checks for the
 source code in the directory that `configure' is in and in `..'.
 
-   If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory.  After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
+   With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory.  After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
 
 Installation Names
 ==================
@@ -190,12 +191,12 @@
      ./configure CC=/usr/local2/bin/gcc
 
 causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).  Here is a another example:
+overridden in the site shell script).
 
-     /bin/bash ./configure CONFIG_SHELL=/bin/bash
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug.  Until the bug is fixed you can use this workaround:
 
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-configuration-related scripts to be executed by `/bin/bash'.
+     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
 
 `configure' Invocation
 ======================

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Jan 20 21:53:35 2009
@@ -352,14 +352,14 @@
 dnl -------------------------------------------------------------
 
 AC_ARG_ENABLE(plugin-scintilla,
-	AC_HELP_STRING([--enable-plugin-scintilla],[Enable Scintilla based editor in Anjuta]), 
+	AC_HELP_STRING([--disable-plugin-scintilla],[ Scintilla based editor in Anjuta]), 
 	[ if test "$enableval" = "yes"; then
-		user_enabled_scintilla=1
+		user_disabled_scintilla=1
 	  fi ],
-	[ user_enabled_scintilla=0 ])
+	[ user_disabled_scintilla=0 ])
 
 AC_MSG_CHECKING(if scintilla plugin is disabled)
-if test "$user_enabled_scintilla" = 0; then
+if test "$user_disabled_scintilla" = 1; then
 	AC_MSG_RESULT(yes)
 	scintilla="no"
 else
@@ -938,10 +938,10 @@
 plugins/class-gen/Makefile
 plugins/class-gen/templates/Makefile
 plugins/patch/Makefile
-plugins/editor/Makefile
-plugins/editor/scintilla/Makefile
-plugins/editor/scintilla/include/Makefile
-plugins/editor/properties/Makefile
+plugins/scintilla/Makefile
+plugins/scintilla/scintilla/Makefile
+plugins/scintilla/scintilla/include/Makefile
+plugins/scintilla/properties/Makefile
 plugins/document-manager/Makefile
 plugins/document-manager/images/Makefile
 plugins/search/Makefile

Modified: trunk/plugins/Makefile.am
==============================================================================
--- trunk/plugins/Makefile.am	(original)
+++ trunk/plugins/Makefile.am	Tue Jan 20 21:53:35 2009
@@ -3,7 +3,7 @@
 SUBDIRS = . \
 	gtodo \
 	message-view \
-	editor \
+	scintilla \
 	gdb \
 	debug-manager \
 	file-manager \

Modified: trunk/plugins/gbf-am/gbf-am.plugin.in
==============================================================================
--- trunk/plugins/gbf-am/gbf-am.plugin.in	(original)
+++ trunk/plugins/gbf-am/gbf-am.plugin.in	Tue Jan 20 21:53:35 2009
@@ -3,9 +3,9 @@
 _Description=Autotools backend for project manager
 Location=gbf-am:GbfAmPlugin
 Icon=gbf-am-plugin-48.png
-UserActivatable=no
 Interfaces=IAnjutaProjectBackend
 Dependencies=anjuta-project-manager:ProjectManagerPlugin
+UserActivatable=no
 
 [Project]
 Supported-Project-Types=automake

Modified: trunk/plugins/gbf-mkfile/gbf-mkfile.plugin.in
==============================================================================
--- trunk/plugins/gbf-mkfile/gbf-mkfile.plugin.in	(original)
+++ trunk/plugins/gbf-mkfile/gbf-mkfile.plugin.in	Tue Jan 20 21:53:35 2009
@@ -3,9 +3,9 @@
 _Description=Makefile backend for project manager
 Location=gbf-mkfile:GbfMkfilePlugin
 Icon=gbf-mkfile-plugin-48.png
-UserActivatable=no
 Interfaces=IAnjutaProjectBackend
 Dependencies=anjuta-project-manager:ProjectManagerPlugin
+UserActivatable=no
 
 [Project]
 Supported-Project-Types=make

Modified: trunk/plugins/scintilla/anjuta-editor.plugin.in
==============================================================================
--- /trunk/plugins/editor/anjuta-editor.plugin.in	(original)
+++ trunk/plugins/scintilla/anjuta-editor.plugin.in	Tue Jan 20 21:53:35 2009
@@ -1,6 +1,6 @@
 [Anjuta Plugin]
 _Name=Scintilla Editor
-_Description=Scintilla based component for editing files
+_Description=An alternate editor based on Scintilla
 Location=anjuta-editor:EditorPlugin
 Version=0.1
 Icon=anjuta-editor-scintilla-plugin-48.png

Modified: trunk/plugins/sourceview/sourceview.plugin.in
==============================================================================
--- trunk/plugins/sourceview/sourceview.plugin.in	(original)
+++ trunk/plugins/sourceview/sourceview.plugin.in	Tue Jan 20 21:53:35 2009
@@ -2,6 +2,6 @@
 Location=anjuta-sourceview:SourceviewPlugin
 Icon=anjuta-editor-sourceview-plugin-48.png
 _Name=GtkSourceview editor
-_Description=An alternate editor based on GtkSourceview
+_Description=The default editor based on GtkSourceview
 Interfaces=IAnjutaEditorFactory
 UserActivatable=no

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Tue Jan 20 21:53:35 2009
@@ -30,7 +30,7 @@
 	-DG_LOG_DOMAIN=\"Anjuta\"
 
 
-include $(top_srcdir)/plugins/editor/scintilla/lexers.make
+include $(top_srcdir)/plugins/scintilla/scintilla/lexers.make
 
 bin_PROGRAMS = anjuta
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]