[Libreoffice-commits] .: 2 commits - bootstrap configure.ac download .gitignore Makefile.top post_download.in solenv/CustomTarget_concat-deps.mk solenv/gbuild solenv/Module_solenv.mk solenv/Package_concat-deps.mk
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sat Nov 3 09:42:41 PDT 2012
.gitignore | 6 -
Makefile.top | 8 --
bootstrap | 8 --
configure.ac | 9 --
download | 132 +++++++++++++++++++++----------------
post_download.in | 84 -----------------------
solenv/CustomTarget_concat-deps.mk | 26 +++++++
solenv/Module_solenv.mk | 7 +
solenv/Package_concat-deps.mk | 14 +++
solenv/gbuild/LinkTarget.mk | 2
solenv/gbuild/UnoApiTarget.mk | 2
11 files changed, 128 insertions(+), 170 deletions(-)
New commits:
commit 8835ac678f54ec881c5072290fe54be0cc9b5196
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Wed Oct 31 14:51:05 2012 +0100
bin pointless post_download.in
Getting dbghelp.dll with help of dbg_x86.msi was removed.
It was most probably obsolete.
Change-Id: Iab4c63b2ad883e3d1db3df965eecf15dccb478eb
diff --git a/.gitignore b/.gitignore
index 02d1c87..81581c5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,7 +61,6 @@
/configure
/desktop/scripts/soffice.sh
/makefile.mk
-/post_download
/bin/repo-list
/src.downloaded
/ooo.lst
@@ -81,7 +80,6 @@
/warn
/build.log
/build_error.log
-/post_download.log
/install
/downloaded
/ID
diff --git a/Makefile.top b/Makefile.top
index 867d2df..19e5f73 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -359,8 +359,7 @@ ifeq ($(BUILD_DMAKE),YES)
rm -f solenv/*/bin/dmake*
endif
rm -fr config_host.mk config_build.mk aclocal.m4 autom4te.cache \
- config.log config.status configure \
- ooo.lst post_download post_download.log \
+ config.log config.status configure ooo.lst \
config_host.mk.last set_soenv.stamp src.downloaded warn
find $(SOLARENV)/gdb -name "*.pyc" -exec rm {} \;
diff --git a/configure.ac b/configure.ac
index 5114c39..e9b448b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4079,7 +4079,6 @@ if test "$cross_compiling" = "yes"; then
configure \
ooo.lst.in \
oowintool \
- post_download.in \
solenv/bin/getcompver.awk \
solenv/inc/langlist.mk \
solenv/inc/postset.mk \
@@ -12795,14 +12794,6 @@ AC_SUBST(LO_PATH)
# make sure config.guess is +x; we execute config.guess, so it has to be so
chmod +x ./config.guess
-dnl Setting up the post_download check script
-dnl Using autoconf here, so that the migration from the previous state
-dnl (checks for the additional Windows downloads were directly in
-dnl configure.ac) is as easy as possible
-echo "setting up the post_download check script"
-autoconf post_download.in > post_download
-chmod +x post_download
-
# Generate a configuration timestamp we can use for deps
if test -f config_host.mk; then
mv -f config_host.mk config_host.mk.last
diff --git a/download b/download
index eed44ff..7b0aca0 100755
--- a/download
+++ b/download
@@ -208,52 +208,86 @@ if [ ! -z "$failed" ]; then
exit 1
fi
-if [ "$COM" = "MSC" -a "$CPUNAME" = "INTEL" -a -n "$md5sum" ]; then
- # This can be run only on Windows itself (Cygwin)
- TMPUNPACK=`cygpath -d $TARFILE_LOCATION/tmp`
- chmod a+w $TARFILE_LOCATION/tmp
+if [ "$COM" = "MSC" -a "$CPUNAME" = "INTEL" ]; then
+
+ # Windows builds need dbghelp.dll in external/dbghelp/
if [ ! -f ./external/dbghelp/dbghelp.dll -a -f $TARFILE_LOCATION/$DBGHELP_DLL ]; then
- cp $TARFILE_LOCATION/$DBGHELP_DLL ./external/dbghelp/dbghelp.dll
- fi
- if [ ! -f ./external/dbghelp/dbghelp.dll -a -f $TARFILE_LOCATION/dbg_x86.msi ]; then
- msiexec /a `cygpath -d $TARFILE_LOCATION/dbg_x86.msi` /qn TARGETDIR=$TMPUNPACK SHORTFILENAMES=1
- dbghelp_dll_path=PFiles/DbgTools/dbghelp.dll
- sum=`$md5sum $md5special $TARFILE_LOCATION/tmp/$dbghelp_dll_path | sed "s/ .*//"`
- if [ "$sum" = "4003e34416ebd25e4c115d49dc15e1a7" ]; then
- cp $TARFILE_LOCATION/tmp/$dbghelp_dll_path ./external/dbghelp/dbghelp.dll
+ cp $TARFILE_LOCATION/$DBGHELP_DLL ./external/dbghelp/dbghelp.dll
+ else
+ echo "dbghelp.dll is missing in external/dbghelp/."
+ echo "Get it from the Microsoft site and put it there."
+ echo "(Note: Microsoft seems to enjoy changing the exact location of this file."
+ echo "You may have to search Microsoft's website.) Last time it was seen at:"
+ echo "<http://www.microsoft.com/downloads/release.asp?releaseid=30682>."
+ exit 1
+ fi
+
+ # Windows builds need gdiplus.dll in external/gdiplus/
+ if [ ! -f ./external/gdiplus/gdiplus.dll -a -f $TARFILE_LOCATION/WindowsXP-KB958911-x86-ENU.exe -a -n "$md5sum" ]; then
+ # This can be run only on Windows itself (Cygwin)
+ TMPUNPACK=`cygpath -d $TARFILE_LOCATION/tmp`
+ chmod a+w $TARFILE_LOCATION/tmp
+ gdiplus_dll_path=SP3QFE/asms/10/msft/windows/gdiplus/gdiplus.dll
+ chmod +x $TARFILE_LOCATION/WindowsXP-KB958911-x86-ENU.exe
+
+ # Run it through cmd so that the UAC prompt is displayed
+ echo
+ echo "NOTE: We are running the Microsoft KB958911 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 -w $TARFILE_LOCATION/WindowsXP-KB958911-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" = "3a95b4d80a3586ab1e2f0c608608ebac" ]; 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-KB958911-x86-ENU.exe did not unpack the expected $gdiplus_dll_path"
fi
fi
- if [ ! -f ./external/gdiplus/gdiplus.dll -a -f $TARFILE_LOCATION/WindowsXP-KB958911-x86-ENU.exe ]; then
- gdiplus_dll_path=SP3QFE/asms/10/msft/windows/gdiplus/gdiplus.dll
- chmod +x `cygpath $TARFILE_LOCATION`/WindowsXP-KB958911-x86-ENU.exe
+ if [ -f ./external/gdiplus/gdiplus.dll ]; then
+ echo "gdiplus.dll is missing in external/gdiplus/."
+ echo "Get it from the Microsoft site and put it there."
+ echo "You may have to search Microsoft's website. Last time it was seen at:"
+ echo "<http://www.microsoft.com/downloads/details.aspx?familyid=6A63AB9C-DF12-4D41-933C-BE590FEAA05A&displaylang=en>."
+ exit 1
+ fi
+fi
- # Run it through cmd so that the UAC prompt is displayed
- echo
- echo "NOTE: We are running the Microsoft KB958911 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 -w $TARFILE_LOCATION/WindowsXP-KB958911-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" = "3a95b4d80a3586ab1e2f0c608608ebac" ]; 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-KB958911-x86-ENU.exe did not unpack the expected $gdiplus_dll_path"
+if [ "$COM" = "MSC" ]; then
+ if [ "$CPUNAME" = "INTEL" ]; then
+ ver=""
+ else
+ ver="-64"
+ fi
+ # use oowintool to copy CRT dlls and manifest
+ if ! ./oowintool --msvc-copy-dlls"$ver" ./external/msvcp ; then
+ echo "oowintool failed to copy CRT"
+ exit 1
+ fi
+
+ # use oowintool to copy VC redist merge modules
+ if ! ./oowintool --msvc-copy-msms"$ver" ./external/msm"$VCVER" ; then
+ echo "oowintool failed to copy merge modules"
+ exit 1
+ fi
+ if [ "$CPUNAME" = "INTEL" ]; then
+ if ! ./oowintool --msvc-copy-msms-64 ./external/msm"$VCVER" ; then
+ echo "WARNING: oowintool failed to copy x64 merge modules, installation will lack the 64-bit Explorer extension"
fi
fi
fi
@@ -264,20 +298,6 @@ if [ -n "$OXYGENOFFICE_PACK" ] ; then
unzip -o -q $TARFILE_LOCATION/$OXYGENOFFICE_PACK -d $SRC_ROOT/src
fi
-[ -x "post_download" ] || { echo "'post_download' script not found, run ./autogen.sh." ; exit 1 ; }
-
-# Save the config.log from the main configure script
-# and restore it after running post_download.
-mv config.log config.log.save
-
-./post_download --build=$BUILD_PLATFORM --host=$HOST_PLATFORM
-post_download_status=$?
-
-test -f config.log && mv config.log post_download.log
-mv config.log.save config.log
-
-exit $post_download_status
-
# Local Variables:
# tab-width: 4
# indent-tabs-mode: nil
diff --git a/post_download.in b/post_download.in
deleted file mode 100644
index eef61aa..0000000
--- a/post_download.in
+++ /dev/null
@@ -1,84 +0,0 @@
-AC_INIT([LibreOffice],[3.6],[],[],[http://documentfoundation.org/])
-AC_PREREQ([2.59])
-
-echo "********************************************************************"
-echo "*"
-echo "* Running the post download checks."
-echo "*"
-echo "********************************************************************"
-
-AC_CANONICAL_HOST
-case "$host_os" in
- cygwin*) # Windows
- _os=WINNT
- ;;
- *)
- # We only do stuff for Windows here anyway
- _os=whatever
- ;;
-esac
-
-dnl ===================================================================
-dnl Windows builds need dbghelp.dll in external/dbghelp/
-dnl ===================================================================
-if test "$_os" = "WINNT" -a "$CPUNAME" = INTEL; then
- AC_MSG_CHECKING([for dbghelp.dll])
- if test -f ./external/dbghelp/dbghelp.dll; then
- AC_MSG_RESULT([found])
- else
- AC_MSG_ERROR([dbghelp.dll is missing in external/dbghelp/.
-Get it from the Microsoft site and put it into external/dbghelp.
-(Note: Microsoft seems to enjoy changing the exact location of this file. You
-may have to search Microsoft's website.) Last time it was seen at:
-<http://www.microsoft.com/downloads/release.asp?releaseid=30682>.])
- fi
-fi
-
-dnl ===================================================================
-dnl Windows builds - use oowintool to copy CRT dlls and manifest
-dnl ===================================================================
-if test "$COM" = "MSC"; then
- if test "$CPUNAME" = INTEL; then
- if ! ./oowintool --msvc-copy-dlls ./external/msvcp ; then
- AC_MSG_ERROR([oowintool failed to copy CRT])
- fi
- else
- if ! ./oowintool --msvc-copy-dlls-64 ./external/msvcp ; then
- AC_MSG_ERROR([oowintool failed to copy CRT])
- fi
- fi
-fi
-
-dnl ===================================================================
-dnl Windows builds - use oowintool to copy VC redist merge modules
-dnl ===================================================================
-if test "$COM" = "MSC"; then
- if test "$CPUNAME" = INTEL; then
- if ! ./oowintool --msvc-copy-msms ./external/msm"$VCVER" ; then
- AC_MSG_ERROR([oowintool failed to copy merge modules])
- fi
- fi
- if ! ./oowintool --msvc-copy-msms-64 ./external/msm"$VCVER" ; then
- if test "$CPUNAME" = INTEL; then
- AC_MSG_WARN([oowintool failed to copy x64 merge modules, installation
- will lack the 64-bit Explorer extension])
- else
- AC_MSG_ERROR([oowintool failed to copy CRT merge modules])
- fi
- fi
-fi
-
-dnl ===================================================================
-dnl Windows builds need gdiplus.dll in external/gdiplus/
-dnl ===================================================================
-if test "$_os" = "WINNT" -a "$CPUNAME" = INTEL; then
- AC_MSG_CHECKING([for gdiplus.dll])
- if test -f ./external/gdiplus/gdiplus.dll; then
- AC_MSG_RESULT([found])
- else
- AC_MSG_ERROR([gdiplus.dll is missing in external/gdiplus/.
-Get it from the Microsoft site and put it into external/gdiplus.
-You may have to search Microsoft's website. Last time it was seen at:
-<http://www.microsoft.com/downloads/details.aspx?familyid=6A63AB9C-DF12-4D41-933C-BE590FEAA05A&displaylang=en>.])
- fi
-fi
commit 75a087c80730bdce257756d863397da8268469b5
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Wed Oct 31 23:48:49 2012 +0100
compile concat-deps in solenv; also put them into $(OUTDIR)
Change-Id: I4ef21f14a77442b60059c649b83435c775670060
diff --git a/.gitignore b/.gitignore
index ebb1e06..02d1c87 100644
--- a/.gitignore
+++ b/.gitignore
@@ -104,10 +104,6 @@ TAGS
/solenv/gdb/libreoffice/*.py[co]
/solenv/gdb/libreoffice/util/*.py[co]
-# botstrap generated tool
-/solenv/bin/concat-deps
-/solenv/bin/concat-deps.exe
-
# test output files
test/user-template/user/psprint/pspfontcache
diff --git a/Makefile.top b/Makefile.top
index 2838a7b..867d2df 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -361,8 +361,7 @@ endif
rm -fr config_host.mk config_build.mk aclocal.m4 autom4te.cache \
config.log config.status configure \
ooo.lst post_download post_download.log \
- config_host.mk.last set_soenv.stamp src.downloaded warn \
- solenv/bin/concat-deps.exe solenv/bin/concat-deps
+ config_host.mk.last set_soenv.stamp src.downloaded warn
find $(SOLARENV)/gdb -name "*.pyc" -exec rm {} \;
#
@@ -392,7 +391,7 @@ endif
#
bootstrap: $(WORKDIR)/bootstrap compilerplugins
-$(WORKDIR)/bootstrap: solenv/bin/concat-deps.c
+$(WORKDIR)/bootstrap:
@cd $(SRCDIR) && ./bootstrap
@mkdir -p $(dir $@) && touch $@
diff --git a/bootstrap b/bootstrap
index 073f69a..b7a7362 100755
--- a/bootstrap
+++ b/bootstrap
@@ -72,14 +72,6 @@ if test "$BUILD_DMAKE" != "NO"; then
echo "dmake copied to $SOLARENV/$OUTPATH_FOR_BUILD/bin/dmake$EXEEXT"
fi
-# build concat-deps
-echo "building concat-deps"
-if [ "$COM_FOR_BUILD" = "MSC" ] ; then
- # on cygwin force the use of gcc
- gcc -O2 "$SOLARENV/bin/concat-deps.c" -o "$SOLARENV/bin/concat-deps" || exit
-else
- $CC_FOR_BUILD -O2 "$SOLARENV/bin/concat-deps.c" -o "$SOLARENV/bin/concat-deps" || exit
-fi
#make sure build.pl is executable
chmod +x "$SRC_ROOT/solenv/bin/build.pl"
diff --git a/solenv/CustomTarget_concat-deps.mk b/solenv/CustomTarget_concat-deps.mk
new file mode 100644
index 0000000..1f138c5
--- /dev/null
+++ b/solenv/CustomTarget_concat-deps.mk
@@ -0,0 +1,26 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_CustomTarget_CustomTarget,solenv/concat-deps))
+
+$(call gb_CustomTarget_get_target,solenv/concat-deps) : \
+ $(call gb_CustomTarget_get_workdir,solenv/concat-deps)/concat-deps
+
+$(call gb_CustomTarget_get_workdir,solenv/concat-deps)/concat-deps : \
+ $(SRCDIR)/solenv/bin/concat-deps.c \
+ | $(call gb_CustomTarget_get_workdir,solenv/concat-deps)/.dir
+ $(call gb_Output_announce,solenv/concat-deps,$(true),GCC,1)
+ifeq ($(COM_FOR_BUILD),MSC)
+ # on cygwin force the use of gcc
+ gcc -O2 $< -o $@
+else
+ $(CC_FOR_BUILD) -O2 $< -o $@
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/Module_solenv.mk b/solenv/Module_solenv.mk
index d107f9a..54db397 100644
--- a/solenv/Module_solenv.mk
+++ b/solenv/Module_solenv.mk
@@ -33,6 +33,13 @@ $(eval $(call gb_Module_add_targets,solenv,\
Package_minor \
))
+ifeq ($(CROSS_COMPILING),$(false))
+$(eval $(call gb_Module_add_targets,solenv,\
+ CustomTarget_concat-deps \
+ Package_concat-deps \
+))
+endif
+
ifeq ($(GUI),UNX)
ifneq ($(OS),IOS)
ifneq ($(OS),ANDROID)
diff --git a/solenv/Package_concat-deps.mk b/solenv/Package_concat-deps.mk
new file mode 100644
index 0000000..9d6319d
--- /dev/null
+++ b/solenv/Package_concat-deps.mk
@@ -0,0 +1,14 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Package_Package,solenv_concat-deps,$(call gb_CustomTarget_get_workdir,solenv/concat-deps)))
+
+$(eval $(call gb_Package_add_file,solenv_concat-deps,bin/concat-deps,concat-deps))
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 4b47c83..e63892b 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -386,7 +386,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(foreach object,$(8),$(call gb_GenCObject_get_dep_target,$(object))) \
$(foreach object,$(9),$(call gb_GenCxxObject_get_dep_target,$(object))) \
) && \
- $(SOLARENV)/bin/concat-deps $${RESPONSEFILE} > $(1)) && \
+ $(call gb_Executable_get_target_for_build,concat-deps) $${RESPONSEFILE} > $(1)) && \
rm -f $${RESPONSEFILE}
endef
diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index 98734ab..d5da154 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -143,7 +143,7 @@ $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) && \
RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),200,\
$(foreach idl,$(patsubst %.idl,%,$(3)),$(call gb_UnoApiPartTarget_get_dep_target,$(idl)))) && \
- $(SOLARENV)/bin/concat-deps $${RESPONSEFILE} > $(1)) && \
+ $(call gb_Executable_get_target_for_build,concat-deps) $${RESPONSEFILE} > $(1)) && \
rm -f $${RESPONSEFILE}
endef
More information about the Libreoffice-commits
mailing list