Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'tm/tree-refactoring'

This moves CTags files into their own subdirectory and moves the
tagmanager source and header files into their own subdirectory.

The bulk of the work was done by Colomban.
  • Loading branch information...
commit bfa2db50d6176083daf0b8d559ba3bd78ad77175 2 parents 40ab39d + c72dce0
@ntrel ntrel authored
Showing with 290 additions and 146 deletions.
  1. +2 −1  configure.ac
  2. +3 −3 doc/Doxyfile.in
  3. +5 −3 makefile.win32
  4. +2 −2 plugins/Makefile.am
  5. +1 −1  plugins/makefile.win32
  6. +23 −7 src/Makefile.am
  7. +3 −2 src/makefile.win32
  8. +1 −1  src/plugindata.h
  9. +1 −83 tagmanager/Makefile.am
  10. +80 −0 tagmanager/ctags/Makefile.am
  11. 0  tagmanager/{ → ctags}/abc.c
  12. 0  tagmanager/{ → ctags}/actionscript.c
  13. 0  tagmanager/{ → ctags}/args.c
  14. 0  tagmanager/{ → ctags}/args.h
  15. 0  tagmanager/{ → ctags}/asm.c
  16. 0  tagmanager/{ → ctags}/basic.c
  17. 0  tagmanager/{ → ctags}/c.c
  18. 0  tagmanager/{ → ctags}/cobol.c
  19. 0  tagmanager/{ → ctags}/conf.c
  20. 0  tagmanager/{ → ctags}/css.c
  21. 0  tagmanager/{ → ctags}/ctags.c
  22. 0  tagmanager/{ → ctags}/ctags.h
  23. 0  tagmanager/{ → ctags}/diff.c
  24. 0  tagmanager/{ → ctags}/docbook.c
  25. 0  tagmanager/{ → ctags}/entry.c
  26. 0  tagmanager/{ → ctags}/entry.h
  27. 0  tagmanager/{ → ctags}/fortran.c
  28. 0  tagmanager/{ → ctags}/general.h
  29. 0  tagmanager/{ → ctags}/get.c
  30. 0  tagmanager/{ → ctags}/get.h
  31. 0  tagmanager/{ → ctags}/haskell.c
  32. 0  tagmanager/{ → ctags}/haxe.c
  33. 0  tagmanager/{ → ctags}/html.c
  34. 0  tagmanager/{ → ctags}/js.c
  35. 0  tagmanager/{ → ctags}/keyword.c
  36. 0  tagmanager/{ → ctags}/keyword.h
  37. 0  tagmanager/{ → ctags}/latex.c
  38. 0  tagmanager/{ → ctags}/lregex.c
  39. 0  tagmanager/{ → ctags}/lua.c
  40. 0  tagmanager/{ → ctags}/main.h
  41. 0  tagmanager/{ → ctags}/make.c
  42. +4 −5 tagmanager/{ → ctags}/makefile.win32
  43. 0  tagmanager/{ → ctags}/markdown.c
  44. 0  tagmanager/{ → ctags}/matlab.c
  45. 0  tagmanager/{ → ctags}/nestlevel.c
  46. 0  tagmanager/{ → ctags}/nestlevel.h
  47. 0  tagmanager/{ → ctags}/nsis.c
  48. 0  tagmanager/{ → ctags}/objc.c
  49. 0  tagmanager/{ → ctags}/options.c
  50. 0  tagmanager/{ → ctags}/options.h
  51. 0  tagmanager/{ → ctags}/parse.c
  52. 0  tagmanager/{ → ctags}/parse.h
  53. 0  tagmanager/{ → ctags}/parsers.h
  54. 0  tagmanager/{ → ctags}/pascal.c
  55. 0  tagmanager/{ → ctags}/perl.c
  56. 0  tagmanager/{ → ctags}/php.c
  57. 0  tagmanager/{ → ctags}/python.c
  58. 0  tagmanager/{ → ctags}/r.c
  59. 0  tagmanager/{ → ctags}/read.c
  60. 0  tagmanager/{ → ctags}/read.h
  61. 0  tagmanager/{ → ctags}/rest.c
  62. 0  tagmanager/{ → ctags}/ruby.c
  63. 0  tagmanager/{ → ctags}/sh.c
  64. 0  tagmanager/{ → ctags}/sort.c
  65. 0  tagmanager/{ → ctags}/sort.h
  66. 0  tagmanager/{ → ctags}/sql.c
  67. 0  tagmanager/{ → ctags}/strlist.c
  68. 0  tagmanager/{ → ctags}/strlist.h
  69. 0  tagmanager/{ → ctags}/tcl.c
  70. 0  tagmanager/{ → ctags}/txt2tags.c
  71. 0  tagmanager/{ → ctags}/verilog.c
  72. 0  tagmanager/{ → ctags}/vhdl.c
  73. 0  tagmanager/{ → ctags}/vstring.c
  74. 0  tagmanager/{ → ctags}/vstring.h
  75. +0 −10 tagmanager/include/Makefile.am
  76. +0 −2  tagmanager/mio/Makefile.am
  77. +1 −1  tagmanager/mio/makefile.win32
  78. +34 −0 tagmanager/src/Makefile.am
  79. +52 −0 tagmanager/src/makefile.win32
  80. 0  tagmanager/{ → src}/tm_file_entry.c
  81. 0  tagmanager/{include → src}/tm_file_entry.h
  82. 0  tagmanager/{ → src}/tm_project.c
  83. 0  tagmanager/{include → src}/tm_project.h
  84. 0  tagmanager/{ → src}/tm_source_file.c
  85. 0  tagmanager/{include → src}/tm_source_file.h
  86. 0  tagmanager/{ → src}/tm_symbol.c
  87. 0  tagmanager/{include → src}/tm_symbol.h
  88. 0  tagmanager/{ → src}/tm_tag.c
  89. 0  tagmanager/{include → src}/tm_tag.h
  90. 0  tagmanager/{ → src}/tm_tagmanager.c
  91. 0  tagmanager/{include → src}/tm_tagmanager.h
  92. 0  tagmanager/{ → src}/tm_work_object.c
  93. 0  tagmanager/{include → src}/tm_work_object.h
  94. 0  tagmanager/{ → src}/tm_workspace.c
  95. 0  tagmanager/{include → src}/tm_workspace.h
  96. +78 −25 wscript
View
3  configure.ac
@@ -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
View
6 doc/Doxyfile.in
@@ -96,9 +96,9 @@ WARN_LOGFILE =
#---------------------------------------------------------------------------
INPUT = ../src/ ./ \
../plugins/geanyplugin.h ../plugins/geanyfunctions.h \
- ../tagmanager/tm_source_file.c ../tagmanager/include/tm_source_file.h \
- ../tagmanager/tm_work_object.c ../tagmanager/include/tm_work_object.h \
- ../tagmanager/tm_workspace.c ../tagmanager/include/tm_workspace.h
+ ../tagmanager/src/tm_source_file.c ../tagmanager/src/tm_source_file.h \
+ ../tagmanager/src/tm_work_object.c ../tagmanager/src/tm_work_object.h \
+ ../tagmanager/src/tm_workspace.c ../tagmanager/src/tm_workspace.h
INPUT_ENCODING = UTF-8
FILE_PATTERNS = *.c \
*.cc \
View
8 makefile.win32
@@ -26,8 +26,9 @@ DESTDIR = C:/Program Files/Geany
-include localwin32.mk
all: config.h
+ $(MAKE) -C tagmanager/ctags -f makefile.win32
$(MAKE) -C tagmanager/mio -f makefile.win32
- $(MAKE) -C tagmanager -f makefile.win32
+ $(MAKE) -C tagmanager/src -f makefile.win32
$(MAKE) -C scintilla -f makefile.win32
$(MAKE) -C plugins -f makefile.win32
$(MAKE) -C src -f makefile.win32
@@ -36,15 +37,16 @@ config.h: win32-config.h
$(CP) $< $@
deps:
- -$(RM) tagmanager/mio/deps.mak tagmanager/deps.mak scintilla/deps.mak plugins/deps.mak src/deps.mak
+ -$(RM) tagmanager/ctags/deps.mak tagmanager/mio/deps.mak tagmanager/src/deps.mak scintilla/deps.mak plugins/deps.mak src/deps.mak
# used by src/makefile.win32 to avoid del ../file which is an error
clean-local:
-$(RM) geany_private.res geany.exe
clean: deps
+ $(MAKE) -C tagmanager/ctags -f makefile.win32 clean
$(MAKE) -C tagmanager/mio -f makefile.win32 clean
- $(MAKE) -C tagmanager -f makefile.win32 clean
+ $(MAKE) -C tagmanager/src -f makefile.win32 clean
$(MAKE) -C scintilla -f makefile.win32 clean
$(MAKE) -C plugins -f makefile.win32 clean
$(MAKE) -C src -f makefile.win32 clean
View
4 plugins/Makefile.am
@@ -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)
View
2  plugins/makefile.win32
@@ -23,7 +23,7 @@ GTK_INCLUDES= \
INCLUDEDIRS= -I.. \
-I../src \
-I../scintilla/include \
- -I../tagmanager/include \
+ -I../tagmanager/src \
$(GTK_INCLUDES)
ALL_GTK_LIBS= \
View
30 src/Makefile.am
@@ -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)"\" \
View
5 src/makefile.win32
@@ -34,7 +34,7 @@ GTK_INCLUDES= \
INCLUDEDIRS= -I.. \
-I../scintilla/include \
-I../tagmanager/mio \
- -I../tagmanager/include \
+ -I../tagmanager/src \
$(GTK_INCLUDES)
ALL_GTK_LIBS= \
@@ -85,7 +85,8 @@ exec:
binclean:
$(RM) $(TARGET)
-STLIBS = ../scintilla/scintilla.a ../tagmanager/tagmanager.a ../tagmanager/mio/mio.a
+STLIBS = ../scintilla/scintilla.a ../tagmanager/ctags/ctags.a \
+ ../tagmanager/mio/mio.a ../tagmanager/src/tagmanager.a
$(TARGET): $(OBJS) $(RES) $(STLIBS)
$(CXX) $(OBJS) $(RES) -o $(TARGET) $(STLIBS) $(ALL_GTK_LIBS) $(WIN_LIBS)
View
2  src/plugindata.h
@@ -265,7 +265,7 @@ typedef struct GeanyFunctions
struct MsgWinFuncs *p_msgwindow;
struct EncodingFuncs *p_encodings; /**< See encodings.h */
struct KeybindingFuncs *p_keybindings; /**< See keybindings.h */
- struct TagManagerFuncs *p_tm; /**< See tagmanager/include */
+ struct TagManagerFuncs *p_tm; /**< See tagmanager/src */
struct SearchFuncs *p_search; /**< See search.h */
struct HighlightingFuncs *p_highlighting; /**< See highlighting.h */
struct FiletypeFuncs *p_filetypes; /**< See filetypes.h */
View
84 tagmanager/Makefile.am
@@ -1,85 +1,3 @@
## Process this file with automake to produce Makefile.in
-SUBDIRS = mio include
-INCLUDES = -I$(srcdir)/include $(GTK_CFLAGS) -I$(srcdir)/mio -I$(srcdir)
-
-AM_CFLAGS = -DG_LOG_DOMAIN=\""Tagmanager"\"
-
-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
-
+SUBDIRS = ctags mio src
View
80 tagmanager/ctags/Makefile.am
@@ -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)
+
View
0  tagmanager/abc.c → tagmanager/ctags/abc.c
File renamed without changes
View
0  tagmanager/actionscript.c → tagmanager/ctags/actionscript.c
File renamed without changes
View
0  tagmanager/args.c → tagmanager/ctags/args.c
File renamed without changes
View
0  tagmanager/args.h → tagmanager/ctags/args.h
File renamed without changes
View
0  tagmanager/asm.c → tagmanager/ctags/asm.c
File renamed without changes
View
0  tagmanager/basic.c → tagmanager/ctags/basic.c
File renamed without changes
View
0  tagmanager/c.c → tagmanager/ctags/c.c
File renamed without changes
View
0  tagmanager/cobol.c → tagmanager/ctags/cobol.c
File renamed without changes
View
0  tagmanager/conf.c → tagmanager/ctags/conf.c
File renamed without changes
View
0  tagmanager/css.c → tagmanager/ctags/css.c
File renamed without changes
View
0  tagmanager/ctags.c → tagmanager/ctags/ctags.c
File renamed without changes
View
0  tagmanager/ctags.h → tagmanager/ctags/ctags.h
File renamed without changes
View
0  tagmanager/diff.c → tagmanager/ctags/diff.c
File renamed without changes
View
0  tagmanager/docbook.c → tagmanager/ctags/docbook.c
File renamed without changes
View
0  tagmanager/entry.c → tagmanager/ctags/entry.c
File renamed without changes
View
0  tagmanager/entry.h → tagmanager/ctags/entry.h
File renamed without changes
View
0  tagmanager/fortran.c → tagmanager/ctags/fortran.c
File renamed without changes
View
0  tagmanager/general.h → tagmanager/ctags/general.h
File renamed without changes
View
0  tagmanager/get.c → tagmanager/ctags/get.c
File renamed without changes
View
0  tagmanager/get.h → tagmanager/ctags/get.h
File renamed without changes
View
0  tagmanager/haskell.c → tagmanager/ctags/haskell.c
File renamed without changes
View
0  tagmanager/haxe.c → tagmanager/ctags/haxe.c
File renamed without changes
View
0  tagmanager/html.c → tagmanager/ctags/html.c
File renamed without changes
View
0  tagmanager/js.c → tagmanager/ctags/js.c
File renamed without changes
View
0  tagmanager/keyword.c → tagmanager/ctags/keyword.c
File renamed without changes
View
0  tagmanager/keyword.h → tagmanager/ctags/keyword.h
File renamed without changes
View
0  tagmanager/latex.c → tagmanager/ctags/latex.c
File renamed without changes
View
0  tagmanager/lregex.c → tagmanager/ctags/lregex.c
File renamed without changes
View
0  tagmanager/lua.c → tagmanager/ctags/lua.c
File renamed without changes
View
0  tagmanager/main.h → tagmanager/ctags/main.h
File renamed without changes
View
0  tagmanager/make.c → tagmanager/ctags/make.c
File renamed without changes
View
9 tagmanager/makefile.win32 → tagmanager/ctags/makefile.win32
@@ -5,9 +5,9 @@ AR = ar
RANLIB = ranlib
PREFIX = C:/libs
RM = del
--include ../localwin32.mk
+-include ../../localwin32.mk
-COMPLIB=tagmanager.a
+COMPLIB=ctags.a
REGEX_DEFINES = -DHAVE_REGCOMP -DSTDC_HEADERS=1
@@ -23,7 +23,7 @@ GTK_INCLUDES= \
-I$(PREFIX)/include \
-I$(PREFIX)/include/gettext
-INCLUDEDIRS=-I include -I mio -I . $(GTK_INCLUDES)
+INCLUDEDIRS=-I ../ -I . $(GTK_INCLUDES)
CBASEFLAGS=-Wall -pipe -mms-bitfields -DPACKAGE=\"geany\" -Wno-missing-braces -Wno-char-subscripts $(INCLUDEDIRS)
ifdef DEBUG
@@ -45,8 +45,7 @@ actionscript.o nsis.o objc.o \
haskell.o haxe.o html.o python.o lregex.o rest.o sh.o ctags.o entry.o get.o keyword.o nestlevel.o \
options.o \
parse.o basic.o read.o sort.o strlist.o latex.o markdown.o matlab.o docbook.o tcl.o ruby.o asm.o sql.o txt2tags.o css.o \
-vstring.o tm_workspace.o tm_work_object.o tm_source_file.o tm_project.o tm_tag.o \
-tm_symbol.o tm_file_entry.o tm_tagmanager.o r.o
+vstring.o r.o
$(AR) rc $@ $^
$(RANLIB) $@
View
0  tagmanager/markdown.c → tagmanager/ctags/markdown.c
File renamed without changes
View
0  tagmanager/matlab.c → tagmanager/ctags/matlab.c
File renamed without changes
View
0  tagmanager/nestlevel.c → tagmanager/ctags/nestlevel.c
File renamed without changes
View
0  tagmanager/nestlevel.h → tagmanager/ctags/nestlevel.h
File renamed without changes
View
0  tagmanager/nsis.c → tagmanager/ctags/nsis.c
File renamed without changes
View
0  tagmanager/objc.c → tagmanager/ctags/objc.c
File renamed without changes
View
0  tagmanager/options.c → tagmanager/ctags/options.c
File renamed without changes
View
0  tagmanager/options.h → tagmanager/ctags/options.h
File renamed without changes
View
0  tagmanager/parse.c → tagmanager/ctags/parse.c
File renamed without changes
View
0  tagmanager/parse.h → tagmanager/ctags/parse.h
File renamed without changes
View
0  tagmanager/parsers.h → tagmanager/ctags/parsers.h
File renamed without changes
View
0  tagmanager/pascal.c → tagmanager/ctags/pascal.c
File renamed without changes
View
0  tagmanager/perl.c → tagmanager/ctags/perl.c
File renamed without changes
View
0  tagmanager/php.c → tagmanager/ctags/php.c
File renamed without changes
View
0  tagmanager/python.c → tagmanager/ctags/python.c
File renamed without changes
View
0  tagmanager/r.c → tagmanager/ctags/r.c
File renamed without changes
View
0  tagmanager/read.c → tagmanager/ctags/read.c
File renamed without changes
View
0  tagmanager/read.h → tagmanager/ctags/read.h
File renamed without changes
View
0  tagmanager/rest.c → tagmanager/ctags/rest.c
File renamed without changes
View
0  tagmanager/ruby.c → tagmanager/ctags/ruby.c
File renamed without changes
View
0  tagmanager/sh.c → tagmanager/ctags/sh.c
File renamed without changes
View
0  tagmanager/sort.c → tagmanager/ctags/sort.c
File renamed without changes
View
0  tagmanager/sort.h → tagmanager/ctags/sort.h
File renamed without changes
View
0  tagmanager/sql.c → tagmanager/ctags/sql.c
File renamed without changes
View
0  tagmanager/strlist.c → tagmanager/ctags/strlist.c
File renamed without changes
View
0  tagmanager/strlist.h → tagmanager/ctags/strlist.h
File renamed without changes
View
0  tagmanager/tcl.c → tagmanager/ctags/tcl.c
File renamed without changes
View
0  tagmanager/txt2tags.c → tagmanager/ctags/txt2tags.c
File renamed without changes
View
0  tagmanager/verilog.c → tagmanager/ctags/verilog.c
File renamed without changes
View
0  tagmanager/vhdl.c → tagmanager/ctags/vhdl.c
File renamed without changes
View
0  tagmanager/vstring.c → tagmanager/ctags/vstring.c
File renamed without changes
View
0  tagmanager/vstring.h → tagmanager/ctags/vstring.h
File renamed without changes
View
10 tagmanager/include/Makefile.am
@@ -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
View
2  tagmanager/mio/Makefile.am
@@ -1,5 +1,3 @@
-# $id$
-
noinst_LIBRARIES = libmio.a
AM_CPPFLAGS = -DG_LOG_DOMAIN=\"MIO\" #-DMIO_DEBUG
View
2  tagmanager/mio/makefile.win32
@@ -3,7 +3,7 @@
CC = gcc
AR = ar
RANLIB = ranlib
-PREFIX = C:\libs
+PREFIX = C:/libs
RM = del
-include ../../localwin32.mk
View
34 tagmanager/src/Makefile.am
@@ -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
View
52 tagmanager/src/makefile.win32
@@ -0,0 +1,52 @@
+
+.SUFFIXES: .cxx .c .o .h .a
+CC = gcc
+AR = ar
+RANLIB = ranlib
+PREFIX = C:/libs
+RM = del
+-include ../../localwin32.mk
+
+COMPLIB=tagmanager.a
+
+REGEX_DEFINES = -DHAVE_REGCOMP -DSTDC_HEADERS=1
+
+GTK_INCLUDES= \
+ -I$(PREFIX)/include/gtk-2.0 \
+ -I$(PREFIX)/lib/gtk-2.0/include \
+ -I$(PREFIX)/include/atk-1.0 \
+ -I$(PREFIX)/include/cairo \
+ -I$(PREFIX)/include/gdk-pixbuf-2.0 \
+ -I$(PREFIX)/include/pango-1.0 \
+ -I$(PREFIX)/include/glib-2.0 \
+ -I$(PREFIX)/lib/glib-2.0/include \
+ -I$(PREFIX)/include \
+ -I$(PREFIX)/include/gettext
+
+INCLUDEDIRS=-I ../ctags -I ../ -I . $(GTK_INCLUDES)
+
+CBASEFLAGS=-Wall -pipe -mms-bitfields -DPACKAGE=\"geany\" -Wno-missing-braces -Wno-char-subscripts $(INCLUDEDIRS)
+ifdef DEBUG
+CFLAGS= -O0 -g $(CBASEFLAGS)
+else
+CFLAGS=-O2 $(CBASEFLAGS)
+endif
+
+.c.o:
+ $(CC) $(REGEX_DEFINES) $(CFLAGS) -c $<
+
+all: $(COMPLIB)
+
+clean:
+ -$(RM) deps.mak *.o $(COMPLIB)
+
+$(COMPLIB): tm_workspace.o tm_work_object.o tm_source_file.o tm_project.o tm_tag.o \
+tm_symbol.o tm_file_entry.o tm_tagmanager.o
+ $(AR) rc $@ $^
+ $(RANLIB) $@
+
+deps.mak:
+ $(CC) -MM $(CFLAGS) *.c >deps.mak
+
+# Generate header dependencies with "make deps.mak"
+include deps.mak
View
0  tagmanager/tm_file_entry.c → tagmanager/src/tm_file_entry.c
File renamed without changes
View
0  tagmanager/include/tm_file_entry.h → tagmanager/src/tm_file_entry.h
File renamed without changes
View
0  tagmanager/tm_project.c → tagmanager/src/tm_project.c
File renamed without changes
View
0  tagmanager/include/tm_project.h → tagmanager/src/tm_project.h
File renamed without changes
View
0  tagmanager/tm_source_file.c → tagmanager/src/tm_source_file.c
File renamed without changes
View
0  tagmanager/include/tm_source_file.h → tagmanager/src/tm_source_file.h
File renamed without changes
View
0  tagmanager/tm_symbol.c → tagmanager/src/tm_symbol.c
File renamed without changes
View
0  tagmanager/include/tm_symbol.h → tagmanager/src/tm_symbol.h
File renamed without changes
View
0  tagmanager/tm_tag.c → tagmanager/src/tm_tag.c
File renamed without changes
View
0  tagmanager/include/tm_tag.h → tagmanager/src/tm_tag.h
File renamed without changes
View
0  tagmanager/tm_tagmanager.c → tagmanager/src/tm_tagmanager.c
File renamed without changes
View
0  tagmanager/include/tm_tagmanager.h → tagmanager/src/tm_tagmanager.h
File renamed without changes
View
0  tagmanager/tm_work_object.c → tagmanager/src/tm_work_object.c
File renamed without changes
View
0  tagmanager/include/tm_work_object.h → tagmanager/src/tm_work_object.h
File renamed without changes
View
0  tagmanager/tm_workspace.c → tagmanager/src/tm_workspace.c
File renamed without changes
View
0  tagmanager/include/tm_workspace.h → tagmanager/src/tm_workspace.h
File renamed without changes
View
103 wscript
@@ -60,23 +60,65 @@ out = '_build_'
mio_sources = set(['tagmanager/mio/mio.c'])
+ctags_sources = set([
+ 'tagmanager/ctags/args.c',
+ 'tagmanager/ctags/abc.c',
+ 'tagmanager/ctags/actionscript.c',
+ '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/diff.c',
+ 'tagmanager/ctags/docbook.c',
+ 'tagmanager/ctags/entry.c',
+ 'tagmanager/ctags/fortran.c',
+ 'tagmanager/ctags/get.c',
+ 'tagmanager/ctags/haskell.c',
+ 'tagmanager/ctags/haxe.c',
+ 'tagmanager/ctags/html.c',
+ 'tagmanager/ctags/js.c',
+ 'tagmanager/ctags/keyword.c',
+ 'tagmanager/ctags/latex.c',
+ 'tagmanager/ctags/lregex.c',
+ 'tagmanager/ctags/lua.c',
+ 'tagmanager/ctags/make.c',
+ 'tagmanager/ctags/markdown.c',
+ 'tagmanager/ctags/matlab.c',
+ 'tagmanager/ctags/nsis.c',
+ 'tagmanager/ctags/nestlevel.c',
+ 'tagmanager/ctags/objc.c',
+ 'tagmanager/ctags/options.c',
+ 'tagmanager/ctags/parse.c',
+ 'tagmanager/ctags/pascal.c',
+ 'tagmanager/ctags/r.c',
+ 'tagmanager/ctags/perl.c',
+ 'tagmanager/ctags/php.c',
+ 'tagmanager/ctags/python.c',
+ 'tagmanager/ctags/read.c',
+ 'tagmanager/ctags/rest.c',
+ 'tagmanager/ctags/ruby.c',
+ 'tagmanager/ctags/sh.c',
+ 'tagmanager/ctags/sort.c',
+ 'tagmanager/ctags/sql.c',
+ 'tagmanager/ctags/strlist.c',
+ 'tagmanager/ctags/txt2tags.c',
+ 'tagmanager/ctags/tcl.c',
+ 'tagmanager/ctags/vhdl.c',
+ 'tagmanager/ctags/verilog.c',
+ 'tagmanager/ctags/vstring.c'])
+
tagmanager_sources = set([
- 'tagmanager/args.c', 'tagmanager/abc.c', 'tagmanager/actionscript.c', 'tagmanager/asm.c',
- 'tagmanager/basic.c', 'tagmanager/c.c', 'tagmanager/cobol.c',
- 'tagmanager/conf.c', 'tagmanager/css.c', 'tagmanager/ctags.c', 'tagmanager/diff.c',
- 'tagmanager/docbook.c', 'tagmanager/entry.c', 'tagmanager/fortran.c', 'tagmanager/get.c',
- 'tagmanager/haskell.c', 'tagmanager/haxe.c', 'tagmanager/html.c', 'tagmanager/js.c',
- 'tagmanager/keyword.c', 'tagmanager/latex.c', 'tagmanager/lregex.c', 'tagmanager/lua.c',
- 'tagmanager/make.c', 'tagmanager/markdown.c', 'tagmanager/matlab.c', 'tagmanager/nsis.c',
- 'tagmanager/nestlevel.c', 'tagmanager/objc.c', 'tagmanager/options.c',
- 'tagmanager/parse.c', 'tagmanager/pascal.c', 'tagmanager/r.c',
- 'tagmanager/perl.c', 'tagmanager/php.c', 'tagmanager/python.c', 'tagmanager/read.c',
- 'tagmanager/rest.c', 'tagmanager/ruby.c', 'tagmanager/sh.c', 'tagmanager/sort.c',
- 'tagmanager/sql.c', 'tagmanager/strlist.c', 'tagmanager/txt2tags.c', 'tagmanager/tcl.c',
- 'tagmanager/tm_file_entry.c',
- 'tagmanager/tm_project.c', 'tagmanager/tm_source_file.c', 'tagmanager/tm_symbol.c',
- 'tagmanager/tm_tag.c', 'tagmanager/tm_tagmanager.c', 'tagmanager/tm_work_object.c',
- 'tagmanager/tm_workspace.c', 'tagmanager/vhdl.c', 'tagmanager/verilog.c', 'tagmanager/vstring.c'])
+ 'tagmanager/src/tm_file_entry.c',
+ 'tagmanager/src/tm_project.c',
+ 'tagmanager/src/tm_source_file.c',
+ 'tagmanager/src/tm_symbol.c',
+ 'tagmanager/src/tm_tag.c',
+ 'tagmanager/src/tm_tagmanager.c',
+ 'tagmanager/src/tm_work_object.c',
+ 'tagmanager/src/tm_workspace.c'])
scintilla_sources = set(['scintilla/gtk/scintilla-marshal.c'])
@@ -255,19 +297,30 @@ def build(bld):
bld.new_task_gen(
features = ['c', 'cshlib'],
source = 'plugins/%s.c' % plugin_name,
- includes = ['.', 'src/', 'scintilla/include', 'tagmanager/include'],
+ includes = ['.', 'src/', 'scintilla/include', 'tagmanager/src'],
defines = 'G_LOG_DOMAIN="%s"' % plugin_name,
target = plugin_name,
uselib = ['GTK', 'GLIB', 'GMODULE'],
install_path = instpath)
+ # CTags
+ bld.new_task_gen(
+ features = ['c', 'cstlib'],
+ source = ctags_sources,
+ name = 'ctags',
+ target = 'ctags',
+ includes = ['.', 'tagmanager', 'tagmanager/ctags'],
+ defines = 'G_LOG_DOMAIN="CTags"',
+ uselib = ['GLIB'],
+ install_path = None) # do not install this library
+
# Tagmanager
bld.new_task_gen(
features = ['c', 'cstlib'],
source = tagmanager_sources,
name = 'tagmanager',
target = 'tagmanager',
- includes = ['.', 'tagmanager', 'tagmanager/include'],
+ includes = ['.', 'tagmanager', 'tagmanager/ctags'],
defines = 'G_LOG_DOMAIN="Tagmanager"',
uselib = ['GTK', 'GLIB'],
install_path = None) # do not install this library
@@ -307,11 +360,11 @@ def build(bld):
name = 'geany',
target = 'geany',
source = geany_sources,
- includes = ['.', 'scintilla/include/', 'tagmanager/include/'],
+ includes = ['.', 'scintilla/include', 'tagmanager/src'],
defines = ['G_LOG_DOMAIN="Geany"', 'GEANY_PRIVATE'],
linkflags = [] if is_win32 else ['-Wl,--export-dynamic'],
uselib = ['GTK', 'GLIB', 'GMODULE', 'GIO', 'GTHREAD', 'WIN32', 'SUNOS_SOCKET'],
- use = ['scintilla', 'tagmanager', 'mio'])
+ use = ['scintilla', 'ctags', 'tagmanager', 'mio'])
# geanyfunctions.h
bld.new_task_gen(
@@ -402,11 +455,11 @@ def build(bld):
scintilla/include/SciLexer.h scintilla/include/Scintilla.h
scintilla/include/Scintilla.iface scintilla/include/ScintillaWidget.h ''')
bld.install_files('${PREFIX}/include/geany/tagmanager', '''
- tagmanager/include/tm_file_entry.h tagmanager/include/tm_project.h
- tagmanager/include/tm_source_file.h
- tagmanager/include/tm_symbol.h tagmanager/include/tm_tag.h
- tagmanager/include/tm_tagmanager.h tagmanager/include/tm_work_object.h
- tagmanager/include/tm_workspace.h ''')
+ tagmanager/src/tm_file_entry.h tagmanager/src/tm_project.h
+ tagmanager/src/tm_source_file.h
+ tagmanager/src/tm_symbol.h tagmanager/src/tm_tag.h
+ tagmanager/src/tm_tagmanager.h tagmanager/src/tm_work_object.h
+ tagmanager/src/tm_workspace.h ''')
# Docs
base_dir = '${PREFIX}' if is_win32 else '${DOCDIR}'
ext = '.txt' if is_win32 else ''
Please sign in to comment.
Something went wrong with that request. Please try again.