From 4f4bd53ed7cc084ff7998dfef01f54f8cb15dc21 Mon Sep 17 00:00:00 2001
From: Martin Goik <goik@hdm-stuttgart.de>
Date: Fri, 24 Oct 2014 00:25:24 +0200
Subject: [PATCH] Jdoc build rules
---
Sda2/Makefile | 15 +++++-
.../Jndi/Rdbms2Ldap/rdbms2ldap/.gitignore | 4 --
.../Jndi/Rdbms2Ldap/rdbms2ldap/pom.xml | 54 -------------------
Sda2/sda2.xml | 10 ++++
4 files changed, 24 insertions(+), 59 deletions(-)
delete mode 100644 Sda2/P/UnixSqlLdap/Jndi/Rdbms2Ldap/rdbms2ldap/.gitignore
delete mode 100644 Sda2/P/UnixSqlLdap/Jndi/Rdbms2Ldap/rdbms2ldap/pom.xml
diff --git a/Sda2/Makefile b/Sda2/Makefile
index 97e94efa9..557ec7a83 100644
--- a/Sda2/Makefile
+++ b/Sda2/Makefile
@@ -17,12 +17,25 @@ BUILDROOT=/tmp
BUILDBASE=$(BUILDROOT)/$(SCRIPTBASENAME)
BUILDNAVI=$(BUILDBASE)/navi/$(PLUGINID)
BUILDNONAVI=$(BUILDBASE)/nonavi/$(PLUGINID)
+JAVADOCDESTDIR=${BUILDNAVI}/Ref/api
+POMDIRS= $(shell find P -name pom.xml|grep -v target/classes/META-INF|sed -e s/\\/pom.xml//g)
+#
+#Rule to build javadoc from pom.xml file
+#
+%/jdoc : %
+ mkdir -p ${JAVADOCDESTDIR}/$*
+ cp -r $* $*_jdoctmp;
+ 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 *
+ rm -rf $*_jdoctmp
all::${BUILDNAVI}/index.html ${BUILDNAVI}/printversion.pdf
-jdoc:
+jdoc: $(foreach pomDir,$(POMDIRS),$(pomDir)/jdoc )
cd ../ws/eclipse;javadoc \
-classpath ${HIBDEPS}:${JDBCDEPS} -d ${BUILDNAVI}/Ref/api -linksource \
-link http://docs.oracle.com/javase/8/docs/api/ -link http://testng.org/javadocs/ -link http://docs.oracle.com/javaee/6/api/ \
diff --git a/Sda2/P/UnixSqlLdap/Jndi/Rdbms2Ldap/rdbms2ldap/.gitignore b/Sda2/P/UnixSqlLdap/Jndi/Rdbms2Ldap/rdbms2ldap/.gitignore
deleted file mode 100644
index a1c3ab4d0..000000000
--- a/Sda2/P/UnixSqlLdap/Jndi/Rdbms2Ldap/rdbms2ldap/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/target/
-/.settings/
-.classpath
-.project
diff --git a/Sda2/P/UnixSqlLdap/Jndi/Rdbms2Ldap/rdbms2ldap/pom.xml b/Sda2/P/UnixSqlLdap/Jndi/Rdbms2Ldap/rdbms2ldap/pom.xml
deleted file mode 100644
index 7d82a7c13..000000000
--- a/Sda2/P/UnixSqlLdap/Jndi/Rdbms2Ldap/rdbms2ldap/pom.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<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.mi.sda2</groupId>
- <artifactId>rdbms2ldap</artifactId>
- <version>0.9</version>
- <packaging>jar</packaging>
-
- <name>rdbms2ldap</name>
-
- <!--Fixme: Add a sensible project related domain here -->
- <url>http://somedomain.org</url>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.17</version>
- </dependency>
-
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>5.1.33</version>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
- <configuration>
- <source>1.8</source>
- <target>1.8</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/Sda2/sda2.xml b/Sda2/sda2.xml
index 09bc1a6e9..9a2d65029 100644
--- a/Sda2/sda2.xml
+++ b/Sda2/sda2.xml
@@ -629,6 +629,16 @@ tty:x:5:
</listitem>
</orderedlist>
</question>
+
+ <answer>
+ <annotation role="make">
+ <para role="eclipse">P/UnixSqlLdap/Jndi/Unix2Rdbms</para>
+ </annotation>
+
+ <annotation role="make">
+ <para role="eclipse">P/UnixSqlLdap/Jndi/Rdbms2Ldap</para>
+ </annotation>
+ </answer>
</qandaentry>
</qandadiv>
</qandaset>
--
GitLab