blob: 1acc130a74a3864e5c090d2d78ce333bb746013d (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
|
#!/bin/bash
#
#############################################################################
##
## Copyright (C) 2021 The Qt Company Ltd.
## Contact: https://www.qt.io/licensing/
##
## This file is part of the QtScxml module of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:GPL-EXCEPT$
## Commercial License Usage
## Licensees holding valid commercial Qt licenses may use this file in
## accordance with the commercial license agreement provided with the
## Software or, alternatively, in accordance with the terms contained in
## a written agreement between you and The Qt Company. For licensing terms
## and conditions see https://www.qt.io/terms-conditions. For further
## information use the contact form at https://www.qt.io/contact-us.
##
## GNU General Public License Usage
## Alternatively, this file may be used under the terms of the GNU
## General Public License version 3 as published by the Free Software
## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
## included in the packaging of this file. Please review the following
## information to ensure the GNU General Public License requirements will
## be met: https://www.gnu.org/licenses/gpl-3.0.html.
##
## $QT_END_LICENSE$
##
############################################################################/
usage() {
cat <<EOF >&2
Usage: update_moc [gu] [moc directory]
The moc directory should be qtbase's moc source directory
(absolute or relative). The script must be run from the directory
containing the moc files (moc.h et. al).
The script has two modes:
'g' Generates updated patches of the current qtscxml-specific moc
changes. Use this when the qtscxml-specific parts in moc files
have changed and the patches should be updated accordingly.
'u' Updates the moc from the upstream qtbase moc.
This mode gets the applicable qtbase moc files from the provided
directory, and updates their qtscxml copies by applying patches to them.
If you have not modified qtscxml moc code and just want to update the moc
code from upstream, this is the one you should use.
Examples:
moc_patches/update_moc g ../../../qtbase/src/tools/moc
moc_patches/update_moc u ../../../qtbase/src/tools/moc
EOF
die "$@"
}
checkFile () {
for f
do [[ -f "$f" ]] || die "Error: file \"$f\" does not exist."
done
}
warn () { echo "$@" >&2; }
die () {
[[ -h .upstream ]] && rm .upstream
warn "$@"
exit 1
}
generate_patch() {
echo Generating patches recording how qscxmlc moc differs from upstream.
# Link the upstream moc files to create a patch file with filepaths
# that are independent of the actual used upstream moc location.
ln -s "$MOC_DIR" .upstream
for file in "${FILES[@]}"
do
checkFile "$file" ".upstream/$file"
diff -u ".upstream/$file" "$file" > "moc_patches/$file.patch"
echo Generated "moc_patches/$file.patch"
done
# tidy up
rm .upstream
}
update_moc() {
echo Updating qscxmlc moc from upstream by applying saved patches.
for file in "${FILES[@]}"
do
checkFile "moc_patches/$file.patch" "$MOC_DIR/$file"
echo Patching file: "$file" with "moc_patches/$file.patch"
# overwrite the current file from upstream
cp "$MOC_DIR/$file" "$file"
if patch "$file" "moc_patches/$file.patch"
then echo Patched "$file"
else warn "Please hand-patch $file; see $file.orig and $file.rej and tidy them away when you are done."
fi
done
}
MODE="$1"
MOC_DIR="$2"
FILES=( "outputrevision.h" "moc.h" "generator.h" "generator.cpp" )
[[ -f moc_patches/update_moc.sh ]] || usage "Error: script must be run from the tools/qscxmlc/ directory."
[[ -n "$MOC_DIR" ]] || usage "Error: You did not specify a moc directory."
[[ -d "$MOC_DIR" ]] || usage "Error: moc directory \"$MOC_DIR\" does not exist."
case "$MODE" in
g) generate_patch ;;
u) update_moc ;;
*) usage "Error: mode \"$MODE\" is not recognized." ;;
esac
echo Done
|
