Skip to content

Commit 9a5b5e8

Browse files
pmienkpmienk
committed
Clean up flags.
(cherry picked from commit cd7fdfc)
1 parent c49d616 commit 9a5b5e8

1 file changed

Lines changed: 47 additions & 55 deletions

File tree

‎generate.xml‎

Lines changed: 47 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@
110110
<nuget compiler="vc141" name="secp256k1_vc141" version="0.1.0.16" />
111111
</dependency>
112112

113+
<!-- General flags -->
113114
<flag name="std=c++11" comment="Require c++11 for all c++ products." context="c++" />
114115

115116
<flag name="Wall" comment="Warn on all stuff." context="c" />
@@ -121,19 +122,18 @@
121122
<flag name="Wno-reorder" comment="Disallow warning on style order of declarations." context="c++" />
122123
<flag name="Wno-missing-field-initializers" comment="Suppress warning for incomplete field initialization." context="c++" />
123124
<flag name="Wno-missing-braces" comment="Conform to style." context="c++" />
124-
<flag name="Wno-mismatched-tags" compiler="clang" comment="Conflict in stdlib under clang." context="c++" />
125+
<flag name="Wno-comment" comment="Ignore comments within comments or commenting of backslash extended lines." context="c++" />
125126

126-
<flag name="Wno-long-long" comment="Allow use of C99 'long long' type." context="c" />
127-
<flag name="Wno-comment" comment="Allow for multi-line commenting." context="c++" />
128-
<flag name="Wno-type-limits" comment="Disallow warning always true conditions related to types (allows generalization related to constants)." context="c++" />
127+
<flag name="Wno-mismatched-tags" compiler="clang" comment="Conflict in stdlib under clang." context="c++" />
128+
<!-- <flag name="fvisibility=hidden" compiler="gcc" comment="Hide internal functions from external libs." context="c++" /> -->
129129

130130
<flag name="fstack-protector" comment="Protect stack." context="link" />
131131
<flag name="fstack-protector-all" comment="Protect stack comprehensively." context="link" />
132-
<!-- <flag name="fvisibility=hidden" compiler="gcc" comment="Hide internal functions from external libs." context="c++" /> -->
133-
<flag name="fvisibility-inlines-hidden" compiler="gcc" comment="Hide inlines from external libs." context="c++" />
134-
<flag name="fno-var-tracking-assignments" compiler="gcc" comment="Limit delays and warnings." context="c++" />
135132

136-
<!--<template name="CompileMe.am" />-->
133+
<!-- Project specific flags -->
134+
<flag name="Wno-long-long" comment="Allow use of C99 'long long' type." context="c" />
135+
<flag name="Wno-type-limits" comment="Ignore always true or false conditions due to the limited range of the data type." context="c++" />
136+
<flag name="fno-var-tracking-assignments" compiler="gcc" comment="Limit delays and warnings." context="c++" />
137137
</configure>
138138

139139
<make>
@@ -345,6 +345,7 @@
345345

346346
<flag name="std=c++11" comment="Require c++11 for all c++ products." context="c++" />
347347

348+
<!-- General flags -->
348349
<flag name="Wall" comment="Warn on all stuff." context="c" />
349350
<flag name="Wall" comment="Warn on all stuff." context="c++" />
350351
<flag name="Wextra" comment="Warn on extra stuff." context="c" />
@@ -354,16 +355,13 @@
354355
<flag name="Wno-reorder" comment="Disallow warning on style order of declarations." context="c++" />
355356
<flag name="Wno-missing-field-initializers" comment="Suppress warning for incomplete field initialization." context="c++" />
356357
<flag name="Wno-missing-braces" comment="Conform to style." context="c++" />
357-
<flag name="Wno-mismatched-tags" compiler="clang" comment="Conflict in stdlib under clang." context="c++" />
358+
<flag name="Wno-comment" comment="Ignore comments within comments or commenting of backslash extended lines." context="c++" />
358359

359-
<!-- boost -->
360-
<!-- <flag name="Wno-deprecated-declarations" compiler="gcc" comment="Clean up boost 1.55 headers." context="c++" /> -->
361-
<!-- <flag name="Wno-redeclared-class-member" compiler="clang" comment="Clean up boost 1.55 headers." context="c++" /> -->
360+
<flag name="Wno-mismatched-tags" compiler="clang" comment="Conflict in stdlib under clang." context="c++" />
361+
<!-- <flag name="fvisibility=hidden" compiler="gcc" comment="Hide internal functions from external libs." context="c++" /> -->
362362

363363
<flag name="fstack-protector" comment="Protect stack." context="link" />
364364
<flag name="fstack-protector-all" comment="Protect stack comprehensively." context="link" />
365-
<!-- <flag name="fvisibility=hidden" compiler="gcc" comment="Hide internal functions from external libs." context="c++" /> -->
366-
<flag name="fvisibility-inlines-hidden" compiler="gcc" comment="Hide inlines from external libs." context="c++" />
367365
</configure>
368366

369367
<make>
@@ -520,6 +518,7 @@
520518
<dependency name="bitcoin" version="3.4.0" />
521519
<dependency name="bitcoin-protocol" version="3.4.0" />
522520

521+
<!-- General flags -->
523522
<flag name="std=c++11" comment="Require c++11 for all c++ products." context="c++" />
524523

525524
<flag name="Wall" comment="Warn on all stuff." context="c" />
@@ -531,15 +530,13 @@
531530
<flag name="Wno-reorder" comment="Disallow warning on style order of declarations." context="c++" />
532531
<flag name="Wno-missing-field-initializers" comment="Suppress warning for incomplete field initialization." context="c++" />
533532
<flag name="Wno-missing-braces" comment="Conform to style." context="c++" />
534-
<flag name="Wno-mismatched-tags" compiler="clang" comment="Conflict in stdlib under clang." context="c++" />
533+
<flag name="Wno-comment" comment="Ignore comments within comments or commenting of backslash extended lines." context="c++" />
535534

536-
<!-- boost -->
537-
<!-- <flag name="Wno-deprecated-declarations" compiler="gcc" comment="Clean up boost 1.55 headers." context="c++" /> -->
535+
<flag name="Wno-mismatched-tags" compiler="clang" comment="Conflict in stdlib under clang." context="c++" />
536+
<!-- <flag name="fvisibility=hidden" compiler="gcc" comment="Hide internal functions from external libs." context="c++" /> -->
538537

539538
<flag name="fstack-protector" comment="Protect stack." context="link" />
540539
<flag name="fstack-protector-all" comment="Protect stack comprehensively." context="link" />
541-
<!-- <flag name="fvisibility=hidden" compiler="gcc" comment="Hide internal functions from external libs." context="c++" /> -->
542-
<flag name="fvisibility-inlines-hidden" compiler="gcc" comment="Hide inlines from external libs." context="c++" />
543540
</configure>
544541

545542
<make>
@@ -742,6 +739,7 @@
742739
<dependency name="java" option="java" />
743740
<dependency name="python" version="2.7" option="python" />
744741

742+
<!-- General flags -->
745743
<flag name="std=c++11" comment="Require c++11 for all c++ products." context="c++" />
746744

747745
<flag name="Wall" comment="Warn on all stuff." context="c" />
@@ -753,13 +751,13 @@
753751
<flag name="Wno-reorder" comment="Disallow warning on style order of declarations." context="c++" />
754752
<flag name="Wno-missing-field-initializers" comment="Suppress warning for incomplete field initialization." context="c++" />
755753
<flag name="Wno-missing-braces" comment="Conform to style." context="c++" />
754+
<flag name="Wno-comment" comment="Ignore comments within comments or commenting of backslash extended lines." context="c++" />
755+
756756
<flag name="Wno-mismatched-tags" compiler="clang" comment="Conflict in stdlib under clang." context="c++" />
757+
<!-- <flag name="fvisibility=hidden" compiler="gcc" comment="Hide internal functions from external libs." context="c++" /> -->
757758

758-
<!-- boost -->
759759
<flag name="fstack-protector" comment="Protect stack." context="link" />
760760
<flag name="fstack-protector-all" comment="Protect stack comprehensively." context="link" />
761-
<!-- <flag name="fvisibility=hidden" compiler="gcc" comment="Hide internal functions from external libs." context="c++" /> -->
762-
<flag name="fvisibility-inlines-hidden" compiler="gcc" comment="Hide inlines from external libs." context="c++" />
763761
</configure>
764762

765763
<make>
@@ -922,6 +920,7 @@
922920
</dependency>
923921
<dependency name="bitcoin" version="3.4.0" />
924922

923+
<!-- General flags -->
925924
<flag name="std=c++11" comment="Require c++11 for all c++ products." context="c++" />
926925

927926
<flag name="Wall" comment="Warn on all stuff." context="c" />
@@ -933,16 +932,13 @@
933932
<flag name="Wno-reorder" comment="Disallow warning on style order of declarations." context="c++" />
934933
<flag name="Wno-missing-field-initializers" comment="Suppress warning for incomplete field initialization." context="c++" />
935934
<flag name="Wno-missing-braces" comment="Conform to style." context="c++" />
936-
<flag name="Wno-mismatched-tags" compiler="clang" comment="Conflict in stdlib under clang." context="c++" />
935+
<flag name="Wno-comment" comment="Ignore comments within comments or commenting of backslash extended lines." context="c++" />
937936

938-
<!-- boost -->
939-
<!-- <flag name="Wno-deprecated-declarations" compiler="gcc" comment="Clean up boost 1.55 headers." context="c++" /> -->
940-
<!-- <flag name="Wno-redeclared-class-member" compiler="clang" comment="Clean up boost 1.55 headers." context="c++" /> -->
937+
<flag name="Wno-mismatched-tags" compiler="clang" comment="Conflict in stdlib under clang." context="c++" />
938+
<!-- <flag name="fvisibility=hidden" compiler="gcc" comment="Hide internal functions from external libs." context="c++" /> -->
941939

942940
<flag name="fstack-protector" comment="Protect stack." context="link" />
943941
<flag name="fstack-protector-all" comment="Protect stack comprehensively." context="link" />
944-
<!-- <flag name="fvisibility=hidden" compiler="gcc" comment="Hide internal functions from external libs." context="c++" /> -->
945-
<flag name="fvisibility-inlines-hidden" compiler="gcc" comment="Hide inlines from external libs." context="c++" />
946942
</configure>
947943

948944
<make>
@@ -1089,6 +1085,7 @@
10891085
<!-- -ldl is missing from icu package config and ends up out of order from libbitcoin inclusion -->
10901086
<dependency name="dl" function="dlopen" system="linux" optionXXX="icu" />
10911087

1088+
<!-- General flags -->
10921089
<flag name="std=c++11" comment="Require c++11 for all c++ products." context="c++" />
10931090

10941091
<flag name="Wall" comment="Warn on all stuff." context="c" />
@@ -1100,18 +1097,16 @@
11001097
<flag name="Wno-reorder" comment="Disallow warning on style order of declarations." context="c++" />
11011098
<flag name="Wno-missing-field-initializers" comment="Suppress warning for incomplete field initialization." context="c++" />
11021099
<flag name="Wno-missing-braces" comment="Conform to style." context="c++" />
1103-
<flag name="Wno-mismatched-tags" compiler="clang" comment="Conflict in stdlib under clang." context="c++" />
1104-
1105-
<!-- boost -->
1106-
<!-- <flag name="Wno-deprecated-declarations" compiler="gcc" comment="Clean up boost 1.55 headers." context="c++" /> -->
1100+
<flag name="Wno-comment" comment="Ignore comments within comments or commenting of backslash extended lines." context="c++" />
11071101

1108-
<!-- bx -->
1109-
<flag name="Wno-unused-parameter" comment="Clean up bx generated code." context="c++" />
1102+
<flag name="Wno-mismatched-tags" compiler="clang" comment="Conflict in stdlib under clang." context="c++" />
1103+
<!-- <flag name="fvisibility=hidden" compiler="gcc" comment="Hide internal functions from external libs." context="c++" /> -->
11101104

11111105
<flag name="fstack-protector" comment="Protect stack." context="link" />
11121106
<flag name="fstack-protector-all" comment="Protect stack comprehensively." context="link" />
1113-
<!-- <flag name="fvisibility=hidden" compiler="gcc" comment="Hide internal functions from external libs." context="c++" /> -->
1114-
<flag name="fvisibility-inlines-hidden" compiler="gcc" comment="Hide inlines from external libs." context="c++" />
1107+
1108+
<!-- Project specific flags -->
1109+
<flag name="Wno-unused-parameter" comment="Clean up bx generated code." context="c++" />
11151110
</configure>
11161111

11171112
<make>
@@ -1344,6 +1339,7 @@
13441339
</dependency>
13451340
<dependency name="bitcoin" version="3.4.0" />
13461341

1342+
<!-- General flags -->
13471343
<flag name="std=c++11" comment="Require c++11 for all c++ products." context="c++" />
13481344

13491345
<flag name="Wall" comment="Warn on all stuff." context="c" />
@@ -1355,12 +1351,13 @@
13551351
<flag name="Wno-reorder" comment="Disallow warning on style order of declarations." context="c++" />
13561352
<flag name="Wno-missing-field-initializers" comment="Suppress warning for incomplete field initialization." context="c++" />
13571353
<flag name="Wno-missing-braces" comment="Conform to style." context="c++" />
1354+
<flag name="Wno-comment" comment="Ignore comments within comments or commenting of backslash extended lines." context="c++" />
1355+
13581356
<flag name="Wno-mismatched-tags" compiler="clang" comment="Conflict in stdlib under clang." context="c++" />
1357+
<!-- <flag name="fvisibility=hidden" compiler="gcc" comment="Hide internal functions from external libs." context="c++" /> -->
13591358

13601359
<flag name="fstack-protector" comment="Protect stack." context="link" />
13611360
<flag name="fstack-protector-all" comment="Protect stack comprehensively." context="link" />
1362-
<!-- <flag name="fvisibility=hidden" compiler="gcc" comment="Hide internal functions from external libs." context="c++" /> -->
1363-
<flag name="fvisibility-inlines-hidden" compiler="gcc" comment="Hide inlines from external libs." context="c++" />
13641361
</configure>
13651362

13661363
<make>
@@ -1507,6 +1504,7 @@
15071504
<dependency name="bitcoin-blockchain" version="3.4.0" />
15081505
<dependency name="bitcoin-network" version="3.4.0" />
15091506

1507+
<!-- General flags -->
15101508
<flag name="std=c++11" comment="Require c++11 for all c++ products." context="c++" />
15111509

15121510
<flag name="Wall" comment="Warn on all stuff." context="c" />
@@ -1518,16 +1516,13 @@
15181516
<flag name="Wno-reorder" comment="Disallow warning on style order of declarations." context="c++" />
15191517
<flag name="Wno-missing-field-initializers" comment="Suppress warning for incomplete field initialization." context="c++" />
15201518
<flag name="Wno-missing-braces" comment="Conform to style." context="c++" />
1521-
<flag name="Wno-mismatched-tags" compiler="clang" comment="Conflict in stdlib under clang." context="c++" />
1519+
<flag name="Wno-comment" comment="Ignore comments within comments or commenting of backslash extended lines." context="c++" />
15221520

1523-
<!-- boost -->
1524-
<!-- <flag name="Wno-deprecated-declarations" compiler="gcc" comment="Clean up boost 1.55 headers." context="c++" /> -->
1525-
<!-- <flag name="Wno-redeclared-class-member" compiler="clang" comment="Clean up boost 1.55 headers." context="c++" /> -->
1521+
<flag name="Wno-mismatched-tags" compiler="clang" comment="Conflict in stdlib under clang." context="c++" />
1522+
<!-- <flag name="fvisibility=hidden" compiler="gcc" comment="Hide internal functions from external libs." context="c++" /> -->
15261523

15271524
<flag name="fstack-protector" comment="Protect stack." context="link" />
15281525
<flag name="fstack-protector-all" comment="Protect stack comprehensively." context="link" />
1529-
<!-- <flag name="fvisibility=hidden" compiler="gcc" comment="Hide internal functions from external libs." context="c++" /> -->
1530-
<flag name="fvisibility-inlines-hidden" compiler="gcc" comment="Hide inlines from external libs." context="c++" />
15311526
</configure>
15321527

15331528
<make>
@@ -1712,6 +1707,7 @@
17121707
</dependency>
17131708
<dependency name="bitcoin" version="3.4.0" />
17141709

1710+
<!-- General flags -->
17151711
<flag name="std=c++11" comment="Require c++11 for all c++ products." context="c++" />
17161712

17171713
<flag name="Wall" comment="Warn on all stuff." context="c" />
@@ -1723,15 +1719,13 @@
17231719
<flag name="Wno-reorder" comment="Disallow warning on style order of declarations." context="c++" />
17241720
<flag name="Wno-missing-field-initializers" comment="Suppress warning for incomplete field initialization." context="c++" />
17251721
<flag name="Wno-missing-braces" comment="Conform to style." context="c++" />
1726-
<flag name="Wno-mismatched-tags" compiler="clang" comment="Conflict in stdlib under clang." context="c++" />
1722+
<flag name="Wno-comment" comment="Ignore comments within comments or commenting of backslash extended lines." context="c++" />
17271723

1728-
<!-- boost -->
1729-
<!-- <flag name="Wno-deprecated-declarations" compiler="gcc" comment="Clean up boost 1.55 headers." context="c++" /> -->
1724+
<flag name="Wno-mismatched-tags" compiler="clang" comment="Conflict in stdlib under clang." context="c++" />
1725+
<!-- <flag name="fvisibility=hidden" compiler="gcc" comment="Hide internal functions from external libs." context="c++" /> -->
17301726

17311727
<flag name="fstack-protector" comment="Protect stack." context="link" />
17321728
<flag name="fstack-protector-all" comment="Protect stack comprehensively." context="link" />
1733-
<!-- <flag name="fvisibility=hidden" compiler="gcc" comment="Hide internal functions from external libs." context="c++" /> -->
1734-
<flag name="fvisibility-inlines-hidden" compiler="gcc" comment="Hide inlines from external libs." context="c++" />
17351729
</configure>
17361730

17371731
<make>
@@ -1885,6 +1879,7 @@
18851879
<dependency name="bitcoin-node" version="3.4.0" />
18861880
<dependency name="bitcoin-protocol" version="3.4.0" />
18871881

1882+
<!-- General flags -->
18881883
<flag name="std=c++11" comment="Require c++11 for all c++ products." context="c++" />
18891884

18901885
<flag name="Wall" comment="Warn on all stuff." context="c" />
@@ -1896,16 +1891,13 @@
18961891
<flag name="Wno-reorder" comment="Disallow warning on style order of declarations." context="c++" />
18971892
<flag name="Wno-missing-field-initializers" comment="Suppress warning for incomplete field initialization." context="c++" />
18981893
<flag name="Wno-missing-braces" comment="Conform to style." context="c++" />
1899-
<flag name="Wno-mismatched-tags" compiler="clang" comment="Conflict in stdlib under clang." context="c++" />
1894+
<flag name="Wno-comment" comment="Ignore comments within comments or commenting of backslash extended lines." context="c++" />
19001895

1901-
<!-- boost -->
1902-
<!-- <flag name="Wno-deprecated-declarations" compiler="gcc" comment="Clean up boost 1.55 headers." context="c++" /> -->
1903-
<!-- <flag name="Wno-redeclared-class-member" compiler="clang" comment="Clean up boost 1.55 headers." context="c++" /> -->
1896+
<flag name="Wno-mismatched-tags" compiler="clang" comment="Conflict in stdlib under clang." context="c++" />
1897+
<!-- <flag name="fvisibility=hidden" compiler="gcc" comment="Hide internal functions from external libs." context="c++" /> -->
19041898

19051899
<flag name="fstack-protector" comment="Protect stack." context="link" />
19061900
<flag name="fstack-protector-all" comment="Protect stack comprehensively." context="link" />
1907-
<!-- <flag name="fvisibility=hidden" compiler="gcc" comment="Hide internal functions from external libs." context="c++" /> -->
1908-
<flag name="fvisibility-inlines-hidden" compiler="gcc" comment="Hide inlines from external libs." context="c++" />
19091901
</configure>
19101902

19111903
<make>

0 commit comments

Comments
 (0)