Skip to content

Commit 09e4eb5

Browse files
authored
升级pugixml至最新1.10, 统一元素大小写,一律小写 (#11)
* 升级pugixml至最新1.10 * fix cmake version * Make cmake scripts compatible with cmake-3.10 * fix ci * Sets minimal CMAKE_VS_PLATFORM_TOOLSET to v100 * fix ci * fix ci issues * Appveyor build work image doesn't install visual studio 2010 Win64 platform toolset * Update build ver, [skip appveyor] * DUI控件类型名称统一为小写 * 统一xml序列化ui元素名称为小写 * 修改设计器版本号为2.0 * 保留设计器xml布局里的注释 * Update
1 parent a2c03cb commit 09e4eb5

162 files changed

Lines changed: 5261 additions & 4978 deletions

File tree

Some content is hidden

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

.appveyor.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@ image:
22
- Visual Studio 2013
33
- Visual Studio 2019
44

5-
version: 1.0.{build}
5+
version: 2.0.{build}
66

77
environment:
88
matrix:
9-
- GEN: -G "Visual Studio 12 2013"
9+
- GEN: -T v100 -G "Visual Studio 12 2013"
1010
- GEN: -G "Visual Studio 12 2013 Win64"
1111
- GEN: -A Win32 -G "Visual Studio 16 2019"
1212
- GEN: -G "Visual Studio 16 2019"
1313
matrix:
1414
exclude:
1515
- image: Visual Studio 2019
16-
GEN: -G "Visual Studio 12 2013"
16+
GEN: -T v100 -G "Visual Studio 12 2013"
1717
- image: Visual Studio 2019
1818
GEN: -G "Visual Studio 12 2013 Win64"
1919
- image: Visual Studio 2013

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# guoyou 2015-1-5 1.0
77
# k000 2017-07-11 修复项目作为子项目引入时PrecompiledHeader.cmake路径错误
88
#-------------------------------------------------------
9-
cmake_minimum_required(VERSION 2.8)
9+
cmake_minimum_required(VERSION 3.10)
1010
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
1111

1212
# 工程名

DmMain/CMakeLists.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,13 @@ SET(CMAKE_CXX_FLAGS_RELEASE "/MT /O2 /Ob2 /D NDEBUG")
8383
SET(CMAKE_CXX_FLAGS_MINSIZEREL "/MT /O1 /Ob1 /D NDEBUG")
8484
SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MT /Zi /O2 /Ob1 /D NDEBUG")
8585
endif()
86+
87+
if (${CMAKE_MAJOR_VERSION} GREATER_EQUAL 3 AND ${CMAKE_MINOR_VERSION} GREATER_EQUAL 16)
88+
set_source_files_properties(src/Common/pugixml.cpp PROPERTIES SKIP_PRECOMPILE_HEADERS ON)
89+
else()
90+
set_source_files_properties(src/Common/pugixml.cpp PROPERTIES COMPILE_FLAGS /Y-)
91+
endif()
92+
8693
if(USE_DMDLL_)
8794
ADD_LIBRARY(DmMain SHARED
8895
${ROOT_HEADER};

DmMain/inc/Common/DMVersion.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
// Create date: 2017-3-16
1111
// ----------------------------------------------------------------
1212
#pragma once
13-
#define VER_MAJOR 1
13+
#define VER_MAJOR 2
1414
#define VER_MINOR 0
1515
#define VER_SLAVE 0
16-
#define VER_BUILD 259
16+
#define VER_BUILD 0
1717

1818
#define PRODUCTNAME "DMMain"
1919

DmMain/inc/Common/pugiconfig.hpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/**
2-
* pugixml parser - version 1.7
2+
* pugixml parser - version 1.10
33
* --------------------------------------------------------
4-
* Copyright (C) 2006-2015, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com)
5-
* Report bugs and download new versions at http://pugixml.org/
4+
* Copyright (C) 2006-2019, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com)
5+
* Report bugs and download new versions at https://pugixml.org/
66
*
77
* This library is distributed under the MIT License. See notice at the end
88
* of this file.
@@ -15,19 +15,19 @@
1515
#define HEADER_PUGICONFIG_HPP
1616

1717
// Uncomment this to enable wchar_t mode
18-
#define PUGIXML_WCHAR_MODE
18+
#define PUGIXML_WCHAR_MODE
1919

2020
// Uncomment this to enable compact mode
2121
// #define PUGIXML_COMPACT
2222

2323
// Uncomment this to disable XPath
24-
#define PUGIXML_NO_XPATH
24+
#define PUGIXML_NO_XPATH
2525

2626
// Uncomment this to disable STL
27-
#define PUGIXML_NO_STL
27+
#define PUGIXML_NO_STL
2828

2929
// Uncomment this to disable exceptions
30-
#define PUGIXML_NO_EXCEPTIONS
30+
#define PUGIXML_NO_EXCEPTIONS
3131

3232
// Set this to control attributes for public classes/functions, i.e.:
3333
// #define PUGIXML_API __declspec(dllexport) // to export all public symbols from DLL
@@ -49,7 +49,7 @@
4949
#endif
5050

5151
/**
52-
* Copyright (c) 2006-2015 Arseny Kapoulkine
52+
* Copyright (c) 2006-2019 Arseny Kapoulkine
5353
*
5454
* Permission is hereby granted, free of charge, to any person
5555
* obtaining a copy of this software and associated documentation
@@ -62,7 +62,7 @@
6262
*
6363
* The above copyright notice and this permission notice shall be
6464
* included in all copies or substantial portions of the Software.
65-
*
65+
*
6666
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
6767
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
6868
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

0 commit comments

Comments
 (0)