[Libreoffice-commits] .: Branch 'feature/gbuild_conversions' - 8 commits - Makefile Module_tail_build.mk officecfg/util postprocess/prj reportbuilder/Configuration_reportbuilder.mk reportbuilder/Extension_reportbuilder.mk reportbuilder/Jar_reportbuilder.mk reportbuilder/java reportbuilder/Makefile reportbuilder/Module_reportbuilder.mk reportbuilder/Package_readme.mk reportbuilder/prj reportbuilder/registry reportbuilder/template reportbuilder/util RepositoryExternal.mk RepositoryModule_ooo.mk solenv/gbuild tail_build/prj
David Tardon
dtardon at kemper.freedesktop.org
Sat Apr 7 04:18:21 PDT 2012
Makefile | 2
Module_tail_build.mk | 2
RepositoryExternal.mk | 133 ++++
RepositoryModule_ooo.mk | 1
officecfg/util/schema_val.xsl | 23
postprocess/prj/build.lst | 2
reportbuilder/Configuration_reportbuilder.mk | 56 +
reportbuilder/Extension_reportbuilder.mk | 102 +++
reportbuilder/Jar_reportbuilder.mk | 296 ++++++++++
reportbuilder/Makefile | 7
reportbuilder/Module_reportbuilder.mk | 39 +
reportbuilder/Package_readme.mk | 34 +
reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk | 66 --
reportbuilder/java/com/sun/star/report/makefile.mk | 74 --
reportbuilder/java/com/sun/star/report/util/ReportUtil.java | 46 -
reportbuilder/java/com/sun/star/report/util/makefile.mk | 49 -
reportbuilder/java/makefile.mk | 45 -
reportbuilder/prj/build.lst | 15
reportbuilder/prj/d.lst | 12
reportbuilder/prj/makefile.mk | 1
reportbuilder/registry/data/org/openoffice/Office/UI/makefile.mk | 48 -
reportbuilder/registry/data/org/openoffice/Office/makefile.mk | 70 --
reportbuilder/registry/data/org/openoffice/TypeDetection/makefile.mk | 57 -
reportbuilder/registry/data/org/openoffice/makefile.mk | 52 -
reportbuilder/registry/schema/org/openoffice/Office/UI/makefile.mk | 60 --
reportbuilder/registry/schema/org/openoffice/Office/makefile.mk | 48 -
reportbuilder/template/en-US/wizard/report/makefile.mk | 69 --
reportbuilder/template/makefile.mk | 121 ----
reportbuilder/template/registry/data/org/openoffice/Office/makefile.mk | 49 -
reportbuilder/template/wizard/report/makefile.mk | 69 --
reportbuilder/util/delzip | 1
reportbuilder/util/makefile.mk | 168 -----
reportbuilder/util/makefile.pmk | 66 --
reportbuilder/util/target.pmk | 34 -
solenv/gbuild/Configuration.mk | 15
solenv/gbuild/Jar.mk | 6
tail_build/prj/build.lst | 2
37 files changed, 716 insertions(+), 1224 deletions(-)
New commits:
commit 6535a092e78242c4c11183e90db30a199ba41104
Author: David Tardon <dtardon at redhat.com>
Date: Sat Apr 7 13:12:00 2012 +0200
move rsc to tail_build
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index a3184fa..4b0bc28 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -68,6 +68,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
psprint_config \
reportbuilder \
reportdesign \
+ rsc \
sc \
scaddins \
sccomp \
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 7f7741c..74cd5f8 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 CURL:curl FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HSQLDB:hsqldb HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SANE:sane SAXON:saxon TRANSLATIONS:translations TWAIN:twain VIGRA:vigra X11_EXTENSIONS:x11_extensions XPDF:xpdf ZLIB:zlib basegfx bridges comphelper cppu cppuhelper cpputools i18npool i18nutil icc javaunohelper jurt jvmaccess jvmfwk offapi officecfg oovbaapi QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar rsc sal salhelper sax shell solenv soltools stoc sysui
tools ucbhelper udkapi unoil unotest unotools ure DESKTOP:xmlhelp xmlreader xsltml NULL
+tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CURL:curl FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HSQLDB:hsqldb HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SANE:sane SAXON:saxon TRANSLATIONS:translations TWAIN:twain VIGRA:vigra X11_EXTENSIONS:x11_extensions XPDF:xpdf ZLIB:zlib basegfx bridges comphelper cppu cppuhelper cpputools i18npool i18nutil icc javaunohelper jurt jvmaccess jvmfwk offapi officecfg oovbaapi QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar sal salhelper sax shell solenv soltools stoc sysui tool
s ucbhelper udkapi unoil unotest unotools ure DESKTOP:xmlhelp xmlreader xsltml NULL
tb tail_build\prj nmake - all tb_prj NULL
commit 97349f99f36d35b0812b9b75b2c0a54a9b747456
Author: David Tardon <dtardon at redhat.com>
Date: Sat Apr 7 13:06:36 2012 +0200
move reportbuilder to tail_build
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 9d22ed6..a3184fa 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -66,6 +66,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
package \
padmin \
psprint_config \
+ reportbuilder \
reportdesign \
sc \
scaddins \
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index 745c251..8944450 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,4 +1,4 @@
-po postprocess :: BINFILTER:binfilter CRASHREP:crashrep CT2N:ct2n embedserv EPM:epm extras HELP:helpcontent2 LIBRSVG:librsvg ODK:odk DESKTOP:scp2 testtools wizards MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport tail_build NULL
+po postprocess :: BINFILTER:binfilter CRASHREP:crashrep CT2N:ct2n embedserv EPM:epm extras HELP:helpcontent2 LIBRSVG:librsvg ODK:odk DESKTOP:scp2 testtools MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno DESKTOP:unodevtools LANGUAGETOOL:languagetool MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport 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
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 0316df4..7f7741c 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 CURL:curl FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HSQLDB:hsqldb HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SANE:sane SAXON:saxon TRANSLATIONS:translations TWAIN:twain VIGRA:vigra X11_EXTENSIONS:x11_extensions XPDF:xpdf ZLIB:zlib basegfx bridges comphelper cppu cppuhelper cpputools i18npool i18nutil icc javaunohelper jurt jvmaccess jvmfwk offapi officecfg oovbaapi QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar rsc sal salhelper sax shell solenv soltools stoc sysui tools ucbhelper udkapi u
noil unotest unotools ure DESKTOP:xmlhelp xmlreader xsltml NULL
+tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CURL:curl FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HSQLDB:hsqldb HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SANE:sane SAXON:saxon TRANSLATIONS:translations TWAIN:twain VIGRA:vigra X11_EXTENSIONS:x11_extensions XPDF:xpdf ZLIB:zlib basegfx bridges comphelper cppu cppuhelper cpputools i18npool i18nutil icc javaunohelper jurt jvmaccess jvmfwk offapi officecfg oovbaapi QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar rsc sal salhelper sax shell solenv soltools stoc sysui
tools ucbhelper udkapi unoil unotest unotools ure DESKTOP:xmlhelp xmlreader xsltml NULL
tb tail_build\prj nmake - all tb_prj NULL
commit dfd16eba2dfa20b141a43de1f08de0d22395a8db
Author: David Tardon <dtardon at redhat.com>
Date: Sat Apr 7 12:59:12 2012 +0200
remove unused source
diff --git a/reportbuilder/java/com/sun/star/report/util/ReportUtil.java b/reportbuilder/java/com/sun/star/report/util/ReportUtil.java
deleted file mode 100644
index 464f0e9..0000000
--- a/reportbuilder/java/com/sun/star/report/util/ReportUtil.java
+++ /dev/null
@@ -1,46 +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.
- *
- ************************************************************************/
-package com.sun.star.report.util;
-
-import org.pentaho.reporting.libraries.base.util.ObjectUtilities;
-
-/**
- *
- * @author Ocke Janssen
- */
-public class ReportUtil
-{
-
- private ReportUtil()
- {
- }
-
- public static boolean equalString(final String uri, final String uri2)
- {
- return ObjectUtilities.equal(uri, uri2);
- }
-}
commit ba57dd8a0f37123e97ceb23408241fbdf1b7603f
Author: David Tardon <dtardon at redhat.com>
Date: Sat Apr 7 12:57:48 2012 +0200
remove makefiles
diff --git a/reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk b/reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk
deleted file mode 100644
index eacd1c5..0000000
--- a/reportbuilder/java/com/sun/star/report/function/metadata/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 = reportbuilder
-TARGET= rpt_java_css_metadata
-PACKAGE = com$/sun$/star$/report$/function$/metadata
-
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
-#----- compile .java files -----------------------------------------
-
-.IF "$(SYSTEM_JFREEREPORT)" == "YES"
-EXTRAJARFILES = $(LIBBASE_JAR) $(LIBFORMULA_JAR)
-.ELSE
-.INCLUDE : $(OUTDIR)/bin/jfreereport_version.mk
-JARFILES += \
- libbase-$(LIBBASE_VERSION).jar \
- libformula-$(LIBFORMULA_VERSION).jar
-.ENDIF
-
-JAVAFILES := AuthorFunction.java \
- AuthorFunctionDescription.java \
- TitleFunction.java \
- TitleFunctionDescription.java \
- MetaDataFunctionCategory.java
-
-COPYFILES := $(CLASSDIR)$/$(PACKAGE)$/category.properties \
- $(CLASSDIR)$/$(PACKAGE)$/Title-Function.properties\
- $(CLASSDIR)$/$(PACKAGE)$/category_en_US.properties \
- $(CLASSDIR)$/$(PACKAGE)$/Author-Function.properties \
- $(CLASSDIR)$/$(PACKAGE)$/Author-Function_en_US.properties \
- $(CLASSDIR)$/$(PACKAGE)$/Title-Function_en_US.properties
-
-ALLTAR : $(COPYFILES)
-# --- Targets ------------------------------------------------------
-.INCLUDE : target.mk
-
-$(COPYFILES): $$(@:f)
- +$(MKDIRHIER) $(CLASSDIR)$/$(PACKAGE)
- +$(COPY) $< $@
-
diff --git a/reportbuilder/java/com/sun/star/report/makefile.mk b/reportbuilder/java/com/sun/star/report/makefile.mk
deleted file mode 100644
index 1b96e99..0000000
--- a/reportbuilder/java/com/sun/star/report/makefile.mk
+++ /dev/null
@@ -1,74 +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 = reportbuilder
-TARGET=rpt_java_css
-PACKAGE = com$/sun$/star$/report
-
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
-#----- compile .java files -----------------------------------------
-
-JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar
-.IF "$(SYSTEM_APACHE_COMMONS)" == "YES"
-EXTRAJARFILES = $(COMMONS_LOGGING_JAR)
-.ELSE
-JARFILES += commons-logging-1.1.1.jar
-.ENDIF
-
-JAVAFILES := DataRow.java\
- DataSource.java\
- DataSourceException.java\
- DataSourceFactory.java\
- InputRepository.java\
- JobDefinitionException.java\
- JobProgressIndicator.java\
- JobProperties.java\
- OutputRepository.java\
- ParameterMap.java\
- ReportAddIn.java\
- ReportEngine.java\
- ReportEngineMetaData.java\
- ReportEngineParameterNames.java\
- ReportExecutionException.java\
- ReportExpression.java\
- ReportExpressionMetaData.java\
- ReportFunction.java\
- ReportJob.java\
- ReportJobFactory.java\
- ReportJobDefinition.java\
- ImageService.java\
- SOImageService.java\
- StorageRepository.java\
- SDBCReportData.java\
- SDBCReportDataFactory.java \
- OfficeToken.java
-
-
-# --- Targets ------------------------------------------------------
-.INCLUDE : target.mk
diff --git a/reportbuilder/java/com/sun/star/report/util/makefile.mk b/reportbuilder/java/com/sun/star/report/util/makefile.mk
deleted file mode 100644
index 84f2bf9..0000000
--- a/reportbuilder/java/com/sun/star/report/util/makefile.mk
+++ /dev/null
@@ -1,49 +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 = reportbuilder
-TARGET= rpt_java_css_util
-PACKAGE = com$/sun$/star$/report$/util
-
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
-#----- compile .java files -----------------------------------------
-
-.IF "$(SYSTEM_JFREEREPORT)" == "YES"
-EXTRAJARFILES = $(LIBBASE_JAR) $(LIBXML_JAR) $(JFREEREPORT_JAR)
-.ELSE
-.INCLUDE : $(OUTDIR)/bin/jfreereport_version.mk
-JARFILES += \
- libbase-$(LIBBASE_VERSION).jar \
- libxml-$(LIBXML_VERSION).jar \
- flow-engine-$(FLOW_ENGINE_VERSION).jar
-.ENDIF
-
-JAVAFILES = DefaultJobProperties.java DefaultParameterMap.java DefaultReportJobDefinition.java ManifestWriter.java
-# --- Targets ------------------------------------------------------
-.INCLUDE : target.mk
diff --git a/reportbuilder/java/makefile.mk b/reportbuilder/java/makefile.mk
deleted file mode 100644
index ba62a0d..0000000
--- a/reportbuilder/java/makefile.mk
+++ /dev/null
@@ -1,45 +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=reportbuilder
-TARGET=rpt_java
-# --- Settings ----------------------------------
-.INCLUDE : settings.mk
-# ------------------------------------------------------------------
-
-COPYFILES = \
- $(CLASSDIR)$/jfreereport.properties \
- $(CLASSDIR)$/libformula.properties \
- $(CLASSDIR)$/loader.properties
-
-.INCLUDE : target.mk
-# --- Targets ----------------------------------
-ALLTAR : $(COPYFILES)
-
-$(COPYFILES): $$(@:f)
- +$(COPY) $< $@
diff --git a/reportbuilder/registry/data/org/openoffice/Office/UI/makefile.mk b/reportbuilder/registry/data/org/openoffice/Office/UI/makefile.mk
deleted file mode 100644
index 8a9e8ec..0000000
--- a/reportbuilder/registry/data/org/openoffice/Office/UI/makefile.mk
+++ /dev/null
@@ -1,48 +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=reportbuilder
-TARGET=data_ooOUI
-PACKAGE=org.openoffice.Office.UI
-
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Targets ------------------------------------------------------
-LOCALIZEDFILES= \
- ReportCommands.xcu \
- DbReportWindowState.xcu
-
-XCUFILES= \
- $(LOCALIZEDFILES) \
- Controller.xcu
-
-MODULEFILES=
-
-.INCLUDE : target.mk
-
-
diff --git a/reportbuilder/registry/data/org/openoffice/Office/makefile.mk b/reportbuilder/registry/data/org/openoffice/Office/makefile.mk
deleted file mode 100644
index 6e691dd..0000000
--- a/reportbuilder/registry/data/org/openoffice/Office/makefile.mk
+++ /dev/null
@@ -1,70 +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=reportbuilder
-TARGET=data_ooOOffice
-PACKAGE=org.openoffice.Office
-
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Targets ------------------------------------------------------
-
-LOCALIZEDFILES= \
- Embedding.xcu \
- Accelerators.xcu \
- ExtendedColorScheme.xcu \
- DataAccess.xcu
-
-XCUFILES= \
- $(LOCALIZEDFILES) \
- ReportDesign.xcu \
- Paths.xcu
-
-.INCLUDE : target.mk
-
-.IF "$(depend)" == ""
-ALLTAR: "$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Embedding.xcs" "$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/ExtendedColorScheme.xcs" "$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Paths.xcs"
-.END
-
-"$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Embedding.xcs" : $(SOLARXMLDIR)$/registry$/schema$/$(PACKAGEDIR)$/Embedding.xcs
- @@-$(MKDIRHIER) $(@:d)
- $(COPY) $< $@
-
-"$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/ExtendedColorScheme.xcs" : $(SOLARXMLDIR)$/registry$/schema$/$(PACKAGEDIR)$/ExtendedColorScheme.xcs
- @@-$(MKDIRHIER) $(@:d)
- $(COPY) $< $@
-
-"$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Paths.xcs" : $(SOLARXMLDIR)$/registry$/schema$/$(PACKAGEDIR)$/Paths.xcs
- @@-$(MKDIRHIER) $(@:d)
- $(COPY) $< $@
-
-"$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Accelerators.xcs" : $(SOLARXMLDIR)$/registry$/schema$/$(PACKAGEDIR)$/Accelerators.xcs
- @@-$(MKDIRHIER) $(@:d)
- $(COPY) $< $@
-
diff --git a/reportbuilder/registry/data/org/openoffice/TypeDetection/makefile.mk b/reportbuilder/registry/data/org/openoffice/TypeDetection/makefile.mk
deleted file mode 100644
index 68d0fe6..0000000
--- a/reportbuilder/registry/data/org/openoffice/TypeDetection/makefile.mk
+++ /dev/null
@@ -1,57 +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=reportbuilder
-TARGET=data_ooType
-PACKAGE=org.openoffice.TypeDetection
-
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Targets ------------------------------------------------------
-
-LOCALIZEDFILES= \
- Filter.xcu \
- Types.xcu
-
-XCUFILES= \
- $(LOCALIZEDFILES)
-
-.INCLUDE : target.mk
-
-.IF "$(depend)" == ""
-ALLTAR: "$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Filter.xcs" "$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Types.xcs"
-.END
-
-"$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Filter.xcs" : $(SOLARXMLDIR)$/registry$/schema$/$(PACKAGEDIR)$/Filter.xcs
- @@-$(MKDIRHIER) $(@:d)
- $(COPY) $< $@
-
-"$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Types.xcs" : $(SOLARXMLDIR)$/registry$/schema$/$(PACKAGEDIR)$/Types.xcs
- @@-$(MKDIRHIER) $(@:d)
- $(COPY) $< $@
diff --git a/reportbuilder/registry/data/org/openoffice/makefile.mk b/reportbuilder/registry/data/org/openoffice/makefile.mk
deleted file mode 100644
index 9d36495..0000000
--- a/reportbuilder/registry/data/org/openoffice/makefile.mk
+++ /dev/null
@@ -1,52 +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=reportbuilder
-TARGET=data_ooOffice
-PACKAGE=org.openoffice
-
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Targets ------------------------------------------------------
-
-LOCALIZEDFILES= \
- Setup.xcu
-
-XCUFILES= \
- $(LOCALIZEDFILES)
-
-.INCLUDE : target.mk
-
-.IF "$(depend)" == ""
-ALLTAR: "$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Setup.xcs"
-.END
-
-"$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Setup.xcs": $(SOLARXMLDIR)$/registry$/schema$/$(PACKAGEDIR)$/Setup.xcs
- @@-$(MKDIRHIER) $(@:d)
- $(COPY) $< $@
diff --git a/reportbuilder/registry/schema/org/openoffice/Office/UI/makefile.mk b/reportbuilder/registry/schema/org/openoffice/Office/UI/makefile.mk
deleted file mode 100644
index 9f284f9..0000000
--- a/reportbuilder/registry/schema/org/openoffice/Office/UI/makefile.mk
+++ /dev/null
@@ -1,60 +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=reportbuilder
-TARGET=schema_ooOfficeUI
-PACKAGE=org.openoffice.Office.UI
-
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Targets ------------------------------------------------------
-
-XCSFILES= \
- ReportCommands.xcs \
- DbReportWindowState.xcs
-
-MODULEFILES=
-
-.INCLUDE : target.mk
-
-.IF "$(depend)" == ""
-ALLTAR: "$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Commands.xcs" "$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/WindowState.xcs" "$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Controller.xcs"
-.END
-
-"$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Commands.xcs": $(SOLARXMLDIR)$/registry$/schema$/$(PACKAGEDIR)$/Commands.xcs
- @@-$(MKDIRHIER) $(@:d)
- $(COPY) $< $@
-
-"$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/WindowState.xcs" : $(SOLARXMLDIR)$/registry$/schema$/$(PACKAGEDIR)$/WindowState.xcs
- @@-$(MKDIRHIER) $(@:d)
- $(COPY) $< $@
-
-"$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Controller.xcs" : $(SOLARXMLDIR)$/registry$/schema$/$(PACKAGEDIR)$/Controller.xcs
- @@-$(MKDIRHIER) $(@:d)
- $(COPY) $< $@
-
diff --git a/reportbuilder/registry/schema/org/openoffice/Office/makefile.mk b/reportbuilder/registry/schema/org/openoffice/Office/makefile.mk
deleted file mode 100644
index 82fb3a7..0000000
--- a/reportbuilder/registry/schema/org/openoffice/Office/makefile.mk
+++ /dev/null
@@ -1,48 +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=reportbuilder
-TARGET=schema_ooOffice
-PACKAGE=org.openoffice.Office
-
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Targets ------------------------------------------------------
-
-XCSFILES= \
- ReportDesign.xcs
-
-.INCLUDE : target.mk
-
-.IF "$(depend)" == ""
-ALLTAR: "$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/DataAccess.xcs"
-.END
-
-"$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/DataAccess.xcs" : $(SOLARXMLDIR)$/registry$/schema$/$(PACKAGEDIR)$/DataAccess.xcs
- @@-$(MKDIRHIER) $(@:d)
- $(COPY) $< $@
diff --git a/reportbuilder/template/delzip b/reportbuilder/template/delzip
deleted file mode 100644
index e69de29..0000000
diff --git a/reportbuilder/template/en-US/wizard/report/makefile.mk b/reportbuilder/template/en-US/wizard/report/makefile.mk
deleted file mode 100644
index 0de25c3..0000000
--- a/reportbuilder/template/en-US/wizard/report/makefile.mk
+++ /dev/null
@@ -1,69 +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=reportbuilder
-TARGET=template_en_us
-PACKAGE=
-
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Targets ------------------------------------------------------
-
-XCUFILES=
-
-MODULEFILES=
-
-OTR_FILES_IN_REPORT_BUILDER_EXT=\
- default.otr
-
-# OTR_FILES_IN_TEMPLATE_EXT=\
-# finance.odr \
-# finance_2.odr \
-# yellow.odr
-
-ALLTAR: COPYFILES # COPYFILES2
-
-.INCLUDE : target.mk
-
-#-------------------------------------------------------------------------------
-
-TARGETDIR=$(MISC)$/sun-report-builder$/template$/en-US$/wizard$/report
-
-COPYFILES: $(OTR_FILES_IN_REPORT_BUILDER_EXT) $(XCU_FILES)
- @@-$(MKDIRHIER) $(TARGETDIR)
- $(COPY) $(OTR_FILES_IN_REPORT_BUILDER_EXT) $(TARGETDIR)
-
-#-------------------------------------------------------------------------------
-
-# TARGETDIR2=$(MISC)$/templates$/template$/wizard$/report
-#
-# COPYFILES2: $(OTR_FILES_IN_TEMPLATE_EXT) $(XCU_FILES)
-# @@-$(MKDIRHIER) $(TARGETDIR2)
-# $(COPY) $(OTR_FILES_IN_TEMPLATE_EXT) $(TARGETDIR2)
-
diff --git a/reportbuilder/template/makefile.mk b/reportbuilder/template/makefile.mk
deleted file mode 100644
index cf38d10..0000000
--- a/reportbuilder/template/makefile.mk
+++ /dev/null
@@ -1,121 +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=reportbuilder
-TARGET=rpt_templates
-
-# ???
-
-EXTENSION_VERSION_BASE=1.0.0
-.IF "$(DBG_LEVEL)" == "0"
- EXTENSION_VERSION=$(EXTENSION_VERSION_BASE)
-.ELSE
- EXTENSION_VERSION=$(EXTENSION_VERSION_BASE).$(BUILD)
-.ENDIF
-
-# --- Settings ----------------------------------
-.INCLUDE : settings.mk
-# ------------------------------------------------------------------
-
-# create Extension -----------------------------
-
-.IF "$(SOLAR_JAVA)"!=""
-
-ZIP1TARGET=sun-report-builder-templates
-ZIP1FLAGS=-r
-ZIP1DIR=$(MISC)$/templates
-ZIP1LIST=*
-ZIP1EXT=.oxt
-
-XMLFILES := $(ZIP1DIR)$/description.xml \
- $(ZIP1DIR)$/META-INF$/manifest.xml
-
-XCU_FILES := $(ZIP1DIR)$/registry$/data$/org$/openoffice$/Office$/Paths.xcu
-
-ODR_FILES := \
- $(ZIP1DIR)$/template$/wizard$/report$/finance.odr \
- $(ZIP1DIR)$/template$/wizard$/report$/finance_2.odr \
- $(ZIP1DIR)$/template$/wizard$/report$/yellow.odr
-
-HTMLFILES := $(ZIP1DIR)$/THIRDPARTYREADMELICENSE.html \
- $(ZIP1DIR)$/readme_en-US.html \
- $(ZIP1DIR)$/readme_en-US.txt
-
-.IF "$(GUI)"!="WNT"
-TXTFILES:=$(foreach,i,$(alllangiso) $(ZIP1DIR)$/registration$/LICENSE_$i)
-LICLINES:=$(foreach,i,$(TXTFILES) <license-text xlink:href="registration/$(i:f)" lang="$(subst,LICENSE_, $(i:f))" license-id="$(subst,LICENSE_, $(i:f))" />)
-.ELSE # "$(GUI)"!="WNT"
-TXTFILES:=$(foreach,i,$(alllangiso) $(ZIP1DIR)$/registration$/license_$i.txt)
-LICLINES:=$(foreach,i,$(TXTFILES) <license-text xlink:href="registration/$(i:f)" lang="$(subst,.txt, $(subst,license_, $(i:f)))" license-id="$(subst,.txt, $(subst,license_, $(i:f)))" />)
-.ENDIF # "$(GUI)"!="WNT"
-
-# --- Targets ----------------------------------
-.INCLUDE : target.mk
-
-.IF "$(ZIP1TARGETN)"!=""
-$(ZIP1TARGETN) : $(TXTFILES) $(XMLFILES) $(HTMLFILES) $(ODR_FILES)
-.ENDIF # "$(ZIP1TARGETN)"!="
-
-$(MISC)$/template_update_report.flag : $(XCU_FILES)
- $(TOUCH) $@
-
-$(ZIP1DIR)$/description.xml : pre.xml post.xml
- @@-$(MKDIRHIER) $(@:d)
- @@-$(RM) $(ZIP1DIR)$/description.xml
- $(TYPE) pre.xml > $@
- $(TYPE) $(mktmp $(LICLINES)) >> $@
- $(TYPE) post.xml | $(SED) s/#VERSION#/$(EXTENSION_VERSION)/ >> $@
-
-$(ZIP1DIR)$/registration$/license_%.txt : $(SOLARBINDIR)$/osl$/license_%.txt
- @@-$(MKDIRHIER) $(@:d)
- $(COPY) $< $@
-
-$(ZIP1DIR)$/registration$/LICENSE_% : $(SOLARBINDIR)$/osl$/LICENSE_%
- @@-$(MKDIRHIER) $(@:d)
- $(COPY) $< $@
-
-$(ZIP1DIR)$/registry$/data$/org$/openoffice$/Office$/%.xcu : $(MISC)$/template$/registry$/data$/org$/openoffice$/Office$/%.xcu
- @@-$(MKDIRHIER) $(@:d)
- $(COPY) $< $@
-
-$(ZIP1DIR)$/META-INF$/manifest.xml : manifest.xml $(MISC)$/template_update_report.flag
- @@-$(MKDIRHIER) $(@:d)
- $(PERL) $(SOLARENV)$/bin$/makemani.pl $(PRJ)$/template$/manifest.xml $(ZIP1DIR) registry $(@:d:d)
-
-$(ZIP1DIR)$/readme_en-US.% : $(PRJ)$/license$/readme_en-US.%
- @@-$(MKDIRHIER) $(@:d)
- $(COPY) $< $@
-
-$(ZIP1DIR)$/THIRDPARTYREADMELICENSE.html : $(PRJ)$/license$/THIRDPARTYREADMELICENSE.html
- @@-$(MKDIRHIER) $(@:d)
- $(COPY) $< $@
-
-.ELSE # "$(SOLAR_JAVA)"!=""
-.INCLUDE : target.mk
-.ENDIF # "$(SOLAR_JAVA)"!=""
-#
diff --git a/reportbuilder/template/registry/data/org/openoffice/Office/makefile.mk b/reportbuilder/template/registry/data/org/openoffice/Office/makefile.mk
deleted file mode 100644
index e10c06b..0000000
--- a/reportbuilder/template/registry/data/org/openoffice/Office/makefile.mk
+++ /dev/null
@@ -1,49 +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=reportbuilder
-TARGET=template_data_ooOffice
-PACKAGE=org.openoffice.Office
-
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-#
-# we overwrite the PROCESSOUT directory, which comes from util/makefile.pmk
-# and set it to the templates directory
-#
-PROCESSOUT=$(MISC)$/templates
-
-# --- Targets ------------------------------------------------------
-
-XCUFILES= \
- Paths.xcu
-
-MODULEFILES=
-
-.INCLUDE : target.mk
diff --git a/reportbuilder/template/wizard/report/makefile.mk b/reportbuilder/template/wizard/report/makefile.mk
deleted file mode 100644
index ffe2f9f..0000000
--- a/reportbuilder/template/wizard/report/makefile.mk
+++ /dev/null
@@ -1,69 +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=reportbuilder
-TARGET=template
-PACKAGE=
-
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Targets ------------------------------------------------------
-
-XCUFILES=
-
-MODULEFILES=
-
-ODR_FILES_IN_REPORT_BUILDER_EXT=\
- default.odr
-
-ODR_FILES_IN_TEMPLATE_EXT=\
- finance.odr \
- finance_2.odr \
- yellow.odr
-
-ALLTAR: COPYFILES COPYFILES2
-
-.INCLUDE : target.mk
-
-#-------------------------------------------------------------------------------
-
-TARGETDIR=$(MISC)$/template$/wizard$/report
-
-COPYFILES: $(ODR_FILES_IN_REPORT_BUILDER_EXT) $(XCU_FILES)
- @@-$(MKDIRHIER) $(TARGETDIR)
- $(COPY) $(ODR_FILES_IN_REPORT_BUILDER_EXT) $(TARGETDIR)
-
-#-------------------------------------------------------------------------------
-
-TARGETDIR2=$(MISC)$/templates$/template$/wizard$/report
-
-COPYFILES2: $(ODR_FILES_IN_TEMPLATE_EXT) $(XCU_FILES)
- @@-$(MKDIRHIER) $(TARGETDIR2)
- $(COPY) $(ODR_FILES_IN_TEMPLATE_EXT) $(TARGETDIR2)
-
diff --git a/reportbuilder/util/delzip b/reportbuilder/util/delzip
deleted file mode 100644
index 8b13789..0000000
--- a/reportbuilder/util/delzip
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/reportbuilder/util/makefile.mk b/reportbuilder/util/makefile.mk
deleted file mode 100644
index d3cc505..0000000
--- a/reportbuilder/util/makefile.mk
+++ /dev/null
@@ -1,168 +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=reportbuilder
-TARGET=rpt
-EXTENSION_VERSION_BASE=1.2.1
-
- EXTENSION_VERSION=$(EXTENSION_VERSION_BASE)
-
-# --- Settings ----------------------------------
-.INCLUDE : makefile.pmk
-
-.IF "$(L10N_framework)"==""
-# ------------------------------------------------------------------
-# calready set in util$/makefile.pmk
-EXTENSION_ZIPNAME:=report-builder
-
-# create Extension -----------------------------
-
-.IF "$(SOLAR_JAVA)"!=""
-
-XMLFILES = $(EXTENSIONDIR)$/META-INF$/manifest.xml
-
-# DESCRIPTION_SRC is the source file which is copied into the extension
-# It is defaulted to "description.xml", but we want to pre-process it, so we use an intermediate
-# file
-DESCRIPTION_SRC = $(MISC)$/description.xml
-
-COMPONENT_MERGED_XCU= \
- $(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/Setup.xcu \
- $(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/Office$/DataAccess.xcu \
- $(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/Office$/ReportDesign.xcu \
- $(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/Office$/ExtendedColorScheme.xcu \
- $(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/Office$/Embedding.xcu \
- $(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/Office$/Paths.xcu \
- $(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/Office$/Accelerators.xcu \
- $(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/TypeDetection$/Filter.xcu \
- $(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/TypeDetection$/Types.xcu \
- $(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/Office$/UI$/ReportCommands.xcu \
- $(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/Office$/UI$/Controller.xcu \
- $(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/Office$/UI$/DbReportWindowState.xcu \
- $(EXTENSIONDIR)$/registry$/schema$/org$/openoffice$/Office$/UI$/DbReportWindowState.xcs \
- $(EXTENSIONDIR)$/registry$/schema$/org$/openoffice$/Office$/UI$/ReportCommands.xcs \
- $(EXTENSIONDIR)$/registry$/schema$/org$/openoffice$/Office$/ReportDesign.xcs
-
-COMPONENT_OTR_FILES= \
- $(EXTENSIONDIR)$/template$/en-US$/wizard$/report$/default.otr
-
-COMPONENT_IMAGES= \
- $(EXTENSIONDIR)$/images$/extension_32.png
-
-COMPONENT_HTMLFILES = $(EXTENSIONDIR)$/THIRDPARTYREADMELICENSE.html \
- $(EXTENSIONDIR)$/readme_en-US.html \
- $(EXTENSIONDIR)$/readme_en-US.txt
-
-COMPONENT_JARFILES = \
- $(EXTENSIONDIR)$/sun-report-builder.jar
-
-COMPONENT_DESCRIPTION= \
- $(foreach,lang,$(alllangiso) $(EXTENSIONDIR)$/description-$(lang).txt)
-
-# .jar files from solver
-COMPONENT_EXTJARFILES = \
- $(EXTENSIONDIR)$/sun-report-builder.jar
-COMPONENT_EXTJARFILES_COPY = \
- $(OUTDIR)$/bin$/reportbuilderwizard.jar
-
-.IF "$(SYSTEM_JFREEREPORT)" != "YES"
-.INCLUDE : $(OUTDIR)/bin/jfreereport_version.mk
-COMPONENT_EXTJARFILES_COPY += \
- $(OUTDIR)$/bin$/flute-$(FLUTE_VERSION).jar \
- $(OUTDIR)$/bin$/libserializer-$(LIBSERIALIZER_VERSION).jar \
- $(OUTDIR)$/bin$/libbase-$(LIBBASE_VERSION).jar \
- $(OUTDIR)$/bin$/libfonts-$(LIBFONTS_VERSION).jar \
- $(OUTDIR)$/bin$/libformula-$(LIBFORMULA_VERSION).jar \
- $(OUTDIR)$/bin$/liblayout-$(LIBLAYOUT_VERSION).jar \
- $(OUTDIR)$/bin$/libloader-$(LIBLOADER_VERSION).jar \
- $(OUTDIR)$/bin$/librepository-$(LIBREPOSITORY_VERSION).jar \
- $(OUTDIR)$/bin$/libxml-$(LIBXML_VERSION).jar \
- $(OUTDIR)$/bin$/flow-engine-$(FLOW_ENGINE_VERSION).jar \
- $(OUTDIR)$/bin$/sac.jar
-.ENDIF
-.IF "$(SYSTEM_APACHE_COMMONS)" != "YES"
-COMPONENT_EXTJARFILES_COPY += \
- $(OUTDIR)$/bin$/commons-logging-1.1.1.jar
-.ENDIF
-
-COMPONENT_MANIFEST_GENERIC:=TRUE
-COMPONENT_MANIFEST_SEARCHDIR:=registry
-
-# make sure to add your custom files here
-EXTENSION_PACKDEPS=$(COMPONENT_EXTJARFILES) $(MISC)/$(TARGET).copied $(COMPONENT_HTMLFILES) $(COMPONENT_OTR_FILES) $(COMPONENT_DESCRIPTION) $(COMPONENT_IMAGES) $(EXTENSIONDIR)/components.rdb
-.ENDIF
-# --- Targets ----------------------------------
-
-.INCLUDE : extension_pre.mk
-.INCLUDE : target.mk
-.INCLUDE : extension_post.mk
-.IF "$(L10N_framework)"==""
-$(EXTENSIONDIR)$/%.jar : $(SOLARBINDIR)$/%.jar
- @@-$(MKDIRHIER) $(@:d)
- $(COPY) $< $@
-
-$(EXTENSIONDIR)/components.rdb : components.rdb
- @@-$(MKDIRHIER) $(@:d)
- $(COPY) $< $@
-
-$(EXTENSIONDIR)$/readme_en-US.% : $(PRJ)$/license$/readme_en-US.%
- @@-$(MKDIRHIER) $(@:d)
- $(COPY) $< $@
-
-$(COMPONENT_IMAGES) : $(SRC_ROOT)/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
- @@-$(MKDIRHIER) $(@:d)
- $(COPY) $< $@
-
-$(EXTENSIONDIR)$/THIRDPARTYREADMELICENSE.html : $(PRJ)$/license$/THIRDPARTYREADMELICENSE.html
- @@-$(MKDIRHIER) $(@:d)
- $(COPY) $< $@
-
-$(COMPONENT_DESCRIPTION) : $(DESCRIPTION)
-
-
-$(DESCRIPTION_SRC): description.xml
- +-$(RM) $@
- $(COPY) description-en-US.txt $(EXTENSIONDIR)/description-en-US.txt
-.IF "$(WITH_LANG)" != ""
- $(XRMEX) -p $(PRJNAME) -i description.xml -o $@ -m $(LOCALIZESDF) -l all
- $(SED) "s/#VERSION#/$(EXTENSION_VERSION)/" < $@ > $@.new
- mv $@.new $@
- @@-$(COPY) $(@:d)/description-*.txt $(EXTENSIONDIR)
-.ELSE
- $(SED) "s/#VERSION#/$(EXTENSION_VERSION)/" < $< > $@
-.ENDIF
-
-$(MISC)/$(TARGET).copied: $(COMPONENT_EXTJARFILES_COPY)
- @@-$(MKDIRHIER) $(EXTENSIONDIR)
- : $(foreach,i,$(COMPONENT_EXTJARFILES_COPY) && $(COPY) $i $(EXTENSIONDIR)/)
- $(TOUCH) $@
-.ENDIF
-.ELSE # "$(SOLAR_JAVA)"!=""
-.INCLUDE : target.mk
-.ENDIF # "$(SOLAR_JAVA)"!=""
-#
diff --git a/reportbuilder/util/makefile.pmk b/reportbuilder/util/makefile.pmk
deleted file mode 100644
index 5661322..0000000
--- a/reportbuilder/util/makefile.pmk
+++ /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.
-#
-#*************************************************************************
-
-XSLDIR=$(SOLARXMLDIR)$/processing
-ABSXCSROOT=$(PWD)$/$(MISC)$/$(EXTNAME)
-# ABSXCSROOT=$(MISC)$/$(EXTNAME)
-XCSROOT=..
-# XCSROOT=$(SOLARXMLDIR)
-# ABSXCSROOT=$(SOLARXMLDIR)
-DTDDIR=$(SOLARXMLDIR)
-PROCESSOUT=$(MISC)$/$(EXTNAME)
-PROCESSORDIR=$(SOLARBINDIR)
-
-
-# no validation by inspector class
-NO_INSPECTION=TRUE
-
-JAVAPREPRO=
-.IF "$(JDK_VERSION)" == "110"
-JAVAPREPRO=-jdk11
-.ENDIF
-.IF "$(PRODUCT)" != ""
-JAVAPREPRO=$(JAVAPREPRO) + " -product"
-.ENDIF
-
-# --- Settings -----------------------------------------------------
-
-EXTENSIONNAME:=sun-report-builder
-
-.INCLUDE : settings.mk
-
-NOUNODOC=
-BUILD_URD_ONLY=TRUE
-LOCALIDLFILES=TRUE
-URDDOC=TRUE
-
-.IF "$(OS)"=="SOLARIS" || "$(OS)"=="FREEBSD"
-.IF "$(CPU)"=="I"
-UNOIDL=unoidl
-.ENDIF
-.ENDIF
-
diff --git a/reportbuilder/util/target.pmk b/reportbuilder/util/target.pmk
deleted file mode 100644
index dfe8b81..0000000
--- a/reportbuilder/util/target.pmk
+++ /dev/null
@@ -1,34 +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.
-#
-#*************************************************************************
-REGISTRYCHECKFLAG=$(MISC)$/registrycheck.flag
-$(OUT)$/misc$/$(TARGET).idls: makefile.mk
- +-$(RM) $@
- +-$(RM) $(REGISTRYCHECKFLAG)
- +$(TYPE) $(mktmp $(foreach,i,$(IDLFILES) $(PACKAGE)$/$i)) >>$@
-
-ALLTAR: $(OUT)$/misc$/$(TARGET).idls
-
commit a2387835c677c73ca9b6cfd13174cccc96df0e41
Author: David Tardon <dtardon at redhat.com>
Date: Sat Apr 7 12:55:41 2012 +0200
gbuildize reportbuilder
diff --git a/Makefile b/Makefile
index 89e77a3..8e84a9a 100644
--- a/Makefile
+++ b/Makefile
@@ -86,6 +86,7 @@ padmin\
psprint_config\
qadevOOo\
regexp\
+reportbuilder\
reportdesign\
ridljar\
rsc\
@@ -217,7 +218,6 @@ readlicense_oo\
redland\
registry\
remotebridges\
-reportbuilder\
rhino\
saxon\
scp2\
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 3dc3c81..0fca83f 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -88,6 +88,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
padmin \
psprint_config \
regexp \
+ reportbuilder \
reportdesign \
ridljar \
rsc \
diff --git a/reportbuilder/Configuration_reportbuilder.mk b/reportbuilder/Configuration_reportbuilder.mk
new file mode 100644
index 0000000..1e6b30e
--- /dev/null
+++ b/reportbuilder/Configuration_reportbuilder.mk
@@ -0,0 +1,56 @@
+# -*- 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_Configuration_Configuration,sun-report-builder,nodeliver))
+
+$(eval $(call gb_Configuration_use_configuration,sun-report-builder,officecfg))
+
+$(eval $(call gb_Configuration_add_schemas,sun-report-builder,reportbuilder/registry/schema,\
+ org/openoffice/Office/ReportDesign.xcs \
+ org/openoffice/Office/UI/DbReportWindowState.xcs \
+ org/openoffice/Office/UI/ReportCommands.xcs \
+))
+
+$(eval $(call gb_Configuration_add_datas,sun-report-builder,reportbuilder/registry/data,\
+ org/openoffice/Office/Paths.xcu \
+ org/openoffice/Office/ReportDesign.xcu \
+ org/openoffice/Office/UI/Controller.xcu \
+))
+
+$(eval $(call gb_Configuration_add_localized_datas,sun-report-builder,reportbuilder/registry/data,\
+ org/openoffice/Office/Accelerators.xcu \
+ org/openoffice/Office/DataAccess.xcu \
+ org/openoffice/Office/Embedding.xcu \
+ org/openoffice/Office/ExtendedColorScheme.xcu \
+ org/openoffice/Office/UI/DbReportWindowState.xcu \
+ org/openoffice/Office/UI/ReportCommands.xcu \
+ org/openoffice/Setup.xcu \
+ org/openoffice/TypeDetection/Filter.xcu \
+ org/openoffice/TypeDetection/Types.xcu \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/reportbuilder/Extension_reportbuilder.mk b/reportbuilder/Extension_reportbuilder.mk
new file mode 100644
index 0000000..2a77ae5
--- /dev/null
+++ b/reportbuilder/Extension_reportbuilder.mk
@@ -0,0 +1,102 @@
+# -*- 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_Extension_Extension,sun-report-builder,reportbuilder/util))
+
+$(eval $(call gb_Extension_add_files,sun-report-builder,,\
+ $(call gb_Jar_get_outdir_target,reportbuilderwizard) \
+ $(call gb_Jar_get_outdir_target,sun-report-builder) \
+ $(SRCDIR)/reportbuilder/license/readme_en-US.html \
+ $(SRCDIR)/reportbuilder/license/readme_en-US.txt \
+ $(SRCDIR)/reportbuilder/license/THIRDPARTYREADMELICENSE.html \
+ $(SRCDIR)/reportbuilder/util/components.rdb \
+))
+
+ifneq ($(SYSTEM_APACHE_COMMONS),YES)
+$(eval $(call gb_Extension_add_files,sun-report-builder,,\
+ $(OUTDIR)/bin/commons-logging-1.1.1.jar \
+))
+endif
+
+ifneq ($(SYSTEM_JFREEREPORT),YES)
+include $(OUTDIR)/bin/jfreereport_version.mk
+$(eval $(call gb_Extension_add_files,sun-report-builder,,\
+ $(OUTDIR)/bin/flow-engine-$(FLOW_ENGINE_VERSION).jar \
+ $(OUTDIR)/bin/flute-$(FLUTE_VERSION).jar \
+ $(OUTDIR)/bin/libbase-$(LIBBASE_VERSION).jar \
+ $(OUTDIR)/bin/libfonts-$(LIBFONTS_VERSION).jar \
+ $(OUTDIR)/bin/libformula-$(LIBFORMULA_VERSION).jar \
+ $(OUTDIR)/bin/liblayout-$(LIBLAYOUT_VERSION).jar \
+ $(OUTDIR)/bin/libloader-$(LIBLOADER_VERSION).jar \
+ $(OUTDIR)/bin/librepository-$(LIBREPOSITORY_VERSION).jar \
+ $(OUTDIR)/bin/libserializer-$(LIBSERIALIZER_VERSION).jar \
+ $(OUTDIR)/bin/libxml-$(LIBXML_VERSION).jar \
+ $(OUTDIR)/bin/sac.jar \
+))
+endif
+
+$(eval $(call gb_Extension_add_files,sun-report-builder,images,\
+ $(SRCDIR)/icon-themes/galaxy/desktop/res/extension_32.png \
+))
+
+$(eval $(call gb_Extension_add_files,sun-report-builder,registry/data/org/openoffice,\
+ $(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Setup.xcu) \
+))
+
+$(eval $(call gb_Extension_add_files,sun-report-builder,registry/data/org/openoffice/Office,\
+ $(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/Accelerators.xcu) \
+ $(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/DataAccess.xcu) \
+ $(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/Embedding.xcu) \
+ $(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu) \
+ $(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/Paths.xcu) \
+ $(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/ReportDesign.xcu) \
+))
+
+$(eval $(call gb_Extension_add_files,sun-report-builder,registry/data/org/openoffice/Office/UI,\
+ $(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/UI/DbReportWindowState.xcu) \
+ $(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/UI/ReportCommands.xcu) \
+))
+
+$(eval $(call gb_Extension_add_files,sun-report-builder,registry/data/org/openoffice/TypeDetection,\
+ $(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/TypeDetection/Filter.xcu) \
+ $(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/TypeDetection/Types.xcu) \
+))
+
+$(eval $(call gb_Extension_add_files,sun-report-builder,registry/schema/org/openoffice/Office,\
+ $(call gb_XcsTarget_get_target,reportbuilder/registry/schema/org/openoffice/Office/ReportDesign.xcs) \
+))
+
+$(eval $(call gb_Extension_add_files,sun-report-builder,registry/schema/org/openoffice/Office/UI,\
+ $(call gb_XcsTarget_get_target,reportbuilder/registry/schema/org/openoffice/Office/UI/DbReportWindowState.xcs) \
+ $(call gb_XcsTarget_get_target,reportbuilder/registry/schema/org/openoffice/Office/UI/ReportCommands.xcs) \
+))
+
+$(eval $(call gb_Extension_add_files,sun-report-builder,template/en-US/wizard/report,\
+ $(SRCDIR)/reportbuilder/template/en-US/wizard/report/default.otr \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/reportbuilder/Jar_reportbuilder.mk b/reportbuilder/Jar_reportbuilder.mk
new file mode 100644
index 0000000..a38d165
--- /dev/null
+++ b/reportbuilder/Jar_reportbuilder.mk
@@ -0,0 +1,296 @@
+# -*- 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.
+
+# TODO: fix manifest
+
+$(eval $(call gb_Jar_Jar,sun-report-builder))
+
+$(eval $(call gb_Jar_add_jars,sun-report-builder,\
+ $(OUTDIR)/bin/java_uno.jar \
+ $(OUTDIR)/bin/juh.jar \
+ $(OUTDIR)/bin/jurt.jar \
+ $(OUTDIR)/bin/ridl.jar \
+ $(OUTDIR)/bin/unoil.jar \
+))
+
+$(eval $(call gb_Jar_use_externals,sun-report-builder,\
+ commons-logging \
+ flow-engine \
+ flute \
+ libbase \
+ libfonts \
+ libformula \
+ liblayout \
+ libloader \
+ librepository \
+ libserializer \
+ libxml \
+ sac \
+))
+
+$(eval $(call gb_Jar_set_packageroot,sun-report-builder,com))
+
+$(eval $(call gb_Jar_add_sourcefiles,sun-report-builder,\
+ reportbuilder/java/com/sun/star/report/DataRow \
+ reportbuilder/java/com/sun/star/report/DataSource \
+ reportbuilder/java/com/sun/star/report/DataSourceException \
+ reportbuilder/java/com/sun/star/report/DataSourceFactory \
+ reportbuilder/java/com/sun/star/report/ImageService \
+ reportbuilder/java/com/sun/star/report/InputRepository \
+ reportbuilder/java/com/sun/star/report/JobDefinitionException \
+ reportbuilder/java/com/sun/star/report/JobProgressIndicator \
+ reportbuilder/java/com/sun/star/report/JobProperties \
+ reportbuilder/java/com/sun/star/report/OfficeToken \
+ reportbuilder/java/com/sun/star/report/OutputRepository \
+ reportbuilder/java/com/sun/star/report/ParameterMap \
+ reportbuilder/java/com/sun/star/report/ReportAddIn \
+ reportbuilder/java/com/sun/star/report/ReportEngine \
+ reportbuilder/java/com/sun/star/report/ReportEngineMetaData \
+ reportbuilder/java/com/sun/star/report/ReportEngineParameterNames \
+ reportbuilder/java/com/sun/star/report/ReportExecutionException \
+ reportbuilder/java/com/sun/star/report/ReportExpression \
+ reportbuilder/java/com/sun/star/report/ReportExpressionMetaData \
+ reportbuilder/java/com/sun/star/report/ReportFunction \
+ reportbuilder/java/com/sun/star/report/ReportJob \
+ reportbuilder/java/com/sun/star/report/ReportJobDefinition \
+ reportbuilder/java/com/sun/star/report/ReportJobFactory \
+ reportbuilder/java/com/sun/star/report/SDBCReportData \
+ reportbuilder/java/com/sun/star/report/SDBCReportDataFactory \
+ reportbuilder/java/com/sun/star/report/SOImageService \
+ reportbuilder/java/com/sun/star/report/StorageRepository \
+ reportbuilder/java/com/sun/star/report/function/metadata/AuthorFunction \
+ reportbuilder/java/com/sun/star/report/function/metadata/AuthorFunctionDescription \
+ reportbuilder/java/com/sun/star/report/function/metadata/MetaDataFunctionCategory \
+ reportbuilder/java/com/sun/star/report/function/metadata/TitleFunction \
+ reportbuilder/java/com/sun/star/report/function/metadata/TitleFunctionDescription \
+ reportbuilder/java/com/sun/star/report/pentaho/DefaultNameGenerator \
+ reportbuilder/java/com/sun/star/report/pentaho/OfficeNamespaces \
+ reportbuilder/java/com/sun/star/report/pentaho/PentahoFormulaContext \
+ reportbuilder/java/com/sun/star/report/pentaho/PentahoReportAddIn \
+ reportbuilder/java/com/sun/star/report/pentaho/PentahoReportEngine \
+ reportbuilder/java/com/sun/star/report/pentaho/PentahoReportEngineMetaData \
+ reportbuilder/java/com/sun/star/report/pentaho/PentahoReportJob \
+ reportbuilder/java/com/sun/star/report/pentaho/SOFormulaOpCodeMapper \
+ reportbuilder/java/com/sun/star/report/pentaho/SOFormulaParser \
+ reportbuilder/java/com/sun/star/report/pentaho/SOFunctionManager \
+ reportbuilder/java/com/sun/star/report/pentaho/SOReportJobFactory \
+ reportbuilder/java/com/sun/star/report/pentaho/StarFunctionCategory \
+ reportbuilder/java/com/sun/star/report/pentaho/StarFunctionDescription \
+ reportbuilder/java/com/sun/star/report/pentaho/StarReportData \
+ reportbuilder/java/com/sun/star/report/pentaho/StarReportDataFactory \
+ reportbuilder/java/com/sun/star/report/pentaho/StarReportModule \
+ reportbuilder/java/com/sun/star/report/pentaho/expressions/SumExpression \
+ reportbuilder/java/com/sun/star/report/pentaho/expressions/SumExpressionMetaData \
+ reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/AbstractReportElementLayoutController \
+ reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FixedTextLayoutController \
+ reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility \
+ reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormattedTextLayoutController \
+ reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ImageElementContext \
+ reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ImageElementLayoutController \
+ reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ObjectOleLayoutController \
+ reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeDetailLayoutController \
+ reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeGroupInstanceSectionLayoutController \
+ reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeGroupLayoutController \
+ reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeGroupSectionLayoutController \
+ reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficePageSectionLayoutController \
+ reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeRepeatingStructureLayoutController \
+ reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeReportLayoutController \
+ reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeTableLayoutController \
+ reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeTableTemplateLayoutController \
+ reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController \
+ reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/VariablesCollection \
+ reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/VariablesDeclarationLayoutController \
+ reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryLoader \
+ reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryResourceData \
+ reportbuilder/java/com/sun/star/report/pentaho/loader/InputResourceKey \
+ reportbuilder/java/com/sun/star/report/pentaho/model/DataStyle \
+ reportbuilder/java/com/sun/star/report/pentaho/model/FixedTextElement \
+ reportbuilder/java/com/sun/star/report/pentaho/model/FontFaceDeclsSection \
+ reportbuilder/java/com/sun/star/report/pentaho/model/FontFaceElement \
+ reportbuilder/java/com/sun/star/report/pentaho/model/FormatCondition \
+ reportbuilder/java/com/sun/star/report/pentaho/model/FormattedTextElement \
+ reportbuilder/java/com/sun/star/report/pentaho/model/ImageElement \
+ reportbuilder/java/com/sun/star/report/pentaho/model/ObjectOleElement \
+ reportbuilder/java/com/sun/star/report/pentaho/model/OfficeDetailSection \
+ reportbuilder/java/com/sun/star/report/pentaho/model/OfficeDocument \
+ reportbuilder/java/com/sun/star/report/pentaho/model/OfficeGroup \
+ reportbuilder/java/com/sun/star/report/pentaho/model/OfficeGroupInstanceSection \
+ reportbuilder/java/com/sun/star/report/pentaho/model/OfficeGroupSection \
+ reportbuilder/java/com/sun/star/report/pentaho/model/OfficeMasterPage \
+ reportbuilder/java/com/sun/star/report/pentaho/model/OfficeMasterStyles \
+ reportbuilder/java/com/sun/star/report/pentaho/model/OfficeReport \
+ reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStyle \
+ reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStyles \
+ reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStylesCollection \
+ reportbuilder/java/com/sun/star/report/pentaho/model/OfficeTableSection \
+ reportbuilder/java/com/sun/star/report/pentaho/model/PageLayout \
+ reportbuilder/java/com/sun/star/report/pentaho/model/PageSection \
+ reportbuilder/java/com/sun/star/report/pentaho/model/RawText \
+ reportbuilder/java/com/sun/star/report/pentaho/model/ReportElement \
+ reportbuilder/java/com/sun/star/report/pentaho/model/TableCellElement \
+ reportbuilder/java/com/sun/star/report/pentaho/model/VariablesDeclarationSection \
+ reportbuilder/java/com/sun/star/report/pentaho/output/ImageProducer \
+ reportbuilder/java/com/sun/star/report/pentaho/output/OfficeDocumentReportTarget \
+ reportbuilder/java/com/sun/star/report/pentaho/output/OleProducer \
+ reportbuilder/java/com/sun/star/report/pentaho/output/StyleUtilities \
+ reportbuilder/java/com/sun/star/report/pentaho/output/StylesWriter \
+ reportbuilder/java/com/sun/star/report/pentaho/output/chart/ChartRawReportProcessor \
+ reportbuilder/java/com/sun/star/report/pentaho/output/chart/ChartRawReportTarget \
+ reportbuilder/java/com/sun/star/report/pentaho/output/spreadsheet/SpreadsheetRawReportProcessor \
+ reportbuilder/java/com/sun/star/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget \
+ reportbuilder/java/com/sun/star/report/pentaho/output/text/MasterPageFactory \
+ reportbuilder/java/com/sun/star/report/pentaho/output/text/PageBreakDefinition \
+ reportbuilder/java/com/sun/star/report/pentaho/output/text/PageContext \
+ reportbuilder/java/com/sun/star/report/pentaho/output/text/TextRawReportProcessor \
+ reportbuilder/java/com/sun/star/report/pentaho/output/text/TextRawReportTarget \
+ reportbuilder/java/com/sun/star/report/pentaho/output/text/VariablesDeclarations \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/AttributeSpecification \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/ElementReadHandler \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/OfficeDocumentXmlResourceFactory \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/OfficeParserUtil \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/OfficeStylesXmlResourceFactory \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/StarStyleXmlFactoryModule \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/StarXmlFactoryModule \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/StyleMapper \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/chart/ChartReadHandler \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/data/DataStyleReadHandler \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/draw/ObjectOleReadHandler \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/office/BodyReadHandler \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/office/DocumentContentReadHandler \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/office/DocumentStylesReadHandler \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/office/FontFaceDeclsReadHandler \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/office/MasterStylesReadHandler \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ConditionalPrintExpressionReadHandler \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/DetailRootTableReadHandler \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FixedContentReadHandler \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FormatConditionReadHandler \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FormattedTextReadHandler \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FunctionReadHandler \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/GroupReadHandler \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/GroupSectionReadHandler \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ImageReadHandler \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/MasterDetailReadHandler \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ReportElementReadHandler \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ReportReadHandler \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/RootTableReadHandler \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/SubDocumentReadHandler \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/style/FontFaceReadHandler \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/style/MasterPageReadHandler \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/style/OfficeStyleReadHandler \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/style/OfficeStylesReadHandler \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/style/PageLayoutReadHandler \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/style/StyleDefinitionReadHandler \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/OneOfConstantsMapper \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/draw/TextAreaVerticalAlignMapper \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/BackgroundColorMapper \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/BorderRightMapper \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/ColorMapper \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/FontSizeMapper \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/FontStyleMapper \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/FontWeightMapper \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/TextAlignMapper \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontFamilyGenericMapper \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontFamilyMapper \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontNameMapper \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontPitchMapper \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontReliefMapper \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextEmphasizeMapper \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineColorMapper \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineStyleMapper \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineWidthMapper \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineWordMode \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/VerticalAlignMapper \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/table/ColumnWidthMapper \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/table/RowHeightMapper \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/table/CoveredCellReadHandler \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableCellReadHandler \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableColumnReadHandler \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableColumnsReadHandler \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableReadHandler \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableRowReadHandler \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableRowsReadHandler \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/text/NoCDATATextContentReadHandler \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/text/TextContentReadHandler \
+ reportbuilder/java/com/sun/star/report/pentaho/parser/xlink/XLinkReadHandler \
+ reportbuilder/java/com/sun/star/report/pentaho/styles/LengthCalculator \
+ reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapper \
+ reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapperKey \
+ reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapperXmlFactoryModule \
+ reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapperXmlResourceFactory \
+ reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMappingDocumentReadHandler \
+ reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMappingReadHandler \
+ reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMappingRule \
+ reportbuilder/java/com/sun/star/report/util/DefaultJobProperties \
+ reportbuilder/java/com/sun/star/report/util/DefaultParameterMap \
+ reportbuilder/java/com/sun/star/report/util/DefaultReportJobDefinition \
+ reportbuilder/java/com/sun/star/report/util/ManifestWriter \
+))
+
+$(eval $(call gb_Jar_add_packagefiles,sun-report-builder,,\
+ $(SRCDIR)/reportbuilder/java/jfreereport.properties \
+ $(SRCDIR)/reportbuilder/java/libformula.properties \
+ $(SRCDIR)/reportbuilder/java/loader.properties \
+))
+
+$(eval $(call gb_Jar_add_packagefiles,sun-report-builder,com/sun/star/report/function/metadata,\
+ $(SRCDIR)/reportbuilder/java/com/sun/star/report/function/metadata/Author-Function.properties \
+ $(SRCDIR)/reportbuilder/java/com/sun/star/report/function/metadata/Author-Function_en_US.properties \
+ $(SRCDIR)/reportbuilder/java/com/sun/star/report/function/metadata/Title-Function.properties \
+ $(SRCDIR)/reportbuilder/java/com/sun/star/report/function/metadata/Title-Function_en_US.properties \
+ $(SRCDIR)/reportbuilder/java/com/sun/star/report/function/metadata/category.properties \
+ $(SRCDIR)/reportbuilder/java/com/sun/star/report/function/metadata/category_en_US.properties \
+))
+
+$(eval $(call gb_Jar_add_packagefiles,sun-report-builder,com/sun/star/report/pentaho,\
+ $(SRCDIR)/reportbuilder/java/com/sun/star/report/pentaho/configuration.properties \
+ $(SRCDIR)/reportbuilder/java/com/sun/star/report/pentaho/module.properties \
+ $(SRCDIR)/reportbuilder/java/com/sun/star/report/pentaho/oasis-datastyle.css \
+ $(SRCDIR)/reportbuilder/java/com/sun/star/report/pentaho/oasis-draw.css \
+ $(SRCDIR)/reportbuilder/java/com/sun/star/report/pentaho/oasis-form.css \
+ $(SRCDIR)/reportbuilder/java/com/sun/star/report/pentaho/oasis-style.css \
+ $(SRCDIR)/reportbuilder/java/com/sun/star/report/pentaho/oasis-table.css \
+ $(SRCDIR)/reportbuilder/java/com/sun/star/report/pentaho/oasis-text.css \
+ $(SRCDIR)/reportbuilder/java/com/sun/star/report/pentaho/smil.css \
+ $(SRCDIR)/reportbuilder/java/com/sun/star/report/pentaho/star-office.css \
+ $(SRCDIR)/reportbuilder/java/com/sun/star/report/pentaho/star-report.css \
+ $(SRCDIR)/reportbuilder/java/com/sun/star/report/pentaho/star-rpt.css \
+ $(SRCDIR)/reportbuilder/java/com/sun/star/report/pentaho/svg.css \
+ $(SRCDIR)/reportbuilder/java/com/sun/star/report/pentaho/xsl-fo.css \
+))
+
+$(eval $(call gb_Jar_add_packagefiles,sun-report-builder,com/sun/star/report/pentaho/parser,\
+ $(SRCDIR)/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt-schema-v1.0-os.xsd \
+ $(SRCDIR)/reportbuilder/java/com/sun/star/report/pentaho/parser/selectors.properties \
+ $(SRCDIR)/reportbuilder/java/com/sun/star/report/pentaho/parser/style-mapping.txt \
+))
+
+$(eval $(call gb_Jar_add_packagefiles,sun-report-builder,com/sun/star/report/pentaho/styles,\
+ $(SRCDIR)/reportbuilder/java/com/sun/star/report/pentaho/styles/stylemapper.xml \
+ $(SRCDIR)/reportbuilder/java/com/sun/star/report/pentaho/styles/stylemapper.xsd \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/reportbuilder/Makefile b/reportbuilder/Makefile
new file mode 100644
index 0000000..ccb1c85
--- /dev/null
+++ b/reportbuilder/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/reportbuilder/Module_reportbuilder.mk b/reportbuilder/Module_reportbuilder.mk
new file mode 100644
index 0000000..9d3bea5
--- /dev/null
+++ b/reportbuilder/Module_reportbuilder.mk
@@ -0,0 +1,39 @@
+# -*- 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_Module_Module,reportbuilder))
+
+ifneq ($(SOLAR_JAVA),)
+$(eval $(call gb_Module_add_targets,reportbuilder,\
+ Configuration_reportbuilder \
+ Extension_reportbuilder \
+ Jar_reportbuilder \
+ Package_readme \
+))
+endif
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/reportbuilder/Package_readme.mk b/reportbuilder/Package_readme.mk
new file mode 100644
index 0000000..f98da4d
--- /dev/null
+++ b/reportbuilder/Package_readme.mk
@@ -0,0 +1,34 @@
+# -*- 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_Package_Package,reportbuilder_license,$(SRCDIR)/reportbuilder/license))
+
+$(eval $(call gb_Package_add_file,reportbuilder,bin/reportbuilder/readme_en-US.html,readme_en-US.html))
+$(eval $(call gb_Package_add_file,reportbuilder,bin/reportbuilder/readme_en-US.txt,readme_en-US.txt))
+$(eval $(call gb_Package_add_file,reportbuilder,bin/reportbuilder/THIRDPARTYREADMELICENSE.html,THIRDPARTYREADMELICENSE.html))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/reportbuilder/prj/build.lst b/reportbuilder/prj/build.lst
index 8545295..9221b1b 100644
--- a/reportbuilder/prj/build.lst
+++ b/reportbuilder/prj/build.lst
@@ -1,16 +1,3 @@
rpb reportbuilder : BOOST:boost JFREEREPORT:jfreereport wizards readlicense_oo APACHE_COMMONS:apache-commons officecfg NULL
rpb reportbuilder usr1 - all rpb_mkout NULL
-rpb reportbuilder\java nmake - all rpb_java NULL
-rpb reportbuilder\java\com\sun\star\report nmake - all rpb_jreport rpb_java NULL
-rpb reportbuilder\java\com\sun\star\report\util nmake - all rpb_jreport_util rpb_jreport NULL
-rpb reportbuilder\java\com\sun\star\report\pentaho nmake - all rpb_jreport_pe rpb_jreport_util rpb_jreport_f_m NULL
-rpb reportbuilder\java\com\sun\star\report\function\metadata nmake - all rpb_jreport_f_m rpb_jreport NULL
-rpb reportbuilder\registry\schema\org\openoffice\Office nmake - all rpb_reg_schema_ooo NULL
-rpb reportbuilder\registry\schema\org\openoffice\Office\UI nmake - all rpb_reg_schema_ooo_ui NULL
-rpb reportbuilder\registry\data\org\openoffice nmake - all rpb_data_ooOffice NULL
-rpb reportbuilder\registry\data\org\openoffice\Office nmake - all rpb_reg_data_ooo rpb_reg_schema_ooo NULL
-rpb reportbuilder\registry\data\org\openoffice\Office\UI nmake - all rpb_reg_data_ooo_ui rpb_reg_schema_ooo_ui NULL
-rpb reportbuilder\registry\data\org\openoffice\TypeDetection nmake - all rpb_reg_data_oot NULL
-rpb reportbuilder\template\en-US\wizard\report nmake - all rpb_template_en_us_wiz_rep NULL
-rpb reportbuilder\util nmake - all rpb_util rpb_jreport_pe rpb_reg_data_ooo rpb_data_ooOffice rpb_reg_data_oot rpb_template_en_us_wiz_rep rpb_reg_data_ooo_ui NULL
-
+rpb reportbuilder\prj nmake - all rpb_prj NULL
diff --git a/reportbuilder/prj/d.lst b/reportbuilder/prj/d.lst
index 9015e97..e69de29 100644
--- a/reportbuilder/prj/d.lst
+++ b/reportbuilder/prj/d.lst
@@ -1,12 +0,0 @@
-# Extensions
-
-..\%__SRC%\bin\*.oxt %_DEST%\bin\*.oxt
-
-# License
-mkdir: %_DEST%\bin\reportbuilder
-
-..\license\license_en-US.txt %_DEST%\bin\reportbuilder\license_en-US.txt
-..\license\license_en-US.html %_DEST%\bin\reportbuilder\license_en-US.html
-..\license\readme_en-US.html %_DEST%\bin\reportbuilder\readme_en-US.html
-..\license\readme_en-US.txt %_DEST%\bin\reportbuilder\readme_en-US.txt
-..\license\THIRDPARTYREADMELICENSE.html %_DEST%\bin\reportbuilder\THIRDPARTYREADMELICENSE.html
diff --git a/reportbuilder/prj/makefile.mk b/reportbuilder/prj/makefile.mk
new file mode 100644
index 0000000..0997622
--- /dev/null
+++ b/reportbuilder/prj/makefile.mk
@@ -0,0 +1 @@
+.INCLUDE : gbuildbridge.mk
commit 1fdc31ea57db4d177304f815de23c1bb6f447650
Author: David Tardon <dtardon at redhat.com>
Date: Sat Apr 7 12:08:19 2012 +0200
allow to set extra (global) schema root
diff --git a/officecfg/util/schema_val.xsl b/officecfg/util/schema_val.xsl
index 04342e7..1ae2ff7 100755
--- a/officecfg/util/schema_val.xsl
+++ b/officecfg/util/schema_val.xsl
@@ -38,6 +38,7 @@
<!-- Parameter -->
<xsl:param name="root">../registry/schema</xsl:param>
+<xsl:param name="schemaRoot"/>
<xsl:param name="componentName"/>
<xsl:template match = "/">
@@ -121,9 +122,25 @@
<!-- locate a component file -->
<xsl:template name="locateFile">
<xsl:param name="componentName"/>
- <xsl:variable name ="file"><xsl:value-of select="$root"/>/<xsl:value-of select="translate($componentName,'.','/')"/>.xcs</xsl:variable>
- <xsl:if test="not( document($file) )">
- <xsl:message terminate ="yes">**Error: unable to locate document '<xsl:value-of select="translate($componentName,'.','/')"/>.xcd'</xsl:message>
+ <xsl:variable name="path"><xsl:value-of select="translate($componentName,'.','/')"/>.xcs</xsl:variable>
+ <xsl:variable name ="file">
+ <xsl:variable name ="tryfile" select="concat($root,'/',$path)"/>
+ <xsl:choose>
+ <xsl:when test="document($tryfile)">
+ <xsl:value-of select="$tryfile"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:if test="$schemaRoot">
+ <xsl:variable name="globalfile" select="concat($schemaRoot,'/',$path)"/>
+ <xsl:if test="document($globalfile)">
+ <xsl:value-of select="$globalfile"/>
+ </xsl:if>
+ </xsl:if>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:if test="not($file)">
+ <xsl:message terminate ="yes">**Error: unable to locate document '<xsl:value-of select="$path"/>'</xsl:message>
</xsl:if>
<xsl:value-of select="$file"/>
</xsl:template>
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
index 60f5b81..572cd4e 100644
--- a/solenv/gbuild/Configuration.mk
+++ b/solenv/gbuild/Configuration.mk
@@ -78,6 +78,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
--noout \
--stringparam componentName $(subst /,.,$(basename $(XCSFILE))) \
--stringparam root $(subst $(XCSFILE),,$(3)) \
+ $(if $(SCHEMA_ROOT),--stringparam schemaRoot $(SCHEMA_ROOT)) \
$(gb_XcsTarget_XSLT_SchemaVal) \
$(3) && \
$(gb_XSLTPROC) --nonet \
@@ -348,6 +349,9 @@ $(foreach lang,$(gb_Configuration_LANGS),$(eval \
$(foreach lang,$(gb_Configuration_LANGS),$(eval \
$(call gb_Configuration_get_clean_target,$(1)) : \
$(call gb_Zip_get_clean_target,$(1)_$(lang))))
+
+$(call gb_Configuration_get_target,$(1)) : SCHEMA_ROOT :=
+
$$(eval $$(call gb_Module_register_target,$(call gb_Configuration_get_target,$(1)),$(call gb_Configuration_get_clean_target,$(1))))
endef
@@ -493,4 +497,15 @@ $(foreach xcu,$(3),$(call gb_Configuration_add_localized_data,$(1),$(2),$(xcu)))
endef
+# Set extra registry this configuration can use schemas from.
+#
+# Example:
+# # foo needs schemas from the main configuration
+# $(eval $(call gb_Configuration_use_configuration,foo,officecfg))
+define gb_Configuration_use_configuration
+$(call gb_Configuration_get_target,$(1)) : $(call gb_Configuration_get_target,$(2))
+$(call gb_Configuration_get_target,$(1)) : SCHEMA_ROOT := $(gb_Configuration_registry)/schema
+
+endef
+
# vim: set noet sw=4 ts=4:
commit 95dc472f93d805b5e0426953f3a3a313874adcb0
Author: David Tardon <dtardon at redhat.com>
Date: Sat Apr 7 10:07:35 2012 +0200
register external jars for apache-commons and jfreereport
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index a76d0ff..0be5270 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1484,4 +1484,137 @@ endef
endif # SYSTEM_BSH
+ifeq ($(SYSTEM_APACHE_COMMONS),YES)
+
+define gb_JavaClassSet__use_commons-codec
+$(call gb_JavaClassSet_add_system_jar,$(1),$(COMMONS_CODEC_JAR))
+endef
+
+define gb_JavaClassSet__use_commons-httpclient
+$(call gb_JavaClassSet_add_system_jar,$(1),$(COMMONS_HTTPCLIENT_JAR))
+endef
+
+define gb_JavaClassSet__use_commons-lang
+$(call gb_JavaClassSet_add_system_jar,$(1),$(COMMONS_LANG_JAR))
+endef
+
+define gb_JavaClassSet__use_commons-logging
+$(call gb_JavaClassSet_add_system_jar,$(1),$(COMMONS_LOGGING_JAR))
+endef
+
+else # !SYSTEM_APACHE_COMMONS
+
+define gb_JavaClassSet__use_commons-codec
+$(call gb_JavaClassSet_add_jar,$(1),$(OUTDIR)/bin/commons-codec-1.3.jar)
+endef
+
+define gb_JavaClassSet__use_commons-httpclient
+$(call gb_JavaClassSet_add_jar,$(1),$(OUTDIR)/bin/commons-httpclient-3.1.jar)
+endef
+
+define gb_JavaClassSet__use_commons-lang
+$(call gb_JavaClassSet_add_jar,$(1),$(OUTDIR)/bin/commons-lang-2.3.jar)
+endef
+
+define gb_JavaClassSet__use_commons-logging
+$(call gb_JavaClassSet_add_jar,$(1),$(OUTDIR)/bin/commons-logging-1.1.1.jar)
+endef
+
+endif # SYSTEM_APACHE_COMMONS
+
+
+ifeq ($(SYSTEM_JFREEREPORT),YES)
+
+define gb_JavaClassSet__use_flow-engine
+$(call gb_JavaClassSet_add_system_jar,$(1),$(JFREEREPORT_JAR))
+endef
+
+define gb_JavaClassSet__use_flute
+$(call gb_JavaClassSet_add_system_jar,$(1),$(FLUTE_JAR))
+endef
+
+define gb_JavaClassSet__use_libbase
+$(call gb_JavaClassSet_add_system_jar,$(1),$(LIBBASE_JAR))
+endef
+
+define gb_JavaClassSet__use_libfonts
+$(call gb_JavaClassSet_add_system_jar,$(1),$(LIBFONTS_JAR))
+endef
+
+define gb_JavaClassSet__use_libformula
+$(call gb_JavaClassSet_add_system_jar,$(1),$(LIBFORMULA_JAR))
+endef
+
+define gb_JavaClassSet__use_liblayout
+$(call gb_JavaClassSet_add_system_jar,$(1),$(LIBLAYOUT_JAR))
+endef
+
+define gb_JavaClassSet__use_libloader
+$(call gb_JavaClassSet_add_system_jar,$(1),$(LIBLOADER_JAR))
+endef
+
+define gb_JavaClassSet__use_librepository
+$(call gb_JavaClassSet_add_system_jar,$(1),$(LIBREPOSITORY_JAR))
+endef
+
+define gb_JavaClassSet__use_libserializer
+$(call gb_JavaClassSet_add_system_jar,$(1),$(LIBSERIALIZER_JAR))
+endef
+
+define gb_JavaClassSet__use_libxml
+$(call gb_JavaClassSet_add_system_jar,$(1),$(LIBXML_JAR))
+endef
+
+define gb_JavaClassSet__use_sac
+$(call gb_JavaClassSet_add_system_jar,$(1),$(SAC_JAR))
+endef
+
+else # !SYSTEM_JFREEREPORT
+
+define gb_JavaClassSet__use_flow-engine
+$(call gb_JavaClassSet_add_jar,$(1),$(OUTDIR)/bin/flow-engine-0.9.2.jar)
+endef
+
+define gb_JavaClassSet__use_flute
+$(call gb_JavaClassSet_add_jar,$(1),$(OUTDIR)/bin/flute-1.3.0.jar)
+endef
+
+define gb_JavaClassSet__use_libbase
+$(call gb_JavaClassSet_add_jar,$(1),$(OUTDIR)/bin/libbase-1.0.0.jar)
+endef
+
+define gb_JavaClassSet__use_libfonts
+$(call gb_JavaClassSet_add_jar,$(1),$(OUTDIR)/bin/libfonts-1.0.0.jar)
+endef
+
+define gb_JavaClassSet__use_libformula
+$(call gb_JavaClassSet_add_jar,$(1),$(OUTDIR)/bin/libformula-0.2.0.jar)
+endef
+
+define gb_JavaClassSet__use_liblayout
+$(call gb_JavaClassSet_add_jar,$(1),$(OUTDIR)/bin/liblayout-1.0.0.jar)
+endef
+
+define gb_JavaClassSet__use_libloader
+$(call gb_JavaClassSet_add_jar,$(1),$(OUTDIR)/bin/libloader-0.2.0.jar)
+endef
+
+define gb_JavaClassSet__use_librepository
+$(call gb_JavaClassSet_add_jar,$(1),$(OUTDIR)/bin/librepository-1.0.0.jar)
+endef
+
+define gb_JavaClassSet__use_libserializer
+$(call gb_JavaClassSet_add_jar,$(1),$(OUTDIR)/bin/libserializer-1.0.0.jar)
+endef
+
+define gb_JavaClassSet__use_libxml
+$(call gb_JavaClassSet_add_jar,$(1),$(OUTDIR)/bin/libxml-1.0.0.jar)
+endef
+
+define gb_JavaClassSet__use_sac
+$(call gb_JavaClassSet_add_jar,$(1),$(OUTDIR)/bin/sac.jar)
+endef
+
+endif # SYSTEM_JFREEREPORT
+
# vim: set noet sw=4 ts=4:
commit 3216635f7dd2615b7438a83d3341ee891efaaa49
Author: David Tardon <dtardon at redhat.com>
Date: Sat Apr 7 10:06:19 2012 +0200
allow adding more package files at once
diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk
index d07467e..0513426 100644
--- a/solenv/gbuild/Jar.mk
+++ b/solenv/gbuild/Jar.mk
@@ -134,6 +134,12 @@ $(call gb_Jar_get_workdir,$(1))/$(strip $(2)) : $(3) $(call gb_JavaClassSet_get_
endef
+# gb_Jar_add_packagefiles jar target-dir file(s)
+define gb_Jar_add_packagefiles
+$(foreach file,$(3),$(call gb_Jar_add_packagefile,$(1),$(if $(strip $(2)),$(strip $(2))/)$(notdir $(file)),$(file)))
+
+endef
+
define gb_Jar_add_sourcefiles
$(foreach sourcefile,$(2),$(call gb_Jar_add_sourcefile,$(1),$(sourcefile)))
More information about the Libreoffice-commits
mailing list