[Libreoffice-commits] .: 6 commits - beanshell/bsh-2.0b1-src.patch beanshell/makefile.mk cairo/cairo-1.8.0.patch configure.in cppunit/makefile.mk cppunit/prj Module_tail_build.mk postprocess/prj solenv/gbuild tail_build/prj
Peter Foley
pefoley2 at kemper.freedesktop.org
Sat Oct 1 15:38:46 PDT 2011
Module_tail_build.mk | 1 +
beanshell/bsh-2.0b1-src.patch | 39 ---------------------------------------
beanshell/makefile.mk | 5 ++---
cairo/cairo-1.8.0.patch | 2 +-
configure.in | 26 ++++++++++----------------
cppunit/makefile.mk | 2 +-
cppunit/prj/d.lst | 3 +++
postprocess/prj/build.lst | 2 +-
solenv/gbuild/ExternalLib.mk | 2 +-
tail_build/prj/build.lst | 2 +-
10 files changed, 21 insertions(+), 63 deletions(-)
New commits:
commit 1a04d9feaebf54b5da21a45483b6e5971d674ad4
Author: Peter Foley <pefoley2 at verizon.net>
Date: Sat Oct 1 18:32:08 2011 -0400
add xmlsecurity to tail_build
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index c8afd89..4840c44 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -58,6 +58,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
wizards \
writerfilter \
writerperfect \
+ xmlsecurity \
))
ifeq ($(MERGELIBS),TRUE)
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index 3773355..0834cd0 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,4 +1,4 @@
-po postprocess :: accessibility BINFILTER:binfilter configmgr CRASHREP:crashrep CT2N:ct2n dtrans embeddedobj embedserv EPM:epm DESKTOP:extensions extras fpicker HELP:helpcontent2 io LIBRSVG:librsvg lingucomponent ODK:odk officecfg package psprint_config remotebridges scaddins scp2 DESKTOP:setup_native sysui testtools ucb UnoControls ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno readlicense_oo DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport LIBXSLT:libxslt tail_build NULL
+po postprocess :: accessibility BINFILTER:binfilter configmgr CRASHREP:crashrep CT2N:ct2n dtrans embeddedobj embedserv EPM:epm DESKTOP:extensions extras fpicker HELP:helpcontent2 io LIBRSVG:librsvg lingucomponent ODK:odk officecfg package psprint_config remotebridges scaddins scp2 DESKTOP:setup_native sysui testtools ucb UnoControls ure wizards xmerge MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno readlicense_oo DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport LIBXSLT:libxslt tail_build NULL
po postprocess usr1 - all po_mkout NULL
po postprocess\checkxml nmake - all po_checkxml NULL
po postprocess\checkdeliver nmake - all po_checkdlv NULL
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index cd0c537..1a2b852 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb tail_build : BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost DESKTOP:l10ntools LIBXML2:libxml2 LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds OPENSSL:openssl PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf avmedia basegfx basic bridges canvas comphelper connectivity cppcanvas cppu cppuhelper fpicker javaunohelper jurt jvmaccess offapi officecfg oovbaapi package qadevOOo DESKTOP:rdbmaker rhino ridljar sal sax sfx2 solenv soltools sot stoc svtools svx sysui test toolkit tools ucbhelper udkapi unoil unotools ure vcl xmlhelp xmloff xmlscript NULL
+tb tail_build : BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost DESKTOP:l10ntools LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf avmedia basegfx basic bridges canvas comphelper connectivity cppcanvas cppu cppuhelper fpicker javaunohelper jurt jvmaccess offapi officecfg oovbaapi package qadevOOo DESKTOP:rdbmaker rhino ridljar sal sax sfx2 solenv soltools sot stoc svtools svx sysui test toolkit tools ucbhelper udkapi unoil unotools ure vcl xmlhelp xmloff xmlscript NULL
tb tail_build\prj nmake - all tb_prj NULL
commit fb6a64d8fc6a93b52a10fad5516918fed9482f22
Author: Peter Foley <pefoley2 at verizon.net>
Date: Sat Oct 1 15:08:58 2011 -0400
make libcmis build aginst internal cppunit
diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk
index a136e34..913504c 100644
--- a/cppunit/makefile.mk
+++ b/cppunit/makefile.mk
@@ -144,7 +144,7 @@ CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
BUILD_ACTION = $(GNUMAKE) -j$(EXTMAXPROCESS)
BUILD_FLAGS = install
-OUTDIR2INC = ooo-install/include/cppunit
+OUTDIR2INC = ooo-install/include/cppunit ooo-install/lib/pkgconfig
OUT2BIN = ooo-install/bin/DllPlugInTester
.IF "$(OS)" == "MACOSX"
diff --git a/cppunit/prj/d.lst b/cppunit/prj/d.lst
index 1cfdb55..97e710d 100644
--- a/cppunit/prj/d.lst
+++ b/cppunit/prj/d.lst
@@ -36,3 +36,6 @@ symlink: %_DEST%\lib\libcppunit-1.12.a %_DEST%\lib\libcppunit.a
..\%__SRC%\bin\DllPlugInTester %_DEST%\bin\DllPlugInTester
..\%__SRC%\bin\DllPlugInTester.exe %_DEST%\bin\DllPlugInTester.exe
..\%__SRC%\bin\DllPlugInTester_dll.exe %_DEST%\bin\DllPlugInTester_dll.exe
+
+mkdir: %_DEST%\lib\pkgconfig
+..\%__SRC%\inc\pkgconfig\cppunit.pc %_DEST%\lib\pkgconfig\cppunit.pc
diff --git a/solenv/gbuild/ExternalLib.mk b/solenv/gbuild/ExternalLib.mk
index 142968f..07d45b6 100644
--- a/solenv/gbuild/ExternalLib.mk
+++ b/solenv/gbuild/ExternalLib.mk
@@ -97,7 +97,7 @@ define gb_ExternalLib__command_autotools
mkdir -p $(call gb_ExternalLib_get_builddir,$(1)) && \
tar -x -C $(call gb_ExternalLib_get_builddir,$(1)) --strip-component=1 -f $< && \
pushd $(call gb_ExternalLib_get_builddir,$(1)) && for p in $(T_PATCHES) ; do patch -p 1 < $(gb_REPOS)/$$p || exit 1; done && \
- CC="$(gb_CC)" CXX="$(gb_CXX)" CFLAGS="$(T_CFLAGS)" CXXFLAGS="$(T_CXXFLAGS)" ./configure --prefix=$(OUTDIR) $(T_CONF_ARGS) && \
+ CC="$(gb_CC)" CXX="$(gb_CXX)" CFLAGS="$(T_CFLAGS)" CXXFLAGS="$(T_CXXFLAGS)" PKG_CONFIG_PATH="$(OUTDIR)/lib/pkgconfig" ./configure --prefix=$(OUTDIR) $(T_CONF_ARGS) && \
for p in $(T_POST_PATCHES) ; do patch -p 1 < $(gb_REPOS)/$p || exit 1; done
#we don't want a deployed rpath pointing into our solver, to-do, set correct ORIGIN-foo ?
pushd $(call gb_ExternalLib_get_builddir,$(1)) && if test -e libtool ; then sed -i 's,^hardcode_libdir_flag_spec=.*,hardcode_libdir_flag_spec="",g' libtool && sed -i 's,^runpath_var=LD_RUN_PATH,runpath_var=DIE_RPATH_DIE,g' libtool; fi
commit 2f6dc09c05857ddc6238a425d64ab63577e90ec7
Author: Peter Foley <pefoley2 at verizon.net>
Date: Sat Sep 24 16:58:13 2011 -0400
don't use dmake ant.mk during beanshell build
diff --git a/beanshell/bsh-2.0b1-src.patch b/beanshell/bsh-2.0b1-src.patch
index 99e8b8b..a1358d3 100644
--- a/beanshell/bsh-2.0b1-src.patch
+++ b/beanshell/bsh-2.0b1-src.patch
@@ -29,45 +29,6 @@
<!-- Legacy excludes. Comment this *out* to build these legacy items -->
<property name="legacy-excludes"
---- misc/BeanShell/makefile.mk Fri Mar 28 15:56:40 2008
-+++ misc/build/BeanShell/makefile.mk Fri Mar 28 15:56:06 2008
-@@ -1 +1,35 @@
--dummy
-+#*************************************************************************
-+#
-+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+#
-+# Copyright 2000, 2010 Oracle and/or its affiliates.
-+#
-+# OpenOffice.org - a multi-platform office productivity suite
-+#
-+# This file is part of OpenOffice.org.
-+#
-+# OpenOffice.org is free software: you can redistribute it and/or modify
-+# it under the terms of the GNU Lesser General Public License version 3
-+# only, as published by the Free Software Foundation.
-+#
-+# OpenOffice.org is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+# GNU Lesser General Public License version 3 for more details
-+# (a copy is included in the LICENSE file that accompanied this code).
-+#
-+# You should have received a copy of the GNU Lesser General Public License
-+# version 3 along with OpenOffice.org. If not, see
-+# <http://www.openoffice.org/license.html>
-+# for a copy of the LGPLv3 License.
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..$/..
-+PRJNAME=ooo_beanshell
-+TARGET=jarall
-+
-+.INCLUDE : ant.mk
-+
-+ALLTAR : ANTBUILD
-+
--- misc/BeanShell/src/bsh/ClassGeneratorUtil.java Fri Dec 19 17:14:28 2003
+++ misc/build/BeanShell/src/bsh/ClassGeneratorUtil.java Fri Mar 28 15:55:05 2008
@@ -34,7 +34,9 @@
diff --git a/beanshell/makefile.mk b/beanshell/makefile.mk
index 6e89a00..dc22223 100644
--- a/beanshell/makefile.mk
+++ b/beanshell/makefile.mk
@@ -34,6 +34,7 @@ TARGET=ooo_beanshell
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
+.INCLUDE : antsettings.mk
# --- Files --------------------------------------------------------
@@ -42,9 +43,7 @@ TARFILE_MD5=ea570af93c284aa9e5621cd563f54f4d
TARFILE_ROOTDIR=BeanShell
PATCH_FILES=bsh-2.0b1-src.patch
-ADDITIONAL_FILES=makefile.mk
-
-BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
+BUILD_ACTION=$(ANT) $(ANT_FLAGS)
# --- Targets ------------------------------------------------------
commit 0d0bd8972089d8b891b4d021b57328653ee9012f
Author: Peter Foley <pefoley2 at verizon.net>
Date: Sun Sep 25 20:42:45 2011 -0400
make cairo build with libpng 1.5
diff --git a/cairo/cairo-1.8.0.patch b/cairo/cairo-1.8.0.patch
index 3c1f780..0ada5a4 100644
--- a/cairo/cairo-1.8.0.patch
+++ b/cairo/cairo-1.8.0.patch
@@ -202,7 +202,7 @@ diff -ur misc/build/cairo-1.8.0.org/configure misc/build/cairo-1.8.0/configure
if test "x$png_REQUIRES" = x; then
# libpng13 is GnuWin32's libpng-1.2.8 :-(
- for l in libpng12 libpng13 libpng10 ; do
-+ for l in libpng12 libpng13 libpng14 libpng10 ; do
++ for l in libpng12 libpng13 libpng14 libpng15 libpng10 ; do
if $PKG_CONFIG --exists $l ; then
png_REQUIRES=$l
use_png=yes
commit 0ce20f250af2a0adbaa37f45a13e8fe8f39eb4cc
Author: Peter Foley <pefoley2 at verizon.net>
Date: Sun Sep 25 19:38:33 2011 -0400
Don't generate config.status twice
The current configure script generates ooo.lst for the purpose of extracting
the filename for the seamonkey tarball. This is unnecessary because ooo.lst.in
contains the exact same filename. This patch moves the generation of ooo.lst
next to the other generated files. This move uncovered that the code to set
PREFIXDIR was depending on the AC_OUTPUT code to set prefix and exec_prefix
to /usr/local or the value of --prefix rather than NONE. Because of this I
added the prefix setting code from AC_OUTPUT to the code that sets PREFIXDIR.
diff --git a/configure.in b/configure.in
index b141f65..cb7cfcc 100644
--- a/configure.in
+++ b/configure.in
@@ -5709,8 +5709,6 @@ fi
AC_SUBST(WITH_LDAP)
AC_SUBST(WITH_OPENLDAP)
-AC_OUTPUT([ooo.lst])
-
dnl ===================================================================
dnl Check for system mozilla
dnl ===================================================================
@@ -5909,7 +5907,7 @@ if test "$BUILD_MOZAB" = "TRUE"; then
MOZILLA_VERSION=1.1.14
fi
MOZILLA_SOURCE_VERSION="seamonkey-${MOZILLA_VERSION}.source"
- MOZILLA_FETCH_FILE=`grep $MOZILLA_SOURCE_VERSION ooo.lst`
+ MOZILLA_FETCH_FILE=`grep $MOZILLA_SOURCE_VERSION ooo.lst.in`
AC_MSG_CHECKING([for Mozilla sources])
if test -z "$MOZILLA_FETCH_FILE"; then
AC_MSG_RESULT([not found])
@@ -9253,6 +9251,8 @@ AC_MSG_RESULT([$INSTALLDIRNAME])
AC_SUBST(INSTALLDIRNAME)
AC_MSG_CHECKING([for prefix])
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+test "x$exec_prefix" = xNONE && exec_prefix=$prefix
PREFIXDIR="$prefix"
AC_MSG_RESULT([$PREFIXDIR])
AC_SUBST(PREFIXDIR)
@@ -9492,7 +9492,8 @@ else
echo > set_soenv.last
fi
-AC_OUTPUT([set_soenv Makefile bin/repo-list desktop/scripts/soffice.sh])
+AC_CONFIG_FILES([ooo.lst set_soenv Makefile bin/repo-list desktop/scripts/soffice.sh])
+AC_OUTPUT
# make sure this is executable
chmod +x desktop/scripts/soffice.sh
commit 74bd1f57b56918a3ef5f27aa2565397a4c6e85e1
Author: Peter Foley <pefoley2 at verizon.net>
Date: Sun Sep 25 19:03:02 2011 -0400
get version from AC_PACKAGE_VERSION instead of files in solenv/inc
diff --git a/configure.in b/configure.in
index e49b885..b141f65 100644
--- a/configure.in
+++ b/configure.in
@@ -2112,9 +2112,7 @@ if test "$cross_compiling" = "yes"; then
post_download.in \
set_soenv.in \
solenv/inc/langlist.mk \
- solenv/inc/minor.mk \
solenv/inc/postset.mk \
- solenv/inc/productversion.mk \
desktop/scripts/soffice.sh.in \
| (cd CONF-FOR-BUILD && tar xf -)
(
@@ -2191,15 +2189,10 @@ AC_SUBST(SOLARINC_FOR_BUILD)
AC_SUBST(SOLARLIB_FOR_BUILD)
AC_SUBST(WORKDIR_FOR_BUILD)
-if test -e solenv/inc/minor.mk; then
- # Get UPD number from ./solenv/inc/minor.mk
- UPD="`grep RSCVERSION= solenv/inc/minor.mk | $AWK -F"=" '{ print $2 }'`"
- AC_SUBST(UPD)
- SOURCEVERSION="`grep SOURCEVERSION= solenv/inc/minor.mk | $AWK -F"=" '{ print $2 }'`"
- AC_SUBST(SOURCEVERSION)
-else
- AC_MSG_ERROR([solenv/inc/minor.mk missing but needed for architecture/os detecion and proper environment script generation...])
-fi
+UPD="`echo AC_PACKAGE_VERSION | sed "s/\.//"`0"
+SOURCEVERSION="OOO$UPD"
+AC_SUBST(UPD)
+AC_SUBST(SOURCEVERSION)
dnl ===================================================================
dnl Set the ENABLE_CRASHDUMP variable.
@@ -9025,7 +9018,7 @@ dnl ===================================================================
dnl Product version
dnl ===================================================================
AC_MSG_CHECKING([for product version])
-[eval $(sed -n -e 's/ //g' -e '/PRODUCTVERSION=/p' solenv/inc/productversion.mk)]
+PRODUCTVERSION=AC_PACKAGE_VERSION
AC_MSG_RESULT([$PRODUCTVERSION])
AC_SUBST(PRODUCTVERSION)
More information about the Libreoffice-commits
mailing list