Skip to content

Commit d714b14

Browse files
committed
nginx: package more files
referring to offical releases
1 parent 6671629 commit d714b14

File tree

3 files changed

+24
-2
lines changed

3 files changed

+24
-2
lines changed

.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@ openssl-*/*
1111
libressl-*/*
1212
pcre-*/*
1313
zlib-*/*
14+
conf/*
15+
contrib/*
16+
docs/*
17+
html/*
18+
logs/*
19+
temp/*
1420

1521
# Prerequisites
1622
*.d

nginx-build-msys2.sh

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ do
1111
esac
1212
done
1313

14+
# create dir for docs
15+
mkdir -p docs
16+
1417
# init
1518
machine_str="$(gcc -dumpmachine | cut -d'-' -f1)"
1619

@@ -58,6 +61,18 @@ tar -xf "${PCRE}.tar.bz2"
5861
wget -c -nv "https://www.openssl.org/source/${OPENSSL}.tar.gz"
5962
tar -xf "${OPENSSL}.tar.gz"
6063

64+
# make changes
65+
make -f docs/GNUmakefile changes
66+
mv -f tmp/*/CHANGES* ../docs/
67+
68+
# copy docs and licenses
69+
cp -f docs/text/LICENSE ../docs/
70+
cp -f docs/text/README ../docs/
71+
cp -pf "${OPENSSL}/LICENSE" '../docs/OpenSSL.LICENSE'
72+
cp -pf "${PCRE}/LICENCE" '../docs/PCRE.LICENCE'
73+
sed -ne '/^ (C) 1995-20/,/^ jloup@gzip\.org/p' "${ZLIB}/README" > '../docs/zlib.LICENSE'
74+
touch -r "${ZLIB}/README" '../docs/zlib.LICENSE'
75+
6176
# configure
6277
configure_args=(
6378
--sbin-path=nginx.exe \
@@ -94,7 +109,7 @@ configure_args=(
94109
--prefix=
95110
)
96111
echo ${configure_args[@]}
97-
auto/configure ${configure_args[@]} --with-cc-opt='-O2 -fno-strict-aliasing -pipe'
112+
auto/configure ${configure_args[@]} --with-cc-opt='-s -O2 -fno-strict-aliasing -pipe'
98113

99114
# build
100115
make -j$(nproc)

nginx-package-msys2.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
#!/bin/bash
22
cp -rf nginx/conf .
33
cp -rf nginx/docs/html .
4+
cp -rf nginx/contrib .
45
rm -rf temp logs
56
mkdir -p temp
67
mkdir -p logs
7-
7z a -mx9 nginx-bin.7z nginx-*.exe conf html temp logs
8+
7z a -mx9 nginx-bin.7z nginx-*.exe contrib docs conf html temp logs

0 commit comments

Comments
 (0)