[Libreoffice-commits] .: configure.in libcdr/ExternalPackage_libcdr.mk libcdr/ExternalProject_libcdr.mk libcdr/Module_libcdr.mk libcdr/StaticLibrary_cdr.mk RepositoryExternal.mk
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Oct 5 07:04:58 PDT 2012
RepositoryExternal.mk | 7 +-
configure.in | 2
libcdr/ExternalPackage_libcdr.mk | 9 +++
libcdr/ExternalProject_libcdr.mk | 106 +++++++++++++++++++++++++++++++++++++++
libcdr/Module_libcdr.mk | 2
libcdr/StaticLibrary_cdr.mk | 46 ----------------
6 files changed, 122 insertions(+), 50 deletions(-)
New commits:
commit b8f39c5c411fd4c40016c5aadd398005c2ed1755
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Fri Oct 5 13:32:14 2012 +0200
Uploading a new shiny libcdr-0.0.9
Change-Id: I5bb93f9228e69dfd46b450089f34cac7204f10b8
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 78e82b6..d56accc 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -940,12 +940,15 @@ endef
else # !SYSTEM_LIBCDR
$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
- cdrlib \
+ cdr-0.0 \
))
define gb_LinkTarget__use_cdr
+$(call gb_LinkTarget_use_package,$(1),\
+ libcdr \
+)
$(call gb_LinkTarget_use_static_libraries,$(1),\
- cdrlib \
+ cdr-0.0 \
)
endef
diff --git a/configure.in b/configure.in
index c81931c..244925e 100644
--- a/configure.in
+++ b/configure.in
@@ -6791,7 +6791,7 @@ elif test $_os = iOS; then
else
AC_MSG_RESULT([internal])
SYSTEM_LIBCDR=NO
- CDR_TARBALL=ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2
+ CDR_TARBALL=3c0037fb07dea2f0bbae8386fa7c6a9a-libcdr-0.0.9.tar.bz2
fi
AC_SUBST(SYSTEM_LIBCDR)
AC_SUBST(CDR_CFLAGS)
diff --git a/libcdr/ExternalPackage_libcdr.mk b/libcdr/ExternalPackage_libcdr.mk
index 0a6d15c..06e0179 100644
--- a/libcdr/ExternalPackage_libcdr.mk
+++ b/libcdr/ExternalPackage_libcdr.mk
@@ -16,4 +16,13 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,libcdr_inc,inc/external/libc
src/lib/CMXDocument.h \
))
+$(eval $(call gb_ExternalPackage_use_external_project,libcdr,libcdr))
+
+ifeq ($(OS)$(COM),WNTMSC)
+$(eval $(call gb_ExternalPackage_add_file,libcdr,lib/cdr-0.0.lib,build/win32/Release/lib/libcdr-0.0.lib))
+else
+$(eval $(call gb_ExternalPackage_add_file,libcdr,lib/libcdr-0.0.a,src/lib/.libs/libcdr-0.0.a))
+endif
+
+
# vim: set noet sw=4 ts=4:
diff --git a/libcdr/ExternalProject_libcdr.mk b/libcdr/ExternalProject_libcdr.mk
new file mode 100644
index 0000000..de48bae
--- /dev/null
+++ b/libcdr/ExternalProject_libcdr.mk
@@ -0,0 +1,106 @@
+# -*- 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,libcdr))
+
+$(eval $(call gb_ExternalProject_use_unpacked,libcdr,cdr))
+
+$(eval $(call gb_ExternalProject_register_targets,libcdr,\
+ build \
+))
+
+$(eval $(call gb_ExternalProject_use_externals,cdrlib,\
+ lcms2 \
+ wpd \
+ wpg \
+ zlib \
+))
+
+ifeq ($(OS)$(COM),WNTMSC)
+
+$(call gb_ExternalProject_get_state_target,libcdr,build) :
+ cd $(EXTERNAL_WORKDIR)/build/win32 \
+ && export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \
+ && export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \
+ && export LCMS2_INCLUDE_DIR=$(OUTDIR)/inc/lcms2 \
+ && export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \
+ && $(COMPATH)/vcpackages/vcbuild.exe libcdr.vcproj "Release|Win32" \
+ && touch $@
+
+else
+
+libcdr_cflags :=
+libcdr_libs :=
+
+ifeq ($(SYSTEM_LIBWPD),YES)
+
+libcdr_cflags += $(WPD_CFLAGS)
+libcdr_libs += $(WPD_LIBS)
+
+else # !SYSTEM_LIBWPD
+
+libcdr_cflags += -I$(OUTDIR)/inc/external
+libcdr_libs += $(SOLARLIB)
+
+endif # SYSTEM_LIBWPD
+
+
+ifeq ($(SYSTEM_LIBWPG),YES)
+
+libcdr_cflags += $(WPG_CFLAGS)
+libcdr_libs += $(WPG_LIBS)
+
+else # !SYSTEM_LIBWPG
+
+libcdr_cflags += -I$(OUTDIR)/inc/external
+libcdr_libs += $(SOLARLIB)
+
+endif # SYSTEM_LIBWPG
+
+
+ifeq ($(SYSTEM_LCMS2),YES)
+
+else # !SYSTEM_LCMS2
+
+libcdr_cflags += -I$(OUTDIR)/inc/lcms2
+libcdr_libs += $(SOLARLIB)
+
+endif # SYSTEM_LCMS2
+
+zlib_cflags :=
+zlib_libs :=
+
+ifneq ($(SYSTEM_ZLIB),YES)
+
+zlib_cflags += -I$(OUTDIR)/inc/external/zlib
+zlib_libs += $(SOLARLIB)
+
+endif # !SYSTEM_ZLIB
+
+$(call gb_ExternalProject_get_state_target,libcdr,build) :
+ cd $(EXTERNAL_WORKDIR) \
+ && PKG_CONFIG="" \
+ LIBCDR_CFLAGS="$(libcdr_cflags)" \
+ LIBCDR_LIBS="$(libcdr_libs)" \
+ ZLIB_CFLAGS="$(zlib_cflags)" \
+ ZLIB_LIBS="$(zlib_libs)" \
+ ./configure \
+ --with-pic \
+ --enable-static \
+ --disable-shared \
+ --without-docs \
+ --disable-debug \
+ --disable-werror \
+ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+ && (cd $(EXTERNAL_WORKDIR)/src/lib && $(GNUMAKE) -j$(EXTMAXPROCESS)) \
+ && touch $@
+
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/libcdr/Module_libcdr.mk b/libcdr/Module_libcdr.mk
index b02dc27..a9ee924 100644
--- a/libcdr/Module_libcdr.mk
+++ b/libcdr/Module_libcdr.mk
@@ -13,7 +13,7 @@ ifeq ($(SYSTEM_LIBCDR),NO)
$(eval $(call gb_Module_add_targets,libcdr,\
ExternalPackage_libcdr \
- StaticLibrary_cdr \
+ ExternalProject_libcdr \
UnpackedTarball_cdr \
))
diff --git a/libcdr/StaticLibrary_cdr.mk b/libcdr/StaticLibrary_cdr.mk
deleted file mode 100644
index 71aa233..0000000
--- a/libcdr/StaticLibrary_cdr.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-# -*- 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_StaticLibrary_StaticLibrary,cdrlib))
-
-$(eval $(call gb_StaticLibrary_use_unpacked,cdrlib,cdr))
-
-$(eval $(call gb_StaticLibrary_use_package,cdrlib,libcdr_inc))
-
-$(eval $(call gb_StaticLibrary_use_externals,cdrlib,\
- lcms2 \
- wpd \
- wpg \
- zlib \
-))
-
-$(eval $(call gb_StaticLibrary_set_warnings_not_errors,cdrlib))
-
-$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,cdrlib,cpp))
-
-$(eval $(call gb_StaticLibrary_add_generated_exception_objects,cdrlib,\
- UnpackedTarball/cdr/src/lib/CDRCollector \
- UnpackedTarball/cdr/src/lib/CDRContentCollector \
- UnpackedTarball/cdr/src/lib/CDRDocument \
- UnpackedTarball/cdr/src/lib/CDRInternalStream \
- UnpackedTarball/cdr/src/lib/CDROutputElementList \
- UnpackedTarball/cdr/src/lib/CDRParser \
- UnpackedTarball/cdr/src/lib/CDRPath \
- UnpackedTarball/cdr/src/lib/CDRStringVector \
- UnpackedTarball/cdr/src/lib/CDRStylesCollector \
- UnpackedTarball/cdr/src/lib/CDRSVGGenerator \
- UnpackedTarball/cdr/src/lib/CDRTypes \
- UnpackedTarball/cdr/src/lib/CDRZipStream \
- UnpackedTarball/cdr/src/lib/CMXDocument \
- UnpackedTarball/cdr/src/lib/CMXParser \
- UnpackedTarball/cdr/src/lib/CommonParser \
- UnpackedTarball/cdr/src/lib/libcdr_utils \
-))
-
-# vim: set noet sw=4 ts=4:
More information about the Libreoffice-commits
mailing list