Tag: cws_dev300_ause094 User: hjs Date: 2008-05-26 13:08:31+0000 Removed: dba/reportdesign/util/post.xml dba/reportdesign/util/pre.xml
Added: dba/reportdesign/util/description.xml Modified: dba/reportdesign/util/makefile.mk Log: #i83636# use centralized targets File Changes: Directory: /dba/reportdesign/util/ ================================== File [added]: description.xml Url: http://dba.openoffice.org/source/browse/dba/reportdesign/util/description.xml?rev=1.3.2.2&content-type=text/vnd.viewcvs-markup Added lines: 15 --------------- <?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";> <registration> <simple-license accept-by="admin" default-license-id="en-US" > <license-text xlink:href="licensefile" lang="isocode" license-id="lic-isocode"/> </simple-license> </registration> <version value="1.0.2"/> <identifier value="com.sun.reportdesigner"/> <dependencies> <OpenOffice.org-minimal-version value="2.3" d:name="OpenOffice.org 2.3"/> </dependencies> </description> File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/reportdesign/util/makefile.mk?r1=1.17.12.1&r2=1.17.12.2 Delta lines: +6 -11 -------------------- --- makefile.mk 2008-05-19 11:09:09+0000 1.17.12.1 +++ makefile.mk 2008-05-26 13:08:28+0000 1.17.12.2 @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.17.12.1 $ +# $Revision: 1.17.12.2 $ # # This file is part of OpenOffice.org. # @@ -210,7 +210,7 @@ $(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/Office$/DataAccess.xcu \ $(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/Office$/ReportDesign.xcu -COMPONENT_HTMLFILES := $(EXTENSIONDIR)$/THIRDPARTYREADMELICENSE.html \ +COMPONENT_HTMLFILES = $(EXTENSIONDIR)$/THIRDPARTYREADMELICENSE.html \ $(EXTENSIONDIR)$/readme_en-US.html \ $(EXTENSIONDIR)$/readme_en-US.txt @@ -231,8 +231,11 @@ $(EXTENSIONDIR)$/pentaho-reporting-flow-engine-0.9.2.jar \ $(EXTENSIONDIR)$/sac.jar +COMPONENT_MANIFEST_GENERIC:=TRUE +COMPONENT_MANIFEST_SEARCHDIR:=registry + # make sure to add your custom files here -EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_EXTJARFILES) $(COMPONENT_JARFILES) $(COMPONENT_MERGED_XCU) +EXTENSION_PACKDEPS=$(COMPONENT_EXTJARFILES) $(COMPONENT_HTMLFILES) # --- Targets ---------------------------------- @@ -240,10 +243,6 @@ .INCLUDE : target.mk .INCLUDE : extension_post.mk -$(EXTENSIONDIR)$/%.xml : %.xml - @@-$(MKDIRHIER) $(@:d) - $(COPY) $< $@ - .IF "$(SYSTEM_JFREEREPORT)" == "YES" $(EXTENSIONDIR)$/%.jar : $(JFREEREPORT_JAR:d:d)$/%.jar @@-$(MKDIRHIER) $(@:d) @@ -254,10 +253,6 @@ $(COPY) $< $@ .ENDIF -$(E-XTENSIONDIR)$/META-INF$/manifest.xml : manifest.xml $(MISC)$/update_report.flag - @@-$(MKDIRHIER) $(@:d) - $(PERL) $(SOLARENV)$/bin$/makemani.pl $(PRJ)$/util$/manifest.xml $(EXTENSIONDIR) registry $(@:d:d) - $(EXTENSIONDIR)$/readme_en-US.% : $(PRJ)$/license$/readme_en-US.% @@-$(MKDIRHIER) $(@:d) $(COPY) $< $@ File [removed]: post.xml File [removed]: pre.xml --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
