[geany/geany] 3d2e7d: Move TM into src
Jiří Techet
git-noreply at xxxxx
Thu Jul 21 11:08:42 UTC 2016
Branch: refs/heads/master
Author: Jiří Techet <techet at gmail.com>
Committer: Jiří Techet <techet at gmail.com>
Date: Thu, 21 Jul 2016 11:08:42 UTC
Commit: 3d2e7d4fcacf39c5331af5d226a5e0037b880c52
https://github.com/geany/geany/commit/3d2e7d4fcacf39c5331af5d226a5e0037b880c52
Log Message:
-----------
Move TM into src
Move the tag manager implementation to src as it really is part of Geany
sources and start making the ctags directory structure similar to
the universal-ctags one.
In principle, the patch does
mv tagmanager/src src/tagmanager
mv tagmanager/ctags tagmanager/main
mv tagmanager ctags
plus corresponding Makefile.am and configure.ac updates.
Modified Paths:
--------------
Makefile.am
configure.ac
ctags/Makefile.am
ctags/main/Makefile.am
ctags/main/abaqus.c
ctags/main/abc.c
ctags/main/actionscript.c
ctags/main/args.c
ctags/main/args.h
ctags/main/asciidoc.c
ctags/main/asm.c
ctags/main/basic.c
ctags/main/c.c
ctags/main/cobol.c
ctags/main/conf.c
ctags/main/css.c
ctags/main/ctags.c
ctags/main/ctags.h
ctags/main/diff.c
ctags/main/docbook.c
ctags/main/entry.c
ctags/main/entry.h
ctags/main/erlang.c
ctags/main/fortran.c
ctags/main/general.h
ctags/main/get.c
ctags/main/get.h
ctags/main/go.c
ctags/main/haskell.c
ctags/main/haxe.c
ctags/main/html.c
ctags/main/js.c
ctags/main/json.c
ctags/main/keyword.c
ctags/main/keyword.h
ctags/main/latex.c
ctags/main/lregex.c
ctags/main/lua.c
ctags/main/main.h
ctags/main/make.c
ctags/main/makefile.win32
ctags/main/markdown.c
ctags/main/matlab.c
ctags/main/nestlevel.c
ctags/main/nestlevel.h
ctags/main/nsis.c
ctags/main/objc.c
ctags/main/options.c
ctags/main/options.h
ctags/main/parse.c
ctags/main/parse.h
ctags/main/parsers.h
ctags/main/pascal.c
ctags/main/perl.c
ctags/main/php.c
ctags/main/powershell.c
ctags/main/python.c
ctags/main/r.c
ctags/main/read.c
ctags/main/read.h
ctags/main/rest.c
ctags/main/ruby.c
ctags/main/rust.c
ctags/main/sh.c
ctags/main/sort.c
ctags/main/sort.h
ctags/main/sql.c
ctags/main/strlist.c
ctags/main/strlist.h
ctags/main/tcl.c
ctags/main/txt2tags.c
ctags/main/verilog.c
ctags/main/vhdl.c
ctags/main/vstring.c
ctags/main/vstring.h
ctags/mio/COPYING
ctags/mio/Makefile.am
ctags/mio/README
ctags/mio/makefile.win32
ctags/mio/mio-file.c
ctags/mio/mio-memory.c
ctags/mio/mio.c
ctags/mio/mio.h
plugins/Makefile.am
src/Makefile.am
src/tagmanager/Makefile.am
src/tagmanager/makefile.win32
src/tagmanager/tm_ctags_wrappers.c
src/tagmanager/tm_ctags_wrappers.h
src/tagmanager/tm_parser.c
src/tagmanager/tm_parser.h
src/tagmanager/tm_source_file.c
src/tagmanager/tm_source_file.h
src/tagmanager/tm_tag.c
src/tagmanager/tm_tag.h
src/tagmanager/tm_workspace.c
src/tagmanager/tm_workspace.h
Modified: Makefile.am
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-SUBDIRS = tagmanager scintilla src plugins icons po doc data tests
+SUBDIRS = ctags scintilla src plugins icons po doc data tests
AUTOMAKE_OPTIONS = 1.7
Modified: configure.ac
8 lines changed, 4 insertions(+), 4 deletions(-)
===================================================================
@@ -147,13 +147,13 @@ AC_CONFIG_FILES([
icons/tango/32x32/Makefile
icons/tango/48x48/Makefile
icons/tango/scalable/Makefile
- tagmanager/Makefile
- tagmanager/ctags/Makefile
- tagmanager/mio/Makefile
- tagmanager/src/Makefile
+ ctags/Makefile
+ ctags/main/Makefile
+ ctags/mio/Makefile
scintilla/Makefile
scintilla/include/Makefile
src/Makefile
+ src/tagmanager/Makefile
plugins/Makefile
po/Makefile.in
data/Makefile
Modified: ctags/Makefile.am
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -1,3 +1,3 @@
## Process this file with automake to produce Makefile.in
-SUBDIRS = mio ctags src
+SUBDIRS = mio main
Modified: ctags/main/Makefile.am
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/abaqus.c
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/abc.c
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/actionscript.c
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/args.c
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/args.h
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/asciidoc.c
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/asm.c
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/basic.c
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/c.c
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/cobol.c
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/conf.c
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/css.c
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/ctags.c
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/ctags.h
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/diff.c
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/docbook.c
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/entry.c
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/entry.h
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/erlang.c
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/fortran.c
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/general.h
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/get.c
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/get.h
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/go.c
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/haskell.c
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/haxe.c
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/html.c
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/js.c
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/json.c
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/keyword.c
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/keyword.h
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/latex.c
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/lregex.c
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/lua.c
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/main.h
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/make.c
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/makefile.win32
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/markdown.c
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/matlab.c
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/nestlevel.c
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/nestlevel.h
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/nsis.c
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/objc.c
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/options.c
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/options.h
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/parse.c
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/parse.h
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/parsers.h
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/pascal.c
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/perl.c
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/php.c
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/powershell.c
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/python.c
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/r.c
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/read.c
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/read.h
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/rest.c
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/ruby.c
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/rust.c
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/sh.c
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/sort.c
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/sort.h
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/sql.c
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/strlist.c
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/strlist.h
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/tcl.c
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/txt2tags.c
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/verilog.c
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/vhdl.c
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/vstring.c
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/vstring.h
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/mio/COPYING
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/mio/Makefile.am
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/mio/README
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/mio/makefile.win32
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/mio/mio-file.c
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/mio/mio-memory.c
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/mio/mio.c
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/mio/mio.h
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: plugins/Makefile.am
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -74,7 +74,7 @@ endif
AM_CPPFLAGS += \
-DGTK \
-I$(top_srcdir)/src \
- -I$(top_srcdir)/tagmanager/src \
+ -I$(top_srcdir)/src/tagmanager \
-I$(top_srcdir)/scintilla/include \
$(GTK_CFLAGS) \
$(PLUGIN_CFLAGS)
Modified: src/Makefile.am
5 lines changed, 3 insertions(+), 2 deletions(-)
===================================================================
@@ -1,5 +1,6 @@
## Process this file with automake to produce Makefile.in
+SUBDIRS = tagmanager
EXTRA_DIST = \
gb.c \
@@ -15,7 +16,7 @@ EXTRA_DIST = \
AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/scintilla/include \
- -I$(top_srcdir)/tagmanager/src \
+ -I$(srcdir)/tagmanager \
-DGTK \
-DGEANY_PRIVATE \
-DG_LOG_DOMAIN=\""Geany"\" \
@@ -120,7 +121,7 @@ libgeany_la_LDFLAGS = @LIBGEANY_LDFLAGS@
libgeany_la_LIBADD = \
$(top_builddir)/scintilla/libscintilla.la \
- $(top_builddir)/tagmanager/src/libtagmanager.la \
+ $(builddir)/tagmanager/libtagmanager.la \
@GTK_LIBS@ \
@GTHREAD_LIBS@ \
$(MAC_INTEGRATION_LIBS) \
Modified: src/tagmanager/Makefile.am
6 lines changed, 3 insertions(+), 3 deletions(-)
===================================================================
@@ -1,7 +1,7 @@
AM_CPPFLAGS = \
-I$(srcdir) \
- -I$(srcdir)/.. \
- -I$(srcdir)/../ctags \
+ -I$(top_srcdir)/ctags \
+ -I$(top_srcdir)/ctags/main \
-DGEANY_PRIVATE \
-DG_LOG_DOMAIN=\"Tagmanager\"
AM_CFLAGS = \
@@ -33,4 +33,4 @@ libtagmanager_la_SOURCES =\
tm_ctags_wrappers.h \
tm_ctags_wrappers.c
-libtagmanager_la_LIBADD = ../ctags/libctags.la $(GTK_LIBS)
+libtagmanager_la_LIBADD = $(top_builddir)/ctags/main/libctags.la $(GTK_LIBS)
Modified: src/tagmanager/makefile.win32
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: src/tagmanager/tm_ctags_wrappers.c
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: src/tagmanager/tm_ctags_wrappers.h
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: src/tagmanager/tm_parser.c
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: src/tagmanager/tm_parser.h
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: src/tagmanager/tm_source_file.c
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: src/tagmanager/tm_source_file.h
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: src/tagmanager/tm_tag.c
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: src/tagmanager/tm_tag.h
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: src/tagmanager/tm_workspace.c
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: src/tagmanager/tm_workspace.h
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
More information about the Commits
mailing list