Download as
Browse Code »

Commit 34fafbedbad644bc44aa3377c2a6b6b0179994ec

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

Corrigindo empacotamento java

Showing 6 changed files with 31 additions and 17 deletions   Show diff stats
@@ -385,12 +385,6 @@ install-java: @@ -385,12 +385,6 @@ install-java:
385 install-rexx: 385 install-rexx:
386 @$(MAKE) BINDIR=../../../.bin LIB3270_CFLAGS="-I../../src/include" -C src/plugins/rx3270 install 386 @$(MAKE) BINDIR=../../../.bin LIB3270_CFLAGS="-I../../src/include" -C src/plugins/rx3270 install
387 387
388 -#install-plugin-rexx:  
389 -# @$(MAKE) BINDIR=../../../.bin LIB3270_CFLAGS="-I../../src/include" -C src/plugins/rx3270 install  
390 -#  
391 -#install-plugin-dbus:  
392 -# @$(MAKE) BINDIR=../../../.bin LIB3270_CFLAGS="-I../../src/include" -C src/plugins/dbus3270 install  
393 -  
394 clean: 388 clean:
395 @rm -fr .obj 389 @rm -fr .obj
396 @rm -fr .bin 390 @rm -fr .bin
@@ -316,7 +316,7 @@ AC_ARG_VAR([JDK_HOME], [JDK home directory]) @@ -316,7 +316,7 @@ AC_ARG_VAR([JDK_HOME], [JDK home directory])
316 AC_ARG_VAR([JRE_HOME], [JRE home directory]) 316 AC_ARG_VAR([JRE_HOME], [JRE home directory])
317 317
318 AC_ARG_WITH([jnidir], [AS_HELP_STRING([--with-jnidir], [Directory for JNI libraries])], [ jnidir="$withval" ],[ jnidir=\$"{libdir}/java" ]) 318 AC_ARG_WITH([jnidir], [AS_HELP_STRING([--with-jnidir], [Directory for JNI libraries])], [ jnidir="$withval" ],[ jnidir=\$"{libdir}/java" ])
319 -AC_ARG_WITH([jnidir], [AS_HELP_STRING([--with-javadocdir], [Directory for javadoc files])], [ javadocdir="$withval" ],[ javadocdir=\$"{datadir}/javadoc" ]) 319 +AC_ARG_WITH([javadocdir], [AS_HELP_STRING([--with-javadocdir], [Directory for javadoc files])], [ javadocdir="$withval" ],[ javadocdir=\$"{datadir}/javadoc" ])
320 320
321 AC_ARG_WITH([jvmjardir], [AS_HELP_STRING([--with-jvmjardir], [Directory for JAR files])], [ jvmjardir="$withval" ],[ jvmjardir=\$"{libdir}/jvm-exports" ]) 321 AC_ARG_WITH([jvmjardir], [AS_HELP_STRING([--with-jvmjardir], [Directory for JAR files])], [ jvmjardir="$withval" ],[ jvmjardir=\$"{libdir}/jvm-exports" ])
322 322
@@ -5,7 +5,7 @@ msgid "" @@ -5,7 +5,7 @@ msgid ""
5 msgstr "" 5 msgstr ""
6 "Project-Id-Version: pw3270 5.0\n" 6 "Project-Id-Version: pw3270 5.0\n"
7 "Report-Msgid-Bugs-To: \n" 7 "Report-Msgid-Bugs-To: \n"
8 -"POT-Creation-Date: 2015-06-18 21:35-0300\n" 8 +"POT-Creation-Date: 2015-06-19 10:47-0300\n"
9 "PO-Revision-Date: 2014-02-17 08:05-0300\n" 9 "PO-Revision-Date: 2014-02-17 08:05-0300\n"
10 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n" 10 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
11 "Language-Team: Portugues <>\n" 11 "Language-Team: Portugues <>\n"
pw3270.spec.in
  Diff comments   View file @34fafbe
@@ -226,6 +226,16 @@ from pw3270 application. @@ -226,6 +226,16 @@ from pw3270 application.
226 226
227 Revision @PACKAGE_REVISION@ from @PACKAGE_SOURCE@ 227 Revision @PACKAGE_REVISION@ from @PACKAGE_SOURCE@
228 228
  229 +%package javadoc
  230 +Summary: Javadoc for %{name}
  231 +Group: Documentation
  232 +Requires: jpackage-utils
  233 +
  234 +%description javadoc
  235 +API documentation for %{name}.
  236 +
  237 +Revision @PACKAGE_REVISION@ from @PACKAGE_SOURCE@
  238 +
229 %endif 239 %endif
230 240
231 241
@@ -244,11 +254,19 @@ export FFLAGS=&quot;$RPM_OPT_FLAGS&quot; @@ -244,11 +254,19 @@ export FFLAGS=&quot;$RPM_OPT_FLAGS&quot;
244 %if 0%{?_office} 254 %if 0%{?_office}
245 export OFFICE_HOME=%{_libdir}/libreoffice 255 export OFFICE_HOME=%{_libdir}/libreoffice
246 export OO_SDK_HOME=%{_libdir}/libreoffice/sdk 256 export OO_SDK_HOME=%{_libdir}/libreoffice/sdk
247 -%configure --sysconfdir=%{_sysconfdir}  
248 -%else  
249 -%configure --disable-office --sysconfdir=%{_sysconfdir}  
250 %endif 257 %endif
251 258
  259 +%if 0%{?_java}
  260 +export JAVA_HOME=%{java_home}
  261 +%endif
  262 +
  263 +%configure --disable-strip \
  264 + --enable-pic \
  265 + --with-jnidir="%{_jnidir}" \
  266 + --with-jvmjardir="%{_jvmjardir}" \
  267 + --with-javadocdir="%{_javadocdir}"
  268 +
  269 +
252 %build 270 %build
253 make clean 271 make clean
254 make all 272 make all
@@ -343,14 +361,14 @@ rm -rf $RPM_BUILD_ROOT @@ -343,14 +361,14 @@ rm -rf $RPM_BUILD_ROOT
343 %{_jnidir}/libjni3270.so 361 %{_jnidir}/libjni3270.so
344 %{_jvmjardir}/pw3270.jar 362 %{_jvmjardir}/pw3270.jar
345 363
346 -  
347 -%dir %{_javadocdir}/%{name}/*  
348 -%{_javadocdir}/%{name}/*  
349 -  
350 %files -n %{name}-plugin-java 364 %files -n %{name}-plugin-java
351 %{_libdir}/@PACKAGE_NAME@-plugins/j3270.so 365 %{_libdir}/@PACKAGE_NAME@-plugins/j3270.so
352 %{_datadir}/pw3270/ui/80java.xml 366 %{_datadir}/pw3270/ui/80java.xml
353 367
  368 +%files javadoc
  369 +%dir %{_javadocdir}/%{name}/*
  370 +%{_javadocdir}/%{name}/*
  371 +
354 %endif 372 %endif
355 373
356 374
src/java/Makefile.in
  Diff comments   View file @34fafbe
@@ -177,7 +177,7 @@ jni3270.zip: \ @@ -177,7 +177,7 @@ jni3270.zip: \
177 @cp ../../ui/*java.xml ui 177 @cp ../../ui/*java.xml ui
178 @zip -9 -m -r $@ ui 178 @zip -9 -m -r $@ ui
179 @rm -fr ui 179 @rm -fr ui
180 - 180 +
181 @zip -9 -j $@ $(BINRLS)@DLLDIR@/@DLLPREFIX@jni3270@DLLEXT@ 181 @zip -9 -j $@ $(BINRLS)@DLLDIR@/@DLLPREFIX@jni3270@DLLEXT@
182 @zip -9 -r $@ doc sample/efglobe.java sample/popup.java 182 @zip -9 -r $@ doc sample/efglobe.java sample/popup.java
183 183
@@ -245,6 +245,8 @@ install-extension: \ @@ -245,6 +245,8 @@ install-extension: \
245 install-doc: \ 245 install-doc: \
246 doc 246 doc
247 247
  248 + @echo "javadocdir=$(javadocdir)"
  249 +
248 @$(MKDIR) $(DESTDIR)/$(javadocdir)/$(PACKAGE_NAME) 250 @$(MKDIR) $(DESTDIR)/$(javadocdir)/$(PACKAGE_NAME)
249 @cp -r doc/* $(DESTDIR)/$(javadocdir)/$(PACKAGE_NAME) 251 @cp -r doc/* $(DESTDIR)/$(javadocdir)/$(PACKAGE_NAME)
250 @find $(DESTDIR)/$(javadocdir)/$(PACKAGE_NAME) -type f -exec chmod 644 {} \; 252 @find $(DESTDIR)/$(javadocdir)/$(PACKAGE_NAME) -type f -exec chmod 644 {} \;
src/java/terminal.java
  Diff comments   View file @34fafbe
@@ -293,7 +293,7 @@ public class terminal @@ -293,7 +293,7 @@ public class terminal
293 /** 293 /**
294 * Get next field address. 294 * Get next field address.
295 * 295 *
296 - * @param Field address. 296 + * @param baddr Field address.
297 * 297 *
298 * @return Address of the next field. 298 * @return Address of the next field.
299 * 299 *