diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-02-26 13:29:11 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-02-26 15:45:11 +0100 |
| commit | 43dd869ec9777bd9e8f79b12b8037aab28cd0716 (patch) | |
| tree | 39b9f5c5b32843d965937cec1194801b00e7d139 /odk | |
| parent | 56b44d0123e53e0a6e8309da32852d41694ad9ce (diff) | |
odk: remove temporary Zip file gratuitous complexity
4 zip files containing ridl, unoloader, jurt and juh source files are
created and copied to solver and unzipped again in odk when odk could
simply run javadoc over the source files directly.
Change-Id: I8d2d7c794988eab2e8a3c6005cc8a849a1232f64
Diffstat (limited to 'odk')
| -rw-r--r-- | odk/CustomTarget_javadoc.mk | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/odk/CustomTarget_javadoc.mk b/odk/CustomTarget_javadoc.mk index e6ff1cafcd73..133e9a215e56 100644 --- a/odk/CustomTarget_javadoc.mk +++ b/odk/CustomTarget_javadoc.mk @@ -17,7 +17,7 @@ odk_JAVAPACKAGES := com.sun.star.comp.helper \ com.sun.star.lib.uno.helper \ com.sun.star.lib.unoloader \ com.sun.star.uno \ - $(odk_WORKDIR)/java_src/com/sun/star/lib/util/UrlToFileMapper.java + $(SRCDIR)/jurt/com/sun/star/lib/util/UrlToFileMapper.java $(eval $(call gb_CustomTarget_register_target,odk/odkcommon/docs/java/ref,index.html)) @@ -26,7 +26,7 @@ $(odk_WORKDIR)/docs/java/ref/index.html: $(call gb_Jar_get_target,ridl) $(JAVADOC) -J-Xmx120m -use -splitindex \ -windowtitle "Java UNO Runtime Reference" \ -header $(JAVADOCREFNAME) -d $(dir $@) \ - -sourcepath $(odk_WORKDIR)/java_src \ + -sourcepath $(SRCDIR)/ridljar/source/unoloader:$(SRCDIR)/ridljar:$(SRCDIR)/jurt:$(SRCDIR)/javaunohelper \ -classpath $(OUTDIR)/bin/ridl.jar \ -linkoffline ../../common/reg ./uno \ -linkoffline http://java.sun.com/j2se/1.5/docs/api ./java \ @@ -34,19 +34,4 @@ $(odk_WORKDIR)/docs/java/ref/index.html: $(call gb_Jar_get_target,ridl) $(if $(JAVADOCISGJDOC),,-notimestamp) \ > $(odk_WORKDIR)/javadoc_log.txt -odk_JAVASRCLIST := juh_src \ - jurt_src \ - ridl_src \ - unoloader_src - -define odk_jsrc -$(odk_WORKDIR)/docs/java/ref/index.html: $(odk_WORKDIR)/java_src/$(1).done -$(odk_WORKDIR)/java_src/$(1).done: $(call gb_Zip_get_target,$(1)) - $$(call gb_Output_announce,$$(subst $(WORKDIR)/,,$$@),build,UNZ,1) - unzip -quo $$< -d $$(dir $$@) - touch $$@ -endef - -$(foreach src,$(odk_JAVASRCLIST),$(eval $(call odk_jsrc,$(src)))) - # vim: set noet sw=4 ts=4: |