Skip to content

Commit c7cbe7f

Browse files
danmardanmar
committed
rename externals/tinyxml to externals/tinyxml2
1 parent 8b0699c commit c7cbe7f

29 files changed

+138
-114
lines changed

Diff for: ‎.github/workflows/CI-unixish.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -103,12 +103,12 @@ jobs:
103103
make -j$(nproc) -s CPPFLAGS="-DCHECK_INTERNAL" CXXFLAGS="-g -O2" MATCHCOMPILER=yes VERIFY=1
104104
# self check lib/cli
105105
mkdir b1
106-
./cppcheck -q -j$(nproc) --template=gcc --cppcheck-build-dir=b1 -D__CPPCHECK__ --error-exitcode=1 --inline-suppr --suppressions-list=.travis_suppressions --library=cppcheck-lib --addon=naming.json -Ilib -Iexternals/simplecpp/ -Iexternals/tinyxml/ -Icli --inconclusive --enable=style,performance,portability,warning,internal --exception-handling cli lib
106+
./cppcheck -q -j$(nproc) --template=gcc --cppcheck-build-dir=b1 -D__CPPCHECK__ --error-exitcode=1 --inline-suppr --suppressions-list=.travis_suppressions --library=cppcheck-lib --addon=naming.json -Ilib -Iexternals/simplecpp/ -Iexternals/tinyxml2/ -Icli --inconclusive --enable=style,performance,portability,warning,internal --exception-handling cli lib
107107
# check gui with qt settings
108108
mkdir b2
109-
./cppcheck -q -j$(nproc) --template=gcc --cppcheck-build-dir=b2 -D__CPPCHECK__ -DQT_VERSION=0x050000 --error-exitcode=1 --inline-suppr --suppressions-list=.travis_suppressions --library=qt --addon=naming.json -Ilib -Iexternals/simplecpp/ -Iexternals/tinyxml/ --enable=style,performance,portability,warning,internal --exception-handling gui/*.cpp
109+
./cppcheck -q -j$(nproc) --template=gcc --cppcheck-build-dir=b2 -D__CPPCHECK__ -DQT_VERSION=0x050000 --error-exitcode=1 --inline-suppr --suppressions-list=.travis_suppressions --library=qt --addon=naming.json -Ilib -Iexternals/simplecpp/ -Iexternals/tinyxml2/ --enable=style,performance,portability,warning,internal --exception-handling gui/*.cpp
110110
# self check test and tools
111-
./cppcheck -q -j$(nproc) --template=gcc -D__CPPCHECK__ --error-exitcode=1 --inline-suppr --suppressions-list=.travis_suppressions --library=cppcheck-lib -Ilib -Iexternals/simplecpp/ -Iexternals/tinyxml/ -Icli -Igui --inconclusive --enable=style,performance,portability,warning,internal --exception-handling test/*.cpp tools
111+
./cppcheck -q -j$(nproc) --template=gcc -D__CPPCHECK__ --error-exitcode=1 --inline-suppr --suppressions-list=.travis_suppressions --library=cppcheck-lib -Ilib -Iexternals/simplecpp/ -Iexternals/tinyxml2/ -Icli -Igui --inconclusive --enable=style,performance,portability,warning,internal --exception-handling test/*.cpp tools
112112
113113
- name: Build triage on ubuntu
114114
if: matrix.os == 'ubuntu-latest'

Diff for: ‎.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ script:
194194
- make -s check -j2 CPPFLAGS=-DTEST_MATHLIB_VALUE
195195
- touch lib/mathlib.cpp test/testmathlib.cpp
196196
# syntax checking of cppcheck source code with -DNONNEG
197-
- ls lib/*.cpp | xargs -n 1 -P 2 g++ -fsyntax-only -std=c++0x -Ilib -Iexternals -Iexternals/picojson -Iexternals/simplecpp -Iexternals/tinyxml -DNONNEG
197+
- ls lib/*.cpp | xargs -n 1 -P 2 g++ -fsyntax-only -std=c++0x -Ilib -Iexternals -Iexternals/picojson -Iexternals/simplecpp -Iexternals/tinyxml2 -DNONNEG
198198
# compile cppcheck, default build
199199
- echo $CXXFLAGS
200200
- make -s check -j2

Diff for: ‎CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ if (BUILD_TESTS)
3333
enable_testing()
3434
endif()
3535

36-
add_subdirectory(externals/tinyxml)
36+
add_subdirectory(externals/tinyxml2)
3737
add_subdirectory(externals/simplecpp)
3838
add_subdirectory(lib) # CppCheck Library
3939
add_subdirectory(cli) # Client application

Diff for: ‎Makefile

+33-29
Large diffs are not rendered by default.

Diff for: ‎cli/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
include_directories(${PROJECT_SOURCE_DIR}/lib/)
2-
include_directories(SYSTEM ${PROJECT_SOURCE_DIR}/externals/tinyxml/)
2+
include_directories(SYSTEM ${PROJECT_SOURCE_DIR}/externals/tinyxml2/)
33
include_directories(${PROJECT_SOURCE_DIR}/externals/simplecpp/)
44

55
file(GLOB hdrs "*.h")
@@ -8,7 +8,7 @@ file(GLOB mainfile "main.cpp")
88
list(REMOVE_ITEM srcs ${mainfile})
99

1010
add_library(cli_objs OBJECT ${hdrs} ${srcs})
11-
add_executable(cppcheck ${hdrs} ${mainfile} $<TARGET_OBJECTS:cli_objs> $<TARGET_OBJECTS:lib_objs> $<TARGET_OBJECTS:tinyxml_objs> $<TARGET_OBJECTS:simplecpp_objs>)
11+
add_executable(cppcheck ${hdrs} ${mainfile} $<TARGET_OBJECTS:cli_objs> $<TARGET_OBJECTS:lib_objs> $<TARGET_OBJECTS:tinyxml2_objs> $<TARGET_OBJECTS:simplecpp_objs>)
1212
if (HAVE_RULES)
1313
target_link_libraries(cppcheck ${PCRE_LIBRARY})
1414
endif()

Diff for: ‎cli/cli.vcxproj

+8-8
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@
155155
</PropertyGroup>
156156
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
157157
<ClCompile>
158-
<AdditionalIncludeDirectories>..\lib;..\externals;..\externals\simplecpp;..\externals\tinyxml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
158+
<AdditionalIncludeDirectories>..\lib;..\externals;..\externals\simplecpp;..\externals\tinyxml2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
159159
<BrowseInformation>false</BrowseInformation>
160160
<BufferSecurityCheck>true</BufferSecurityCheck>
161161
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -183,7 +183,7 @@
183183
</ItemDefinitionGroup>
184184
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|Win32'">
185185
<ClCompile>
186-
<AdditionalIncludeDirectories>..\lib;..\externals;..\externals\simplecpp;..\externals\tinyxml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
186+
<AdditionalIncludeDirectories>..\lib;..\externals;..\externals\simplecpp;..\externals\tinyxml2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
187187
<BrowseInformation>false</BrowseInformation>
188188
<BufferSecurityCheck>true</BufferSecurityCheck>
189189
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -210,7 +210,7 @@
210210
</ItemDefinitionGroup>
211211
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
212212
<ClCompile>
213-
<AdditionalIncludeDirectories>..\lib;..\externals;..\externals\simplecpp;..\externals\tinyxml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
213+
<AdditionalIncludeDirectories>..\lib;..\externals;..\externals\simplecpp;..\externals\tinyxml2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
214214
<BufferSecurityCheck>true</BufferSecurityCheck>
215215
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
216216
<Optimization>Disabled</Optimization>
@@ -235,7 +235,7 @@
235235
</ItemDefinitionGroup>
236236
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|x64'">
237237
<ClCompile>
238-
<AdditionalIncludeDirectories>..\lib;..\externals;..\externals\simplecpp;..\externals\tinyxml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
238+
<AdditionalIncludeDirectories>..\lib;..\externals;..\externals\simplecpp;..\externals\tinyxml2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
239239
<BufferSecurityCheck>true</BufferSecurityCheck>
240240
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
241241
<Optimization>Disabled</Optimization>
@@ -260,7 +260,7 @@
260260
</ItemDefinitionGroup>
261261
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
262262
<ClCompile>
263-
<AdditionalIncludeDirectories>..\lib;..\externals;..\externals\simplecpp;..\externals\tinyxml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
263+
<AdditionalIncludeDirectories>..\lib;..\externals;..\externals\simplecpp;..\externals\tinyxml2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
264264
<BufferSecurityCheck>false</BufferSecurityCheck>
265265
<Optimization>MaxSpeed</Optimization>
266266
<PreprocessorDefinitions>CPPCHECKLIB_IMPORT;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -295,7 +295,7 @@
295295
</ItemDefinitionGroup>
296296
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-PCRE|Win32'">
297297
<ClCompile>
298-
<AdditionalIncludeDirectories>..\lib;..\externals;..\externals\simplecpp;..\externals\tinyxml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
298+
<AdditionalIncludeDirectories>..\lib;..\externals;..\externals\simplecpp;..\externals\tinyxml2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
299299
<BufferSecurityCheck>false</BufferSecurityCheck>
300300
<Optimization>MaxSpeed</Optimization>
301301
<PreprocessorDefinitions>CPPCHECKLIB_IMPORT;TINYXML2_IMPORT;NDEBUG;WIN32;HAVE_RULES;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;TIXML_USE_STL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -330,7 +330,7 @@
330330
</ItemDefinitionGroup>
331331
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
332332
<ClCompile>
333-
<AdditionalIncludeDirectories>..\lib;..\externals;..\externals\simplecpp;..\externals\tinyxml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
333+
<AdditionalIncludeDirectories>..\lib;..\externals;..\externals\simplecpp;..\externals\tinyxml2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
334334
<BufferSecurityCheck>false</BufferSecurityCheck>
335335
<Optimization>MaxSpeed</Optimization>
336336
<PreprocessorDefinitions>CPPCHECKLIB_IMPORT;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -365,7 +365,7 @@
365365
</ItemDefinitionGroup>
366366
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-PCRE|x64'">
367367
<ClCompile>
368-
<AdditionalIncludeDirectories>..\lib;..\externals;..\externals\simplecpp;..\externals\tinyxml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
368+
<AdditionalIncludeDirectories>..\lib;..\externals;..\externals\simplecpp;..\externals\tinyxml2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
369369
<BufferSecurityCheck>false</BufferSecurityCheck>
370370
<Optimization>MaxSpeed</Optimization>
371371
<PreprocessorDefinitions>CPPCHECKLIB_IMPORT;TINYXML2_IMPORT;NDEBUG;WIN32;HAVE_RULES;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

Diff for: ‎democlient/build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ rm cppcheck-$1.tar.bz2
1616
rm cppcheck-$1/Changelog
1717

1818
echo Building...
19-
g++ -O2 -o democlient-$1.cgi -I$cppchecklib -Icppcheck-$1/externals/tinyxml cppcheck-$1/democlient/democlient.cpp $cppchecklib/*.cpp cppcheck-$1/externals/tinyxml/tinyxml2.cpp
19+
g++ -O2 -o democlient-$1.cgi -I$cppchecklib -Icppcheck-$1/externals/tinyxml2 cppcheck-$1/democlient/democlient.cpp $cppchecklib/*.cpp cppcheck-$1/externals/tinyxml2/tinyxml2.cpp
2020

2121
echo Copy cgi to webspace...
2222
cp democlient-$1.cgi /home/project-web/cppcheck/cgi-bin/democlient.cgi

Diff for: ‎externals/externals.pri

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
INCLUDEPATH += $${PWD} \
22
$${PWD}/picojson \
33
$${PWD}/simplecpp \
4-
$${PWD}/tinyxml
4+
$${PWD}/tinyxml2
55

66
HEADERS += $${PWD}/picojson/picojson.h \
77
$${PWD}/simplecpp/simplecpp.h \
8-
$${PWD}/tinyxml/tinyxml2.h
8+
$${PWD}/tinyxml2/tinyxml2.h
99

1010
SOURCES += $${PWD}/simplecpp/simplecpp.cpp \
11-
$${PWD}/tinyxml/tinyxml2.cpp
11+
$${PWD}/tinyxml2/tinyxml2.cpp

Diff for: ‎externals/tinyxml/CMakeLists.txt

-23
This file was deleted.

Diff for: ‎externals/tinyxml2/CMakeLists.txt

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
file(GLOB hdrs "*.h")
2+
file(GLOB srcs "*.cpp")
3+
4+
add_library(tinyxml2_objs OBJECT ${srcs} ${hdrs})
5+
6+
# TODO: need to be fixed upstream
7+
if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
8+
target_compile_options(tinyxml2_objs PRIVATE -Wno-suggest-attribute=format)
9+
endif()
10+
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
11+
if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "8.0.0")
12+
target_compile_options(tinyxml2_objs PRIVATE -Wno-extra-semi-stmt)
13+
endif()
14+
endif()
15+
16+
# TODO: conflicts with ANALYZE_* options
17+
if (ENABLE_OSS_FUZZ AND CMAKE_CXX_COMPILER_ID MATCHES "Clang")
18+
add_library(tinyxml2_objs_sanitized OBJECT EXCLUDE_FROM_ALL ${srcs} ${hdrs})
19+
target_compile_options(tinyxml2_objs_sanitized PRIVATE -fsanitize=address)
20+
if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "8.0.0")
21+
target_compile_options(tinyxml2_objs_sanitized PRIVATE -Wno-extra-semi-stmt)
22+
endif()
23+
endif()

Diff for: ‎externals/tinyxml2/LICENSE

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
This software is provided 'as-is', without any express or implied
2+
warranty. In no event will the authors be held liable for any
3+
damages arising from the use of this software.
4+
5+
Permission is granted to anyone to use this software for any
6+
purpose, including commercial applications, and to alter it and
7+
redistribute it freely, subject to the following restrictions:
8+
9+
1. The origin of this software must not be misrepresented; you must
10+
not claim that you wrote the original software. If you use this
11+
software in a product, an acknowledgment in the product documentation
12+
would be appreciated but is not required.
13+
14+
2. Altered source versions must be plainly marked as such, and
15+
must not be misrepresented as being the original software.
16+
17+
3. This notice may not be removed or altered from any source
18+
distribution.

Diff for: ‎externals/tinyxml/tinyxml2.cpp renamed to ‎externals/tinyxml2/tinyxml2.cpp

File renamed without changes.

Diff for: ‎externals/tinyxml/tinyxml2.h renamed to ‎externals/tinyxml2/tinyxml2.h

File renamed without changes.

Diff for: ‎generate_coverage_report

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ rm lib/*.gcda
1414
rm lib/*.gcno
1515
rm test/*.gcda
1616
rm test/*.gcno
17-
rm externals/tinyxml/*.gcda
18-
rm externals/tinyxml/*.gcno
17+
rm externals/tinyxml2/*.gcda
18+
rm externals/tinyxml2/*.gcno
1919
rm lcov.info lcov_tmp.info
2020
make clean

Diff for: ‎gui/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ if (BUILD_GUI)
1010
endif()
1111

1212
include_directories(${PROJECT_SOURCE_DIR}/lib/)
13-
include_directories(SYSTEM ${PROJECT_SOURCE_DIR}/externals/tinyxml/)
13+
include_directories(SYSTEM ${PROJECT_SOURCE_DIR}/externals/tinyxml2/)
1414

1515
file(GLOB hdrs "*.h")
1616
file(GLOB srcs "*.cpp")
@@ -20,7 +20,7 @@ if (BUILD_GUI)
2020
QT5_ADD_RESOURCES(resources "gui.qrc")
2121
QT5_ADD_TRANSLATION(qms ${tss})
2222

23-
add_executable(cppcheck-gui ${hdrs} ${srcs} ${uis_hdrs} ${resources} ${qms} $<TARGET_OBJECTS:lib_objs> $<TARGET_OBJECTS:tinyxml_objs> $<TARGET_OBJECTS:simplecpp_objs>)
23+
add_executable(cppcheck-gui ${hdrs} ${srcs} ${uis_hdrs} ${resources} ${qms} $<TARGET_OBJECTS:lib_objs> $<TARGET_OBJECTS:tinyxml2_objs> $<TARGET_OBJECTS:simplecpp_objs>)
2424
if (HAVE_RULES)
2525
target_link_libraries(cppcheck-gui ${PCRE_LIBRARY})
2626
endif()

Diff for: ‎lib/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
include_directories(SYSTEM ${PROJECT_SOURCE_DIR}/externals/)
22
include_directories(SYSTEM ${PROJECT_SOURCE_DIR}/externals/picojson/)
3-
include_directories(SYSTEM ${PROJECT_SOURCE_DIR}/externals/tinyxml/)
3+
include_directories(SYSTEM ${PROJECT_SOURCE_DIR}/externals/tinyxml2/)
44
include_directories(${PROJECT_SOURCE_DIR}/externals/simplecpp/)
55

66
file(GLOB_RECURSE hdrs "*.h")

0 commit comments

Comments
 (0)