Skip to content

Commit f54a719

Browse files
author
Adrien SCHADLE
committed
fix(script): fix unixes package scripts
1 parent ae992c3 commit f54a719

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

scripts/unixes/package_xpcf.sh

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
#!/bin/bash
2-
32
QTVERSION=5.15.2
43
XPCFROOT=../..
54

65
display_usage() {
76
echo "This script builds xpcf and xpcfSampleComponent in shared and static mode with a special deployment option for packaging."
87
echo "It also compress the various xpcf packages."
98
echo "It can receive two optional arguments."
10-
echo -e "\nUsage: \$0 [path to xpcf project root | default='${XPCFROOT}'] [Qt kit version to use | default='${QTVERSION}'] \n"
9+
echo -e "\nUsage: \$0 [path to qmake] [path to xpcf project root | default='${XPCFROOT}'] [Qt kit version to use | default='${QTVERSION}'] \n"
1110
}
1211

1312
# check whether user had supplied -h or --help . If yes display usage
@@ -18,15 +17,18 @@ then
1817
fi
1918

2019
if [ $# -ge 1 ]; then
21-
XPCFROOT=$1
20+
QMAKEPATH=$1
21+
fi
22+
if [ $# -ge 2 ]; then
23+
XPCFROOT=$2
2224
fi
23-
if [ $# -eq 2 ]; then
24-
QTVERSION=$2
25+
if [ $# -eq 3 ]; then
26+
QTVERSION=$3
2527
fi
2628

27-
${XPCFROOT}/scripts/unixes/build_remaken_project_package.sh xpcf shared ${XPCFROOT} ${QTVERSION}
28-
${XPCFROOT}/scripts/unixes/build_remaken_project_package.sh xpcf static ${XPCFROOT} ${QTVERSION}
29-
${XPCFROOT}/scripts/unixes/build_remaken_project_package.sh xpcfSampleComponent shared ${XPCFROOT}/samples/sample_component ${QTVERSION}
29+
${XPCFROOT}/scripts/unixes/build_remaken_project_package.sh xpcf shared ${QMAKEPATH} ${XPCFROOT} ${QTVERSION}
30+
${XPCFROOT}/scripts/unixes/build_remaken_project_package.sh xpcf static ${QMAKEPATH} ${XPCFROOT} ${QTVERSION}
31+
${XPCFROOT}/scripts/unixes/build_remaken_project_package.sh xpcfSampleComponent shared ${QMAKEPATH} ${XPCFROOT}/samples/sample_component ${QTVERSION}
3032

3133
${XPCFROOT}/scripts/unixes/make_remaken_package.sh xpcf 2.6.2
3234
${XPCFROOT}/scripts/unixes/make_remaken_package.sh xpcfSampleComponent 2.6.2

0 commit comments

Comments
 (0)