Skip to content

Commit 8435086

Browse files
egorpuginegorpugin
committed
Fix cppan build.
1 parent 7e027e6 commit 8435086

7 files changed

Lines changed: 46 additions & 84 deletions

File tree

‎cppan.yml‎

Lines changed: 43 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,7 @@ local_settings:
66
#use_cache: true
77
builds:
88
vs_release:
9-
generator: Visual Studio 15 2017 #Win64
10-
11-
vs_preview:
12-
c_compiler: c:/Program Files (x86)/Microsoft Visual Studio/Preview/Community/VC/Tools/MSVC/14.12.25805/bin/Hostx64/x64/cl.exe
13-
cxx_compiler: c:/Program Files (x86)/Microsoft Visual Studio/Preview/Community/VC/Tools/MSVC/14.12.25805/bin/Hostx64/x64/cl.exe
9+
generator: Visual Studio 16 2019
1410

1511
vs_llvm:
1612
generator: Visual Studio 15 2017 Win64
@@ -100,7 +96,7 @@ common_settings:
10096

10197
projects:
10298
tools.client:
103-
root_directory: src/tools
99+
root_directory: src/sw/tools
104100
files: client.cpp
105101
condition: WIN32
106102
output_name: client.com
@@ -114,33 +110,33 @@ projects:
114110
- pvt.cppan.demo.boost.filesystem: 1
115111

116112
tools.self_builder:
117-
root_directory: src/tools
113+
root_directory: src/sw/tools
118114
files: self_builder.cpp
119115
dependencies:
120116
- manager
121117
- name: pvt.egorpugin.primitives.sw.main
122118
version: master
123119
local: primitives.sw.main
124-
- name: pvt.egorpugin.primitives.context
120+
- name: pvt.egorpugin.primitives.emitter
125121
version: master
126-
local: primitives.context
122+
local: primitives.emitter
127123

128124
tools.cl_generator:
129-
root_directory: src/tools
125+
root_directory: src/sw/tools
130126
files: cl_generator.cpp
131127
dependencies:
132128
- name: pvt.egorpugin.primitives.main
133129
version: master
134130
local: primitives.sw.main
135-
- name: pvt.egorpugin.primitives.context
131+
- name: pvt.egorpugin.primitives.emitter
136132
version: master
137-
local: primitives.context
133+
local: primitives.emitter
138134
- name: pvt.egorpugin.primitives.yaml
139135
version: master
140136
local: primitives.yaml
141137

142138
client:
143-
root_directory: src/client
139+
root_directory: src/sw/client
144140
#executable_type: win32
145141
files:
146142
- .*
@@ -162,22 +158,20 @@ projects:
162158
file(GLOB_RECURSE x "${SDIR}/*")
163159
source_group(TREE ${SDIR} PREFIX "Source Files" FILES ${x})
164160
161+
embed(${SDIR}/inserts/inserts.cpp.in
162+
${SDIR}/inserts/SWConfig.cmake
163+
)
164+
165165
driver.cpp:
166166
type: library
167167
#static_only: true
168168
api_name: SW_DRIVER_CPP_API
169169
export_if_static: true
170170

171-
files:
172-
- include/sw/driver/.*
173-
- src/driver/.*
171+
files: src/sw/driver/.*
174172
exclude_from_build:
175-
- src/driver/misc/.*
176-
- src/driver/inserts/cppan.cpp
177-
178-
include_directories:
179-
- include
180-
- src/driver # make private
173+
- src/sw/driver/misc/.*
174+
- src/sw/driver/inserts/cppan.cpp
181175

182176
options:
183177
any:
@@ -218,14 +212,14 @@ projects:
218212

219213
post_sources: |
220214
if (WIN32)
221-
add_src_dir(src/driver/misc/*)
215+
add_src_dir(src/sw/driver/misc/*)
222216
endif()
223217
224218
file(GLOB_RECURSE x "${SDIR}/*")
225219
source_group(TREE ${SDIR} PREFIX "Source Files" FILES ${x})
226220
227-
embed(${SDIR}/src/driver/inserts/inserts.cpp.in ${SDIR}/src/driver/inserts/cppan.cpp)
228-
set_source_files_properties(${SDIR}/src/driver/inserts/cppan.cpp PROPERTIES HEADER_FILE_ONLY TRUE)
221+
embed(${SDIR}/src/sw/driver/inserts/inserts.cpp.in ${SDIR}/src/sw/driver/inserts/cppan.cpp)
222+
set_source_files_properties(${SDIR}/src/sw/driver/inserts/cppan.cpp PROPERTIES HEADER_FILE_ONLY TRUE)
229223
230224
set(f ${BDIR}/build_self.generated.h ${BDIR}/build_self.packages.generated.h)
231225
add_custom_command(OUTPUT ${f}
@@ -236,30 +230,24 @@ projects:
236230
237231
set(f ${BDIR}/options_cl.generated.h)
238232
add_custom_command(OUTPUT ${f}
239-
COMMAND ${cl_generator} ${SDIR}/src/driver/options_cl.yml ${f} ${BDIR}/options_cl.generated.cpp
240-
DEPENDS ${cl_generator} ${SDIR}/src/driver/options_cl.yml
233+
COMMAND ${cl_generator} ${SDIR}/src/sw/driver/options_cl.yml ${f} ${BDIR}/options_cl.generated.cpp
234+
DEPENDS ${cl_generator} ${SDIR}/src/sw/driver/options_cl.yml
241235
)
242-
set(src ${src} ${f} ${SDIR}/src/driver/options_cl.yml)
236+
set(src ${src} ${f} ${SDIR}/src/sw/driver/options_cl.yml)
243237
244238
post_target: |
245-
cppan_flex_bison_internal(src/driver/bazel/lexer.ll PARSERS src/driver/bazel/grammar.yy)
239+
cppan_flex_bison_internal(src/sw/driver/bazel/lexer.ll PARSERS src/sw/driver/bazel/grammar.yy)
246240
247241
248242
builder:
249243
type: library
250244
api_name: SW_BUILDER_API
251245
export_if_static: true
252246

253-
files:
254-
- include/sw/builder/.*
255-
- src/builder/.*
247+
files: src/sw/builder/.*
256248
exclude_from_build:
257-
- src/builder/db_sqlite.*
258-
- src/builder/inserts/.*
259-
260-
include_directories:
261-
- include
262-
- src/builder # make private
249+
- src/sw/builder/db_sqlite.*
250+
- src/sw/builder/inserts/.*
263251

264252
options:
265253
any:
@@ -273,9 +261,9 @@ projects:
273261
public:
274262
- manager
275263
- pvt.cppan.demo.preshing.junction: master
276-
- name: pvt.egorpugin.primitives.context
264+
- name: pvt.egorpugin.primitives.emitter
277265
version: master
278-
local: primitives.context
266+
local: primitives.emitter
279267

280268
post_sources: |
281269
file(GLOB_RECURSE x "${SDIR}/*")
@@ -284,7 +272,7 @@ projects:
284272
protos:
285273
type: lib
286274
static_only: true
287-
root_directory: src/protocol
275+
root_directory: src/sw/protocol
288276
files: .*
289277
dependencies:
290278
- name: pvt.egorpugin.primitives.log
@@ -308,13 +296,7 @@ projects:
308296
- SW_MANAGER_API
309297
export_if_static: true
310298

311-
files:
312-
- include/sw/manager/.*
313-
- src/manager/.*
314-
315-
include_directories:
316-
- include
317-
- src/manager # make private
299+
files: src/sw/manager/.*
318300

319301
options:
320302
any:
@@ -340,6 +322,9 @@ projects:
340322
- name: pvt.egorpugin.primitives.yaml
341323
version: master
342324
local: primitives.yaml
325+
- name: pvt.egorpugin.primitives.source
326+
version: master
327+
local: primitives.source
343328
- name: pvt.egorpugin.primitives.version
344329
version: master
345330
local: primitives.version
@@ -372,20 +357,18 @@ projects:
372357
file(GLOB_RECURSE x "${SDIR}/*")
373358
source_group(TREE ${SDIR} PREFIX "Source Files" FILES ${x})
374359
375-
embed(${SDIR}/src/manager/inserts/inserts.cpp.in
376-
${SDIR}/src/manager/inserts/packages_db_schema.sql
377-
${SDIR}/src/manager/inserts/service_db_schema.sql
360+
embed(${SDIR}/src/sw/manager/inserts/inserts.cpp.in
361+
${SDIR}/src/sw/manager/inserts/packages_db_schema.sql
378362
)
379363
380-
sqlite2cpp_gen_sql(${SDIR}/src/manager/inserts/packages_db_schema.sql db_packages.h db::packages)
381-
sqlite2cpp_gen_sql(${SDIR}/src/manager/inserts/service_db_schema.sql db_service.h db::service)
364+
sqlite2cpp_gen_sql(${SDIR}/src/sw/manager/inserts/packages_db_schema.sql db_packages.h db::packages)
382365
383366
support:
384367
type: library
385368
api_name:
386369
- SW_SUPPORT_API
387370

388-
root_directory: src/support
371+
root_directory: src/sw/support
389372
files: .*
390373

391374
options:
@@ -461,10 +444,10 @@ x:
461444
api_name: SW_MANAGER_API
462445
files:
463446
- test/unit/path.cpp
464-
- src/manager/package_path.cpp
465-
- src/manager/package_path.h
447+
- src/sw/manager/package_path.cpp
448+
- src/sw/manager/package_path.h
466449
include_directories:
467-
- src/manager
450+
- src/sw/manager
468451
dependencies:
469452
- support
470453
- pvt.cppan.demo.catchorg.catch2: 2
@@ -486,10 +469,10 @@ x:
486469
copy_to_output_dir: false
487470
files:
488471
- test/unit/property.cpp
489-
- src/manager/property.cpp
490-
- src/manager/property.h
472+
- src/sw/manager/property.cpp
473+
- src/sw/manager/property.h
491474
include_directories:
492-
- src/manager
475+
- src/sw/manager
493476
dependencies:
494477
- support
495478
- pvt.cppan.demo.catchorg.catch2: 2

‎src/sw/client/inserts.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,3 @@
77
#include <string>
88

99
extern const std::string sw_config_cmake;
10-
extern const std::string header_cmake;

‎src/sw/client/inserts/header.cmake‎

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

‎src/sw/client/inserts/inserts.cpp.in‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,5 @@ DECLARE_TEXT_VAR_BEGIN(sw_config_cmake)
1313
EMBED<SWConfig.cmake>
1414
DECLARE_TEXT_VAR_END(sw_config_cmake);
1515

16-
DECLARE_TEXT_VAR_BEGIN(header_cmake)
17-
EMBED<header.cmake>
18-
DECLARE_TEXT_VAR_END(header_cmake);
19-
2016
#undef DECLARE_TEXT_VAR_BEGIN
2117
#undef DECLARE_TEXT_VAR_END

‎src/sw/client/sig.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ static void ds_sign_file(const path &fn, const path &pkey_fn)
1515
auto msg = read_file(fn);
1616
auto key = read_file(pkey_fn);
1717
uint8_t *sig = nullptr;
18+
size_t *slen = 0;
1819

1920
BIO* bo = BIO_new( BIO_s_mem() );
2021
BIO_write( bo, key.c_str(), key.size());
@@ -38,8 +39,7 @@ static void ds_sign_file(const path &fn, const path &pkey_fn)
3839

3940
/* Finalise the DigestSign operation */
4041
/* First call EVP_DigestSignFinal with a NULL sig parameter to obtain the length of the
41-
* signature. Length is returned in slen */
42-
size_t *slen = 0;
42+
* signature. Length is returned in slen */
4343
if(1 != EVP_DigestSignFinal(mdctx, NULL, slen)) goto err;
4444
/* Allocate memory for the signature based on size in slen */
4545
if(!(sig = (uint8_t *)OPENSSL_malloc(sizeof(unsigned char) * (*slen)))) goto err;

‎src/sw/driver/solution_build.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1908,7 +1908,7 @@ void Build::load_dll(const path &dll, bool usedll)
19081908
// add cc if needed
19091909
getHostSolution();
19101910

1911-
for (auto &[i,s] : enumerate(solutions))
1911+
for (auto &s : solutions)
19121912
{
19131913
// apply config settings
19141914
s.findCompiler();

‎src/sw/manager/database.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
#include <sqlpp11/custom_query.h>
2828
#include <sqlpp11/sqlite3/sqlite3.h>
2929
#include <sqlpp11/sqlpp11.h>
30-
#include <db_service.h>
3130
#include <db_packages.h>
3231

3332
#include <boost/algorithm/string.hpp>

0 commit comments

Comments
 (0)