summaryrefslogtreecommitdiff
path: root/reportdesign/util
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2009-03-04 15:27:10 +0000
committerOliver Bolte <obo@openoffice.org>2009-03-04 15:27:10 +0000
commitdabbcbcb3a3a2f39018c7814187b6eaddb850bdd (patch)
tree16e3b1cf797413c8000dbac7cd3d577643593fd5 /reportdesign/util
parentbe33e961b1b044099d9063423c6085e4853d765a (diff)
CWS-TOOLING: integrate CWS rptfix04
2009-02-23 01:59:54 +0100 rene r268341 : #i10000# fix system-jfreereport build 2009-02-13 10:17:16 +0100 oj r267696 : #i98549# integrate zip form pentaho package 2009-02-03 14:48:34 +0100 oj r267330 : set formula locale to doc locale 2009-02-03 14:45:54 +0100 oj r267329 : set formula locale to doc locale 2009-02-03 11:50:03 +0100 oj r267311 : set formula locale to doc locale 2009-02-03 08:55:02 +0100 oj r267297 : unix line ends 2009-01-28 11:21:24 +0100 rene r267043 : #i98549# s/DESIGN/BUILDER/ also for Sun 2009-01-27 17:17:50 +0100 rene r267012 : merge builfix from trunk 2009-01-27 14:16:30 +0100 rene r266991 : #i10000# fix rebase which left out the whole changes in former config_office; sync variable names (s/LIB_//) and some other things 2009-01-27 10:01:09 +0100 oj r266959 : CWS-TOOLING: rebase CWS rptfix04 to trunk@266944 (milestone: DEV300:m40) 2009-01-27 08:00:16 +0100 oj r266951 : conflict in mergeinfo 2009-01-26 12:23:03 +0100 oj r266914 : #i98383# fix grouping 2009-01-23 22:03:03 +0100 rene r266852 : fix --enable-report-builder description 2009-01-23 10:37:27 +0100 oj r266778 : set escape processing when set at query 2009-01-23 09:17:16 +0100 fs r266770 : add CWS name to version 2009-01-21 13:57:35 +0100 oj r266669 : merge for build bots 2009-01-20 09:07:24 +0100 oj r266552 : CWS-TOOLING: rebase CWS rptfix04 to trunk@266428 (milestone: DEV300:m39) 2009-01-20 08:34:16 +0100 oj r266551 : rebase 2009-01-20 08:33:59 +0100 oj r266550 : rebase 2009-01-20 08:32:50 +0100 oj r266549 : rebase 2009-01-20 08:30:13 +0100 oj r266548 : rebase 2009-01-20 08:29:30 +0100 oj r266547 : rebase 2009-01-20 08:22:33 +0100 oj r266546 : merge short cuts from dba31g 2009-01-19 21:04:08 +0100 rene r266525 : #i10000# we need officecfg for component-update.dtd 2009-01-19 21:01:26 +0100 rene r266524 : #i10000# fix import 2009-01-19 20:26:20 +0100 rene r266523 : #i10000# remove svn conflicts markers; fix build 2009-01-19 14:23:56 +0100 rene r266496 : libbase depends on apache-commons.. 2009-01-19 14:00:42 +0100 oj r266495 : merge from m39 2009-01-19 12:39:00 +0100 oj r266489 : CWS-TOOLING: rebase CWS rptfix04 to trunk@266428 (milestone: DEV300:m39) 2009-01-16 11:47:04 +0100 oj r266410 : #i97560# add , between expressions 2009-01-09 17:11:38 +0100 rene r266103 : don't show "checking which Apache commons-* libs to use" when we neither build the wiki editor nor the SRB 2009-01-09 16:48:02 +0100 rene r266099 : #i10000# reportbuilder needs apache-commons 2009-01-09 15:43:35 +0100 oj r266093 : use of new nspaces 2009-01-09 15:41:34 +0100 oj r266092 : use of new nspaces 2009-01-09 14:44:15 +0100 rene r266088 : fix typo/description 2009-01-09 12:48:51 +0100 rene r266074 : #i10000# fix install 2009-01-09 11:52:53 +0100 rene r266070 : #i10000# more build fixes 2009-01-09 10:53:13 +0100 rene r266062 : #i10000# ENABLE_REPORTBUILDER also in set_soenv.in, fix typo 2009-01-09 10:40:24 +0100 rene r266060 : #i10000# configure fix for new reportbuilder module, typo fix at libfonts 2009-01-09 10:01:52 +0100 rene r266055 : #i10000# adapt to current configure.in 2009-01-09 09:59:32 +0100 oj r266054 : add new pentaho jars 2009-01-09 09:47:54 +0100 oj r266049 : merge changes from DEV300_m39 2009-01-09 09:14:08 +0100 oj r266048 : merge from DEV300_m39 2009-01-09 08:28:43 +0100 oj r266045 : merge changes from dba31g 2009-01-09 07:58:10 +0100 oj r266044 : replace JCOMMON with LIB 2009-01-08 13:42:24 +0100 oj r266005 : move ext to reportbuilder 2009-01-08 13:41:38 +0100 oj r266004 : add dep for license 2009-01-08 13:27:56 +0100 oj r266001 : new module for Sun report Builder extension 2009-01-07 12:58:13 +0100 oj r265960 : CWS-TOOLING: rebase CWS rptfix04 to trunk@265758 (milestone: DEV300:m38) 2008-12-15 13:47:18 +0100 oj r265481 : new pentaho resources 2008-12-15 10:04:01 +0100 oj r265462 : integrate new pentaho sources 2008-12-15 10:02:54 +0100 oj r265461 : #i96888# fix date time function 2008-12-12 09:23:29 +0100 oj r265389 : #97174# check of res < 0 removed 2008-12-12 09:15:54 +0100 oj r265388 : #i9716# fix for DayFunction 2008-12-11 12:24:24 +0100 oj r265281 : integrate new pentaho sources 2008-12-11 11:49:16 +0100 oj r265273 : integrate new pentaho sources 2008-12-11 09:34:07 +0100 oj r265248 : integrate new pentaho sources 2008-12-10 18:58:06 +0100 oj r265227 : introduce new pentaho sources 2008-12-10 18:56:43 +0100 oj r265226 : introduce new pentaho sources 2008-12-10 18:54:26 +0100 oj r265225 : introduce new pentaho sources 2008-12-10 18:42:59 +0100 oj r265221 : introduce new pentaho sources 2008-12-10 17:24:23 +0100 oj r265212 : introduce new pentaho sources 2008-12-10 17:24:07 +0100 oj r265211 : new pentaho sources 2008-12-10 17:23:00 +0100 oj r265210 : introduce new pentaho sources
Diffstat (limited to 'reportdesign/util')
-rw-r--r--reportdesign/util/component.txt1
-rw-r--r--reportdesign/util/delzip1
-rw-r--r--reportdesign/util/description.xml22
-rw-r--r--reportdesign/util/makefile.mk113
-rw-r--r--reportdesign/util/makefile.pmk70
-rw-r--r--reportdesign/util/manifest.xml7
-rw-r--r--reportdesign/util/target.pmk38
7 files changed, 1 insertions, 251 deletions
diff --git a/reportdesign/util/component.txt b/reportdesign/util/component.txt
deleted file mode 100644
index 17f312c8ea72..000000000000
--- a/reportdesign/util/component.txt
+++ /dev/null
@@ -1 +0,0 @@
-Create with the Sun Report Builder stylish, smart-looking database reports. The flexible report editor can define group and page headers as well as group and page footers and even calculation fields are available to accomplish complex database reports.
diff --git a/reportdesign/util/delzip b/reportdesign/util/delzip
deleted file mode 100644
index 8b137891791f..000000000000
--- a/reportdesign/util/delzip
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/reportdesign/util/description.xml b/reportdesign/util/description.xml
deleted file mode 100644
index d34bdaa3d117..000000000000
--- a/reportdesign/util/description.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<description xmlns="http://openoffice.org/extensions/description/2006"
- xmlns:d="http://openoffice.org/extensions/description/2006"
- xmlns:xlink="http://www.w3.org/1999/xlink">
- <display-name>
- <name lang="en-US">Sun™ Report Builder</name>
- <!-- <name lang="en-US">Sun(TM) Report Builder</name> -->
- </display-name>
- <registration>
- <simple-license accept-by="admin" default-license-id="lic-en-US" >
- <license-text xlink:href="licensefile" lang="isocode" license-id="lic-isocode"/>
- </simple-license>
- </registration>
- <version value="1.0.9"/>
- <identifier value="com.sun.reportdesigner"/>
- <dependencies>
- <OpenOffice.org-minimal-version value="3.0" d:name="OpenOffice.org 3.0"/>
- </dependencies>
- <publisher>
- <name xlink:href="http://www.sun.com/staroffice" lang="en">Sun Microsystems, Inc.</name>
- </publisher>
-</description>
diff --git a/reportdesign/util/makefile.mk b/reportdesign/util/makefile.mk
index ffdb93c2e082..6faf7b460827 100644
--- a/reportdesign/util/makefile.mk
+++ b/reportdesign/util/makefile.mk
@@ -37,21 +37,10 @@ TARGET2=$(TARGET)ui
GEN_HID=TRUE
GEN_HID_OTHER=TRUE
-EXTENSION_VERSION_BASE=1.0.9
-.IF "$(PRODUCT)" != ""
- EXTENSION_VERSION=$(EXTENSION_VERSION_BASE)
-.ELSE
- EXTENSION_VERSION=$(EXTENSION_VERSION_BASE).$(BUILD)
-.ENDIF
-
# --- Settings ----------------------------------
-.INCLUDE : makefile.pmk
+.INCLUDE : settings.mk
# ------------------------------------------------------------------
-# calready set in util$/makefile.pmk
-# EXTENSIONNAME:=sun-report-builder
-EXTENSION_ZIPNAME:=sun-report-builder
-
# --- reportdesign core (rpt) -----------------------------------
LIB1TARGET=$(SLB)$/$(TARGET).lib
@@ -217,107 +206,7 @@ SHL3DEF= $(MISC)$/$(SHL3TARGET).def
DEF3NAME=$(SHL3TARGET)
-# 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$/em42.png \
- $(EXTENSIONDIR)$/images$/em42_hc.png
-
-COMPONENT_HTMLFILES = $(EXTENSIONDIR)$/THIRDPARTYREADMELICENSE.html \
- $(EXTENSIONDIR)$/readme_en-US.html \
- $(EXTENSIONDIR)$/readme_en-US.txt
-
-COMPONENT_JARFILES = \
- $(EXTENSIONDIR)$/sun-report-builder.jar
-
-COMPONENT_HELP= \
- $(EXTENSIONDIR)$/help$/component.txt
-
-# .jar files from solver
-COMPONENT_EXTJARFILES = \
- $(EXTENSIONDIR)$/sun-report-builder.jar \
- $(EXTENSIONDIR)$/reportbuilderwizard.jar
-.IF "$(SYSTEM_JFREEREPORT)" != "YES"
-COMPONENT_EXTJARFILES += \
- $(EXTENSIONDIR)$/flute-1.3-jfree-20061107.jar \
- $(EXTENSIONDIR)$/jcommon-1.0.10.jar \
- $(EXTENSIONDIR)$/jcommon-serializer-0.2.0.jar \
- $(EXTENSIONDIR)$/libfonts-0.3.3.jar \
- $(EXTENSIONDIR)$/libformula-0.1.14.jar \
- $(EXTENSIONDIR)$/liblayout-0.2.8.jar \
- $(EXTENSIONDIR)$/libloader-0.3.6.jar \
- $(EXTENSIONDIR)$/librepository-0.1.4.jar \
- $(EXTENSIONDIR)$/libxml-0.9.9.jar \
- $(EXTENSIONDIR)$/pentaho-reporting-flow-engine-0.9.2.jar \
- $(EXTENSIONDIR)$/sac.jar
-.ENDIF
-
-COMPONENT_MANIFEST_GENERIC:=TRUE
-COMPONENT_MANIFEST_SEARCHDIR:=registry
-
-# make sure to add your custom files here
-EXTENSION_PACKDEPS=$(COMPONENT_EXTJARFILES) $(COMPONENT_HTMLFILES) $(COMPONENT_OTR_FILES) $(COMPONENT_HELP) $(COMPONENT_IMAGES)
-
# --- Targets ----------------------------------
-.INCLUDE : extension_pre.mk
-.INCLUDE : target.mk
-.INCLUDE : extension_post.mk
-
-$(EXTENSIONDIR)$/%.jar : $(SOLARBINDIR)$/%.jar
- @@-$(MKDIRHIER) $(@:d)
- $(COPY) $< $@
-
-$(EXTENSIONDIR)$/readme_en-US.% : $(PRJ)$/license$/readme_en-US.%
- @@-$(MKDIRHIER) $(@:d)
- $(COPY) $< $@
-
-$(EXTENSIONDIR)$/images$/%.png : $(PRJ)$/images$/%.png
- @@-$(MKDIRHIER) $(@:d)
- $(COPY) $< $@
-
-$(EXTENSIONDIR)$/THIRDPARTYREADMELICENSE.html : $(PRJ)$/license$/THIRDPARTYREADMELICENSE.html
- @@-$(MKDIRHIER) $(@:d)
- $(COPY) $< $@
-
-$(COMPONENT_HELP) : $$(@:f)
- @@-$(MKDIRHIER) $(@:d)
- $(COPY) $< $@
-
-$(DESCRIPTION_SRC): description.xml
- +-$(RM) $@
- $(TYPE) description.xml | $(SED) "s/#VERSION#/$(EXTENSION_VERSION)/" > $@
-
-.ELSE # "$(SOLAR_JAVA)"!=""
.INCLUDE : target.mk
-.ENDIF # "$(SOLAR_JAVA)"!=""
diff --git a/reportdesign/util/makefile.pmk b/reportdesign/util/makefile.pmk
deleted file mode 100644
index 87409c959047..000000000000
--- a/reportdesign/util/makefile.pmk
+++ /dev/null
@@ -1,70 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.pmk,v $
-#
-# $Revision: 1.6 $
-#
-# 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/reportdesign/util/manifest.xml b/reportdesign/util/manifest.xml
deleted file mode 100644
index 8ea30b6ad08e..000000000000
--- a/reportdesign/util/manifest.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE manifest:manifest PUBLIC "-//OpenOffice.org//DTD Manifest 1.0//EN" "Manifest.dtd">
-<manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest">
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-component;type=Java"
- manifest:full-path="sun-report-builder.jar"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.package-bundle-description"
- manifest:full-path="help/component.txt"/>
diff --git a/reportdesign/util/target.pmk b/reportdesign/util/target.pmk
deleted file mode 100644
index 42cc9e453b97..000000000000
--- a/reportdesign/util/target.pmk
+++ /dev/null
@@ -1,38 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: target.pmk,v $
-#
-# $Revision: 1.3 $
-#
-# 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
-