Commit c39d4306 authored by Dr. Martin Goik's avatar Dr. Martin Goik

Java 1.7 correcting javadoc bug

parent 8065621a
nstall
SCRIPTBASENAME=swd1
PLUGINID=de.hdm_stuttgart.mi.swd1
WWWBASE=www.mi.hdm-stuttgart.de:/home/infocenter2/doc
......@@ -31,7 +32,7 @@ JAVADOCDESTDIR=${BUILDNAVI}/Ref/api
%/jdoc : %
mkdir -p ${JAVADOCDESTDIR}/$*
cp -r $* $*_jdoctmp;
cd $*_jdoctmp; mvn -DjavadocDestdir=${JAVADOCDESTDIR}/$* javadoc:javadoc; \
cd $*_jdoctmp; mvn javadoc:javadoc; rm -rf ${JAVADOCDESTDIR}/$*/*; mv target/site/apidocs/* ${JAVADOCDESTDIR}/$*; \
mvn eclipse:myeclipse-clean eclipse:clean clean; \
rm -rf .settings; \
zip ${JAVADOCDESTDIR}/$*/eclipse.zip -r *
......@@ -46,22 +47,11 @@ dirty:
cd P/Array/integerStoreUnbounded;mvn install
cd ../ws/eclipse/HtmlExtensionTaglet;mvn compile
solution:${OWNCLOUDPDF}
${OWNCLOUDPDF}:${SCRIPTBASENAME}.xml
/usr/share/xmlmind/bin/convertdoc db5.toPSFile ${SCRIPTBASENAME}.xml \
-s pdf -s "|pdf" -u ${OWNCLOUDPDF}
jdoc: $(foreach pomDir,$(POMDIRS),$(pomDir)/jdoc )
all: ${BUILDNAVI}/printversion.pdf
#$(foreach pomDir,$(POMDIRS),$(pomDir)/jdoc ) : ${BUILDNAVI}/printversion.pdf
${BUILDNAVI}/index.html ${BUILDNAVI}/printversion.pdf:${SCRIPTBASENAME}.xml lastAnswerId.xml dirty
${BUILDNAVI}/index.html ${BUILDNAVI}/printversion.pdf:${SCRIPTBASENAME}.xml dirty
rm -rf ${BUILDBASE} || true
mkdir -p ${BUILDNAVI} ${BUILDNONAVI}
#cd Ref/Fig;make all
......@@ -78,7 +68,7 @@ ${BUILDNAVI}/index.html ${BUILDNAVI}/printversion.pdf:${SCRIPTBASENAME}.xml last
db.docbook.bib.xml:db.docbook.xml
runbib -u refdb -d refdb_mi -t db50x -r -G raw.css -E utf-8 db.docbook.xml
install:
install:jdoc
rsync -av --delete -e ssh ${BUILDNAVI} infocenter2@${WWWBASE}/navi
rsync -av --delete -e ssh ${BUILDNONAVI} infocenter2@${WWWBASE}/nonavi
ssh infocenter2@www.mi.hdm-stuttgart.de /usr/share/hdm/indexupdate.pl
......
......@@ -33,17 +33,6 @@
<version>2.9.1</version>
<configuration>
<linksource>true</linksource>
<!-- Setting destDir interferes with taglet class -->
<additionalJOptions>
<additionalJOption>-d ${javadocDestdir}</additionalJOption>
</additionalJOptions>
<taglets>
<taglet>
<tagletClass>de.hdm_stuttgart.de.sd1.taglet.HtmlExtensionTaglet</tagletClass>
</taglet>
</taglets>
<tagletpath>../../../../../../../ws/eclipse/HtmlExtensionTaglet/target/classes</tagletpath>
</configuration>
</plugin>
</plugins>
......
......@@ -33,17 +33,6 @@
<version>2.9.1</version>
<configuration>
<linksource>true</linksource>
<!-- Setting destDir interferes with taglet class -->
<additionalJOptions>
<additionalJOption>-d ${javadocDestdir}</additionalJOption>
</additionalJOptions>
<taglets>
<taglet>
<tagletClass>de.hdm_stuttgart.de.sd1.taglet.HtmlExtensionTaglet</tagletClass>
</taglet>
</taglets>
<tagletpath>../../../../../../../ws/eclipse/HtmlExtensionTaglet/target/classes</tagletpath>
</configuration>
</plugin>
</plugins>
......
......@@ -33,17 +33,6 @@
<version>2.9.1</version>
<configuration>
<linksource>true</linksource>
<!-- Setting destDir interferes with taglet class -->
<additionalJOptions>
<additionalJOption>-d ${javadocDestdir}</additionalJOption>
</additionalJOptions>
<taglets>
<taglet>
<tagletClass>de.hdm_stuttgart.de.sd1.taglet.HtmlExtensionTaglet</tagletClass>
</taglet>
</taglets>
<tagletpath>../../../../../../../ws/eclipse/HtmlExtensionTaglet/target/classes</tagletpath>
</configuration>
</plugin>
</plugins>
......
......@@ -32,18 +32,7 @@
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version>
<configuration>
<linksource>true</linksource>
<!-- Setting destDir interferes with taglet class -->
<additionalJOptions>
<additionalJOption>-d ${javadocDestdir}</additionalJOption>
</additionalJOptions>
<taglets>
<taglet>
<tagletClass>de.hdm_stuttgart.de.sd1.taglet.HtmlExtensionTaglet</tagletClass>
</taglet>
</taglets>
<tagletpath>../../../../../../../ws/eclipse/HtmlExtensionTaglet/target/classes</tagletpath>
<linksource>true</linksource>
</configuration>
</plugin>
</plugins>
......
......@@ -33,17 +33,6 @@
<version>2.9.1</version>
<configuration>
<linksource>true</linksource>
<!-- Setting destDir interferes with taglet class -->
<additionalJOptions>
<additionalJOption>-d ${javadocDestdir}</additionalJOption>
</additionalJOptions>
<taglets>
<taglet>
<tagletClass>de.hdm_stuttgart.de.sd1.taglet.HtmlExtensionTaglet</tagletClass>
</taglet>
</taglets>
<tagletpath>../../../../../../../ws/eclipse/HtmlExtensionTaglet/target/classes</tagletpath>
</configuration>
</plugin>
</plugins>
......
......@@ -33,17 +33,6 @@
<version>2.9.1</version>
<configuration>
<linksource>true</linksource>
<!-- Setting destDir interferes with taglet class -->
<additionalJOptions>
<additionalJOption>-d ${javadocDestdir}</additionalJOption>
</additionalJOptions>
<taglets>
<taglet>
<tagletClass>de.hdm_stuttgart.de.sd1.taglet.HtmlExtensionTaglet</tagletClass>
</taglet>
</taglets>
<tagletpath>../../../../../../../../ws/eclipse/HtmlExtensionTaglet/target/classes</tagletpath>
</configuration>
</plugin>
</plugins>
......
......@@ -33,17 +33,6 @@
<version>2.9.1</version>
<configuration>
<linksource>true</linksource>
<!-- Setting destDir interferes with taglet class -->
<additionalJOptions>
<additionalJOption>-d ${javadocDestdir}</additionalJOption>
</additionalJOptions>
<taglets>
<taglet>
<tagletClass>de.hdm_stuttgart.de.sd1.taglet.HtmlExtensionTaglet</tagletClass>
</taglet>
</taglets>
<tagletpath>../../../../../../../../ws/eclipse/HtmlExtensionTaglet/target/classes</tagletpath>
</configuration>
</plugin>
</plugins>
......
......@@ -33,17 +33,6 @@
<version>2.9.1</version>
<configuration>
<linksource>true</linksource>
<!-- Setting destDir interferes with taglet class -->
<additionalJOptions>
<additionalJOption>-d ${javadocDestdir}</additionalJOption>
</additionalJOptions>
<taglets>
<taglet>
<tagletClass>de.hdm_stuttgart.de.sd1.taglet.HtmlExtensionTaglet</tagletClass>
</taglet>
</taglets>
<tagletpath>../../../../../../../ws/eclipse/HtmlExtensionTaglet/target/classes</tagletpath>
</configuration>
</plugin>
</plugins>
......
......@@ -33,17 +33,7 @@
<version>2.9.1</version>
<configuration>
<linksource>true</linksource>
<!-- Setting destDir interferes with taglet class -->
<additionalJOptions>
<additionalJOption>-d ${javadocDestdir}</additionalJOption>
</additionalJOptions>
<taglets>
<taglet>
<tagletClass>de.hdm_stuttgart.de.sd1.taglet.HtmlExtensionTaglet</tagletClass>
</taglet>
</taglets>
<tagletpath>../../../../../../../ws/eclipse/HtmlExtensionTaglet/target/classes</tagletpath>
</configuration>
</plugin>
</plugins>
......
......@@ -33,17 +33,7 @@
<version>2.9.1</version>
<configuration>
<linksource>true</linksource>
<!-- Setting destDir interferes with taglet class -->
<additionalJOptions>
<additionalJOption>-d ${javadocDestdir}</additionalJOption>
</additionalJOptions>
<taglets>
<taglet>
<tagletClass>de.hdm_stuttgart.de.sd1.taglet.HtmlExtensionTaglet</tagletClass>
</taglet>
</taglets>
<tagletpath>../../../../../../../ws/eclipse/HtmlExtensionTaglet/target/classes</tagletpath>
</configuration>
</plugin>
</plugins>
......
......@@ -36,17 +36,13 @@
<links>
<link>http://www.greenfoot.org/files/javadoc/</link>
</links>
<!-- Setting destDir interferes with taglet class -->
<additionalJOptions>
<additionalJOption>-d ${javadocDestdir} -cp ../../../../../../lib/Greenfoot-core-2.5.jar</additionalJOption>
</additionalJOptions>
<taglets>
<taglet>
<tagletClass>de.hdm_stuttgart.de.sd1.taglet.HtmlExtensionTaglet</tagletClass>
</taglet>
</taglets>
<tagletpath>../../../../../../../ws/eclipse/HtmlExtensionTaglet/target/classes</tagletpath>
<additionalDependencies>
<additionalDependency>
<groupId>org.greenfoot</groupId>
<artifactId>greenfoot-core</artifactId>
<version>2.5</version>
</additionalDependency>
</additionalDependencies>
</configuration>
</plugin>
</plugins>
......
......@@ -36,17 +36,14 @@
<links>
<link>http://www.greenfoot.org/files/javadoc/</link>
</links>
<!-- Setting destDir interferes with taglet class -->
<additionalJOptions>
<additionalJOption>-d ${javadocDestdir} -cp ../../../../../../lib/Greenfoot-core-2.5.jar</additionalJOption>
</additionalJOptions>
<additionalDependencies>
<additionalDependency>
<groupId>org.greenfoot</groupId>
<artifactId>greenfoot-core</artifactId>
<version>2.5</version>
</additionalDependency>
</additionalDependencies>
<taglets>
<taglet>
<tagletClass>de.hdm_stuttgart.de.sd1.taglet.HtmlExtensionTaglet</tagletClass>
</taglet>
</taglets>
<tagletpath>../../../../../../../ws/eclipse/HtmlExtensionTaglet/target/classes</tagletpath>
</configuration>
</plugin>
</plugins>
......
......@@ -33,10 +33,6 @@
<version>2.9.1</version>
<configuration>
<linksource>true</linksource>
<!-- Setting destDir interferes with taglet class -->
<additionalJOptions>
<additionalJOption>-d ${javadocDestdir}</additionalJOption>
</additionalJOptions>
<taglets>
<taglet>
......
......@@ -33,10 +33,6 @@
<version>2.9.1</version>
<configuration>
<linksource>true</linksource>
<!-- Setting destDir interferes with taglet class -->
<additionalJOptions>
<additionalJOption>-d ${javadocDestdir}</additionalJOption>
</additionalJOptions>
<taglets>
<taglet>
......
......@@ -33,10 +33,6 @@
<version>2.9.1</version>
<configuration>
<linksource>true</linksource>
<!-- Setting destDir interferes with taglet class -->
<additionalJOptions>
<additionalJOption>-d ${javadocDestdir}</additionalJOption>
</additionalJOptions>
<taglets>
<taglet>
......
......@@ -33,10 +33,6 @@
<version>2.9.1</version>
<configuration>
<linksource>true</linksource>
<!-- Setting destDir interferes with taglet class -->
<additionalJOptions>
<additionalJOption>-d ${javadocDestdir}</additionalJOption>
</additionalJOptions>
<taglets>
<taglet>
......
......@@ -33,19 +33,17 @@
<version>2.9.1</version>
<configuration>
<linksource>true</linksource>
<links>
<link>http://www.greenfoot.org/files/javadoc/</link>
</links>
<additionalJOptions>
<additionalJOption>-d ${javadocDestdir} -cp ../../../../../../lib/Greenfoot-core-2.5.jar</additionalJOption>
</additionalJOptions>
<links>
<link>http://www.greenfoot.org/files/javadoc/</link>
</links>
<additionalDependencies>
<additionalDependency>
<groupId>org.greenfoot</groupId>
<artifactId>greenfoot-core</artifactId>
<version>2.5</version>
</additionalDependency>
</additionalDependencies>
<taglets>
<taglet>
<tagletClass>de.hdm_stuttgart.de.sd1.taglet.HtmlExtensionTaglet</tagletClass>
</taglet>
</taglets>
<tagletpath>../../../../../../../ws/eclipse/HtmlExtensionTaglet/target/classes</tagletpath>
</configuration>
</plugin>
</plugins>
......
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>de.hdm-stuttgart.de.sd1</groupId>
<artifactId>life</artifactId>
<version>3.0</version>
<packaging>jar</packaging>
<name>Game of Life</name>
<url>http://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<javadocDestdir>~/tmp</javadocDestdir>
</properties>
<build>
<plugins>
<plugin>
......@@ -33,23 +33,20 @@
<version>2.9.1</version>
<configuration>
<linksource>true</linksource>
<links>
<link>http://www.greenfoot.org/files/javadoc/</link>
</links>
<additionalJOptions>
<additionalJOption>-d ${javadocDestdir} -cp ../../../../../../lib/Greenfoot-core-2.5.jar</additionalJOption>
</additionalJOptions>
<taglets>
<taglet>
<tagletClass>de.hdm_stuttgart.de.sd1.taglet.HtmlExtensionTaglet</tagletClass>
</taglet>
</taglets>
<tagletpath>../../../../../../../ws/eclipse/HtmlExtensionTaglet/target/classes</tagletpath>
<links>
<link>http://www.greenfoot.org/files/javadoc/</link>
</links>
<additionalDependencies>
<additionalDependency>
<groupId>org.greenfoot</groupId>
<artifactId>greenfoot-core</artifactId>
<version>2.5</version>
</additionalDependency>
</additionalDependencies>
</configuration>
</plugin>
</plugins>
<resources>
<resource>
<directory>src/main/java</directory>
......@@ -59,7 +56,7 @@
</resource>
</resources>
</build>
<dependencies>
<dependency>
<groupId>junit</groupId>
......
......@@ -36,10 +36,6 @@
<links>
<link>http://www.greenfoot.org/files/javadoc/</link>
</links>
<!-- Setting destDir interferes with taglet class -->
<additionalJOptions>
<additionalJOption>-d ${javadocDestdir}</additionalJOption>
</additionalJOptions>
</configuration>
</plugin>
......
......@@ -36,10 +36,6 @@
<links>
<link>http://www.greenfoot.org/files/javadoc/</link>
</links>
<!-- Setting destDir interferes with taglet class -->
<additionalJOptions>
<additionalJOption>-d ${javadocDestdir}</additionalJOption>
</additionalJOptions>
</configuration>
</plugin>
</plugins>
......
......@@ -33,17 +33,7 @@
<version>2.9.1</version>
<configuration>
<linksource>true</linksource>
<!-- Setting destDir interferes with taglet class -->
<additionalJOptions>
<additionalJOption>-d ${javadocDestdir}</additionalJOption>
</additionalJOptions>
<taglets>
<taglet>
<tagletClass>de.hdm_stuttgart.de.sd1.taglet.HtmlExtensionTaglet</tagletClass>
</taglet>
</taglets>
<tagletpath>../../../../../../../ws/eclipse/HtmlExtensionTaglet/target/classes</tagletpath>
</configuration>
</plugin>
</plugins>
......
......@@ -33,10 +33,6 @@
<version>2.9.1</version>
<configuration>
<linksource>true</linksource>
<!-- Setting destDir interferes with taglet class -->
<additionalJOptions>
<additionalJOption>-d ${javadocDestdir}</additionalJOption>
</additionalJOptions>
<taglets>
<taglet>
......
......@@ -33,10 +33,6 @@
<version>2.9.1</version>
<configuration>
<linksource>true</linksource>
<!-- Setting destDir interferes with taglet class -->
<additionalJOptions>
<additionalJOption>-d ${javadocDestdir}</additionalJOption>
</additionalJOptions>
<taglets>
<taglet>
......
......@@ -33,10 +33,6 @@
<version>2.9.1</version>
<configuration>
<linksource>true</linksource>
<!-- Setting destDir interferes with taglet class -->
<additionalJOptions>
<additionalJOption>-d ${javadocDestdir}</additionalJOption>
</additionalJOptions>
<taglets>
<taglet>
......
......@@ -33,10 +33,6 @@
<version>2.9.1</version>
<configuration>
<linksource>true</linksource>
<!-- Setting destDir interferes with taglet class -->
<additionalJOptions>
<additionalJOption>-d ${javadocDestdir}</additionalJOption>
</additionalJOptions>
<taglets>
<taglet>
......
......@@ -33,14 +33,6 @@
<version>2.9.1</version>
<configuration>
<linksource>true</linksource>
<links>
<link>http://www.greenfoot.org/files/javadoc/</link>
</links>
<!-- Setting destDir interferes with taglet class -->
<additionalJOptions>
<additionalJOption>-d ${javadocDestdir}</additionalJOption>
</additionalJOptions>
</configuration>
</plugin>
</plugins>
......
......@@ -21,8 +21,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
</plugins>
......@@ -42,7 +42,7 @@
<dependency>
<groupId>sun.jdk</groupId>
<artifactId>tools</artifactId>
<version>1.5.0</version>
<version>1.7.0</version>
<scope>system</scope>
<systemPath>${java.home}/../lib/tools.jar</systemPath>
</dependency>
......
......@@ -22,8 +22,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
</plugins>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment