Skip to content

Commit 1b31f8f

Browse files
committed
Используемая версия simstr обновлена до 1.3.1.
Используемая версия sqlite3 обновлена до 3.51.2. Версия обновлена на 1.0.0.9
1 parent 9b0b9ef commit 1b31f8f

14 files changed

Lines changed: 7783 additions & 2978 deletions

File tree

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
# This starter workflow is for a CMake project running on multiple platforms. There is a different starter workflow if you just want a single platform.
2+
# See: https://github.com/actions/starter-workflows/blob/main/ci/cmake-single-platform.yml
3+
name: CMake on Windows
4+
5+
on:
6+
push:
7+
branches: [ "master" ]
8+
pull_request:
9+
branches: [ "master" ]
10+
11+
jobs:
12+
build:
13+
runs-on: ${{ matrix.os }}
14+
15+
strategy:
16+
# Set fail-fast to false to ensure that feedback is delivered for all matrix combinations. Consider changing this to true when your workflow is stable.
17+
fail-fast: false
18+
19+
# Set up a matrix to run the following 3 configurations:
20+
# 1. <Windows, Release, latest MSVC compiler toolchain on the default runner image, default generator>
21+
# 3. <Linux, Release, latest Clang compiler toolchain on the default runner image, default generator>
22+
#
23+
# To add more build types (Release, Debug, RelWithDebInfo, etc.) customize the build_type list.
24+
matrix:
25+
os: [windows-latest]
26+
build_type: [Release]
27+
c_compiler: [cl]
28+
include:
29+
- os: windows-latest
30+
c_compiler: cl
31+
cpp_compiler: cl
32+
exclude:
33+
- os: windows-latest
34+
c_compiler: gcc
35+
- os: windows-latest
36+
c_compiler: clang
37+
- os: ubuntu-latest
38+
c_compiler: cl
39+
40+
steps:
41+
- uses: actions/checkout@v4
42+
43+
- name: Set reusable strings
44+
# Turn repeated input strings (such as the build output directory) into step outputs. These step outputs can be used throughout the workflow file.
45+
id: strings
46+
shell: bash
47+
run: |
48+
echo "build-output-dir=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT"
49+
50+
- name: Configure CMake
51+
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
52+
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
53+
run: >
54+
cmake -B ${{ steps.strings.outputs.build-output-dir }}
55+
-DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }}
56+
-DCMAKE_C_COMPILER=${{ matrix.c_compiler }}
57+
-DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
58+
-S ${{ github.workspace }}
59+
60+
- name: Build
61+
# Build your program with the given configuration. Note that --config is needed because the default Windows generator is a multi-config generator (Visual Studio generator).
62+
run: cmake --build ${{ steps.strings.outputs.build-output-dir }} --config ${{ matrix.build_type }}
63+
64+
- name: Test
65+
working-directory: ${{ steps.strings.outputs.build-output-dir }}
66+
# Execute tests defined by the CMake configuration. Note that --build-config is needed because the default Windows generator is a multi-config generator (Visual Studio generator).
67+
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
68+
run: ctest --build-config ${{ matrix.build_type }}

.gitmodules

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

1C_include/com.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,13 @@
44

55
#if defined(__linux__) || defined(__APPLE__) || defined(__ANDROID__)
66

7-
#ifdef __ANDROID__
8-
97
typedef struct {
108
unsigned int Data1;
119
unsigned short Data2;
1210
unsigned short Data3;
1311
unsigned char Data4[ 8 ];
1412
} uuid_t;
1513

16-
#else
17-
#include <linux/uuid.h>
18-
#endif //__ANDROID__
19-
2014
#ifndef __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ // iOS
2115
#include <dlfcn.h>
2216
#endif //!__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__
@@ -93,7 +87,6 @@ typedef unsigned short USHORT;
9387
typedef void *HMODULE;
9488
#define OLESTR(str) L##str
9589

96-
typedef guid_t uuid_t;
9790
typedef uuid_t GUID;
9891
typedef uuid_t IID;
9992
typedef uuid_t UUID;

CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -162,12 +162,8 @@ endif ()
162162

163163
include_directories("${CMAKE_SOURCE_DIR}/1C_include")
164164
include_directories("${CMAKE_SOURCE_DIR}/include")
165-
include_directories("${CMAKE_SOURCE_DIR}/libs/simstr/include")
166165
include_directories("${CMAKE_SOURCE_DIR}/sqlite3")
167166

168167
# Include sub-projects.
169-
set (SIMSTR_BUILD_TESTS OFF)
170-
set (SIMSTR_BENCHMARKS OFF)
171-
add_subdirectory (libs/simstr)
172168
add_subdirectory (sqlite3)
173169
add_subdirectory (src)

CMakePresets.json

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -172,21 +172,21 @@
172172
}
173173
},
174174
{
175-
"name": "linux-clang-16-debug",
176-
"displayName": "Linux Clang 16 Debug",
175+
"name": "linux-clang-18-debug",
176+
"displayName": "Linux Clang 18 Debug",
177177
"inherits": "linux-debug",
178178
"cacheVariables": {
179-
"CMAKE_C_COMPILER": "/usr/bin/clang-16",
180-
"CMAKE_CXX_COMPILER": "/usr/bin/clang++-16"
179+
"CMAKE_C_COMPILER": "/usr/bin/clang-18",
180+
"CMAKE_CXX_COMPILER": "/usr/bin/clang++-18"
181181
}
182182
},
183183
{
184-
"name": "linux-clang-16-release",
185-
"displayName": "Linux Clang 16 Release",
184+
"name": "linux-clang-18-release",
185+
"displayName": "Linux Clang 18 Release",
186186
"inherits": "linux-release",
187187
"cacheVariables": {
188-
"CMAKE_C_COMPILER": "/usr/bin/clang-16",
189-
"CMAKE_CXX_COMPILER": "/usr/bin/clang++-16"
188+
"CMAKE_C_COMPILER": "/usr/bin/clang-18",
189+
"CMAKE_CXX_COMPILER": "/usr/bin/clang++-18"
190190
}
191191
},
192192
{
@@ -209,11 +209,5 @@
209209
}
210210
],
211211
"buildPresets": [
212-
{
213-
"name": "buildPresets",
214-
"displayName": "Custom build preset",
215-
"description": "Custom build preset description",
216-
"configurePreset": "x64-release"
217-
}
218212
]
219213
}

libs/simstr

Lines changed: 0 additions & 1 deletion
This file was deleted.

readme.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# V8Sqlite
22

3+
[![CMake on Windows](https://github.com/orefkov/v8sqlite/actions/workflows/cmake-multi-platform.yml/badge.svg)](https://github.com/orefkov/v8sqlite/actions/workflows/cmake-multi-platform.yml)
4+
35
Нативная внешняя компонента для 1С 8 для работы с базами данных sqlite.
46
Позволяет выполнять запросы к базам данных sqlite и получать их результаты в виде ТаблицыЗначений или массива массивов.
57

@@ -9,7 +11,7 @@
911
- Linux x64
1012

1113
Сама библиотека sqlite подключена статически, то есть внедрена в ВК.
12-
Используется версия 3.49.2. Версию sqlite можно узнать запросом
14+
Используется версия 3.51.2. Версию sqlite можно узнать запросом
1315

1416
```
1517
select sqlite_version()

0 commit comments

Comments
 (0)