Skip to content

Commit f6c7f35

Browse files
author
Stéphane Leduc
committed
fix: bad files precedently commited
1 parent a521e5d commit f6c7f35

File tree

6 files changed

+70
-31
lines changed

6 files changed

+70
-31
lines changed

‎test/packagedependencies.txt.template‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
xpcf|<version>|xpcf%XPCF_SHARED_DEPS|github|https://github.com/b-com-software-basis/xpcf/releases/download
2+
xpcf_static_deps|<version>|xpcf_static_deps%XPCF_STATIC_DEPS|github|https://github.com/b-com-software-basis/xpcf/releases/download

‎test/testxpcf.pri‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
! exists(../version.pri) {
2+
win32 {
3+
system(scripts/win/update_version.bat -t ../version.pri)
4+
}
5+
linux {
6+
system(scripts/unixes/update_version.sh -t ../version.pri)
7+
}
8+
system(cd $${currentPath})
9+
}
10+
include(../version.pri)
111
VERSION=$${XPCF_VERSION}
212

313
CONFIG += c++1z

‎test/testxpcf.pro‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,17 @@
11
TARGET = testxpcf
22

3-
TEMPLATE_LIST_FILE=../version.pri packagedependencies.txt xpcf_registry_test.xml xpcf_xml_test_missing_end_tag.xml xpcf_xml_test_missing_start_tag.xml xpcf_xml_test_module_uuid_format_ko.xml xpcf_xml_test_property_type_invalid.xml xpcf_xml_test_property_unknown_component.xml xpcf_xml_test_unknown_component.xml xpcf_xml_test_unknown_property.xml xpcf_xml_test_valid.xml
4-
PROJECT_ROOT_PATH=$$_PRO_FILE_PWD_/..
5-
include ($${PROJECT_ROOT_PATH}/generate_template_files.pri)
3+
LIST = "xpcf_registry_test.xml.template" "xpcf_xml_test_missing_end_tag.xml" "xpcf_xml_test_missing_start_tag.xml.template" "xpcf_xml_test_module_uuid_format_ko.xml.template" "xpcf_xml_test_property_type_invalid.xml.template" "xpcf_xml_test_property_unknown_component.xml.template" "xpcf_xml_test_unknown_component.xml.template" "xpcf_xml_test_unknown_property.xml.template" "xpcf_xml_test_valid.xml.template"
4+
for(file, LIST) {
5+
! exists(file) {
6+
win32 {
7+
system(../scripts/win/update_version.bat)
8+
}
9+
linux {
10+
system(../scripts/unixes/update_version.sh)
11+
}
12+
break()
13+
}
14+
}
615

716
CONFIG += shared
817
DEPENDENCIESCONFIG = sharedlib recurse

‎test/testxpcf_static_deps.pro‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
TARGET = testxpcf_static_deps
22

3-
TEMPLATE_LIST_FILE=../version.pri packagedependencies.txt xpcf_registry_test.xml xpcf_xml_test_missing_end_tag.xml xpcf_xml_test_missing_start_tag.xml xpcf_xml_test_module_uuid_format_ko.xml xpcf_xml_test_property_type_invalid.xml xpcf_xml_test_property_unknown_component.xml xpcf_xml_test_unknown_component.xml xpcf_xml_test_unknown_property.xml xpcf_xml_test_valid.xml
4-
PROJECT_ROOT_PATH=$$_PRO_FILE_PWD_/..
5-
include ($${PROJECT_ROOT_PATH}/generate_template_files.pri)
6-
7-
CONFIG += shared
8-
DEPENDENCIESCONFIG = staticlib recurse
3+
REMAKEN_PKGSUBDIR=shared
4+
DEPENDENCIESCONFIG -= sharedlib
5+
DEPENDENCIESCONFIG += recurse
96
DEFINES += XPCF_STATIC_DEPS
107

118
include(testxpcf.pri)

‎xpcf.pro‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,33 @@
1-
TARGET = xpcf
2-
QT -= core gui
3-
CONFIG -= app_bundle qt
4-
FRAMEWORK = $${TARGET}
5-
6-
#CONFIG += verbose
1+
TARGET = xpcf
2+
3+
!exists(version.pri) {
4+
message("$$TARGET - version.pri not present, generate it")
5+
win32 {
6+
system(scripts/win/update_version.bat)
7+
}
8+
linux {
9+
system(scripts/unixes/update_version.sh)
10+
}
11+
}
712

8-
TEMPLATE_LIST_FILE=version.pri
9-
PROJECT_ROOT_PATH=$$_PRO_FILE_PWD_/.
10-
include ($${PROJECT_ROOT_PATH}/generate_template_files.pri)
13+
include(version.pri)
14+
QT -= core gui
15+
CONFIG -= app_bundle qt
1116

17+
FRAMEWORK = $${TARGET}
1218
VERSION=$${XPCF_VERSION}
19+
1320
DEFINES += XPCFVERSION=\\\"$${VERSION}\\\"
1421

1522
CONFIG += c++1z
16-
CONFIG += staticlib recurse
23+
#CONFIG += verbose
1724
!staticlib {
1825
CONFIG += shared
1926
} else {
2027
CONFIG -= shared
2128
}
2229
#message($${CONFIG})
30+
#CONFIG += verbose
2331

2432
# Uncomment following line to prepare remaken package
2533
#CONFIG += package_remaken
@@ -207,8 +215,6 @@ macx {
207215
win32 {
208216
DEFINES += _X86_VC12_TARGET_
209217
DEFINES += MBCS _MBCS
210-
211-
212218
}
213219

214220
INCLUDEPATH += $${PWD} $${PWD}/interfaces

‎xpcf_static_deps.pro‎

Lines changed: 25 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,42 @@
1-
TARGET = xpcf_static_deps
1+
!exists(version.pri) {
2+
message("$$TARGET - version.pri not present, generate it")
3+
win32 {
4+
system(scripts/win/update_version.bat)
5+
}
6+
linux {
7+
system(scripts/unixes/update_version.sh)
8+
}
9+
}
10+
11+
include(version.pri)
12+
VERSION=$${XPCF_VERSION}
13+
214
QT -= core gui
315
CONFIG -= app_bundle qt
16+
TARGET = xpcf_static_deps
417
FRAMEWORK = $${TARGET}
518

6-
#CONFIG += verbose
7-
8-
TEMPLATE_LIST_FILE=version.pri
9-
PROJECT_ROOT_PATH=$$_PRO_FILE_PWD_/.
10-
include ($${PROJECT_ROOT_PATH}/generate_template_files.pri)
11-
12-
VERSION=$${XPCF_VERSION}
1319
DEFINES += XPCFVERSION=\\\"$${VERSION}\\\"
1420

1521
CONFIG += c++1z
16-
CONFIG += shared
22+
#CONFIG += staticlib
23+
#CONFIG += verbose
24+
#!staticlib {
25+
CONFIG += shared
26+
#} else {
27+
# CONFIG -= shared
28+
#}
29+
#message($${CONFIG})
30+
#CONFIG += verbose
1731

1832
# Uncomment following line to prepare remaken package
1933
#CONFIG += package_remaken
2034

2135
DEFINES += WITHREMOTING
2236
DEFINES += XPCF_USE_BOOST
37+
2338
DEFINES += XPCF_SHARED
24-
DEPENDENCIESCONFIG = staticlib
39+
DEPENDENCIESCONFIG = staticlib #sharedlib
2540
REMAKEN_PKGSUBDIR=shared
2641

2742
CONFIG(debug,debug|release) {

0 commit comments

Comments
 (0)