summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.top2
-rw-r--r--Module_tail_build.mk1
-rw-r--r--RepositoryModule_ooo.mk1
-rw-r--r--config_host.mk.in1
-rw-r--r--configure.in3
-rw-r--r--libvisio/Makefile7
-rw-r--r--libvisio/Module_libvisio.mk22
-rw-r--r--libvisio/Package_libvisio.mk20
-rw-r--r--libvisio/StaticLibrary_visio.mk45
-rw-r--r--libvisio/UnpackedTarball_visio.mk14
-rw-r--r--libvisio/makefile.mk67
-rw-r--r--libvisio/prj/d.lst6
-rw-r--r--libvisio/prj/dmake0
-rw-r--r--ooo.lst.in2
-rw-r--r--tail_build/prj/build.lst2
-rw-r--r--writerperfect/prj/build.lst2
16 files changed, 117 insertions, 78 deletions
diff --git a/Makefile.top b/Makefile.top
index 9b65103fb67a..d94075d79c2e 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -86,6 +86,7 @@ jurt\
jvmaccess\
jvmfwk\
l10ntools\
+libvisio\
lingucomponent\
linguistic\
lotuswordpro\
@@ -213,7 +214,6 @@ libmspub\
liborcus\
libpng\
librsvg\
-libvisio\
libwpd\
libwpg\
libwps\
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 1f230475d507..dd80586d2fe2 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -73,6 +73,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
idl \
io \
javaunohelper \
+ libvisio \
lingucomponent \
linguistic \
lotuswordpro \
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 0f39f418fc9a..27ee9207175c 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -82,6 +82,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
jvmaccess \
jvmfwk \
l10ntools \
+ libvisio \
lingucomponent \
linguistic \
lotuswordpro \
diff --git a/config_host.mk.in b/config_host.mk.in
index c83ae449f015..bd44460724e9 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -584,6 +584,7 @@ export VERBOSE=@VERBOSE@
export VIGRA_TARBALL=@VIGRA_TARBALL@
export VISIO_CFLAGS=@VISIO_CFLAGS@
export VISIO_LIBS=@VISIO_LIBS@
+export VISIO_TARBALL=@VISIO_TARBALL@
export WATCH_WINDOW_EXTENSION_PACK=@WATCH_WINDOW_EXTENSION_PACK@
export WINDOWS_SDK_HOME=@WINDOWS_SDK_HOME@
export WINDRES=@WINDRES@
diff --git a/configure.in b/configure.in
index 2fb4b35faa29..a35194c76d13 100644
--- a/configure.in
+++ b/configure.in
@@ -6660,11 +6660,12 @@ elif test $_os = iOS; then
else
AC_MSG_RESULT([internal])
SYSTEM_LIBVISIO=NO
- BUILD_TYPE="$BUILD_TYPE LIBVISIO"
+ VISIO_TARBALL=94e7f271e38c976462558b4278590178-libvisio-0.0.19.tar.bz2
fi
AC_SUBST(SYSTEM_LIBVISIO)
AC_SUBST(VISIO_CFLAGS)
AC_SUBST(VISIO_LIBS)
+AC_SUBST(VISIO_TARBALL)
dnl ===================================================================
dnl Check for system libcmis
diff --git a/libvisio/Makefile b/libvisio/Makefile
new file mode 100644
index 000000000000..ccb1c85a04da
--- /dev/null
+++ b/libvisio/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/libvisio/Module_libvisio.mk b/libvisio/Module_libvisio.mk
new file mode 100644
index 000000000000..6c4190d7251f
--- /dev/null
+++ b/libvisio/Module_libvisio.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,libvisio))
+
+ifeq ($(SYSTEM_LIBVISIO),NO)
+
+$(eval $(call gb_Module_add_targets,libvisio,\
+ Package_libvisio \
+ StaticLibrary_visio \
+ UnpackedTarball_visio \
+))
+
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/libvisio/Package_libvisio.mk b/libvisio/Package_libvisio.mk
new file mode 100644
index 000000000000..54bb8f416c0c
--- /dev/null
+++ b/libvisio/Package_libvisio.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_Package_Package,libvisio_inc,$(call gb_UnpackedTarball_get_dir,visio/src/lib)))
+
+$(eval $(call gb_Package_use_unpacked,libvisio_inc,visio))
+
+$(eval $(call gb_Package_add_files,libvisio_inc,inc/external/libvisio,\
+ libvisio.h \
+ VisioDocument.h \
+ VSDStringVector.h \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/libvisio/StaticLibrary_visio.mk b/libvisio/StaticLibrary_visio.mk
new file mode 100644
index 000000000000..c917b6f5fa36
--- /dev/null
+++ b/libvisio/StaticLibrary_visio.mk
@@ -0,0 +1,45 @@
+# -*- 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,visiolib))
+
+$(eval $(call gb_StaticLibrary_use_unpacked,visiolib,visio))
+
+$(eval $(call gb_StaticLibrary_use_package,visiolib,libvisio_inc))
+
+$(eval $(call gb_StaticLibrary_use_externals,visiolib,\
+ wpd \
+ wpg \
+))
+
+$(eval $(call gb_StaticLibrary_set_cxx_suffix,visiolib,cpp))
+
+$(eval $(call gb_StaticLibrary_add_generated_exception_objects,visiolib,\
+ UnpackedTarball/visio/src/lib/libvisio_utils \
+ UnpackedTarball/visio/src/lib/VisioDocument \
+ UnpackedTarball/visio/src/lib/VSD11Parser \
+ UnpackedTarball/visio/src/lib/VSD6Parser \
+ UnpackedTarball/visio/src/lib/VSDInternalStream \
+ UnpackedTarball/visio/src/lib/VSDStringVector \
+ UnpackedTarball/visio/src/lib/VSDSVGGenerator \
+ UnpackedTarball/visio/src/lib/VSDXCharacterList \
+ UnpackedTarball/visio/src/lib/VSDXContentCollector \
+ UnpackedTarball/visio/src/lib/VSDXFieldList \
+ UnpackedTarball/visio/src/lib/VSDXGeometryList \
+ UnpackedTarball/visio/src/lib/VSDXOutputElementList \
+ UnpackedTarball/visio/src/lib/VSDXPages \
+ UnpackedTarball/visio/src/lib/VSDXParagraphList \
+ UnpackedTarball/visio/src/lib/VSDXParser \
+ UnpackedTarball/visio/src/lib/VSDXShapeList \
+ UnpackedTarball/visio/src/lib/VSDXStencils \
+ UnpackedTarball/visio/src/lib/VSDXStyles \
+ UnpackedTarball/visio/src/lib/VSDXStylesCollector \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/libvisio/UnpackedTarball_visio.mk b/libvisio/UnpackedTarball_visio.mk
new file mode 100644
index 000000000000..aa9113bafd6d
--- /dev/null
+++ b/libvisio/UnpackedTarball_visio.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_UnpackedTarball_UnpackedTarball,visio))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,visio,$(VISIO_TARBALL)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/libvisio/makefile.mk b/libvisio/makefile.mk
deleted file mode 100644
index ab696923748b..000000000000
--- a/libvisio/makefile.mk
+++ /dev/null
@@ -1,67 +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=visio
-TARGET=visio
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(SYSTEM_LIBVISIO)" == "YES"
-@all:
- @echo "Using system libvisio..."
-.ENDIF
-
-# libvisio depends on the libwpd and libwpg
-.IF "$(SYSTEM_LIBWPD)" == "YES"
-INCPRE+=$(WPD_CFLAGS)
-.ELSE
-INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd
-INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd-stream
-.ENDIF
-.IF "$(SYSTEM_LIBWPG)" == "YES"
-INCPRE+=$(WPG_CFLAGS)
-.ELSE
-INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpg
-.ENDIF
-
-TARFILE_NAME=libvisio-0.0.19
-TARFILE_MD5=94e7f271e38c976462558b4278590178
-
-BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
-BUILD_DIR=src$/lib
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.INCLUDE : tg_ext.mk
diff --git a/libvisio/prj/d.lst b/libvisio/prj/d.lst
index 5680abe12d5b..e69de29bb2d1 100644
--- a/libvisio/prj/d.lst
+++ b/libvisio/prj/d.lst
@@ -1,6 +0,0 @@
-mkdir: %_DEST%\inc\libvisio
-..\%__SRC%\misc\build\libvisio*\src\lib\libvisio.h %_DEST%\inc\libvisio
-..\%__SRC%\misc\build\libvisio*\src\lib\VisioDocument.h %_DEST%\inc\libvisio\
-..\%__SRC%\misc\build\libvisio*\src\lib\VSDStringVector.h %_DEST%\inc\libvisio\
-..\%__SRC%\lib\*.a %_DEST%\lib\*.a
-..\%__SRC%\slb\*.lib %_DEST%\lib\*.lib
diff --git a/libvisio/prj/dmake b/libvisio/prj/dmake
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/libvisio/prj/dmake
+++ /dev/null
diff --git a/ooo.lst.in b/ooo.lst.in
index 416968e84f7c..bd14256e9e65 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -88,7 +88,7 @@ d197bd6211669a2fa4ca648faf04bcb1-libwps-0.2.7.tar.bz2
@BOOST_TARBALL@
3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz
3bf481ca95109b14435125c0dd1f2217-graphite2-1.0.3.tgz
-94e7f271e38c976462558b4278590178-libvisio-0.0.19.tar.bz2
+@VISIO_TARBALL@
e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip
0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.tar.gz
ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index cfdfbb9690a2..333bc5e733bb 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GLIB:glib GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBMSPUB:libmspub LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LIBORCUS:liborcus LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf ZLIB:zlib bridges cli_ure comphelper cppu cppuhelper external jurt jvmaccess jvmfwk offapi officecfg DESKTOP:rdbmaker readlicense_oo RHINO:rhino ridljar sal salhelper solenv soltools stoc ucbhelper ucpp udkapi xmlreader xsltml NULL
+tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GLIB:glib GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBMSPUB:libmspub LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBORCUS:liborcus LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf ZLIB:zlib bridges cli_ure comphelper cppu cppuhelper external jurt jvmaccess jvmfwk offapi officecfg DESKTOP:rdbmaker readlicense_oo RHINO:rhino ridljar sal salhelper solenv soltools stoc ucbhelper ucpp udkapi xmlreader xsltml NULL
tb tail_build\prj nmake - all tb_prj NULL
diff --git a/writerperfect/prj/build.lst b/writerperfect/prj/build.lst
index e70c3e74f84a..e7f72211647d 100644
--- a/writerperfect/prj/build.lst
+++ b/writerperfect/prj/build.lst
@@ -1,3 +1,3 @@
-wp writerperfect : LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LIBCDR:libcdr LIBMSPUB:libmspub LCMS2:lcms2 ZLIB:zlib sot comphelper xmloff svtools sfx2 LIBXSLT:libxslt NULL
+wp writerperfect : LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd libvisio LIBCDR:libcdr LIBMSPUB:libmspub LCMS2:lcms2 ZLIB:zlib sot comphelper xmloff svtools sfx2 LIBXSLT:libxslt NULL
wp writerperfect usr1 - all wp_mkout NULL
wp writerperfect\prj nmake - all wp_prj NULL
generated by cgit (git 2.34.1) at 2024-07-30 04:15:34 +0000