[Libreoffice-commits] .: 4 commits - config_host.mk.in configure.ac epm/ExternalPackage_epm.mk epm/ExternalProject_epm.mk epm/Makefile epm/makefile.mk epm/Module_epm.mk epm/prj epm/UnpackedTarball_epm.mk librsvg/ExternalPackage_librsvg.mk librsvg/prj Makefile.top Module_tail_build.mk ooo.lst.in openldap/ExternalPackage_openldap.mk openldap/ExternalProject_openldap.mk openldap/Makefile openldap/makefile.mk openldap/Module_openldap.mk openldap/prj openldap/UnpackedTarball_openldap.mk postgresql/ExternalProject_postgresql.mk postprocess/prj RepositoryExternal.mk RepositoryModule_ooo.mk tail_build/prj
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sun Oct 28 07:44:41 PDT 2012
Makefile.top | 4 -
Module_tail_build.mk | 2
RepositoryExternal.mk | 4 +
RepositoryModule_ooo.mk | 2
config_host.mk.in | 3 -
configure.ac | 14 ++---
epm/ExternalPackage_epm.mk | 20 ++++++++
epm/ExternalProject_epm.mk | 25 ++++++++++
epm/Makefile | 7 ++
epm/Module_epm.mk | 22 ++++++++
epm/UnpackedTarball_epm.mk | 18 +++++++
epm/makefile.mk | 66 --------------------------
epm/prj/d.lst | 3 -
librsvg/ExternalPackage_librsvg.mk | 7 --
librsvg/prj/d.lst | 14 -----
ooo.lst.in | 14 ++---
openldap/ExternalPackage_openldap.mk | 20 ++++++++
openldap/ExternalProject_openldap.mk | 42 +++++++++++++++++
openldap/Makefile | 7 ++
openldap/Module_openldap.mk | 22 ++++++++
openldap/UnpackedTarball_openldap.mk | 18 +++++++
openldap/makefile.mk | 76 -------------------------------
postgresql/ExternalProject_postgresql.mk | 2
postprocess/prj/build.lst | 2
tail_build/prj/build.lst | 2
25 files changed, 229 insertions(+), 187 deletions(-)
New commits:
commit c3a586a716424a0f22858823622328ce92cb9640
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Sun Oct 28 12:35:07 2012 +0100
openldap: convert to gbuild
Change-Id: Ic1c4c58a09fd41bce78731e61349baa129f5e935
diff --git a/Makefile.top b/Makefile.top
index 87653e1..b338201 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -126,6 +126,7 @@ offapi\
officecfg\
oovbaapi\
oox\
+openldap\
package\
packimages\
padmin\
@@ -238,7 +239,6 @@ mysqlc\
mysqlcppconn\
nss\
odk\
-openldap\
openssl\
pango\
postprocess\
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 7cafb1c..dc8d16d 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -117,6 +117,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
officecfg \
oovbaapi \
oox \
+ $(call gb_Helper_optional,OPENLDAP,openldap) \
package \
padmin \
$(call gb_Helper_optional,POSTGRESQL,postgresql) \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index e08beec..77be1e7 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1776,10 +1776,12 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\
define gb_LinkTarget__use_openldap
$(call gb_LinkTarget_set_include,$(1),\
- -I$(OUTDIR)/inc/openldap \
+ -I$(call gb_UnpackedTarball_get_dir,openldap/include) \
$$(INCLUDE) \
)
+$(call gb_LinkTarget_use_package,$(1),openldap)
+
$(call gb_LinkTarget_use_static_libraries,$(1),\
ldap \
lber \
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 226aa55..d8968ee 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -125,6 +125,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
officecfg \
oovbaapi \
oox \
+ $(call gb_Helper_optional,OPENLDAP,openldap) \
package \
packimages \
padmin \
diff --git a/config_host.mk.in b/config_host.mk.in
index 064eece..c1e0171 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -457,6 +457,7 @@ export OOOP_TEMPLATES_PACK=@OOOP_TEMPLATES_PACK@
export OOO_JUNIT_JAR=@OOO_JUNIT_JAR@
export OOO_SHELL=@BASH@
export OOO_VENDOR=@OOO_VENDOR@
+export OPENLDAP_TARBALL=@OPENLDAP_TARBALL@
export OPENSSL_CFLAGS=@OPENSSL_CFLAGS@
export OPENSSL_LIBS=@OPENSSL_LIBS@
export ORCUS_CFLAGS=@ORCUS_CFLAGS@
diff --git a/configure.ac b/configure.ac
index f25debb..fbe21cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8064,7 +8064,7 @@ dnl ===================================================================
dnl Check for system openldap
dnl ===================================================================
-if test "$_os" != "WINNT"; then
+if test "$_os" != "WINNT" -a "$_os" != "iOS" -a "$_os" != "Android"; then
AC_MSG_CHECKING([which openldap library to use])
if test "$with_system_openldap" = "yes"; then
AC_MSG_RESULT([external])
@@ -8075,12 +8075,12 @@ if test "$with_system_openldap" = "yes"; then
else
AC_MSG_RESULT([internal])
SYSTEM_OPENLDAP=NO
+ OPENLDAP_TARBALL="804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz"
BUILD_TYPE="$BUILD_TYPE OPENLDAP"
fi
-else
- SYSTEM_OPENLDAP=NO
fi
AC_SUBST(SYSTEM_OPENLDAP)
+AC_SUBST(OPENLDAP_TARBALL)
dnl ===================================================================
dnl Check for system mozilla
diff --git a/ooo.lst.in b/ooo.lst.in
index ceaa9ec..00abafd 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -40,7 +40,6 @@ a0a861f539f0e7a91d05e6b9457e4db1-nss-3.13.5-with-nspr-4.9.1.tar.gz
3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz
861ef15fa0bc018f9ddc932c4ad8b6dd-lcms2-2.4.tar.gz
fa6a2f85bd28baab035b2c95e722713f-liblangtag-0.2.tar.bz2
-804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz
@AFMS_TARBALL@
@APACHE_COMMONS_CODEC_TARBALL@
@APACHE_COMMONS_HTTPCLIENT_TARBALL@
@@ -82,6 +81,7 @@ fa6a2f85bd28baab035b2c95e722713f-liblangtag-0.2.tar.bz2
@MSPUB_TARBALL@
@MYTHES_TARBALL@
@NEON_TARBALL@
+ at OPENLDAP_TARBALL@
@ORCUS_TARBALL@
@PNG_TARBALL@
@POSTGRESQL_TARBALL@
diff --git a/openldap/ExternalPackage_openldap.mk b/openldap/ExternalPackage_openldap.mk
new file mode 100644
index 0000000..daacf1f
--- /dev/null
+++ b/openldap/ExternalPackage_openldap.mk
@@ -0,0 +1,20 @@
+# -*- 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_ExternalPackage_ExternalPackage,openldap,openldap))
+
+$(eval $(call gb_ExternalPackage_use_external_project,openldap,openldap))
+
+$(eval $(call gb_ExternalPackage_add_files,openldap,lib,\
+ libraries/libldap/.libs/libldap.a \
+ libraries/libldap_r/.libs/libldap_r.a \
+ libraries/liblber/.libs/liblber.a \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/openldap/ExternalProject_openldap.mk b/openldap/ExternalProject_openldap.mk
new file mode 100644
index 0000000..41a7b43
--- /dev/null
+++ b/openldap/ExternalProject_openldap.mk
@@ -0,0 +1,42 @@
+# -*- 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_ExternalProject_ExternalProject,openldap))
+
+$(eval $(call gb_ExternalProject_use_unpacked,openldap,openldap))
+
+$(eval $(call gb_ExternalProject_register_targets,openldap,\
+ build \
+))
+
+$(call gb_ExternalProject_get_state_target,openldap,build) :
+ cd $(EXTERNAL_WORKDIR) \
+ && ./configure \
+ --disable-slapd \
+ --with-pic \
+ --with-tls=moznss \
+ --without-cyrus-sasl \
+ --disable-shared \
+ --enable-static \
+ $(if $(filter YES,$(CROSS_COMPILING)), \
+ --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
+ --with-yielding_select=yes \
+ ac_cv_func_memcmp_working=yes \
+ ) \
+ $(if $(filter YES,$(SYSTEM_NSS)), \
+ CPPFLAGS="$(NSS_CFLAGS)" CFLAGS="$(NSS_CFLAGS)" LDFLAGS="$(NSS_LIBS)" \
+ , \
+ CPPFLAGS="-I $(OUTDIR)/inc/mozilla/nss -I $(OUTDIR)/inc/mozilla/nspr" \
+ CFLAGS="-I $(OUTDIR)/inc/mozilla/nss -I $(OUTDIR)/inc/mozilla/nspr" \
+ LDFLAGS="-L$(OUTDIR)/lib" \
+ ) \
+ && unset MAKEFLAGS && $(GNUMAKE) -j$(GMAKE_PARALLELISM) \
+ && touch $@
+
+# vim: set noet sw=4 ts=4:
diff --git a/openldap/Makefile b/openldap/Makefile
new file mode 100644
index 0000000..ccb1c85
--- /dev/null
+++ b/openldap/Makefile
@@ -0,0 +1,7 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+
+include $(module_directory)/../solenv/gbuild/partial_build.mk
+
+# vim: set noet sw=4 ts=4:
diff --git a/openldap/Module_openldap.mk b/openldap/Module_openldap.mk
new file mode 100644
index 0000000..658695c
--- /dev/null
+++ b/openldap/Module_openldap.mk
@@ -0,0 +1,22 @@
+# -*- 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_Module_Module,openldap))
+
+ifeq ($(SYSTEM_OPENLDAP),NO)
+
+$(eval $(call gb_Module_add_targets,openldap,\
+ ExternalPackage_openldap \
+ ExternalProject_openldap \
+ UnpackedTarball_openldap \
+))
+
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/openldap/UnpackedTarball_openldap.mk b/openldap/UnpackedTarball_openldap.mk
new file mode 100644
index 0000000..44db530
--- /dev/null
+++ b/openldap/UnpackedTarball_openldap.mk
@@ -0,0 +1,18 @@
+# -*- 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_UnpackedTarball_UnpackedTarball,openldap))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,openldap,$(OPENLDAP_TARBALL)))
+
+$(eval $(call gb_UnpackedTarball_add_patches,openldap,\
+ openldap/openldap-2.4.31.patch \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/openldap/makefile.mk b/openldap/makefile.mk
deleted file mode 100644
index 44b710e..0000000
--- a/openldap/makefile.mk
+++ /dev/null
@@ -1,76 +0,0 @@
-#
-# 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/.
-#
-
-PRJ=.
-
-PRJNAME=openldap
-TARGET=so_openldap
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-.IF "$(SYSTEM_OPENLDAP)" == "YES"
-all:
- @echo "An already available installation of openldap should exist on your system."
- @echo "Therefore the version provided here does not need to be built in addition."
-.ENDIF
-
-.IF "$(OS)"=="WNT" || "$(OS)"=="ANDROID" || "$(OS)"=="IOS"
-all:
- @echo "Openldap is not needed on Windows, Android or iOS."
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-TARFILE_NAME=openldap-2.4.31
-TARFILE_MD5=804c6cb5698db30b75ad0ff1c25baefd
-
-PATCH_FILES=\
- $(TARFILE_NAME).patch
-
-CONFIGURE_DIR=
-CONFIGURE_ACTION=.$/configure
-CONFIGURE_FLAGS=--disable-slapd --with-pic --with-tls=moznss --without-cyrus-sasl --disable-shared --enable-static
-
-.IF "$(CROSS_COMPILING)"=="YES"
-CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --with-yielding_select=yes ac_cv_func_memcmp_working=yes
-.ENDIF
-
-.IF "$(SYSTEM_NSS)" == "YES"
-CONFIGURE_FLAGS+=CPPFLAGS="$(NSS_CFLAGS)" CFLAGS="$(NSS_CFLAGS)" LDFLAGS="$(NSS_LIBS)"
-.ELSE
-CONFIGURE_FLAGS+=CPPFLAGS="-I $(SOLARVER)$/$(INPATH)$/inc$/mozilla$/nss -I $(SOLARVER)$/$(INPATH)$/inc$/mozilla$/nspr"
-CONFIGURE_FLAGS+=CFLAGS="-I $(SOLARVER)$/$(INPATH)$/inc$/mozilla$/nss -I $(SOLARVER)$/$(INPATH)$/inc$/mozilla$/nspr"
-CONFIGURE_FLAGS+=LDFLAGS="-L$(SOLARVER)$/$(INPATH)$/lib"
-.ENDIF
-
-BUILD_FLAGS+= -j$(EXTMAXPROCESS)
-BUILD_DIR=$(CONFIGURE_DIR)
-BUILD_ACTION=$(GNUMAKE)
-
-OUT2INC+=include$/slapi-plugin.h
-OUT2INC+=include$/ldap_utf8.h
-OUT2INC+=include$/ldap.h
-OUT2INC+=include$/ldap_cdefs.h
-OUT2INC+=include$/ldap_features.h
-OUT2INC+=include$/ldap_schema.h
-OUT2INC+=include$/ldif.h
-OUT2INC+=include$/lber_types.h
-OUT2INC+=include$/lber.h
-
-OUT2LIB+=libraries$/libldap$/.libs$/libldap.a
-OUT2LIB+=libraries$/libldap_r$/.libs$/libldap_r.a
-OUT2LIB+=libraries$/liblber$/.libs$/liblber.a
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.INCLUDE : tg_ext.mk
-
diff --git a/openldap/prj/dmake b/openldap/prj/dmake
deleted file mode 100644
index e69de29..0000000
diff --git a/postgresql/ExternalProject_postgresql.mk b/postgresql/ExternalProject_postgresql.mk
index 283b11b..c11cdb4 100644
--- a/postgresql/ExternalProject_postgresql.mk
+++ b/postgresql/ExternalProject_postgresql.mk
@@ -11,6 +11,8 @@ $(eval $(call gb_ExternalProject_ExternalProject,postgresql))
$(eval $(call gb_ExternalProject_use_unpacked,postgresql,postgresql))
+$(eval $(call gb_ExternalProject_use_package,postgresql,openldap))
+
$(eval $(call gb_ExternalProject_register_targets,postgresql,\
build \
))
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 0fb7a06..374a400 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb tail_build : BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit CURL:curl EXPAT:expat GETTEXT:gettext GLIB:glib GDK_PIXBUF:gdk-pixbuf PANGO:pango LIBCROCO:libcroco LIBGSF:libgsf HUNSPELL:hunspell HYPHEN:hyphen ICU:icu JPEG:jpeg LCMS2:lcms2 LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LPSOLVE:lpsolve MOZ:moz NSS:nss OPENLDAP:openldap OPENSSL:openssl PYTHON:python REDLAND:redland XPDF:xpdf ZLIB:zlib external solenv soltools NULL
+tb tail_build : BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit CURL:curl EXPAT:expat GETTEXT:gettext GLIB:glib GDK_PIXBUF:gdk-pixbuf PANGO:pango LIBCROCO:libcroco LIBGSF:libgsf HUNSPELL:hunspell HYPHEN:hyphen ICU:icu JPEG:jpeg LCMS2:lcms2 LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LPSOLVE:lpsolve MOZ:moz NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland XPDF:xpdf ZLIB:zlib external solenv soltools NULL
tb tail_build\prj nmake - all tb_prj NULL
commit eb28dd59b86f572f83eb60c826c08509da9ca6ae
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Sun Oct 28 12:12:57 2012 +0100
ooo.lst.in: keep the list sorted
Change-Id: I2855b7d324aa433d126cc059db70e9cb821a83da
diff --git a/ooo.lst.in b/ooo.lst.in
index 6fac487..ceaa9ec 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -24,22 +24,17 @@ d70951c80dabecc2892c919ff5d07172-db-4.7.25.NC-custom.tar.gz
e0707ff896045731ff99e99799606441-README_db-4.7.25.NC-custom.txt
e81c2f0953aa60f8062c05a4673f2be0-Python-2.6.1.tar.bz2
e61d0364a30146aaa3001296f853b2b9-libxslt-1.1.26.tar.gz
- at EXPAT_TARBALL@
fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz
0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz
- at POSTGRESQL_TARBALL@
- at MYTHES_TARBALL@
3dd55b952826d2b32f51308f2f91aa89-gettext-0.18.1.1.tar.gz
9f6e85e1e38490c3956f4415bcd33e6e-glib-2.28.1.tar.gz
a7d6c5f2fe2d481149ed3ba807b5c043-gdk-pixbuf-2.23.0.tar.gz
3a84ac2da37cae5bf7ce616228c6fbde-libgsf-1.14.19.tar.gz
22ad1c8d3fda7e73b0798035f3dd96bc-pango-1.28.3.tar.gz
0611e099e807210cf738dcb41425d104-libcroco-0.6.2.tar.gz
- at LIBRSVG_TARBALL@
2ab442d169156f34c379c968f3f482dd-zlib-1.2.7.tar.bz2
0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
7c53f83e0327343f4060c0eb83842daf-icu4c-49_1_1-src.tgz
- at CT2N_TARBALL@
0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz
a0a861f539f0e7a91d05e6b9457e4db1-nss-3.13.5-with-nspr-4.9.1.tar.gz
3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz
@@ -56,7 +51,9 @@ fa6a2f85bd28baab035b2c95e722713f-liblangtag-0.2.tar.bz2
@CDR_TARBALL@
@CLUCENE_TARBALL@
@CMIS_TARBALL@
+ at CT2N_TARBALL@
@EPM_TARBALL@
+ at EXPAT_TARBALL@
@FONT_DEJAVU_TARBALL@
@FONT_GENTIUM_TARBALL@
@FONT_LIBERATION_NARROW_TARBALL@
@@ -79,12 +76,15 @@ fa6a2f85bd28baab035b2c95e722713f-liblangtag-0.2.tar.bz2
@JFREEREPORT_SAC_TARBALL@
@JPEG_TARBALL@
@LANGUAGETOOL_TARBALL@
+ at LIBRSVG_TARBALL@
@MDDS_TARBALL@
@MOZ_TARBALL@
@MSPUB_TARBALL@
+ at MYTHES_TARBALL@
@NEON_TARBALL@
@ORCUS_TARBALL@
@PNG_TARBALL@
+ at POSTGRESQL_TARBALL@
@RHINO_TARBALL@
@TOMCAT_TARBALL@
@VIGRA_TARBALL@
commit 51fca817e2b51159c2bc8d44aadf7ff02f9b1b5c
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Sun Oct 28 12:01:09 2012 +0100
epm: convert to gbuild
Change-Id: I1548f3b9339163a7abab637acad620b50cfc3a26
diff --git a/Makefile.top b/Makefile.top
index 7949b12..87653e1 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -72,6 +72,7 @@ dtrans\
editeng\
embeddedobj\
embedserv\
+epm\
eventattacher\
expat\
extensions\
@@ -213,7 +214,6 @@ cairo\
cppunit\
crashrep\
curl\
-epm\
external\
gdk-pixbuf\
gettext\
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index d9a3ed4..7cafb1c 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -64,6 +64,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
editeng \
embeddedobj \
embedserv \
+ $(call gb_Helper_optional,EPM,epm) \
eventattacher \
extensions \
extras \
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 6af9bb0..226aa55 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -69,6 +69,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
editeng \
embeddedobj \
embedserv \
+ $(call gb_Helper_optional,EPM,epm) \
eventattacher \
$(call gb_Helper_optional,EXPAT,expat) \
extensions \
diff --git a/config_host.mk.in b/config_host.mk.in
index fdf1619..064eece 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -38,7 +38,6 @@ export BOOST_TARBALL=@BOOST_TARBALL@
export BSH_JAR=@BSH_JAR@
export BSH_TARBALL=@BSH_TARBALL@
export BUILD_DMAKE=@BUILD_DMAKE@
-export BUILD_EPM=@BUILD_EPM@
export BUILD_MOZAB=@BUILD_MOZAB@
export BUILD_NCPUS=@BUILD_NCPUS@
export BUILD_PLATFORM=@build@
@@ -180,6 +179,7 @@ export ENABLE_TELEPATHY=@ENABLE_TELEPATHY@
export ENABLE_ZENITY=@ENABLE_ZENITY@
export EPM=@EPM@
export EPM_FLAGS=@EPM_FLAGS@
+export EPM_TARBALL=@EPM_TARBALL@
export EXTERNAL_WARNINGS_NOT_ERRORS=@EXTERNAL_WARNINGS_NOT_ERRORS@
@x_Cygwin@ export FIND=@WIN_FIND@
export FLAT_LOGO_SVG=@FLAT_LOGO_SVG@
diff --git a/configure.ac b/configure.ac
index 019357c..f25debb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6563,7 +6563,6 @@ dnl ===================================================================
dnl Check for epm (not needed for Windows)
dnl ===================================================================
AC_MSG_CHECKING([whether to enable EPM for packing])
-BUILD_EPM=NO
if test "$enable_epm" = "yes"; then
AC_MSG_RESULT([yes])
if test "$_os" != "WINNT"; then
@@ -6574,7 +6573,7 @@ if test "$enable_epm" = "yes"; then
fi
if test "$EPM" = "no" -o "$EPM" = "internal"; then
echo "EPM will be built."
- BUILD_EPM=YES
+ EPM_TARBALL="3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz"
BUILD_TYPE="$BUILD_TYPE EPM"
else
# Gentoo has some epm which is something different...
@@ -6589,7 +6588,6 @@ if test "$enable_epm" = "yes"; then
if test "`echo $EPM_VERSION | cut -d'.' -f1`" -gt "3" || \
test "`echo $EPM_VERSION | cut -d'.' -f1`" -eq "3" -a "`echo $EPM_VERSION | cut -d'.' -f2`" -ge "7"; then
AC_MSG_RESULT([OK, >= 3.7])
- BUILD_EPM=NO
if test "$_os" = "Darwin"; then
AC_MSG_CHECKING([which PackageMaker EPM thinks to use])
_pm=`strings $EPM | grep PackageMaker | cut -d" " -f1`
@@ -6604,7 +6602,7 @@ if test "$enable_epm" = "yes"; then
else
AC_MSG_RESULT([too old. epm >= 3.7 is required.])
echo "EPM will be built."
- BUILD_EPM=YES
+ EPM_TARBALL="3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz"
BUILD_TYPE="$BUILD_TYPE EPM"
fi
fi
@@ -6692,7 +6690,7 @@ else
EPM=NO
fi
AC_SUBST(EPM)
-AC_SUBST(BUILD_EPM)
+AC_SUBST(EPM_TARBALL)
dnl ===================================================================
dnl We need winegcc when building MinGW build to be able to cross-build msi tools
diff --git a/epm/ExternalPackage_epm.mk b/epm/ExternalPackage_epm.mk
new file mode 100644
index 0000000..793f419
--- /dev/null
+++ b/epm/ExternalPackage_epm.mk
@@ -0,0 +1,20 @@
+# -*- 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_ExternalPackage_ExternalPackage,epm,epm))
+
+$(eval $(call gb_ExternalPackage_use_external_project,epm,epm))
+
+$(eval $(call gb_ExternalPackage_add_files,epm,bin,\
+ epm \
+ epminstall \
+ mkepmlist \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/epm/ExternalProject_epm.mk b/epm/ExternalProject_epm.mk
new file mode 100644
index 0000000..7229942
--- /dev/null
+++ b/epm/ExternalProject_epm.mk
@@ -0,0 +1,25 @@
+# -*- 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_ExternalProject_ExternalProject,epm))
+
+$(eval $(call gb_ExternalProject_use_unpacked,epm,epm))
+
+$(eval $(call gb_ExternalProject_register_targets,epm,\
+ build \
+))
+
+$(call gb_ExternalProject_get_state_target,epm,build) :
+ cd $(EXTERNAL_WORKDIR) \
+ && ./configure --disable-fltk \
+ $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________NONE) \
+ && $(GNUMAKE) \
+ && touch $@
+
+# vim: set noet sw=4 ts=4:
diff --git a/epm/Makefile b/epm/Makefile
new file mode 100644
index 0000000..ccb1c85
--- /dev/null
+++ b/epm/Makefile
@@ -0,0 +1,7 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+
+include $(module_directory)/../solenv/gbuild/partial_build.mk
+
+# vim: set noet sw=4 ts=4:
diff --git a/epm/Module_epm.mk b/epm/Module_epm.mk
new file mode 100644
index 0000000..8a52272
--- /dev/null
+++ b/epm/Module_epm.mk
@@ -0,0 +1,22 @@
+# -*- 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_Module_Module,epm))
+
+ifeq (EPM,$(filter EPM,$(BUILD_TYPE)))
+
+$(eval $(call gb_Module_add_targets,epm,\
+ ExternalPackage_epm \
+ ExternalProject_epm \
+ UnpackedTarball_epm \
+))
+
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/epm/UnpackedTarball_epm.mk b/epm/UnpackedTarball_epm.mk
new file mode 100644
index 0000000..b9e7e3b
--- /dev/null
+++ b/epm/UnpackedTarball_epm.mk
@@ -0,0 +1,18 @@
+# -*- 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_UnpackedTarball_UnpackedTarball,epm))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,epm,$(EPM_TARBALL)))
+
+$(eval $(call gb_UnpackedTarball_add_patches,epm,\
+ epm/epm-3.7.patch \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/epm/makefile.mk b/epm/makefile.mk
deleted file mode 100644
index ebfcb97..0000000
--- a/epm/makefile.mk
+++ /dev/null
@@ -1,66 +0,0 @@
-#*************************************************************************
-#
-# 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=epm
-TARGET=epm
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-TARFILE_NAME=epm-3.7
-TARFILE_MD5=3ade8cfe7e59ca8e65052644fed9fca4
-PATCH_FILES=epm-3.7.patch
-
-.IF "$(GUI)"=="UNX" && "$(BUILD_EPM)" != "NO" && "$(CROSS_COMPILING)" != "YES"
-
-EXTRPATH = NONE
-
-CONFIGURE_ACTION=.$/configure
-CONFIGURE_FLAGS=--disable-fltk
-.IF "$(OS)"=="MACOSX"
-CONFIGURE_FLAGS += \
- --prefix=/@.__________________________________________________$(EXTRPATH)
-.IF "$(EXTRA_CFLAGS)"!=""
-CONFIGURE_FLAGS+=CFLAGS="$(EXTRA_CFLAGS)" LDFLAGS="$(EXTRA_LINKFLAGS)" CPP="gcc -E $(EXTRA_CFLAGS)"
-.ENDIF # "$(EXTRA_CFLAGS)"!=""
-.ENDIF
-BUILD_ACTION=make
-OUT2BIN=epm epminstall mkepmlist
-
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.INCLUDE : tg_ext.mk
-
diff --git a/epm/prj/d.lst b/epm/prj/d.lst
index 315d3d1..e69de29 100644
--- a/epm/prj/d.lst
+++ b/epm/prj/d.lst
@@ -1,3 +0,0 @@
-..\%__SRC%\bin\epm %_DEST%\bin\epm
-..\%__SRC%\bin\epminstall %_DEST%\bin\epminstall
-..\%__SRC%\bin\mkepmlist %_DEST%\bin\mkepmlist
diff --git a/epm/prj/dmake b/epm/prj/dmake
deleted file mode 100644
index e69de29..0000000
diff --git a/ooo.lst.in b/ooo.lst.in
index 6f23f85..6fac487 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -9,7 +9,6 @@ c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2
26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
284e768eeda0e2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz
35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
-3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz
4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz
f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz
599dc4cc65a07ee868cf92a667a913d2-xpdf-3.02.tar.gz
@@ -57,6 +56,7 @@ fa6a2f85bd28baab035b2c95e722713f-liblangtag-0.2.tar.bz2
@CDR_TARBALL@
@CLUCENE_TARBALL@
@CMIS_TARBALL@
+ at EPM_TARBALL@
@FONT_DEJAVU_TARBALL@
@FONT_GENTIUM_TARBALL@
@FONT_LIBERATION_NARROW_TARBALL@
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index 3247ce9..7353c6c 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,4 +1,4 @@
-po postprocess :: BINFILTER:binfilter CRASHREP:crashrep EPM:epm HELP:helpcontent2 ODK:odk MYSQLC:mysqlc DESKTOP:setup_native STLPORT:stlport sysui tail_build NULL
+po postprocess :: BINFILTER:binfilter CRASHREP:crashrep HELP:helpcontent2 ODK:odk MYSQLC:mysqlc DESKTOP:setup_native STLPORT:stlport sysui tail_build NULL
po postprocess usr1 - all po_mkout NULL
po postprocess\checkxml nmake - all po_checkxml NULL
po postprocess\packconfig nmake - all po_packconfig po_checkxml NULL
commit c32566bf8b983d50a6d5cf736f7f04f5653807a4
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Sun Oct 28 09:51:00 2012 +0100
librsvg: clear d.lst and don't deliver unused headers; it's dlopened
Change-Id: If48f940d30d8fbf439639e100d37da1397e2d682
diff --git a/librsvg/ExternalPackage_librsvg.mk b/librsvg/ExternalPackage_librsvg.mk
index 0478e76..0337c36 100644
--- a/librsvg/ExternalPackage_librsvg.mk
+++ b/librsvg/ExternalPackage_librsvg.mk
@@ -15,11 +15,4 @@ $(eval $(call gb_ExternalPackage_add_files,librsvg,lib,\
.libs/librsvg-2.2.dylib \
))
-$(eval $(call gb_ExternalPackage_add_unpacked_files,librsvg,inc/external/librsvg-2.0/librsvg,\
- rsvg-cairo.h \
- librsvg-enum-types.h \
- librsvg-features.h \
- rsvg.h \
-))
-
# vim: set noet sw=4 ts=4:
diff --git a/librsvg/prj/d.lst b/librsvg/prj/d.lst
index 710e555..e69de29 100644
--- a/librsvg/prj/d.lst
+++ b/librsvg/prj/d.lst
@@ -1,14 +0,0 @@
-mkdir: %_DEST%\inc\external
-mkdir: %_DEST%\inc\external\librsvg-2.0
-mkdir: %_DEST%\inc\external\librsvg-2.0\librsvg
-
-..\%__SRC%\inc\rsvg.h %_DEST%\inc\external\librsvg-2.0\librsvg\rsvg.h
-..\%__SRC%\inc\rsvg-cairo.h %_DEST%\inc\external\librsvg-2.0\librsvg\rsvg-cairo.h
-..\%__SRC%\inc\rsvg-features.h %_DEST%\inc\external\librsvg-2.0\librsvg\rsvg-features.h
-..\%__SRC%\inc\rsvg-enum-types.h %_DEST%\inc\external\librsvg-2.0\librsvg\rsvg-enum-types.h
-
-..\%__SRC%\lib\librsvg-2.2.dylib %_DEST%\lib\librsvg-2.2.dylib
-symlink: %_DEST%\lib\librsvg-2.2.dylib %_DEST%\lib\librsvg-2.dylib
-
-..\%__SRC%\lib\ilibrsvg-2-2.lib %_DEST%\lib\librsvg-2-2.lib
-..\%__SRC%\bin\librsvg-2-2.dll %_DEST%\bin\librsvg-2-2.dll
More information about the Libreoffice-commits
mailing list