[prev in list] [next in list] [prev in thread] [next in thread] 

List:       subversion-dev
Subject:    Re: svn commit: r1476416 - in /subversion/trunk: .ycm_extra_conf.py Makefile.in
From:       Ben Reser <ben () reser ! org>
Date:       2013-04-27 22:07:03
Message-ID: CADkdwvQBqe9aKPVfEP0DC41okjdF7SCh6j07HG3wX+kj2WmorA () mail ! gmail ! com
[Download RAW message or body]

It's public domain now, so I believe the problem is solved.  If it's
still a problem in the tarball we can remove it, it's not important to
anyone other than devs.  If I could have I would have just put it
under contrib, but it's not useful there for functional reasons.

On Sat, Apr 27, 2013 at 4:01 AM, Greg Stein <gstein@gmail.com> wrote:
> Euh, what?!
> 
> We cannot distribute GPL code. Please adjust dist.sh and/or release.py or
> whatever to rm this from our tarball.
> 
> I think it can sit in our svn tree, but am not entirely sure, without a bit
> more reading/thought.
> 
> Thx,
> -g
> 
> Author: breser
> Date: Fri Apr 26 22:07:04 2013
> New Revision: 1476416
> 
> URL: http://svn.apache.org/r1476416
> Log:
> Add some comments to the YouCompleteMe changes.
> 
> * .ycm_extra_conf.py: Add header mentioning the source and copyright.
> 
> * Makefile.in: Comment explaining purpose of compile-commands target.
> 
> Suggested by: julianf
> 
> Modified:
> subversion/trunk/.ycm_extra_conf.py
> subversion/trunk/Makefile.in
> 
> Modified: subversion/trunk/.ycm_extra_conf.py
> URL:
> http://svn.apache.org/viewvc/subversion/trunk/.ycm_extra_conf.py?rev=1476416&r1=1476415&r2=1476416&view=diff
>  ==============================================================================
> --- subversion/trunk/.ycm_extra_conf.py (original)
> +++ subversion/trunk/.ycm_extra_conf.py Fri Apr 26 22:07:04 2013
> @@ -1,3 +1,23 @@
> +# Configuration file for YouCompleteMe vim plugin to allow the plugin
> +# to determine the compile flags.  This file is based on:
> +#
> https://github.com/Valloric/YouCompleteMe/blob/master/cpp/ycm/.ycm_extra_conf.py
> +#
> +# YouCompleteMe's Copyright:
> +# Copyright (C) 2011, 2012  Strahinja Val Markovic  <val@markovic.io>
> +#
> +# YouCompleteMe is free software: you can redistribute it and/or modify
> +# it under the terms of the GNU General Public License as published by
> +# the Free Software Foundation, either version 3 of the License, or
> +# (at your option) any later version.
> +#
> +# This program is distributed in the hope that it will be useful,
> +# but WITHOUT ANY WARRANTY; without even the implied warranty of
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> +# GNU General Public License for more details.
> +#
> +# You should have received a copy of the GNU General Public License
> +# along with this program.  If not, see <http://www.gnu.org/licenses/>.
> +
> import os
> import ycm_core
> from clang_helpers import PrepareClangFlags
> 
> Modified: subversion/trunk/Makefile.in
> URL:
> http://svn.apache.org/viewvc/subversion/trunk/Makefile.in?rev=1476416&r1=1476415&r2=1476416&view=diff
>  ==============================================================================
> --- subversion/trunk/Makefile.in (original)
> +++ subversion/trunk/Makefile.in Fri Apr 26 22:07:04 2013
> @@ -571,6 +571,12 @@ svnsshcheck: bin $(TEST_DEPS) @BDB_TEST_
> bdbcheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@
> @$(MAKE) check FS_TYPE=bdb
> 
> +# Produce the clang compilation database as the compile_commands.json file
> +# in the srcdir.  This is used by tools such as the YouCompleteMe vim
> plugin
> +# to know the compile flags for various source files so that analysis such
> +# as syntax checking, static analysis or symbol completion can be done
> +# outside the build system.  To do this it uses the tool called bear:
> +# https://github.com/rizsotto/Bear
> compile-commands:
> @bear -o $(abs_srcdir)/compile_commands.json -- $(MAKE) all
> 
> 
> 


[prev in list] [next in list] [prev in thread] [next in thread]