diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-25 13:19:45 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-25 13:19:45 +0000 |
| commit | 0a721dfaf439fa7308138f64175362ed44c5d554 (patch) | |
| tree | 9bd0ba50cef1cf516c0a1788c1681863eb7f7007 /reportdesign/util | |
| parent | c102a3dd535621295ed7ce0998b5e86a28e23cec (diff) | |
INTEGRATION: CWS rptwizard01 (1.12.8); FILE MERGED
2008/06/20 09:18:15 lla 1.12.8.8: RESYNC: (1.17-1.18); FILE MERGED
2008/06/02 07:06:09 lla 1.12.8.7: #i86092# templates ends with otr
2008/05/21 10:09:51 lla 1.12.8.6: RESYNC: (1.16-1.17); FILE MERGED
2008/05/20 13:07:54 lla 1.12.8.5: #i86092# support default.odr
2008/04/16 09:59:55 lla 1.12.8.4: #i86092# sed need /, not 2 dollars characters within unix
2008/04/14 10:38:29 lla 1.12.8.3: RESYNC: (1.12-1.16); FILE MERGED
2008/03/19 11:08:02 lla 1.12.8.2: #i86092# extensions in non product versions contains a buildid
2008/03/07 08:01:43 lla 1.12.8.1: #i86092# add reportbuilderwizard.jar
Diffstat (limited to 'reportdesign/util')
| -rw-r--r-- | reportdesign/util/makefile.mk | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/reportdesign/util/makefile.mk b/reportdesign/util/makefile.mk index a18fdd7cf0fe..16715ef7b375 100644 --- a/reportdesign/util/makefile.mk +++ b/reportdesign/util/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.18 $ +# $Revision: 1.19 $ # # This file is part of OpenOffice.org. # @@ -204,10 +204,14 @@ DEF3NAME=$(SHL3TARGET) XMLFILES = $(EXTENSIONDIR)$/description.xml \ $(EXTENSIONDIR)$/META-INF$/manifest.xml - + COMPONENT_MERGED_XCU= \ $(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/Office$/DataAccess.xcu \ - $(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/Office$/ReportDesign.xcu + $(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/Office$/ReportDesign.xcu \ + $(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/Office$/Paths.xcu + +COMPONENT_OTR_FILES= \ + $(EXTENSIONDIR)$/template$/en-US$/wizard$/report$/default.otr COMPONENT_HTMLFILES = $(EXTENSIONDIR)$/THIRDPARTYREADMELICENSE.html \ $(EXTENSIONDIR)$/readme_en-US.html \ @@ -228,13 +232,14 @@ COMPONENT_EXTJARFILES = \ $(EXTENSIONDIR)$/librepository-0.1.4.jar \ $(EXTENSIONDIR)$/libxml-0.9.9.jar \ $(EXTENSIONDIR)$/pentaho-reporting-flow-engine-0.9.2.jar \ - $(EXTENSIONDIR)$/sac.jar + $(EXTENSIONDIR)$/sac.jar \ + $(EXTENSIONDIR)$/sun-report-builder.jar COMPONENT_MANIFEST_GENERIC:=TRUE COMPONENT_MANIFEST_SEARCHDIR:=registry # make sure to add your custom files here -EXTENSION_PACKDEPS=$(COMPONENT_EXTJARFILES) $(COMPONENT_HTMLFILES) +EXTENSION_PACKDEPS=$(COMPONENT_EXTJARFILES) $(COMPONENT_HTMLFILES) $(COMPONENT_OTR_FILES) # --- Targets ---------------------------------- @@ -253,7 +258,7 @@ $(EXTENSIONDIR)$/%.jar : $(SOLARBINDIR)$/%.jar .ENDIF $(EXTENSIONDIR)$/readme_en-US.% : $(PRJ)$/license$/readme_en-US.% - @@-$(MKDIRHIER) $(@:d) + @@-$(MKDIRHIER) $(@:d) $(COPY) $< $@ $(EXTENSIONDIR)$/THIRDPARTYREADMELICENSE.html : $(PRJ)$/license$/THIRDPARTYREADMELICENSE.html |