Skip to content
This repository was archived by the owner on Jun 25, 2020. It is now read-only.

Commit 08c95ce

Browse files
zaloxzalox
committed
Merge branch 'cmaster' into python-refactor
2 parents ed9c394 + 9034b37 commit 08c95ce

33 files changed

+2640
-92
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,7 @@
88
!*.h
99
!CMakeLists.txt
1010
!config.json
11+
!*.py
12+
!debian/*
1113

1214
build

‎.gitmodules‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
[submodule "libclangmm"]
22
path = libclangmm
33
url = https://github.com/cppit/libclangmm
4-
[submodule "pybind11"]
5-
path = pybind11
6-
url = https://github.com/pybind/pybind11.git
4+
branch = v0.9.6
75
[submodule "tiny-process-library"]
86
path = tiny-process-library
9-
url = https://github.com/eidheim/tiny-process-library
7+
url = https://github.com/eidheim/tiny-process-library
8+
branch = v1.0.4
9+
[submodule "pybind11"]
10+
path = pybind11
11+
url = https://github.com/pybind/pybind11.git

‎README.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ towards libclang with speed and ease of use in mind.
1313
* C++ warnings and errors on the fly
1414
* C++ Fix-its
1515
* Debug integration through lldb
16-
* Automated CMake processing
16+
* Automated CMake processing, including support for external libraries
1717
* Fast C++ autocompletion
1818
* Keyword and buffer autocompletion for other file types
1919
* Tooltips showing type information and doxygen documentation (C++)
@@ -39,9 +39,6 @@ See [enhancements](https://github.com/cppit/jucipp/labels/enhancement) for plann
3939

4040
## Dependencies
4141
* boost-filesystem
42-
* boost-log
43-
* boost-thread
44-
* boost-system
4542
* boost-regex
4643
* gtkmm-3.0
4744
* gtksourceviewmm-3.0
@@ -52,4 +49,7 @@ See [enhancements](https://github.com/cppit/jucipp/labels/enhancement) for plann
5249
* [tiny-process-library](http://github.com/eidheim/tiny-process-library/) (downloaded directly with git --recursive, no need to install)
5350

5451
## Installation
55-
See [installation guide](http://github.com/cppit/jucipp/blob/master/docs/install.md).
52+
See [installation guide](docs/install.md).
53+
54+
## Documentation
55+
See [how to build the API doc](docs/api.md).

‎debian/README‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
The Debian Package jucipp
2+
----------------------------
3+
4+
Comments regarding the Package
5+
6+
-- Ole Christian Eidheim <[email protected]> Thu, 28 Apr 2016 15:41:24 +0200

‎debian/README.Debian‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
jucipp for Debian
2+
-----------------
3+
4+
<possible notes regarding this package - if none, delete this file>
5+
6+
-- Ole Christian Eidheim <[email protected]> Thu, 28 Apr 2016 15:41:24 +0200

‎debian/README.source‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
jucipp for Debian
2+
-----------------
3+
4+
<this file describes information about the source package, see Debian policy
5+
manual section 4.14. You WILL either need to modify or delete this file>
6+
7+
8+
9+
-- Ole Christian Eidheim <[email protected]> Thu, 28 Apr 2016 15:41:24 +0200
10+

‎debian/changelog‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
jucipp (1.1.3) unstable; urgency=low
2+
3+
* Initial Release.
4+
5+
-- Ole Christian Eidheim <[email protected]> Thu, 28 Apr 2016 15:41:24 +0200

‎debian/compat‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
9

‎debian/control‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
Source: jucipp
2+
Section: unknown
3+
Priority: optional
4+
Maintainer: Ole Christian Eidheim <[email protected]>
5+
Build-Depends: debhelper (>= 9), cmake, make, g++, libclang-dev, liblldb-3.5-dev, clang-format-3.5, pkg-config, libboost-system-dev, libboost-thread-dev, libboost-filesystem-dev, libboost-log-dev, libboost-regex-dev, libgtksourceviewmm-3.0-dev, aspell-en, libaspell-dev
6+
Standards-Version: 3.9.5
7+
Homepage: https://github.com/cppit/jucipp
8+
9+
Package: jucipp
10+
Architecture: any
11+
Depends: ${shlibs:Depends}, ${misc:Depends}
12+
Description: a lightweight, cross-platform C++11/14/17 IDE
13+
a lightweight, platform independent C++-IDE with support for C++11, C++14,
14+
and experimental C++17 features depending on libclang version.

‎debian/copyright‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
2+
Upstream-Name: jucipp
3+
Source: <url://example.com>
4+
5+
Files: *
6+
Copyright: <years> <put author's name and email here>
7+
<years> <likewise for another author>
8+
License: MIT
9+
Permission is hereby granted, free of charge, to any person obtaining a
10+
copy of this software and associated documentation files (the "Software"),
11+
to deal in the Software without restriction, including without limitation
12+
the rights to use, copy, modify, merge, publish, distribute, sublicense,
13+
and/or sell copies of the Software, and to permit persons to whom the
14+
Software is furnished to do so, subject to the following conditions:
15+
.
16+
The above copyright notice and this permission notice shall be included
17+
in all copies or substantial portions of the Software.
18+
.
19+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
20+
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
21+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
22+
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
23+
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
24+
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
25+
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
26+
27+
# Please also look if there are files or directories which have a
28+
# different copyright/license attached and list them here.
29+
# Please avoid to pick license terms that are more restrictive than the
30+
# packaged work, as it may make Debian's contributions unacceptable upstream.

0 commit comments

Comments
 (0)