diff options
| author | Ariel Constenla-Haile <arielch@apache.org> | 2012-06-13 00:50:29 +0000 |
|---|---|---|
| committer | Ariel Constenla-Haile <arielch@apache.org> | 2012-06-13 00:50:29 +0000 |
| commit | 3f968f4d8feb9990c31a16240cbefc088fbe2270 (patch) | |
| tree | 54c3352895c2600418a39ec6cd4ee706f8af6c90 /reportbuilder | |
| parent | b2c2d2f3b5b55a239c2cc5dc04f306144bccdabf (diff) | |
Remove references to license removed in revision 1305814
Notes
Notes:
ignore: obsolete
Diffstat (limited to 'reportbuilder')
| -rw-r--r-- | reportbuilder/prj/d.lst | 1 | ||||
| -rw-r--r-- | reportbuilder/template/makefile.mk | 9 | ||||
| -rw-r--r-- | reportbuilder/util/makefile.mk | 7 |
3 files changed, 3 insertions, 14 deletions
diff --git a/reportbuilder/prj/d.lst b/reportbuilder/prj/d.lst index b9d46b558d21..843e5ebf9481 100644 --- a/reportbuilder/prj/d.lst +++ b/reportbuilder/prj/d.lst @@ -9,4 +9,3 @@ mkdir: %_DEST%\bin%_EXT%\reportbuilder ..\license\license_en-US.html %_DEST%\bin%_EXT%\reportbuilder\license_en-US.html ..\license\readme_en-US.html %_DEST%\bin%_EXT%\reportbuilder\readme_en-US.html ..\license\readme_en-US.txt %_DEST%\bin%_EXT%\reportbuilder\readme_en-US.txt -..\license\THIRDPARTYREADMELICENSE.html %_DEST%\bin%_EXT%\reportbuilder\THIRDPARTYREADMELICENSE.html diff --git a/reportbuilder/template/makefile.mk b/reportbuilder/template/makefile.mk index fe5e69ce971c..a21b727c8611 100644 --- a/reportbuilder/template/makefile.mk +++ b/reportbuilder/template/makefile.mk @@ -59,9 +59,8 @@ ODR_FILES := \ $(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 +HTMLFILES := $(ZIP1DIR)$/readme_en-US.html \ + $(ZIP1DIR)$/readme_en-US.txt .IF "$(GUI)"!="WNT" TXTFILES:=$(foreach,i,$(alllangiso) $(ZIP1DIR)$/registration$/LICENSE_$i) @@ -108,10 +107,6 @@ $(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/util/makefile.mk b/reportbuilder/util/makefile.mk index db09b9a898cf..41cf3bcf5acf 100644 --- a/reportbuilder/util/makefile.mk +++ b/reportbuilder/util/makefile.mk @@ -76,8 +76,7 @@ COMPONENT_IMAGES= \ $(EXTENSIONDIR)$/images$/extension_32.png \ $(EXTENSIONDIR)$/images$/extension_32_h.png -COMPONENT_HTMLFILES = $(EXTENSIONDIR)$/THIRDPARTYREADMELICENSE.html \ - $(EXTENSIONDIR)$/readme_en-US.html \ +COMPONENT_HTMLFILES = $(EXTENSIONDIR)$/readme_en-US.html \ $(EXTENSIONDIR)$/readme_en-US.txt COMPONENT_JARFILES = \ @@ -134,10 +133,6 @@ $(EXTENSIONDIR)$/readme_en-US.% : $(PRJ)$/license$/readme_en-US.% $(COMPONENT_IMAGES) : $(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f) @@-$(MKDIRHIER) $(@:d) $(COPY) $< $@ - -$(EXTENSIONDIR)$/THIRDPARTYREADMELICENSE.html : $(PRJ)$/license$/THIRDPARTYREADMELICENSE.html - @@-$(MKDIRHIER) $(@:d) - $(COPY) $< $@ $(COMPONENT_HELP) : $$(@:f) @@-$(MKDIRHIER) $(@:d) |