Download as
Browse Code »

Commit 16a57c0c7f0d517700a361f2141dd43ceb04bb67

Authored by perry.werneck@gmail.com
1 parent fadd42b6
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Implementando documentação em formato javadoc

Showing 2 changed files with 17 additions and 5 deletions   Show diff stats
@@ -313,6 +313,8 @@ AC_ARG_VAR([JDK_HOME], [JDK home directory]) @@ -313,6 +313,8 @@ AC_ARG_VAR([JDK_HOME], [JDK home directory])
313 AC_ARG_VAR([JRE_HOME], [JRE home directory]) 313 AC_ARG_VAR([JRE_HOME], [JRE home directory])
314 314
315 AC_ARG_WITH([jnidir], [AS_HELP_STRING([--with-jnidir], [Directory for JNI libraries])], [ jnidir="$withval" ],[ jnidir=\$"{libdir}/java" ]) 315 AC_ARG_WITH([jnidir], [AS_HELP_STRING([--with-jnidir], [Directory for JNI libraries])], [ jnidir="$withval" ],[ jnidir=\$"{libdir}/java" ])
  316 +AC_ARG_WITH([jnidir], [AS_HELP_STRING([--with-javadocdir], [Directory for javadoc files])], [ javadocdir="$withval" ],[ javadocdir=\$"{datadir}/javadoc" ])
  317 +
316 AC_ARG_WITH([jvmjardir], [AS_HELP_STRING([--with-jvmjardir], [Directory for JAR files])], [ jvmjardir="$withval" ],[ jvmjardir=\$"{libdir}/jvm-exports" ]) 318 AC_ARG_WITH([jvmjardir], [AS_HELP_STRING([--with-jvmjardir], [Directory for JAR files])], [ jvmjardir="$withval" ],[ jvmjardir=\$"{libdir}/jvm-exports" ])
317 319
318 AC_ARG_ENABLE([java],[AS_HELP_STRING([--disable-java], [Disable java integration])],[ app_cv_java="$enableval" ],[ app_cv_java="yes" ]) 320 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 @@ -340,6 +342,7 @@ if test "$app_cv_java" = "yes" ; then
340 AC_PATH_TOOL([JAVAC], [javac], [no], [$JDK_HOME/bin:$JRE_HOME/bin:$PATH]) 342 AC_PATH_TOOL([JAVAC], [javac], [no], [$JDK_HOME/bin:$JRE_HOME/bin:$PATH])
341 AC_PATH_TOOL([JAVAH], [javah], [no], [$JDK_HOME/bin:$JRE_HOME/bin:$PATH]) 343 AC_PATH_TOOL([JAVAH], [javah], [no], [$JDK_HOME/bin:$JRE_HOME/bin:$PATH])
342 AC_PATH_TOOL([JAR], [jar], [no], [$JDK_HOME/bin:$JRE_HOME/bin:$PATH]) 344 AC_PATH_TOOL([JAR], [jar], [no], [$JDK_HOME/bin:$JRE_HOME/bin:$PATH])
  345 + AC_PATH_TOOL([JAVADOC], [javadoc], [no], [$JDK_HOME/bin:$JRE_HOME/bin:$PATH])
343 346
344 EXTENSIONS="$EXTENSIONS java" 347 EXTENSIONS="$EXTENSIONS java"
345 348
@@ -347,8 +350,10 @@ fi @@ -347,8 +350,10 @@ fi
347 350
348 AC_SUBST(JAVAC) 351 AC_SUBST(JAVAC)
349 AC_SUBST(JAVAH) 352 AC_SUBST(JAVAH)
  353 +AC_SUBST(JAVADOC)
350 AC_SUBST(jnidir) 354 AC_SUBST(jnidir)
351 AC_SUBST(jvmjardir) 355 AC_SUBST(jvmjardir)
  356 +AC_SUBST(javadocdir)
352 AC_SUBST(JAR) 357 AC_SUBST(JAR)
353 AC_SUBST(JDK_HOME) 358 AC_SUBST(JDK_HOME)
354 AC_SUBST(JRE_HOME) 359 AC_SUBST(JRE_HOME)
src/java/Makefile.in
  Diff comments   View file @16a57c0
@@ -34,10 +34,12 @@ exec_prefix=@exec_prefix@ @@ -34,10 +34,12 @@ exec_prefix=@exec_prefix@
34 bindir=@bindir@ 34 bindir=@bindir@
35 sbindir=@sbindir@ 35 sbindir=@sbindir@
36 libdir=@libdir@ 36 libdir=@libdir@
  37 +datadir=@datadir@
37 includedir=@includedir@ 38 includedir=@includedir@
38 sysconfdir=@sysconfdir@ 39 sysconfdir=@sysconfdir@
39 jnidir=@jnidir@ 40 jnidir=@jnidir@
40 jvmjardir=@jvmjardir@ 41 jvmjardir=@jvmjardir@
  42 +javadocdir=@javadocdir@
41 43
42 #---[ Tools ]------------------------------------------------------------------ 44 #---[ Tools ]------------------------------------------------------------------
43 45
@@ -49,6 +51,7 @@ INSTALL_PROGRAM=@INSTALL_PROGRAM@ @@ -49,6 +51,7 @@ INSTALL_PROGRAM=@INSTALL_PROGRAM@
49 JAVAC=@JAVAC@ 51 JAVAC=@JAVAC@
50 JAVAH=@JAVAH@ 52 JAVAH=@JAVAH@
51 JAR=@JAR@ 53 JAR=@JAR@
  54 +JAVADOC=@JAVADOC@
52 JDK_HOME=@JDK_HOME@ 55 JDK_HOME=@JDK_HOME@
53 JRE_HOME=@JRE_HOME@ 56 JRE_HOME=@JRE_HOME@
54 57
@@ -112,11 +115,11 @@ zip: jni3270.zip @@ -112,11 +115,11 @@ zip: jni3270.zip
112 jni3270.zip: $(BINRLS)/libjni3270.so $(BINRLS)/$(PACKAGE_NAME).jar testprogram.java doc 115 jni3270.zip: $(BINRLS)/libjni3270.so $(BINRLS)/$(PACKAGE_NAME).jar testprogram.java doc
113 @rm -fr .tmp.zip 116 @rm -fr .tmp.zip
114 @rm -f $@ 117 @rm -f $@
115 - @zip -9 -m -j $@ $(BINRLS)/libjni3270.so $(BINRLS)/$(PACKAGE_NAME).jar testprogram.java 118 + @zip -9 -j $@ $(BINRLS)/libjni3270.so $(BINRLS)/$(PACKAGE_NAME).jar testprogram.java
116 @zip -9 -r $@ doc 119 @zip -9 -r $@ doc
117 120
118 doc: terminal.java 121 doc: terminal.java
119 - @javadoc -d doc $^ 122 + @$(JAVADOC) -d doc $^
120 123
121 124
122 125
@@ -143,21 +146,25 @@ run: $(BINDBG)/@DLLPREFIX@jni3270@DLLEXT@ $(BINDIR)/java/testprogram.class @@ -143,21 +146,25 @@ run: $(BINDBG)/@DLLPREFIX@jni3270@DLLEXT@ $(BINDIR)/java/testprogram.class
143 146
144 #---[ Misc targets ]----------------------------------------------------------- 147 #---[ Misc targets ]-----------------------------------------------------------
145 148
146 -install: $(BINRLS)/@DLLPREFIX@jni3270@DLLEXT@ 149 +install: $(BINRLS)/@DLLPREFIX@jni3270@DLLEXT@ doc
147 @$(MKDIR) $(DESTDIR)/$(jnidir) 150 @$(MKDIR) $(DESTDIR)/$(jnidir)
148 @$(INSTALL_PROGRAM) $(BINRLS)/@DLLPREFIX@jni3270@DLLEXT@ $(DESTDIR)/$(jnidir) 151 @$(INSTALL_PROGRAM) $(BINRLS)/@DLLPREFIX@jni3270@DLLEXT@ $(DESTDIR)/$(jnidir)
149 152
150 @mkdir -p $(DESTDIR)/$(jvmjardir) 153 @mkdir -p $(DESTDIR)/$(jvmjardir)
151 @$(INSTALL_DATA) $(BINRLS)/$(PACKAGE_NAME).jar $(DESTDIR)/$(jvmjardir) 154 @$(INSTALL_DATA) $(BINRLS)/$(PACKAGE_NAME).jar $(DESTDIR)/$(jvmjardir)
152 155
  156 + @$(MKDIR) $(DESTDIR)/$(javadocdir)/$(PACKAGE_NAME)
  157 + @cp -r doc/* $(DESTDIR)/$(javadocdir)/$(PACKAGE_NAME)
  158 + @find $(DESTDIR)/$(javadocdir)/$(PACKAGE_NAME) -type f -exec chmod 644 {} \;
  159 + @find $(DESTDIR)/$(javadocdir)/$(PACKAGE_NAME) -type d -exec chmod 755 {} \;
  160 +
  161 +
153 jni3270.h: $(BINDIR)/java/$(PACKAGE_NAME)/terminal.class 162 jni3270.h: $(BINDIR)/java/$(PACKAGE_NAME)/terminal.class
154 @echo $< ... 163 @echo $< ...
155 @mkdir -p `dirname $@` 164 @mkdir -p `dirname $@`
156 $(JAVAH) -o $@ -classpath $(BINDIR)/java $(PACKAGE_NAME).terminal 165 $(JAVAH) -o $@ -classpath $(BINDIR)/java $(PACKAGE_NAME).terminal
157 166
158 167
159 -install: $(BINRLS)/@DLLPREFIX@jni3270@DLLEXT@  
160 -  
161 cleanDebug: clean 168 cleanDebug: clean
162 169
163 clean: 170 clean: