<p>This is the patch I was talking about which moves TM-related things around a bit (can be changed if anyone prefers different locations/directory naming etc.). There are just two things missing:</p>
<ol>
<li><p>I haven't updated the makefile.win32 files - is it worth updating them or can they be removed completely? Are they still needed for something?</p></li>
<li><p>There should probably be some kind of makefile that builds ctags when run inside either ctags/main or ctags/parsers (right now it's only in the ctags directory). There's something similar in universal-ctags too, I just wasn't sure what's the right way to do it for Geany. I'd leave this to someone with better automake knowledge (should be easy).</p></li>
</ol>
<hr>
<h4>You can view, comment on, or merge this pull request online at:</h4>
<p> <a href='https://github.com/geany/geany/pull/1070'>https://github.com/geany/geany/pull/1070</a></p>
<h4>Commit Summary</h4>
<ul>
<li>Move TM into src</li>
<li>Use the single-file implementation of MIO from universal-ctags</li>
<li>Separate ctags into parsers and main sources</li>
<li>Update paths for doxygen</li>
<li>Update various comments mentioning tagmanager/src</li>
<li>Rename js.c to jscript.c to match universal-ctags</li>
</ul>
<h4>File Changes</h4>
<ul>
<li>
<strong>M</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-0">HACKING</a>
(2)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-1">Makefile.am</a>
(2)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-2">configure.ac</a>
(6)
</li>
<li>
<strong>A</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-3">ctags/Makefile.am</a>
(89)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-4">ctags/main/args.c</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-5">ctags/main/args.h</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-6">ctags/main/ctags.c</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-7">ctags/main/ctags.h</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-8">ctags/main/entry.c</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-9">ctags/main/entry.h</a>
(3)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-10">ctags/main/general.h</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-11">ctags/main/get.c</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-12">ctags/main/get.h</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-13">ctags/main/keyword.c</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-14">ctags/main/keyword.h</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-15">ctags/main/lregex.c</a>
(2)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-16">ctags/main/main.h</a>
(0)
</li>
<li>
<strong>A</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-17">ctags/main/mio.c</a>
(1063)
</li>
<li>
<strong>A</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-18">ctags/main/mio.h</a>
(178)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-19">ctags/main/nestlevel.c</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-20">ctags/main/nestlevel.h</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-21">ctags/main/options.c</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-22">ctags/main/options.h</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-23">ctags/main/parse.c</a>
(2)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-24">ctags/main/parse.h</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-25">ctags/main/parsers.h</a>
(2)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-26">ctags/main/read.c</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-27">ctags/main/read.h</a>
(2)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-28">ctags/main/sort.c</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-29">ctags/main/sort.h</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-30">ctags/main/strlist.c</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-31">ctags/main/strlist.h</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-32">ctags/main/vstring.c</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-33">ctags/main/vstring.h</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-34">ctags/makefile.win32</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-35">ctags/parsers/abaqus.c</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-36">ctags/parsers/abc.c</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-37">ctags/parsers/actionscript.c</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-38">ctags/parsers/asciidoc.c</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-39">ctags/parsers/asm.c</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-40">ctags/parsers/basic.c</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-41">ctags/parsers/c.c</a>
(2)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-42">ctags/parsers/cobol.c</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-43">ctags/parsers/conf.c</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-44">ctags/parsers/css.c</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-45">ctags/parsers/diff.c</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-46">ctags/parsers/docbook.c</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-47">ctags/parsers/erlang.c</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-48">ctags/parsers/fortran.c</a>
(2)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-49">ctags/parsers/go.c</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-50">ctags/parsers/haskell.c</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-51">ctags/parsers/haxe.c</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-52">ctags/parsers/html.c</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-53">ctags/parsers/jscript.c</a>
(2)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-54">ctags/parsers/json.c</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-55">ctags/parsers/latex.c</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-56">ctags/parsers/lua.c</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-57">ctags/parsers/make.c</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-58">ctags/parsers/markdown.c</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-59">ctags/parsers/matlab.c</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-60">ctags/parsers/nsis.c</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-61">ctags/parsers/objc.c</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-62">ctags/parsers/pascal.c</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-63">ctags/parsers/perl.c</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-64">ctags/parsers/php.c</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-65">ctags/parsers/powershell.c</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-66">ctags/parsers/python.c</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-67">ctags/parsers/r.c</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-68">ctags/parsers/rest.c</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-69">ctags/parsers/ruby.c</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-70">ctags/parsers/rust.c</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-71">ctags/parsers/sh.c</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-72">ctags/parsers/sql.c</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-73">ctags/parsers/tcl.c</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-74">ctags/parsers/txt2tags.c</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-75">ctags/parsers/verilog.c</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-76">ctags/parsers/vhdl.c</a>
(0)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-77">doc/Doxyfile.in</a>
(10)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-78">doc/Makefile.am</a>
(4)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-79">plugins/Makefile.am</a>
(2)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-80">scripts/create_php_tags.py</a>
(4)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-81">src/Makefile.am</a>
(5)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-82">src/filetypes.h</a>
(2)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-83">src/tagmanager/Makefile.am</a>
(5)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-84">src/tagmanager/makefile.win32</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-85">src/tagmanager/tm_ctags_wrappers.c</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-86">src/tagmanager/tm_ctags_wrappers.h</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-87">src/tagmanager/tm_parser.c</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-88">src/tagmanager/tm_parser.h</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-89">src/tagmanager/tm_source_file.c</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-90">src/tagmanager/tm_source_file.h</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-91">src/tagmanager/tm_tag.c</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-92">src/tagmanager/tm_tag.h</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-93">src/tagmanager/tm_workspace.c</a>
(0)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-94">src/tagmanager/tm_workspace.h</a>
(0)
</li>
<li>
<strong>D</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-95">tagmanager/Makefile.am</a>
(3)
</li>
<li>
<strong>D</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-96">tagmanager/ctags/Makefile.am</a>
(89)
</li>
<li>
<strong>D</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-97">tagmanager/mio/COPYING</a>
(339)
</li>
<li>
<strong>D</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-98">tagmanager/mio/Makefile.am</a>
(13)
</li>
<li>
<strong>D</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-99">tagmanager/mio/README</a>
(3)
</li>
<li>
<strong>D</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-100">tagmanager/mio/makefile.win32</a>
(53)
</li>
<li>
<strong>D</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-101">tagmanager/mio/mio-file.c</a>
(175)
</li>
<li>
<strong>D</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-102">tagmanager/mio/mio-memory.c</a>
(480)
</li>
<li>
<strong>D</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-103">tagmanager/mio/mio.c</a>
(656)
</li>
<li>
<strong>D</strong>
<a href="https://github.com/geany/geany/pull/1070/files#diff-104">tagmanager/mio/mio.h</a>
(221)
</li>
</ul>
<h4>Patch Links:</h4>
<ul>
<li><a href='https://github.com/geany/geany/pull/1070.patch'>https://github.com/geany/geany/pull/1070.patch</a></li>
<li><a href='https://github.com/geany/geany/pull/1070.diff'>https://github.com/geany/geany/pull/1070.diff</a></li>
</ul>
<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br />You are receiving this because you are subscribed to this thread.<br />Reply to this email directly, <a href="https://github.com/geany/geany/pull/1070">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe/ABDrJ4Enad1unhB32PfxM80jZpvitVO6ks5qKuAAgaJpZM4IzlZ-">mute the thread</a>.<img alt="" height="1" src="https://github.com/notifications/beacon/ABDrJ5sHTLkDmqBJffh8AkQyROMCkT3tks5qKuAAgaJpZM4IzlZ-.gif" width="1" /></p>
<div itemscope itemtype="http://schema.org/EmailMessage">
<div itemprop="action" itemscope itemtype="http://schema.org/ViewAction">
<link itemprop="url" href="https://github.com/geany/geany/pull/1070"></link>
<meta itemprop="name" content="View Pull Request"></meta>
</div>
<meta itemprop="description" content="View this Pull Request on GitHub"></meta>
</div>