[Libreoffice-commits] .: 5 commits - configure.in download .gitignore Makefile.in
Tor Lillqvist
tml at kemper.freedesktop.org
Mon Jan 24 06:27:19 PST 2011
.gitignore | 4 ++--
Makefile.in | 32 ++++++++++++++++----------------
configure.in | 13 +++++++------
download | 42 ++++++++++++++++++++++++++++++++++--------
4 files changed, 59 insertions(+), 32 deletions(-)
New commits:
commit 6064fb37e83f9de1cca868a9604b2c299179675d
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Mon Jan 24 16:23:07 2011 +0200
Improve the Windows download code
Mark dbghinst.EXE as executable (from Cygwin's point of view) if
necessary.
Warn that running the security fix installer containing gdiplus.dll
might cause a UAC prompt, and instruct the developer what to do. Be
more verbose in abnormal situations after running it.
Drop some pointless messages.
diff --git a/download b/download
index b839bd8..578f26d 100755
--- a/download
+++ b/download
@@ -73,7 +73,6 @@ for i in wget /usr/bin/wget /usr/local/bin/wget /usr/sfw/bin/wget /opt/sfw/bin/w
ret=$?
if [ $ret -eq 0 ]; then
wget=$i
- echo found wget: $wget
break
fi
done
@@ -86,7 +85,6 @@ if [ -z "$wget" ]; then
# if [ $ret -eq 0 ]; then
if [ -x $i ]; then
curl=$i
- echo found curl: $curl
break
fi
done
@@ -94,7 +92,7 @@ fi
if [ -z "$wget" -a -z "$curl" ]; then
echo "ERROR: neither wget nor curl found!"
- exit
+ exit 1
fi
for i in md5 md5sum /usr/local/bin/md5sum gmd5sum /usr/sfw/bin/md5sum /opt/sfw/bin/gmd5sum /opt/local/bin/md5sum; do
@@ -106,7 +104,6 @@ for i in md5 md5sum /usr/local/bin/md5sum gmd5sum /usr/sfw/bin/md5sum /opt/sfw/b
ret=$?
if [ $ret -eq 0 ]; then
md5sum=$i
- echo found md5sum: $md5sum
break
fi
done
@@ -207,7 +204,11 @@ fi
if [ "$GUI" = "WNT" -a -n "$md5sum" ]; then
TMPUNPACK=`cygpath -d $TARFILE_LOCATION/tmp`
+ chmod a+w $TARFILE_LOCATION/tmp
if [ ! -f ./external/dbghelp/dbghelp.dll -a -f $TARFILE_LOCATION/dbghinst.EXE ]; then
+ if [ ! -x $TARFILE_LOCATION/dbghinst.EXE ]; then
+ chmod +x $TARFILE_LOCATION/dbghinst.EXE
+ fi
$TARFILE_LOCATION/dbghinst.EXE /T:$TMPUNPACK /C
sum=`$md5sum $md5special $TARFILE_LOCATION/tmp/dbghelp.exe | sed "s/ .*//"`
if [ "$sum" == "cd3086a91e37965dd761ef5fd5df5b15" ]; then
@@ -215,10 +216,35 @@ if [ "$GUI" = "WNT" -a -n "$md5sum" ]; then
fi
fi
if [ ! -f ./external/gdiplus/gdiplus.dll -a -f $TARFILE_LOCATION/WindowsXP-KB975337-x86-ENU.exe ]; then
- $TARFILE_LOCATION/WindowsXP-KB975337-x86-ENU.exe /extract:$TMPUNPACK /q
- sum=`$md5sum $md5special $TARFILE_LOCATION/tmp/asms/10/msft/windows/gdiplus/gdiplus.dll | sed "s/ .*//"`
- if [ "$sum" == "4721ab485e0c29cd1617a5f296b9cc47" ]; then
- cp $TARFILE_LOCATION/tmp/asms/10/msft/windows/gdiplus/gdiplus.dll ./external/gdiplus/gdiplus.dll
+ gdiplus_dll_path=asms/10/msft/windows/gdiplus/gdiplus.dll
+
+ # Run it through cmd so that the UAC prompt is displayed
+ echo
+ echo "NOTE: We are running the Microsoft KB975337 security fix installer"
+ echo "to get gdiplus.dll. You will most probably get a UAC prompt now."
+ echo "If you trust us, just enter your administrator password."
+ echo "The security fix is run with the /extract switch to just unpack"
+ echo "its files."
+ echo "If you don't trust us, just get gdiplus.dll yourself and put it"
+ echo "in external/gdiplus/gdiplus.dll."
+ echo "gdiplus.dll is included in the LibreOffice installer for the benefit of"
+ echo "Windows 2000 users."
+ # A few empty lines so that the above is visible even if the taskbar's auto-hide is turned on,
+ # and the UAC prompt caused it to taise (with a blinking icon for the UAC prompt)
+ echo
+ echo
+ echo
+ cmd /c "`cygpath -d $TARFILE_LOCATION/WindowsXP-KB975337-x86-ENU.exe` /extract:$TMPUNPACK /q"
+ if [ -f $TARFILE_LOCATION/tmp/$gdiplus_dll_path ]; then
+ echo "Extraction succeeded"
+ sum=`$md5sum $md5special $TARFILE_LOCATION/tmp/$gdiplus_dll_path | sed "s/ .*//"`
+ if [ "$sum" == "4721ab485e0c29cd1617a5f296b9cc47" ]; then
+ cp $TARFILE_LOCATION/tmp/$gdiplus_dll_path ./external/gdiplus/gdiplus.dll
+ else
+ echo "But unexpected checksum of $gdiplus_dll_path"
+ fi
+ else
+ echo "WindowsXP-KB975337-x86-ENU.exe did not unpack the expected $gdiplus_dll_path"
fi
fi
if [ ! -f ./external/vcredist/vcredist_x86.exe -a -f $TARFILE_LOCATION/vcredist_x86.exe ]; then
commit cb474209c04e5a26e13a8c0b524491e60124f01a
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Mon Jan 24 16:19:25 2011 +0200
Show more commands before executing them
I understand that for commands repeated hundreds of times deeper down
in the build it is a good idea to make them silent in makefiles, to
reduce the amount of output. But here commands are executed just once
when running make here, no need to hide them. (Except echo commands,
they should be hidden.)
diff --git a/Makefile.in b/Makefile.in
index 89da7c5..9a854ea 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -3,39 +3,39 @@
SHELL=/usr/bin/env bash
all: Makefile dmake/dmake at EXEEXT@ src.downloaded
- @. ./*[Ee]nv.[Ss]et.sh && \
+ . ./*[Ee]nv.[Ss]et.sh && \
cd instsetoo_native && \
build.pl -P at BUILD_NCPUS@ --all -- -P at BUILD_MAX_JOBS@
install:
- @. ./*[Ee]nv.[Ss]et.sh && \
- echo "Installing in $${prefix:- at prefix@}..." && \
- ooinstall "$${prefix:- at prefix@}" && \
- echo "" && \
+ @echo "Installing in $${prefix:-/usr/local}..."
+ . ./*[Ee]nv.[Ss]et.sh && \
+ ooinstall "$${prefix:- at prefix@}"
+ @echo && \
echo "Installation finished, you can now execute:" && \
echo "$${prefix:- at prefix@}/program/soffice"
dev-install:
- @. ./*[Ee]nv.[Ss]et.sh && \
- ooinstall -l @abs_builddir@/install && \
- echo "" && \
+ . ./*[Ee]nv.[Ss]et.sh && \
+ ooinstall -l @abs_builddir@/install
+ @echo && \
echo "Developer installation finished, you can now execute:" && \
echo "@abs_builddir@/install/program/soffice"
distclean: dmake/dmake at EXEEXT@
- @. ./*[Ee]nv.[Ss]et.sh && \
+ . ./*[Ee]nv.[Ss]et.sh && \
dmake distclean
clean: dmake/dmake at EXEEXT@
- @. ./*[Ee]nv.[Ss]et.sh && \
+ . ./*[Ee]nv.[Ss]et.sh && \
dmake clean
dmake/dmake at EXEEXT@:
- @. ./*[Ee]nv.[Ss]et.sh && \
+ . ./*[Ee]nv.[Ss]et.sh && \
./bootstrap
src.downloaded: ooo.lst download
- @. ./*[Ee]nv.[Ss]et.sh && \
+ . ./*[Ee]nv.[Ss]et.sh && \
$$SRC_ROOT/download $$SRC_ROOT/ooo.lst && touch $@
fetch: src.downloaded
@@ -44,19 +44,19 @@ Makefile: configure.in set_soenv.in Makefile.in
./autogen.sh
check: Makefile dmake/dmake at EXEEXT@ fetch
- @. ./*[Ee]nv.[Ss]et.sh && \
+ . ./*[Ee]nv.[Ss]et.sh && \
cd smoketestoo_native && \
export SAL_USE_VCLPLUGIN="svp" && \
build.pl -P at BUILD_NCPUS@ --all -- -P at BUILD_MAX_JOBS@
id:
- @. ./*[Ee]nv.[Ss]et.sh && \
+ . ./*[Ee]nv.[Ss]et.sh && \
create-ids
tags:
- @. ./*[Ee]nv.[Ss]et.sh && \
+ . ./*[Ee]nv.[Ss]et.sh && \
create-tags
docs:
- @. ./*[Ee]nv.[Ss]et.sh && \
+ . ./*[Ee]nv.[Ss]et.sh && \
mkdocs.sh $$SRC_ROOT/docs $$SOLARENV/inc/doxygen.cfg
commit 62fb0fa5f3cfafca0f57050c3c4784fb06dbcd43
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Mon Jan 24 14:31:23 2011 +0200
Clean up messages from the Microsoft assembler configury a bit
diff --git a/configure.in b/configure.in
index 4714e03..a0e040d 100755
--- a/configure.in
+++ b/configure.in
@@ -6060,16 +6060,19 @@ else
assembler_bin=bin/amd64
fi
if test "$_os" = "WINNT" -a "$WITH_MINGW" != "yes"; then
- AC_MSG_CHECKING([$assembler assembler path])
if test -n "$with_asm_home"; then
with_asm_home=`cygpath -u "$with_asm_home"`
fi
- if test ! -x "$with_asm_home/$assembler"; then
+ if test -x "$with_asm_home/$assembler"; then
+ AC_MSG_CHECKING([$assembler assembler path])
+ AC_MSG_RESULT([$with_asm_home/$assembler])
+ else
AC_PATH_PROG(ML_EXE, $assembler)
if test -z "$ML_EXE"; then
+ AC_MSG_CHECKING([$with_cl_home/$assembler_bin/$assembler])
if test -x "$with_cl_home/$assembler_bin/$assembler"; then
with_asm_home=$with_cl_home/$assembler_bin
- AC_MSG_RESULT([found ($with_asm_home)])
+ AC_MSG_RESULT([found])
else
AC_MSG_ERROR([Configure did not find $assembler assembler.])
fi
@@ -6077,7 +6080,6 @@ if test "$_os" = "WINNT" -a "$WITH_MINGW" != "yes"; then
with_asm_home="ASM_IN_PATH"
fi
fi
- AC_MSG_RESULT([$ASM_HOME])
else
with_asm_home="NO_ASM_HOME"
fi
commit 4a1f8292605edeb00ebd942eacfd57adfcd1787d
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Mon Jan 24 13:53:59 2011 +0200
Include the wntmscx build directories
diff --git a/.gitignore b/.gitignore
index 5876759..df61cc5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,8 +9,8 @@
# the build directories
/*/unxlng??
/*/unxlng??.pro
-/*/wntmsci??
-/*/wntmsci??.pro
+/*/wntmsc???
+/*/wntmsc???.pro
/*/unxmac??
/*/unxmac??.pro
/solver/*
commit 052da73d174186676be46b22ae83a22310657a3a
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Mon Jan 24 13:32:24 2011 +0200
Missing NSIS is not really a cause for a WARNING
diff --git a/configure.in b/configure.in
index bdbe740..4714e03 100755
--- a/configure.in
+++ b/configure.in
@@ -5939,8 +5939,7 @@ if test "$_os" = "WINNT" ; then
NSIS_PATH="$nsistest"
fi
if test -z "$NSIS_PATH"; then
- AC_MSG_WARN([NSIS not found, no self contained installer will be build.])
- echo "NSIS not found, no self contained installer will be build." >> warn
+ AC_MSG_RESULT([NSIS not found, no self contained installer will be build.])
else
NSIS_PATH=`cygpath -d "$NSIS_PATH"`
NSIS_PATH=`cygpath -u "$NSIS_PATH"`
More information about the Libreoffice-commits
mailing list