From 16a57c0c7f0d517700a361f2141dd43ceb04bb67 Mon Sep 17 00:00:00 2001
From: perry.werneck@gmail.com <perry.werneck@gmail.com@d25448e0-c022-0410-b998-a785f7053de0>
Date: Tue, 16 Jun 2015 16:49:09 +0000
Subject: [PATCH] Implementando documentação em formato javadoc

---
 configure.ac         |  5 +++++
 src/java/Makefile.in | 17 ++++++++++++-----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index ebab14c..92449ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -313,6 +313,8 @@ AC_ARG_VAR([JDK_HOME], [JDK home directory])
 AC_ARG_VAR([JRE_HOME], [JRE home directory])
 
 AC_ARG_WITH([jnidir], [AS_HELP_STRING([--with-jnidir], [Directory for JNI libraries])], [ jnidir="$withval" ],[ jnidir=\$"{libdir}/java" ])
+AC_ARG_WITH([jnidir], [AS_HELP_STRING([--with-javadocdir], [Directory for javadoc files])], [ javadocdir="$withval" ],[ javadocdir=\$"{datadir}/javadoc" ])
+
 AC_ARG_WITH([jvmjardir], [AS_HELP_STRING([--with-jvmjardir], [Directory for JAR files])], [ jvmjardir="$withval" ],[ jvmjardir=\$"{libdir}/jvm-exports" ])
 
 AC_ARG_ENABLE([java],[AS_HELP_STRING([--disable-java], [Disable java integration])],[ app_cv_java="$enableval" ],[ app_cv_java="yes" ])
@@ -340,6 +342,7 @@ if test "$app_cv_java" = "yes" ; then
 	AC_PATH_TOOL([JAVAC], [javac], [no], [$JDK_HOME/bin:$JRE_HOME/bin:$PATH])
 	AC_PATH_TOOL([JAVAH], [javah], [no], [$JDK_HOME/bin:$JRE_HOME/bin:$PATH])
 	AC_PATH_TOOL([JAR], [jar], [no], [$JDK_HOME/bin:$JRE_HOME/bin:$PATH])
+	AC_PATH_TOOL([JAVADOC], [javadoc], [no], [$JDK_HOME/bin:$JRE_HOME/bin:$PATH])
 
 	EXTENSIONS="$EXTENSIONS java"
 
@@ -347,8 +350,10 @@ fi
 
 AC_SUBST(JAVAC)
 AC_SUBST(JAVAH)
+AC_SUBST(JAVADOC)
 AC_SUBST(jnidir)
 AC_SUBST(jvmjardir)
+AC_SUBST(javadocdir)
 AC_SUBST(JAR)
 AC_SUBST(JDK_HOME)
 AC_SUBST(JRE_HOME)
diff --git a/src/java/Makefile.in b/src/java/Makefile.in
index e3b06f5..b719bbf 100644
--- a/src/java/Makefile.in
+++ b/src/java/Makefile.in
@@ -34,10 +34,12 @@ exec_prefix=@exec_prefix@
 bindir=@bindir@
 sbindir=@sbindir@
 libdir=@libdir@
+datadir=@datadir@
 includedir=@includedir@
 sysconfdir=@sysconfdir@
 jnidir=@jnidir@
 jvmjardir=@jvmjardir@
+javadocdir=@javadocdir@
 
 #---[ Tools ]------------------------------------------------------------------
 
@@ -49,6 +51,7 @@ INSTALL_PROGRAM=@INSTALL_PROGRAM@
 JAVAC=@JAVAC@
 JAVAH=@JAVAH@
 JAR=@JAR@
+JAVADOC=@JAVADOC@
 JDK_HOME=@JDK_HOME@
 JRE_HOME=@JRE_HOME@
 
@@ -112,11 +115,11 @@ zip: jni3270.zip
 jni3270.zip: $(BINRLS)/libjni3270.so $(BINRLS)/$(PACKAGE_NAME).jar testprogram.java doc
 	@rm -fr .tmp.zip
 	@rm -f $@
-	@zip -9 -m -j $@ $(BINRLS)/libjni3270.so $(BINRLS)/$(PACKAGE_NAME).jar testprogram.java
+	@zip -9 -j $@ $(BINRLS)/libjni3270.so $(BINRLS)/$(PACKAGE_NAME).jar testprogram.java
 	@zip -9 -r $@ doc
 
 doc: terminal.java
-	@javadoc -d doc $^
+	@$(JAVADOC) -d doc $^
 
 
 
@@ -143,21 +146,25 @@ run: $(BINDBG)/@DLLPREFIX@jni3270@DLLEXT@ $(BINDIR)/java/testprogram.class
 
 #---[ Misc targets ]-----------------------------------------------------------
 
-install: $(BINRLS)/@DLLPREFIX@jni3270@DLLEXT@
+install: $(BINRLS)/@DLLPREFIX@jni3270@DLLEXT@ doc
 	@$(MKDIR) $(DESTDIR)/$(jnidir)
 	@$(INSTALL_PROGRAM) $(BINRLS)/@DLLPREFIX@jni3270@DLLEXT@ $(DESTDIR)/$(jnidir)
 
 	@mkdir -p $(DESTDIR)/$(jvmjardir)
 	@$(INSTALL_DATA) $(BINRLS)/$(PACKAGE_NAME).jar $(DESTDIR)/$(jvmjardir)
 
+	@$(MKDIR) $(DESTDIR)/$(javadocdir)/$(PACKAGE_NAME)
+	@cp -r doc/* $(DESTDIR)/$(javadocdir)/$(PACKAGE_NAME)
+	@find $(DESTDIR)/$(javadocdir)/$(PACKAGE_NAME) -type f -exec chmod 644 {} \;
+	@find $(DESTDIR)/$(javadocdir)/$(PACKAGE_NAME) -type d -exec chmod 755 {} \;
+
+
 jni3270.h: $(BINDIR)/java/$(PACKAGE_NAME)/terminal.class
 	@echo $< ...
 	@mkdir -p `dirname $@`
 	$(JAVAH) -o $@ -classpath $(BINDIR)/java $(PACKAGE_NAME).terminal
 
 
-install: $(BINRLS)/@DLLPREFIX@jni3270@DLLEXT@
-
 cleanDebug: clean
 
 clean:
--
libgit2 0.21.2