Skip to content

Commit 3d77f2f

Browse files
committed
chore: remove create dtkgui_config.h codes
the code move to dtkcore add .release.json file
1 parent cb09384 commit 3d77f2f

File tree

3 files changed

+27
-57
lines changed

3 files changed

+27
-57
lines changed

.release.json

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"commit": {
3+
"quilt": false,
4+
"pkgver": "echo $(git tag | sort -V | tail -n1)'+r'$(git log $(git describe --abbrev=0 --tags)..HEAD --oneline|wc -l)'+g'$(git rev-parse --short HEAD);",
5+
"dist": "experimental"
6+
},
7+
"release": {
8+
"quilt": true,
9+
"pkgver": "git describe --abbrev=0 --tags %(ref)s",
10+
"dist": "unstable"
11+
},
12+
"release-candidate": {
13+
"quilt": true,
14+
"dist": "unstable"
15+
}
16+
}

src/src.pro

+8-56
Original file line numberDiff line numberDiff line change
@@ -1,73 +1,25 @@
11
TARGET = dtkgui
22
TEMPLATE = lib
33
QT += dtkcore gui gui-private
4-
load(dtk_build)
5-
64
CONFIG += internal_module
75

86
include(private/private.pri)
97

108
HEADERS += \
11-
dnativesettings.h \
12-
dtkgui_global.h
9+
$$PWD/dnativesettings.h \
10+
$$PWD/dtkgui_global.h
1311

1412
SOURCES += \
15-
dnativesettings.cpp
13+
$$PWD/dnativesettings.cpp
1614

17-
includes.files += $$PWD/*.h
1815
includes.files += \
16+
$$PWD/*.h \
17+
$$PWD/DtkGuis \
18+
$$PWD/dtkgui_config.h \
1919
$$PWD/DNativeSettings
2020

21-
# create DtkGuis file
22-
defineTest(containIncludeFiles) {
23-
header = $$absolute_path($$ARGS)
24-
header_dir = $$quote($$dirname(header))
25-
26-
for (file, includes.files) {
27-
file_ap = $$absolute_path($$file)
28-
file_dir = $$quote($$dirname(file_ap))
29-
30-
isEqual(file_dir, $$header_dir):return(true)
31-
}
32-
33-
return(false)
34-
}
35-
36-
defineTest(updateDtkGuisFile) {
37-
dtkguis_include_files = $$HEADERS
38-
dtkguis_file_content = $$quote($${LITERAL_HASH}ifndef DTK_GUIS_MODULE_H)
39-
dtkguis_file_content += $$quote($${LITERAL_HASH}define DTK_GUIS_MODULE_H)
40-
41-
for(header, dtkguis_include_files) {
42-
containIncludeFiles($$header) {
43-
dtkguis_file_content += $$quote($${LITERAL_HASH}include \"$$basename(header)\")
44-
}
45-
}
46-
47-
dtkguis_file_content += $$quote($${LITERAL_HASH}endif)
48-
!write_file($$PWD/DtkGuis, dtkguis_file_content):return(false)
49-
50-
return(true)
51-
}
52-
53-
!updateDtkGuisFile():warning(Cannot create "DtkGuis" header file)
54-
55-
# create dtkgui_config.h file
56-
defineTest(updateDtkGuiConfigFile) {
57-
for(file, includes.files) {
58-
file = $$quote($$basename(file))
59-
60-
!isEqual(file, DtkGuis):contains(file, D[A-Za-z0-9_]+) {
61-
dtkgui_config_content += $$quote($${LITERAL_HASH}define DTKGUI_CLASS_$$file)
62-
}
63-
}
64-
65-
!write_file($$PWD/dtkgui_config.h, dtkgui_config_content):return(false)
66-
67-
return(true)
68-
}
69-
70-
!updateDtkGuiConfigFile():warning(Cannot create "dtkgui_config.h" header file)
21+
DTK_MODULE_NAME=$$TARGET
22+
load(dtk_build)
7123

7224
INSTALLS += includes target
7325

tools/deepin-gui-settings/deepin-gui-settings.pro

+3-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ CONFIG(debug, debug|release) {
1616
unix:QMAKE_RPATHDIR += $$OUT_PWD/../../src
1717
}
1818

19-
target.path = $$replace(QT.dtkcore.tools, DCore, DGui)
19+
DTK_MODULE_NAME=dtkgui
20+
load(dtk_build_config)
21+
target.path = $$TOOL_INSTALL_DIR
2022

2123
INSTALLS += target

0 commit comments

Comments
 (0)