Skip to content

Commit 33a1594

Browse files
Ubuntu 24.04 support
1 parent 7e69ea2 commit 33a1594

File tree

4 files changed

+33
-16
lines changed

4 files changed

+33
-16
lines changed

doc/deps.md

Lines changed: 26 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# Build Environment
22
We build CodeCompass in a Linux environment. Currently, Ubuntu Long-Term
3-
Support releases are the main targets: Ubuntu 22.04 LTS (and Ubuntu 24.04 LTS
4-
is planned).
3+
Support releases are the main targets: Ubuntu 22.04 LTS and Ubuntu 24.04 LTS.
54

65
We also provide a Docker image that can be used as developer environment to
76
CodeCompass. See its usage [in a seperate document](/docker/README.md).
@@ -61,23 +60,40 @@ sudo apt install git cmake make g++ libboost-all-dev \
6160
libldap2-dev libgtest-dev
6261
```
6362

63+
#### Ubuntu 24.04 ("Noble Numbat") LTS
64+
65+
```bash
66+
sudo apt install git cmake make g++ libboost-all-dev \
67+
llvm-15-dev clang-15 libclang-15-dev \
68+
gcc-13-plugin-dev thrift-compiler libthrift-dev \
69+
default-jdk libssl-dev libgraphviz-dev libmagic-dev libgit2-dev exuberant-ctags doxygen \
70+
libldap2-dev libgtest-dev
71+
```
72+
6473
#### Database engine support
6574

6675
Depending on the desired database engines to be supported, the following
6776
packages should be installed.
6877

69-
##### Ubuntu 22.04 ("Jammy Jellyfish") LTS
70-
71-
The database connector library must be compiled manually for this release,
78+
The database connector library (ODB) must be compiled manually,
7279
however, the database programs themselves should be installed from the
7380
package manager.
7481

82+
##### SQLite
83+
7584
```bash
76-
# For SQLite database systems:
85+
# For Ubuntu 22.04, Ubuntu 24.04:
7786
sudo apt install libsqlite3-dev
87+
```
88+
89+
##### PostgreSQL
7890

79-
# For PostgreSQL database systems:
91+
```bash
92+
# For Ubuntu 22.04:
8093
sudo apt install postgresql-server-dev-14
94+
95+
# For Ubuntu 24.04:
96+
sudo apt install postgresql-server-dev-16
8197
```
8298

8399
## Known issues
@@ -91,10 +107,10 @@ by other processes which could, in extreme cases, make the system very hard or
91107
impossible to recover. **Please do NOT add a `sudo` in front of any `make` or
92108
other commands below, unless *explicitly* specified!**
93109

94-
### ODB (for Ubuntu 22.04)
110+
### ODB
95111
ODB is an Object Relational Mapping tool, that is required by CodeCompass.
96-
For Ubuntu 22.04, the official release of ODB conflicts with the official
97-
compiler (GNU G++ 11) of the distribution. A newer version of ODB must be
112+
In recent Ubuntu versions, the official release of ODB conflicts with the official
113+
compiler (GNU G++) of the distribution. A newer version of ODB must be
98114
compiled manually.
99115

100116
The ODB installation uses the build2 build system. (Build2 is not needed for
@@ -186,11 +202,7 @@ seen by CMake. Please set this environment before executing the build.
186202
# For all supported OS versions:
187203
export GTEST_ROOT=<gtest_install_dir>
188204

189-
# If using Ubuntu 22.04:
190-
export CMAKE_PREFIX_PATH=<thrift_install_dir>:$CMAKE_PREFIX_PATH
191205
export CMAKE_PREFIX_PATH=<odb_install_directory>:$CMAKE_PREFIX_PATH
192-
193-
export PATH=<thrift_install_dir>/bin:$PATH
194206
export PATH=<odb_install_directory>/bin:$PATH
195207
```
196208

doc/usage.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,11 @@ creating and using the database file.
1818
PostgreSQL can be installed from the package manager:
1919

2020
```bash
21-
sudo apt install postgresql-<version>
22-
# (e.g. postgresql-14 for Ubuntu 22.04)
21+
# For Ubuntu 22.04:
22+
sudo apt install postgresql-14
23+
24+
# For Ubuntu 24.04:
25+
sudo apt install postgresql-16
2326
```
2427

2528
This will set up an automatically starting local server on the default port

model/include/model/buildaction.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#include <string>
55
#include <memory>
66
#include <vector>
7+
#include <cstdint>
78

89
#include <odb/core.hxx>
910
#include <odb/lazy-ptr.hxx>

plugins/cpp/model/include/model/cppinheritance.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#define CC_MODEL_CPPINHERITANCE_H
33

44
#include <memory>
5+
#include <cstdint>
56
#include "common.h"
67

78
namespace cc

0 commit comments

Comments
 (0)