Branch: refs/heads/master Author: Colomban Wendling ban@herbesfolles.org Committer: Colomban Wendling ban@herbesfolles.org Date: Tue, 08 May 2012 21:01:23 Commit: d69a153bb440bf5e27db6851fa291555be5f9d4b https://github.com/geany/geany/commit/d69a153bb440bf5e27db6851fa291555be5f9d...
Log Message: ----------- Refactor tagmanager source files architecture
Split ctags and tagmanager sources, as follows:
tagmanager/ctags: the parsers, more or less upstream CTags; tagmanager/mio: local MIO library copy; tagmanager/src: actual tagmanager sources.
Modified Paths: -------------- configure.ac plugins/Makefile.am src/Makefile.am tagmanager/Makefile.am tagmanager/ctags/Makefile.am tagmanager/ctags/abc.c tagmanager/ctags/actionscript.c tagmanager/ctags/args.c tagmanager/ctags/args.h tagmanager/ctags/asm.c tagmanager/ctags/basic.c tagmanager/ctags/c.c tagmanager/ctags/cobol.c tagmanager/ctags/conf.c tagmanager/ctags/css.c tagmanager/ctags/ctags.c tagmanager/ctags/ctags.h tagmanager/ctags/diff.c tagmanager/ctags/docbook.c tagmanager/ctags/entry.c tagmanager/ctags/entry.h tagmanager/ctags/fortran.c tagmanager/ctags/general.h tagmanager/ctags/get.c tagmanager/ctags/get.h tagmanager/ctags/haskell.c tagmanager/ctags/haxe.c tagmanager/ctags/html.c tagmanager/ctags/js.c tagmanager/ctags/keyword.c tagmanager/ctags/keyword.h tagmanager/ctags/latex.c tagmanager/ctags/lregex.c tagmanager/ctags/lua.c tagmanager/ctags/main.h tagmanager/ctags/make.c tagmanager/ctags/markdown.c tagmanager/ctags/matlab.c tagmanager/ctags/nestlevel.c tagmanager/ctags/nestlevel.h tagmanager/ctags/nsis.c tagmanager/ctags/objc.c tagmanager/ctags/options.c tagmanager/ctags/options.h tagmanager/ctags/parse.c tagmanager/ctags/parse.h tagmanager/ctags/parsers.h tagmanager/ctags/pascal.c tagmanager/ctags/perl.c tagmanager/ctags/php.c tagmanager/ctags/python.c tagmanager/ctags/r.c tagmanager/ctags/read.c tagmanager/ctags/read.h tagmanager/ctags/rest.c tagmanager/ctags/ruby.c tagmanager/ctags/sh.c tagmanager/ctags/sort.c tagmanager/ctags/sort.h tagmanager/ctags/sql.c tagmanager/ctags/strlist.c tagmanager/ctags/strlist.h tagmanager/ctags/tcl.c tagmanager/ctags/txt2tags.c tagmanager/ctags/verilog.c tagmanager/ctags/vhdl.c tagmanager/ctags/vstring.c tagmanager/ctags/vstring.h tagmanager/include/Makefile.am tagmanager/mio/Makefile.am tagmanager/src/Makefile.am tagmanager/src/tm_file_entry.c tagmanager/src/tm_file_entry.h tagmanager/src/tm_project.c tagmanager/src/tm_project.h tagmanager/src/tm_source_file.c tagmanager/src/tm_source_file.h tagmanager/src/tm_symbol.c tagmanager/src/tm_symbol.h tagmanager/src/tm_tag.c tagmanager/src/tm_tag.h tagmanager/src/tm_tagmanager.c tagmanager/src/tm_tagmanager.h tagmanager/src/tm_work_object.c tagmanager/src/tm_work_object.h tagmanager/src/tm_workspace.c tagmanager/src/tm_workspace.h
Modified: configure.ac 3 files changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -105,8 +105,9 @@ AC_CONFIG_FILES([ icons/48x48/Makefile icons/scalable/Makefile tagmanager/Makefile - tagmanager/include/Makefile + tagmanager/ctags/Makefile tagmanager/mio/Makefile + tagmanager/src/Makefile scintilla/Makefile scintilla/include/Makefile src/Makefile
Modified: plugins/Makefile.am 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -38,7 +38,7 @@ MINGW_CFLAGS = \ -DGTK \ -I$(top_srcdir) \ -I$(top_srcdir)/src \ - -I$(top_srcdir)/tagmanager/include \ + -I$(top_srcdir)/tagmanager/src \ -I$(top_srcdir)/scintilla/include \ $(GTK_CFLAGS) \ $(PLUGIN_CFLAGS) @@ -106,7 +106,7 @@ AM_CPPFLAGS = \ -DDATADIR="$(datadir)" \ -DGTK \ -I$(top_srcdir)/src \ - -I$(top_srcdir)/tagmanager/include \ + -I$(top_srcdir)/tagmanager/src \ -I$(top_srcdir)/scintilla/include \ $(GTK_CFLAGS) \ $(PLUGIN_CFLAGS)
Modified: src/Makefile.am 30 files changed, 23 insertions(+), 7 deletions(-) =================================================================== @@ -74,8 +74,11 @@ geany_include_HEADERS = \ utils.h
-INCLUDES = -I$(top_srcdir) -I$(srcdir)/../scintilla/include -I$(srcdir)/../tagmanager/include \ - -I$(topsrcdir)/tagmanager/mio @GTK_CFLAGS@ @GTHREAD_CFLAGS@ +INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/scintilla/include \ + -I$(top_srcdir)/tagmanager/src \ + @GTK_CFLAGS@ @GTHREAD_CFLAGS@
# tell automake we have a C++ file so it uses the C++ linker we need for Scintilla nodist_EXTRA_geany_SOURCES = dummy.cxx @@ -86,9 +89,16 @@ if MINGW
geany_SOURCES = $(SRCS) win32.c win32.h
-geany_LDADD = ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a ../tagmanager/mio/libmio.a \ - @GTK_LIBS@ @GTHREAD_LIBS@ $(INTLLIBS) -lole32 -luuid -liberty -lwsock32 \ - geany_private.res +geany_LDADD = \ + $(top_builddir)/scintilla/libscintilla.a \ + $(top_builddir)/tagmanager/ctags/libctags.a \ + $(top_builddir)/tagmanager/mio/libmio.a \ + $(top_builddir)/tagmanager/src/libtagmanager.a \ + @GTK_LIBS@ \ + @GTHREAD_LIBS@ \ + $(INTLLIBS) \ + -lole32 -luuid -liberty -lwsock32 \ + geany_private.res
AM_CFLAGS = -DGEANY_DATADIR="data" \ -DGEANY_DOCDIR="" \ @@ -114,8 +124,14 @@ else
geany_SOURCES = $(SRCS) vte.c vte.h
-geany_LDADD = ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a ../tagmanager/mio/libmio.a \ - @GTK_LIBS@ @GTHREAD_LIBS@ $(INTLLIBS) +geany_LDADD = \ + $(top_builddir)/scintilla/libscintilla.a \ + $(top_builddir)/tagmanager/ctags/libctags.a \ + $(top_builddir)/tagmanager/mio/libmio.a \ + $(top_builddir)/tagmanager/src/libtagmanager.a \ + @GTK_LIBS@ \ + @GTHREAD_LIBS@ \ + $(INTLLIBS)
AM_CFLAGS = -DGEANY_DATADIR=""$(datadir)"" \ -DGEANY_DOCDIR=""$(docdir)"" \
Modified: tagmanager/Makefile.am 83 files changed, 2 insertions(+), 81 deletions(-) =================================================================== @@ -1,85 +1,6 @@ ## Process this file with automake to produce Makefile.in
-SUBDIRS = mio include -INCLUDES = -I$(srcdir)/include $(GTK_CFLAGS) -I$(srcdir)/mio -I$(srcdir) +SUBDIRS = ctags mio src
-AM_CFLAGS = -DG_LOG_DOMAIN=""Tagmanager"" - -EXTRA_DIST =\ +EXTRA_DIST = \ makefile.win32 - -noinst_LIBRARIES = libtagmanager.a - -libtagmanager_a_SOURCES =\ - general.h\ - keyword.h\ - parsers.h\ - sort.h\ - vstring.h\ - ctags.h\ - entry.h\ - get.h\ - main.h\ - nestlevel.h\ - read.h\ - parse.h\ - strlist.h\ - args.c\ - args.h\ - abc.c\ - basic.c\ - c.c\ - cobol.c\ - conf.c\ - css.c\ - diff.c\ - docbook.c\ - fortran.c\ - haskell.c\ - haxe.c\ - html.c\ - js.c\ - lua.c\ - make.c\ - asm.c\ - latex.c\ - lregex.c\ - matlab.c\ - markdown.c\ - objc.c\ - pascal.c\ - perl.c\ - rest.c\ - ruby.c\ - sql.c\ - php.c\ - python.c\ - tcl.c\ - sh.c\ - txt2tags.c\ - vhdl.c\ - verilog.c\ - actionscript.c\ - nsis.c\ - r.c \ - ctags.c\ - entry.c\ - get.c\ - keyword.c\ - nestlevel.c\ - options.h\ - options.c\ - parse.c\ - read.c\ - sort.c\ - strlist.c\ - vstring.c\ - tm_workspace.c\ - tm_work_object.c\ - tm_source_file.c\ - tm_project.c\ - tm_tag.c\ - tm_symbol.c\ - tm_file_entry.c\ - tm_tagmanager.c -
Modified: tagmanager/ctags/Makefile.am 80 files changed, 80 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,80 @@ +AM_CPPFLAGS = \ + -I$(srcdir) \ + -I$(srcdir)/.. \ + -DG_LOG_DOMAIN="CTags" +AM_CFLAGS = \ + $(GTK_CFLAGS) + +EXTRA_DIST = \ + makefile.win32 + +noinst_LIBRARIES = libctags.a + +parsers = \ + abc.c \ + actionscript.c \ + asm.c \ + basic.c \ + c.c \ + cobol.c \ + conf.c \ + css.c \ + diff.c \ + docbook.c \ + fortran.c \ + haskell.c \ + haxe.c \ + html.c \ + js.c \ + latex.c \ + lregex.c \ + lua.c \ + make.c \ + markdown.c \ + matlab.c \ + nsis.c \ + objc.c \ + pascal.c \ + perl.c \ + php.c \ + python.c \ + r.c \ + rest.c \ + ruby.c \ + sh.c \ + sql.c \ + tcl.c \ + txt2tags.c \ + verilog.c \ + vhdl.c + +libctags_a_SOURCES = \ + args.c \ + args.h \ + ctags.c \ + ctags.h \ + entry.c \ + entry.h \ + general.h \ + get.c \ + get.h \ + keyword.c \ + keyword.h \ + main.h \ + nestlevel.c \ + nestlevel.h \ + options.c \ + options.h \ + parse.c \ + parse.h \ + parsers.h \ + read.c \ + read.h \ + sort.c \ + sort.h \ + strlist.c \ + strlist.h \ + vstring.c \ + vstring.h \ + $(parsers) +
Modified: tagmanager/ctags/abc.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/ctags/actionscript.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/ctags/args.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/ctags/args.h 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/ctags/asm.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/ctags/basic.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/ctags/c.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/ctags/cobol.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/ctags/conf.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/ctags/css.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/ctags/ctags.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/ctags/ctags.h 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/ctags/diff.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/ctags/docbook.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/ctags/entry.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/ctags/entry.h 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/ctags/fortran.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/ctags/general.h 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/ctags/get.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/ctags/get.h 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/ctags/haskell.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/ctags/haxe.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/ctags/html.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/ctags/js.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/ctags/keyword.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/ctags/keyword.h 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/ctags/latex.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/ctags/lregex.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/ctags/lua.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/ctags/main.h 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/ctags/make.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/ctags/markdown.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/ctags/matlab.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/ctags/nestlevel.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/ctags/nestlevel.h 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/ctags/nsis.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/ctags/objc.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/ctags/options.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/ctags/options.h 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/ctags/parse.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/ctags/parse.h 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/ctags/parsers.h 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/ctags/pascal.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/ctags/perl.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/ctags/php.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/ctags/python.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/ctags/r.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/ctags/read.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/ctags/read.h 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/ctags/rest.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/ctags/ruby.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/ctags/sh.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/ctags/sort.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/ctags/sort.h 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/ctags/sql.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/ctags/strlist.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/ctags/strlist.h 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/ctags/tcl.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/ctags/txt2tags.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/ctags/verilog.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/ctags/vhdl.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/ctags/vstring.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/ctags/vstring.h 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/include/Makefile.am 10 files changed, 0 insertions(+), 10 deletions(-) =================================================================== @@ -1,10 +0,0 @@ -tagmanager_includedir = $(includedir)/geany/tagmanager -tagmanager_include_HEADERS = \ - tm_project.h \ - tm_source_file.h \ - tm_tag.h \ - tm_work_object.h \ - tm_workspace.h \ - tm_symbol.h \ - tm_tagmanager.h \ - tm_file_entry.h
Modified: tagmanager/mio/Makefile.am 2 files changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -1,5 +1,3 @@ -# $id$ - noinst_LIBRARIES = libmio.a
AM_CPPFLAGS = -DG_LOG_DOMAIN="MIO" #-DMIO_DEBUG
Modified: tagmanager/src/Makefile.am 34 files changed, 34 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,34 @@ +AM_CPPFLAGS = \ + -I$(srcdir) \ + -I$(srcdir)/.. \ + -I$(srcdir)/../ctags \ + -DG_LOG_DOMAIN="Tagmanager" +AM_CFLAGS = \ + $(GTK_CFLAGS) + +EXTRA_DIST = \ + makefile.win32 + +noinst_LIBRARIES = libtagmanager.a + +tagmanager_includedir = $(includedir)/geany/tagmanager +tagmanager_include_HEADERS = \ + tm_file_entry.h \ + tm_project.h \ + tm_source_file.h \ + tm_symbol.h \ + tm_tag.h \ + tm_tagmanager.h \ + tm_work_object.h \ + tm_workspace.h + + +libtagmanager_a_SOURCES =\ + tm_file_entry.c \ + tm_project.c \ + tm_source_file.c \ + tm_symbol.c \ + tm_tag.c \ + tm_tagmanager.c \ + tm_work_object.c \ + tm_workspace.c
Modified: tagmanager/src/tm_file_entry.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/src/tm_file_entry.h 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/src/tm_project.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/src/tm_project.h 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/src/tm_source_file.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/src/tm_source_file.h 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/src/tm_symbol.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/src/tm_symbol.h 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/src/tm_tag.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/src/tm_tag.h 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/src/tm_tagmanager.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/src/tm_tagmanager.h 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/src/tm_work_object.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/src/tm_work_object.h 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/src/tm_workspace.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: tagmanager/src/tm_workspace.h 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
@@ Diff output truncated at 100000 characters. @@
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).