blob: 0f81f052f3b5f996348d754a1ec5c81e2ab532ab (
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
|
#! /bin/sh
# Copyright (C) 2017 André Klitzing
# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
#
# This is a small script to copy the required files from a zlib tarball
# into 3rdparty/zlib/
if [ $# -ne 2 ]; then
echo "Usage: $0 zlib_tarball_dir/ \$QTDIR/src/3rdparty/zlib/"
exit 1
fi
# Name the arguments, omitting trailing slashes as we'll add where needed.
ZLIB_DIR="${1%/}"
TARGET_DIR="${2%/}"
if [ ! -d "$ZLIB_DIR" -o ! -r "$ZLIB_DIR" -o ! -d "$TARGET_DIR" -o ! -w "$TARGET_DIR" ]; then
echo "Either the zlib source dir or the target dir do not exist,"
echo "are not directories or have the wrong permissions."
exit 2
fi
# with 1 argument, copies ZLIB_DIR/$1 to TARGET_DIR/$1
# with 2 arguments, copies ZLIB_DIR/$1 to TARGET_DIR/$2
copy_file() {
if [ $# -lt 1 -o $# -gt 2 ]; then
echo "Wrong number of arguments to copy_file"
exit 3
fi
SOURCE_FILE=$1
if [ -n "$2" ]; then
DEST_FILE=$2
else
DEST_FILE=$1
fi
mkdir -p "$TARGET_DIR/$(dirname "$SOURCE_FILE")"
cp -v "$ZLIB_DIR/$SOURCE_FILE" "$TARGET_DIR/$DEST_FILE"
}
FILES="
README
ChangeLog
adler32.c
compress.c
crc32.c
crc32.h
deflate.c
deflate.h
gzclose.c
gzguts.h
gzlib.c
gzread.c
gzwrite.c
infback.c
inffast.c
inffast.h
inffixed.h
inflate.c
inflate.h
inftrees.c
inftrees.h
trees.c
trees.h
uncompr.c
zconf.h
zlib.h
zutil.c
zutil.h
"
for i in $FILES; do
copy_file "$i" "src/$i"
done
cat << EOF
Please do not forget to patch qtpatches.diff
The usual routine after this script is:
1. Create commit to clean staging
2. Apply qtpatches.diff with:
patch -p1 < qtpatches.diff
3. Update the version in: ChangeLog and src/zlib.h
4. Validate all changes and create new qtpatches.diff with:
git diff --relative > qtpatches.diff
5. Add changed files and amend the commit with these files.
If you want to revert the diff use: patch -p1 -Ri qtpatches.diff
EOF
|
