Download as
Browse Code »

Commit 038c761d326b013b9066c9d073334d69759e0323

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

Empacotando plugin java

Showing 4 changed files with 30 additions and 13 deletions   Show diff stats
Makefile.in
  Diff comments   View file @038c761
... ... @@ -148,12 +148,16 @@ $(DESTDIR)$(libdir)/$(PACKAGE_NAME)-plugins/%@DLLEXT@: $(BINDIR)/Release/plugins
148 148  
149 149 #---[ Release targets ]--------------------------------------------------------
150 150  
151   -all: Release
  151 +all: \
  152 + $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) \
  153 + $(foreach EXT, $(EXTENSIONS), $(EXT)) \
  154 + $(foreach PLUGIN, $(PLUGINS), $(BINDIR)/Release/plugins/$(PLUGIN)@DLLEXT@) \
  155 + locale pixmaps
152 156  
153 157 Release: \
154 158 $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) \
155   - $(foreach PLUGIN, $(PLUGINS), $(BINDIR)/Release/plugins/$(PLUGIN)@DLLEXT@) \
156 159 $(foreach EXT, $(EXTENSIONS), $(EXT)) \
  160 + $(foreach PLUGIN, $(PLUGINS), $(BINDIR)/Release/plugins/$(PLUGIN)@DLLEXT@) \
157 161 locale pixmaps
158 162  
159 163 $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT): src/pw3270/* $(BINDIR)/Release@DLLDIR@/lib3270@DLLEXT@ $(DEPENDS)
... ... @@ -176,14 +180,13 @@ $(BINDIR)/Release/tn3270.so: src/php/*
176 180 @$(MKDIR) `dirname $@`
177 181 @cp src/php/.bin/Release/php3270.so $@
178 182  
179   -java: src/java/Makefile src/java/*.cc src/java/*.h src/java/*.java
180   - @$(MAKE) -C src/java Release
  183 +java: $(BINDIR)/Release/@DLLPREFIX@jni3270@DLLEXT@
181 184  
182 185 $(BINDIR)/Release/@DLLPREFIX@jni3270@DLLEXT@: src/java/*
183   - @$(MAKE) -C src/java Release
184 186 @$(MKDIR) `dirname $@`
185   - @cp src/java/.bin/Release/*@DLLEXT@ $(BINDIR)/Release
186   - @cp src/java/.bin/Release/*.jar $(BINDIR)/Release
  187 + @$(MAKE) BINDIR="../../$(BINDIR)" LIB3270_LIBS="$(RLSLIB)" LIB3270_CFLAGS="-I../../src/include" -C src/java Release
  188 +
  189 +rexx: $(BINDIR)/Debug/plugins/rx3270@DLLEXT@
187 190  
188 191 #---[ Debug targets ]----------------------------------------------------------
189 192  
... ... @@ -314,13 +317,17 @@ $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar: clean pixmaps
314 317  
315 318 install: $(foreach EXT, sdk lib app man plugins $(EXTENSIONS), install-$(EXT))
316 319  
317   -install-app: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) install-locale
  320 +install-app: \
  321 + $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) \
  322 + install-locale
  323 +
318 324 @$(MAKE) BINDIR="../../$(BINDIR)" LIB3270_LIBS="$(RLSLIB)" LIB3270_CFLAGS="-I../../src/include" -C src/pw3270 install
319 325 @$(MKDIR) $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)/ui
320 326 @$(INSTALL_DATA) colors.conf $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)
321 327 @$(INSTALL_DATA) ui/*.xml $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)/ui
322 328  
323   -install-plugins: $(foreach PLUGIN, $(PLUGINS), $(DESTDIR)$(libdir)/$(PACKAGE_NAME)-plugins/$(PLUGIN)@DLLEXT@)
  329 +install-plugins: \
  330 + $(foreach PLUGIN, $(PLUGINS), $(DESTDIR)$(libdir)/$(PACKAGE_NAME)-plugins/$(PLUGIN)@DLLEXT@)
324 331  
325 332 install-lib: $(BINDIR)/Release@DLLDIR@/lib3270@DLLEXT@
326 333 @$(MAKE) BINRLS="../../.bin/Release@DLLDIR@" -C src/lib3270 install
... ... @@ -375,11 +382,14 @@ install-php:
375 382 install-java:
376 383 @$(MAKE) BINDIR=../../.bin LIB3270_CFLAGS="-I../../src/include" -C src/java install
377 384  
378   -install-plugin-rexx:
  385 +install-rexx:
379 386 @$(MAKE) BINDIR=../../../.bin LIB3270_CFLAGS="-I../../src/include" -C src/plugins/rx3270 install
380 387  
381   -install-plugin-dbus:
382   - @$(MAKE) BINDIR=../../../.bin LIB3270_CFLAGS="-I../../src/include" -C src/plugins/dbus3270 install
  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
383 393  
384 394 clean:
385 395 @rm -fr .obj
... ...
configure.ac
  Diff comments   View file @038c761
... ... @@ -533,7 +533,10 @@ fi
533 533 if test "$app_cv_rexx" == "yes"; then
534 534 AC_DEFINE(HAVE_REXX)
535 535 AC_DEFINE(HAVE_OOREXXAPI_H)
  536 +
536 537 PLUGINS="$PLUGINS rx3270"
  538 + EXTENSIONS="$EXTENSIONS rexx"
  539 +
537 540 AC_MSG_NOTICE([ooRexx plugin & extension are enabled.])
538 541 else
539 542 AC_MSG_NOTICE([ooRexx is NOT present or disabled.])
... ...
po/pt_BR.po
  Diff comments   View file @038c761
... ... @@ -5,7 +5,7 @@ msgid ""
5 5 msgstr ""
6 6 "Project-Id-Version: pw3270 5.0\n"
7 7 "Report-Msgid-Bugs-To: \n"
8   -"POT-Creation-Date: 2015-06-18 14:06-0300\n"
  8 +"POT-Creation-Date: 2015-06-18 14:22-0300\n"
9 9 "PO-Revision-Date: 2014-02-17 08:05-0300\n"
10 10 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
11 11 "Language-Team: Portugues <>\n"
... ...
pw3270.spec.in
  Diff comments   View file @038c761
... ... @@ -347,6 +347,10 @@ rm -rf $RPM_BUILD_ROOT
347 347 %dir %{_javadocdir}/%{name}/*
348 348 %{_javadocdir}/%{name}/*
349 349  
  350 +%files -n %{name}-plugin-java
  351 +%{_libdir}/@PACKAGE_NAME@-plugins/j3270.so
  352 +%{_datadir}/pw3270/ui/80java.xml
  353 +
350 354 %endif
351 355  
352 356  
... ...