incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From arie...@apache.org
Subject svn commit: r1349608 - in /incubator/ooo/trunk/main/reportbuilder: prj/d.lst template/makefile.mk util/makefile.mk
Date Wed, 13 Jun 2012 01:50:30 GMT
Author: arielch
Date: Wed Jun 13 01:50:29 2012
New Revision: 1349608

URL: http://svn.apache.org/viewvc?rev=1349608&view=rev
Log:
Remove references to license removed in revision 1305814

Modified:
    incubator/ooo/trunk/main/reportbuilder/prj/d.lst
    incubator/ooo/trunk/main/reportbuilder/template/makefile.mk
    incubator/ooo/trunk/main/reportbuilder/util/makefile.mk

Modified: incubator/ooo/trunk/main/reportbuilder/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/reportbuilder/prj/d.lst?rev=1349608&r1=1349607&r2=1349608&view=diff
==============================================================================
--- incubator/ooo/trunk/main/reportbuilder/prj/d.lst (original)
+++ incubator/ooo/trunk/main/reportbuilder/prj/d.lst Wed Jun 13 01:50:29 2012
@@ -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

Modified: incubator/ooo/trunk/main/reportbuilder/template/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/reportbuilder/template/makefile.mk?rev=1349608&r1=1349607&r2=1349608&view=diff
==============================================================================
--- incubator/ooo/trunk/main/reportbuilder/template/makefile.mk (original)
+++ incubator/ooo/trunk/main/reportbuilder/template/makefile.mk Wed Jun 13 01:50:29 2012
@@ -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)$/lic
 	@@-$(MKDIRHIER) $(@:d)
     $(COPY) $< $@
 
-$(ZIP1DIR)$/THIRDPARTYREADMELICENSE.html : $(PRJ)$/license$/THIRDPARTYREADMELICENSE.html
-    @@-$(MKDIRHIER) $(@:d)
-    $(COPY) $< $@
-
 .ELSE			# "$(SOLAR_JAVA)"!=""
 .INCLUDE : target.mk
 .ENDIF			# "$(SOLAR_JAVA)"!=""

Modified: incubator/ooo/trunk/main/reportbuilder/util/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/reportbuilder/util/makefile.mk?rev=1349608&r1=1349607&r2=1349608&view=diff
==============================================================================
--- incubator/ooo/trunk/main/reportbuilder/util/makefile.mk (original)
+++ incubator/ooo/trunk/main/reportbuilder/util/makefile.mk Wed Jun 13 01:50:29 2012
@@ -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)
 $(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)



Mime
View raw message