diff options
author | David Tardon <dtardon@redhat.com> | 2012-04-07 12:55:41 +0200 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2012-05-29 07:25:00 +0200 |
commit | 6bf04a4328e6b660e197875d70a6b2057d5f4463 (patch) | |
tree | 5c7982c00aad57cf525c50d8eabd49cea33a144b /reportbuilder/util | |
parent | e2518372691ef66a02b69146e3bc62b4913237e3 (diff) |
gbuildize reportbuilder
Diffstat (limited to 'reportbuilder/util')
-rw-r--r-- | reportbuilder/util/delzip | 1 | ||||
-rw-r--r-- | reportbuilder/util/description.xml | 2 | ||||
-rw-r--r-- | reportbuilder/util/makefile.mk | 168 | ||||
-rw-r--r-- | reportbuilder/util/makefile.pmk | 66 | ||||
-rw-r--r-- | reportbuilder/util/target.pmk | 34 |
5 files changed, 1 insertions, 270 deletions
diff --git a/reportbuilder/util/delzip b/reportbuilder/util/delzip deleted file mode 100644 index 8b137891791f..000000000000 --- a/reportbuilder/util/delzip +++ /dev/null @@ -1 +0,0 @@ - diff --git a/reportbuilder/util/description.xml b/reportbuilder/util/description.xml index f048b86743af..131793ac90a9 100644 --- a/reportbuilder/util/description.xml +++ b/reportbuilder/util/description.xml @@ -5,7 +5,7 @@ <display-name> <name lang="en-US">Report Builder</name> </display-name> - <version value="#VERSION#"/> + <version value="1.2.2"/> <identifier value="com.sun.reportdesigner"/> <dependencies> <OpenOffice.org-minimal-version value="3.2" d:name="OpenOffice.org 3.2"/> diff --git a/reportbuilder/util/makefile.mk b/reportbuilder/util/makefile.mk deleted file mode 100644 index 4382800bf70e..000000000000 --- 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.2 - - 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 7e2b2dcfd1e0..000000000000 --- 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 "$(CPUNAME)"=="INTEL" -UNOIDL=unoidl -.ENDIF -.ENDIF - diff --git a/reportbuilder/util/target.pmk b/reportbuilder/util/target.pmk deleted file mode 100644 index dfe8b8124e5b..000000000000 --- 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 - |