Commit 37186030 authored by Drake Arconis's avatar Drake Arconis
Browse files

Update build files for new library version

parent 9b922b4b
......@@ -120,6 +120,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
</map>
<key>manifest</key>
<array>
<string>lib/debug/nghttp2.*</string>
<string>lib/release/nghttp2.*</string>
</array>
<key>name</key>
......
......@@ -53,22 +53,36 @@ restore_dylibs ()
done
}
mkdir -p "$stage/include/nghttp2"
mkdir -p "$stage/lib/debug"
mkdir -p "$stage/lib/release"
pushd "$top/nghttp2"
case "$AUTOBUILD_PLATFORM" in
windows*)
packages="$(cygpath -m "$stage/packages")"
load_vsvars
cmake . -G"$AUTOBUILD_WIN_CMAKE_GEN" -DCMAKE_C_FLAGS:STRING="$LL_BUILD_RELEASE" \
-DCMAKE_CXX_FLAGS:STRING="$LL_BUILD_RELEASE" \
-DCMAKE_INSTALL_PREFIX="$(cygpath -m "$stage")"
cmake --build . --config Release
# Stage archives
mkdir -p "${stage}/lib/release"
mv "$top/nghttp2/lib/Release"/nghttp2.* "${stage}"/lib/release/
mkdir -p "build"
pushd "build"
cmake .. -G"$AUTOBUILD_WIN_CMAKE_GEN" -T host=x64 -DENABLE_LIB_ONLY=ON \
-DCMAKE_SYSTEM_VERSION="10.0.17763.0" -DCMAKE_INSTALL_PREFIX="$(cygpath -m "$stage")"
cmake --build . --config Debug --clean-first
cmake --build . --config Release --clean-first
cp -a "lib/Debug/nghttp2.dll" \
"$stage/lib/debug/"
cp -a "lib/Debug/nghttp2.lib" \
"$stage/lib/debug/"
cp -a "lib/Debug/nghttp2.pdb" \
"$stage/lib/debug/"
cp -a "lib/Release/nghttp2.dll" \
"$stage/lib/release/"
cp -a "lib/Release/nghttp2.lib" \
"$stage/lib/release/"
cp -a lib/includes/nghttp2/nghttp2ver.h "$stage/include/nghttp2"
popd
;;
darwin*)
......@@ -85,7 +99,6 @@ pushd "$top/nghttp2"
cmake --build . --config Release
mkdir -p "$stage/lib/release"
mv "$top/nghttp2/lib"/libnghttp2*.dylib "$stage/lib/release/"
# SL-807: fix_dylib_id doesn't really handle symlinks, even though
......@@ -135,7 +148,6 @@ pushd "$top/nghttp2"
make
make check
mkdir -p "$stage/lib/release"
# ?! Unclear why this build tucks built libraries into a hidden
# .libs directory.
mv "$top/nghttp2/lib/.libs/libnghttp2.a" "$stage/lib/release/"
......@@ -145,5 +157,4 @@ pushd "$top/nghttp2"
cp "$top/nghttp2/COPYING" "$stage/LICENSES/nghttp2.txt"
popd
mkdir -p "$stage/include/nghttp2"
cp "$NGHTTP2_VERSION_HEADER_DIR"/*.h "$stage/include/nghttp2/"
cp "$NGHTTP2_VERSION_HEADER_DIR"/nghttp2.h "$stage/include/nghttp2/"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment