diff --git a/Sd1/Makefile b/Sd1/Makefile index 0c9e1d7ad9579afcf6a9cb15007ef5d395ad2400..0c4d17602dcaae6bbf233c86577393eff6c86ba0 100644 --- a/Sd1/Makefile +++ b/Sd1/Makefile @@ -7,7 +7,9 @@ PPARAM=\ -p eclipse.plugin.name Swd1 \ -p eclipse.plugin.provider 'Martin Goik, goik@hdm-stuttgart.de' -CP:=../ws/Docbook/Dbtools/target/classes:../ws/eclipse/Jdbc/target/classes:../ws/eclipse/HibIntro/target/classes:${HIBDEPS}:${JDBCDEPS} +JAVAPROJECTS=P/fraction/V1 + + BUILDROOT=/tmp #--no changes below this line------------------------------ @@ -15,25 +17,14 @@ BUILDBASE=$(BUILDROOT)/$(SCRIPTBASENAME) BUILDNAVI=$(BUILDBASE)/navi/$(PLUGINID) BUILDNONAVI=$(BUILDBASE)/nonavi/$(PLUGINID) +all::${BUILDNAVI}/index.html ${BUILDNAVI}/printversion.pdf jdoc - - - -all::${BUILDNAVI}/index.html ${BUILDNAVI}/printversion.pdf - -jdocbase: - for project in P/Fraction/V1 do - -#cd ../ws/eclipse;javadoc \ -#-classpath ${HIBDEPS}:${JDBCDEPS} -d ${BUILDNAVI}/Ref/api -linksource \ -# -link http://docs.oracle.com/javase/7/docs/api -link http://testng.org/javadocs -link http://docs.oracle.com/javaee/6/api \ -# -link http://www.jdom.org/docs/apidocs -link http://docs.jboss.org/hibernate/orm/4.1/javadocs \ -# `find Jdbc -name \*.java|grep -v \.metadata` `find Hibintro -name \*.java|grep -v \.metadata` - +jdoc: + $(foreach prj,$(JAVAPROJECTS),(cd $(prj);mvn javadoc:javadoc \"-DjavadocDestdir=${BUILDNAVI}/Ref/api/$(prj)\");) ${BUILDNAVI}/index.html ${BUILDNAVI}/printversion.pdf:${SCRIPTBASENAME}.xml lastAnswerId.xml - rm -rf $(BUILDBASE) || true - mkdir -p ${BUILDNAVI} ${BUILDNONAVI + rm -rf ${BUILDBASE} || true + mkdir -p ${BUILDNAVI} ${BUILDNONAVI} #cd Ref/Fig;make all saxon9he-xslt -xi -s:${SCRIPTBASENAME}.xml -xsl:../ws/Docbook/Extensions/Xsl/docbook2docbook.xsl > ${SCRIPTBASENAME}.answer.xml /usr/share/xmlmind/bin/convertdoc -p eclipse.plugin.id $(PLUGINID) ${PPARAM} db5.toEclipseHelp ${SCRIPTBASENAME}.answer.xml -u $(BUILDNAVI) diff --git a/Sd1/P/fraction/V1/pom.xml b/Sd1/P/fraction/V1/pom.xml index 3d5aa82153da1cef45a5c7730d9abfd01fe73386..ed320843959f3087d2f90de63b762337923aabd3 100644 --- a/Sd1/P/fraction/V1/pom.xml +++ b/Sd1/P/fraction/V1/pom.xml @@ -12,6 +12,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <javadocDestdir>~/tmp</javadocDestdir> </properties> <build> @@ -31,9 +32,10 @@ <artifactId>maven-javadoc-plugin</artifactId> <version>2.9.1</version> <configuration> + <linksource>true</linksource> <!-- Setting destDir interferes with taglet class --> <additionalJOptions> - <additionalJOption>-d ~/tmp/${name}</additionalJOption> + <additionalJOption>-d ${javadocDestdir}</additionalJOption> </additionalJOptions> <taglets> diff --git a/Sd1/swd1.xml b/Sd1/swd1.xml index 6af8159a7363524f2f4828521bd921b8ca7e4340..1b20976924d22a6df4bff74763dd3d90796aeb42 100644 --- a/Sd1/swd1.xml +++ b/Sd1/swd1.xml @@ -1945,7 +1945,8 @@ public void writeSvg() { * @return * the current default interest rate value. */ - public static double getDefaultInterestRate() { + public static double <link + xlink:href="Ref/api/P/fraction/V1/de/hdm_stuttgart/de/sd1/fraction/Fraction.html">getDefaultInterestRate()</link> { return defaultInterestRate; }