Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(187)

Unified Diff: windows/build.bash

Issue 7109015: Update XZ Utils to 5.0.3 (in deps) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/xz/
Patch Set: Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « windows/README-Windows.txt ('k') | windows/build.sh » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: windows/build.bash
===================================================================
--- windows/build.bash (revision 50504)
+++ windows/build.bash (working copy)
@@ -1,11 +1,11 @@
-#!/bin/sh
+#!/bin/bash
#
###############################################################################
#
# Build a binary package on Windows with MinGW and MSYS
#
# Set the paths where MinGW, Mingw-w32, or MinGW-w64 are installed. If both
-# MinGW and MinGW-w32 are specified, MinGW will be used. If there is no
+# MinGW and MinGW-w32 are specified, MinGW-w32 will be used. If there is no
# 32-bit or 64-bit compiler at all, it is simply skipped.
#
# Optionally, 7-Zip is used to create the final .zip and .7z packages.
@@ -48,9 +48,9 @@
# This script can be run either at the top-level directory of the package
# or in the same directory containing this script.
-if [ ! -f windows/build.sh ]; then
+if [ ! -f windows/build.bash ]; then
cd ..
- if [ ! -f windows/build.sh ]; then
+ if [ ! -f windows/build.bash ]; then
echo "You are in a wrong directory." >&2
exit 1
fi
@@ -98,15 +98,17 @@
--prefix= \
--disable-nls \
--disable-threads \
- --enable-dynamic=no \
--build="$BUILD" \
CFLAGS="$CFLAGS -O2"
- make check
+ make -C src/liblzma
+ make -C src/xz LDFLAGS=-static
+ make -C tests check
cp -v src/xz/xz.exe src/liblzma/.libs/liblzma.a "$DESTDIR"
cp -v src/liblzma/.libs/liblzma-*.dll "$DESTDIR/liblzma.dll"
- strip -v "$DESTDIR/"*
+ strip -v "$DESTDIR/"*.{exe,dll}
+ strip -vg "$DESTDIR/"*.a
}
# Copy files and convert newlines from LF to CR+LF. Optinally add a suffix
@@ -132,20 +134,20 @@
# support even Win95.
#
# FIXME: Using i486 in the configure triplet may be wrong.
-if [ -d "$MINGW_DIR" ]; then
+if [ -d "$MINGW_W32_DIR" ]; then
+ # 32-bit x86, Win95 or later, using MinGW-w32
+ PATH=$MINGW_W32_DIR/bin:$MINGW_W32_DIR/i686-w64-mingw32/bin:$PATH \
+ buildit \
+ pkg/bin_i486 \
+ i486-w64-mingw32 \
+ '-march=i486 -mtune=generic'
+elif [ -d "$MINGW_DIR" ]; then
# 32-bit x86, Win95 or later, using MinGW
PATH=$MINGW_DIR/bin:$PATH \
buildit \
pkg/bin_i486 \
i486-pc-mingw32 \
'-march=i486 -mtune=generic'
-elif [ -d "$MINGW_W32_DIR" ]; then
- # 32-bit x86, Win95 or later, using MinGW-w32
- PATH=$MINGW_W32_DIR/bin:$MINGW_W32_DIR/i686-w64-mingw32/bin:$PATH \
- buildit \
- pkg/bin_i486 \
- i486-w64-mingw32 \
- '-march=i486 -mtune=generic'
fi
if [ -d "$MINGW_W64_DIR" ]; then
@@ -159,19 +161,23 @@
# Copy the headers, the .def file, and the docs.
# They are the same for all architectures and builds.
-mkdir -pv pkg/{include/lzma,doc/manuals}
+mkdir -pv pkg/{include/lzma,doc/{manuals,examples}}
txtcp pkg/include "" src/liblzma/api/lzma.h
txtcp pkg/include/lzma "" src/liblzma/api/lzma/*.h
txtcp pkg/doc "" src/liblzma/liblzma.def
txtcp pkg/doc .txt AUTHORS COPYING NEWS README THANKS TODO
-txtcp pkg/doc "" doc/*.txt
+txtcp pkg/doc "" doc/*.txt windows/README-Windows.txt
txtcp pkg/doc/manuals "" doc/man/txt/{xz,xzdec,lzmainfo}.txt
cp -v doc/man/pdf-*/{xz,xzdec,lzmainfo}-*.pdf pkg/doc/manuals
-txtcp pkg "" windows/README-Windows.txt
+txtcp pkg/doc/examples "" doc/examples/*
+if [ -f windows/COPYING-Windows.txt ]; then
+ txtcp pkg/doc "" windows/COPYING-Windows.txt
+fi
+
# Create the package. This requires 7z.exe from 7-Zip. If it wasn't found,
# this step is skipped and you have to zip it yourself.
-VER=$(sh version.sh)
+VER=$(sh build-aux/version.sh)
cd pkg
if [ -x "$SEVENZ_EXE" ]; then
"$SEVENZ_EXE" a -tzip ../xz-$VER-windows.zip *
@@ -183,6 +189,13 @@
echo " You can create them yourself from the pkg directory."
fi
+if [ ! -f ../windows/COPYING-Windows.txt ]; then
+ echo
+ echo "NOTE: windows/COPYING-Windows.txt doesn't exists."
+ echo " MinGW(-w64) runtime copyright information"
+ echo " is not included in the package."
+fi
+
echo
echo "Build completed successfully."
echo
« no previous file with comments | « windows/README-Windows.txt ('k') | windows/build.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698