Skip to content

Commit 68a7b1c

Browse files
authored
version 1.4.0
1 parent 2c328fb commit 68a7b1c

File tree

68 files changed

+922
-1284
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+922
-1284
lines changed

.clang-format

Lines changed: 0 additions & 68 deletions
This file was deleted.

.github/workflows/build.yaml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: Build Dockerfile
2+
on: push
3+
4+
jobs:
5+
build_dockerfile:
6+
runs-on: ubuntu-latest
7+
steps:
8+
- uses: docker/setup-qemu-action@v3
9+
- uses: docker/setup-buildx-action@v3
10+
- uses: actions/checkout@v4
11+
12+
- name: Build Dockerfile
13+
uses: docker/build-push-action@v6
14+
with:
15+
context: .
16+
load: true
17+
tags: "tentris:${{ github.sha }}"
18+
cache-from: type=gha
19+
cache-to: type=gha,mode=max
20+
21+
- uses: shrink/actions-docker-extract@v3
22+
id: extract
23+
name: Extracting executables from docker image
24+
with:
25+
image: "tentris:${{ github.sha }}"
26+
path: /.
27+
28+
- uses: actions/upload-artifact@v4
29+
name: Uploading executables as artifacts
30+
with:
31+
name: tentris-frontend
32+
path: ${{ steps.extract.outputs.destination }}/tentris_*

.gitignore

Lines changed: 11 additions & 123 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@
44
# log files
55
tentris.log
66

7-
# Created by https://www.toptal.com/developers/gitignore/api/c++,conan,jetbrains+all,cmake
8-
# Edit at https://www.toptal.com/developers/gitignore?templates=c++,conan,jetbrains+all,cmake
7+
.clang-format
8+
.clang-tidy
99

10-
### C++ ###
1110
# Prerequisites
1211
*.d
1312

@@ -21,12 +20,6 @@ tentris.log
2120
*.gch
2221
*.pch
2322

24-
# Linker files
25-
*.ilk
26-
27-
# Debugger Files
28-
*.pdb
29-
3023
# Compiled Dynamic libraries
3124
*.so
3225
*.dylib
@@ -47,121 +40,16 @@ tentris.log
4740
*.out
4841
*.app
4942

50-
### CMake ###
51-
CMakeLists.txt.user
52-
CMakeCache.txt
53-
CMakeFiles
54-
CMakeScripts
55-
Testing
56-
Makefile
57-
cmake_install.cmake
58-
install_manifest.txt
59-
compile_commands.json
60-
CTestTestfile.cmake
61-
_deps
62-
CMakeUserPresets.json
63-
64-
### CMake Patch ###
65-
# External projects
66-
*-prefix/
67-
68-
### Conan ###
69-
# Conan build information
70-
conan.lock
71-
conanbuildinfo.*
72-
conaninfo.txt
73-
graph_info.json
74-
75-
### JetBrains+all ###
76-
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
77-
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
78-
79-
# User-specific stuff
80-
.idea/**/workspace.xml
81-
.idea/**/tasks.xml
82-
.idea/**/usage.statistics.xml
83-
.idea/**/dictionaries
84-
.idea/**/shelf
85-
86-
# Generated files
87-
.idea/**/contentModel.xml
88-
89-
# Sensitive or high-churn files
90-
.idea/**/dataSources/
91-
.idea/**/dataSources.ids
92-
.idea/**/dataSources.local.xml
93-
.idea/**/sqlDataSources.xml
94-
.idea/**/dynamic.xml
95-
.idea/**/uiDesigner.xml
96-
.idea/**/dbnavigator.xml
97-
98-
# Gradle
99-
.idea/**/gradle.xml
100-
.idea/**/libraries
101-
102-
# Gradle and Maven with auto-import
103-
# When using Gradle or Maven with auto-import, you should exclude module files,
104-
# since they will be recreated, and may cause churn. Uncomment if using
105-
# auto-import.
106-
# .idea/artifacts
107-
# .idea/compiler.xml
108-
# .idea/jarRepositories.xml
109-
# .idea/modules.xml
110-
# .idea/*.iml
111-
# .idea/modules
112-
# *.iml
113-
# *.ipr
114-
115-
# CMake
116-
cmake-build-*/
117-
118-
# Mongo Explorer plugin
119-
.idea/**/mongoSettings.xml
120-
121-
# File-based project format
122-
*.iws
123-
124-
# IntelliJ
125-
out/
126-
127-
# mpeltonen/sbt-idea plugin
128-
.idea_modules/
129-
130-
# JIRA plugin
131-
atlassian-ide-plugin.xml
132-
133-
# Cursive Clojure plugin
134-
.idea/replstate.xml
135-
136-
# Crashlytics plugin (for Android Studio and IntelliJ)
137-
com_crashlytics_export_strings.xml
138-
crashlytics.properties
139-
crashlytics-build.properties
140-
fabric.properties
141-
142-
# Editor-based Rest Client
143-
.idea/httpRequests
144-
145-
# Android studio 3.1+ serialized cache file
146-
.idea/caches/build_file_checksums.ser
147-
148-
### JetBrains+all Patch ###
149-
# Ignores the whole .idea folder and all .iml files
150-
# See https://github.com/joeblau/gitignore.io/issues/186 and https://github.com/joeblau/gitignore.io/issues/360
43+
# project folders
44+
cmake-build*/
15145

46+
# intellij
15247
.idea/
48+
venv/
49+
/build/
15350

154-
# Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-249601023
155-
156-
*.iml
157-
modules.xml
158-
.idea/misc.xml
159-
*.ipr
160-
161-
# Sonarlint plugin
162-
.idea/sonarlint
163-
164-
# End of https://www.toptal.com/developers/gitignore/api/c++,conan,jetbrains+all,cmake
16551

166-
# docu folder
167-
/docu/
52+
test_package/build/
53+
test_package/CMakeUserPresets.json
54+
/CMakeUserPresets.json
55+
/conan_provider.cmake

CMakeLists.txt

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,33 @@
1-
cmake_minimum_required(VERSION 3.18)
2-
project(tentris
3-
VERSION 1.3.1
4-
DESCRIPTION "tensor-based triplestore")
1+
cmake_minimum_required(VERSION 3.24)
2+
project(tentris VERSION 1.4.0
3+
DESCRIPTION "Tentris - A tensor-based Triplestore.")
54

65
include(cmake/boilerplate_init.cmake)
76
boilerplate_init()
87

9-
option(CONAN_CMAKE "If this should use conan cmake to fetch dependencies" On)
10-
if (IS_TOP_LEVEL AND CONAN_CMAKE)
11-
include(cmake/conan_cmake.cmake)
12-
install_packages_via_conan("${CMAKE_CURRENT_SOURCE_DIR}/conanfile.py" "")
13-
endif ()
8+
if (PROJECT_IS_TOP_LEVEL)
9+
set(CONAN_INSTALL_ARGS "${CONAN_INSTALL_ARGS};-o=boost/*:header_only=True")
1410

15-
if (NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/CMakeCache.txt)
16-
if (NOT CMAKE_BUILD_TYPE)
17-
set(CMAKE_BUILD_TYPE "Release" CACHE STRING "" FORCE)
11+
if (BUILD_TESTING)
12+
set(CONAN_INSTALL_ARGS "${CONAN_INSTALL_ARGS};-o=&:with_test_deps=True")
1813
endif ()
1914
endif ()
2015

16+
set(style_files
17+
.clang-format
18+
.clang-tidy
19+
)
20+
foreach(style_file ${style_files})
21+
file(DOWNLOAD "https://raw.githubusercontent.com/dice-group/tentris-cpp-coding-guidelines/main/${style_file}"
22+
"${CMAKE_SOURCE_DIR}/${style_file}"
23+
TLS_VERIFY ON)
24+
endforeach()
25+
26+
if (PROJECT_IS_TOP_LEVEL AND USE_CLANG_TIDY)
27+
include(cmake/ClangTidy.cmake)
28+
endif ()
2129

30+
add_compile_definitions(Dnsel_CONFIG_SELECT_EXPECTED=nsel_EXPECTED_NONSTD)
2231

2332
add_subdirectory(libs)
33+
add_subdirectory(execs)

0 commit comments

Comments
 (0)