[Libreoffice-commits] .: afms/delzip afms/Makefile afms/makefile.mk afms/Module_afms.mk afms/prj afms/UnpackedTarball_afms.mk afms/Zip_fontunxafm.mk config_host.mk.in configure.in Makefile.top Module_tail_build.mk ooo.lst.in tail_build/prj
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Sep 26 01:40:04 PDT 2012
Makefile.top | 2 -
Module_tail_build.mk | 3 ++
afms/Makefile | 7 ++++
afms/Module_afms.mk | 17 +++++++++++
afms/UnpackedTarball_afms.mk | 14 +++++++++
afms/Zip_fontunxafm.mk | 64 +++++++++++++++++++++++++++++++++++++++++++
afms/makefile.mk | 52 ----------------------------------
afms/prj/build.lst | 3 --
afms/prj/d.lst | 3 --
config_host.mk.in | 1
configure.in | 3 ++
ooo.lst.in | 2 -
tail_build/prj/build.lst | 2 -
13 files changed, 113 insertions(+), 60 deletions(-)
New commits:
commit 30dba8159557fcebbc7165752697783c2379c824
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Wed Sep 26 03:38:37 2012 -0500
gbuildification of afms
Change-Id: I7ead3e90c9037289b917820c20f5265d5b080b47
diff --git a/Makefile.top b/Makefile.top
index 2bc885a..8b914a6 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -32,6 +32,7 @@ MathMLDTD\
Mesa\
UnoControls\
accessibility\
+afms\
android\
animations\
apple_remote\
@@ -190,7 +191,6 @@ xmlscript\
xmlsecurity\
dmake_modules:=\
-afms\
apache-commons\
beanshell\
berkeleydb\
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 370da00..bbde5cb 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -26,6 +26,9 @@ $(eval $(call gb_Module_Module,tail_end))
$(eval $(call gb_Module_add_moduledirs,tail_end,\
accessibility \
+ $(if $(filter AFMS,$(BUILD_TYPE)),\
+ afms \
+ ) \
animations \
apple_remote \
autodoc \
diff --git a/afms/Makefile b/afms/Makefile
new file mode 100644
index 0000000..ccb1c85
--- /dev/null
+++ b/afms/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/afms/Module_afms.mk b/afms/Module_afms.mk
new file mode 100644
index 0000000..ee04aa9
--- /dev/null
+++ b/afms/Module_afms.mk
@@ -0,0 +1,17 @@
+# -*- 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,afms))
+
+$(eval $(call gb_Module_add_targets,afms,\
+ UnpackedTarball_afms \
+ Zip_fontunxafm \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/afms/UnpackedTarball_afms.mk b/afms/UnpackedTarball_afms.mk
new file mode 100644
index 0000000..feed2f9
--- /dev/null
+++ b/afms/UnpackedTarball_afms.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,afms))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,afms,$(AFMS_TARBALL)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/afms/Zip_fontunxafm.mk b/afms/Zip_fontunxafm.mk
new file mode 100644
index 0000000..699c149
--- /dev/null
+++ b/afms/Zip_fontunxafm.mk
@@ -0,0 +1,64 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Zip_Zip,fontunxafm,$(call gb_UnpackedTarball_get_dir,afms)))
+
+$(eval $(call gb_Zip_add_files,fontunxafm,\
+ Courier-Bold.afm \
+ Courier-BoldOblique.afm \
+ Courier-Oblique.afm \
+ Courier.afm \
+ Helvetica-Bold.afm \
+ Helvetica-BoldOblique.afm \
+ Helvetica-Oblique.afm \
+ Helvetica.afm \
+ ITCAvantGarde-Book.afm \
+ ITCAvantGarde-BookOblique.afm \
+ ITCAvantGarde-Demi.afm \
+ ITCAvantGarde-DemiOblique.afm \
+ ITCBookman-Demi.afm \
+ ITCBookman-DemiItalic.afm \
+ ITCBookman-Light.afm \
+ ITCBookman-LightItalic.afm \
+ ITCZapfChancery-MediumItalic.afm \
+ NewCenturySchlbk-Bold.afm \
+ NewCenturySchlbk-BoldItalic.afm \
+ NewCenturySchlbk-Italic.afm \
+ NewCenturySchlbk-Roman.afm \
+ Palatino-Bold.afm \
+ Palatino-BoldItalic.afm \
+ Palatino-Italic.afm \
+ Palatino-Roman.afm \
+ Symbol.afm \
+ Times-Bold.afm \
+ Times-BoldItalic.afm \
+ Times-Italic.afm \
+ Times-Roman.afm \
+ ZapfDingbats.afm \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/afms/delzip b/afms/delzip
deleted file mode 100644
index e69de29..0000000
diff --git a/afms/makefile.mk b/afms/makefile.mk
deleted file mode 100644
index be129cb..0000000
--- a/afms/makefile.mk
+++ /dev/null
@@ -1,52 +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/.
-#
-# This file incorporates work covered by the following license notice:
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed
-# with this work for additional information regarding copyright
-# ownership. The ASF licenses this file to you under the Apache
-# License, Version 2.0 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-PRJ=.
-
-PRJNAME=afms
-TARGET=afms
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.IF "$(L10N_framework)"==""
-# --- Files --------------------------------------------------------
-
-TARFILE_NAME=Adobe-Core35_AFMs-314
-TARFILE_MD5=1756c4fa6c616ae15973c104cd8cb256
-TARFILE_ROOTDIR=Adobe-Core35_AFMs-314
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-
-ZIP1DIR = $(MISC)$/build$/$(TARFILE_NAME)
-ZIP1TARGET = fontunxafm
-ZIP1LIST = *.afm -x "*Helvetica-Narrow*"
-
-.ENDIF # L10N_framework
-.INCLUDE : target.mk
-
-.INCLUDE : tg_ext.mk
-.IF "$(L10N_framework)"==""
-.IF "$(ZIP1TARGETN)"!=""
-$(ZIP1TARGETN): $(PACKAGE_DIR)$/$(UNTAR_FLAG_FILE)
-
-.ENDIF # "$(ZIP1TARGETN)"!=""
-
-.ENDIF # L10N_framework
diff --git a/afms/prj/build.lst b/afms/prj/build.lst
index ed3d01f..554677b 100644
--- a/afms/prj/build.lst
+++ b/afms/prj/build.lst
@@ -1,3 +1,2 @@
af afms : solenv NULL
-af afms usr1 - all af_mkout NULL
-af afms nmake - all af_fonts NULL
+af afms\prj nmake - all afms_prj NULL
diff --git a/afms/prj/d.lst b/afms/prj/d.lst
index 1652d1f..e69de29 100644
--- a/afms/prj/d.lst
+++ b/afms/prj/d.lst
@@ -1,3 +0,0 @@
-mkdir: %_DEST%\pck
-..\%__SRC%\bin\*.zip %_DEST%\pck\*.zip
-
diff --git a/afms/prj/dmake b/afms/prj/dmake
deleted file mode 100644
index e69de29..0000000
diff --git a/config_host.mk.in b/config_host.mk.in
index ef87773..ff4b83e 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -5,6 +5,7 @@
export SRC_ROOT=@SRC_ROOT@
export ABOUT_BACKGROUND_SVG=@ABOUT_BACKGROUND_SVG@
+export AFMS_TARBALL=@AFMS_TARBALL@
export ALIGNOF_DOUBLE=@ALIGNOF_DOUBLE@
export ALIGNOF_INT=@ALIGNOF_INT@
export ALIGNOF_LONG=@ALIGNOF_LONG@
diff --git a/configure.in b/configure.in
index 81f8fa3..5163859 100644
--- a/configure.in
+++ b/configure.in
@@ -10962,12 +10962,15 @@ AC_MSG_CHECKING([whether to include AFMs])
if test "$with_afms" != "no"; then
AC_MSG_RESULT([yes])
BUILD_TYPE="$BUILD_TYPE AFMS"
+ AFMS_TARBALL="1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz"
else
AC_MSG_RESULT([no])
WITHOUT_AFMS=YES
SCPDEFS="$SCPDEFS -DWITHOUT_AFMS"
+ AFMS_TARBALL=
fi
AC_SUBST(WITHOUT_AFMS)
+AC_SUBST(AFMS_TARBALL)
dnl ===================================================================
dnl Test whether to include extra galleries
diff --git a/ooo.lst.in b/ooo.lst.in
index 1118d0f..bf3bca0 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -5,7 +5,7 @@ c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2
0b49ede71c21c0599b0cc19b353a6cb3-README_apache-commons.txt
6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2
17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
-1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz
+ at AFMS_TARBALL@
18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
24be19595acad0a2cae931af77a0148a-LICENSE_source-9.0.0.7-bj.html
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 7480693..4837e82 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 CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GLIB:glib GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LPSOLVE:lpsolve MOZ:moz MYTHES:mythes NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon XPDF:xpdf ZLIB:zlib external RHINO:rhino sal solenv soltools xsltml NULL
+tb tail_build : APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GLIB:glib GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LPSOLVE:lpsolve MOZ:moz MYTHES:mythes NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon XPDF:xpdf ZLIB:zlib external RHINO:rhino sal solenv soltools xsltml NULL
tb tail_build\prj nmake - all tb_prj NULL
More information about the Libreoffice-commits
mailing list