Download as
Browse Code »

Commit b640e0e705ee7b79318207c52a7c2f6119f0702b

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

Atualizando detecção do java, incluindo compilação dos plugins no "make run"

Showing 4 changed files with 24 additions and 13 deletions   Show diff stats
@@ -176,7 +176,8 @@ $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT): src/pw3270/* $(BINDIR)/Debug@DLLDIR @@ -176,7 +176,8 @@ $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT): src/pw3270/* $(BINDIR)/Debug@DLLDIR
176 $(BINDIR)/Debug@DLLDIR@/@DLLPREFIX@3270@DLLEXT@: src/lib3270/* src/include/lib3270/* src/include/* Makefile 176 $(BINDIR)/Debug@DLLDIR@/@DLLPREFIX@3270@DLLEXT@: src/lib3270/* src/include/lib3270/* src/include/* Makefile
177 @$(MAKE) BINDBG=../../.bin/Debug@DLLDIR@ -C src/lib3270 ../../.bin/Debug@DLLDIR@/@DLLPREFIX@3270@DLLEXT@ 177 @$(MAKE) BINDBG=../../.bin/Debug@DLLDIR@ -C src/lib3270 ../../.bin/Debug@DLLDIR@/@DLLPREFIX@3270@DLLEXT@
178 178
179 -run: $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT) $(PACKAGE_NAME).png $(PACKAGE_NAME)-logo.png 179 +run: $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT) $(PACKAGE_NAME).png $(PACKAGE_NAME)-logo.png \
  180 + $(foreach PLUGIN, $(PLUGINS), $(BINDIR)/Debug/plugins/$(PLUGIN)@DLLEXT@)
180 @$(DBGCMDPREFIX) "$(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT)" 181 @$(DBGCMDPREFIX) "$(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT)"
181 182
182 memchk: $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT) 183 memchk: $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT)
@@ -278,32 +278,29 @@ AC_ARG_ENABLE([java],[AS_HELP_STRING([--disable-java], [Disable java integration @@ -278,32 +278,29 @@ AC_ARG_ENABLE([java],[AS_HELP_STRING([--disable-java], [Disable java integration
278 278
279 if test "$app_cv_java" = "yes" ; then 279 if test "$app_cv_java" = "yes" ; then
280 280
281 - # Check for JDK_HOME  
282 - if test "_$JDK_HOME" = "_" ; then  
283 - AC_CHECK_FILE("/usr/java/default/bin/javac",JDK_HOME="/usr/java/default",)  
284 - fi  
285 -  
286 - if test "_$JDK_HOME" = "_" ; then 281 + # Check for JAVA_HOME
  282 + if test "_$JAVA_HOME" = "_" ; then
287 app_cv_java="no" 283 app_cv_java="no"
288 fi 284 fi
289 285
290 # Check for JRE_HOME 286 # Check for JRE_HOME
291 if test "_$JRE_HOME" = "_" ; then 287 if test "_$JRE_HOME" = "_" ; then
292 - JRE_HOME="\$(JDK_HOME)/jre" 288 + JRE_HOME="\$(JAVA_HOME)/jre"
293 fi 289 fi
294 290
295 fi 291 fi
296 292
297 if test "$app_cv_java" = "yes" ; then 293 if test "$app_cv_java" = "yes" ; then
298 - AC_PATH_TOOL([JAVAC], [javac], [\$(JDK_HOME)/bin/javac])  
299 - AC_PATH_TOOL([JAVAH], [javah], [\$(JDK_HOME)/bin/javah])  
300 - AC_PATH_TOOL([JAR], [jar], [\$(JDK_HOME)/bin/jar]) 294 + AC_PATH_TOOL([JAVA], [java], [no], [$PATH:$JAVA_HOME/bin])
  295 + AC_PATH_TOOL([JAVAC], [javac], [no], [$PATH:$JAVA_HOME/bin])
  296 + AC_PATH_TOOL([JAVAH], [javah], [no], [$PATH:$JAVA_HOME/bin])
  297 + AC_PATH_TOOL([JAR], [jar], [no], [$PATH:$JAVA_HOME/bin])
301 fi 298 fi
302 299
303 AC_SUBST(JAVAC) 300 AC_SUBST(JAVAC)
304 AC_SUBST(JAVAH) 301 AC_SUBST(JAVAH)
305 AC_SUBST(JAR) 302 AC_SUBST(JAR)
306 -AC_SUBST(JDK_HOME) 303 +AC_SUBST(JAVA_HOME)
307 AC_SUBST(JRE_HOME) 304 AC_SUBST(JRE_HOME)
308 305
309 #--[ Misc options ]------------------------------------------------------------------------------------------------------------------------------------------- 306 #--[ Misc options ]-------------------------------------------------------------------------------------------------------------------------------------------
@@ -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: 2013-02-25 08:29-0300\n" 8 +"POT-Creation-Date: 2013-02-25 08:36-0300\n"
9 "PO-Revision-Date: 2013-02-25 08:31-0300\n" 9 "PO-Revision-Date: 2013-02-25 08:31-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: Português <>\n" 11 "Language-Team: Português <>\n"
pw3270.spec.in
  Diff comments   View file @b640e0e
@@ -110,6 +110,16 @@ devel for tn3270 protocol library for %{name} @@ -110,6 +110,16 @@ devel for tn3270 protocol library for %{name}
110 110
111 Revision @PACKAGE_REVISION@ from @PACKAGE_SOURCE@ 111 Revision @PACKAGE_REVISION@ from @PACKAGE_SOURCE@
112 112
  113 +%package plugin-dbus
  114 +Summary: DBUS object for %{name}
  115 +Group: System/X11/Terminals
  116 +Requires: %{name} = @PACKAGE_VERSION@
  117 +
  118 +%description plugin-dbus
  119 +Plugin exporting a DBUS object from every %{name} open session.
  120 +
  121 +Revision @PACKAGE_REVISION@ from @PACKAGE_SOURCE@
  122 +
113 #---[ Build & Install ]----------------------------------------------------------------------------------------------- 123 #---[ Build & Install ]-----------------------------------------------------------------------------------------------
114 124
115 %prep 125 %prep
@@ -177,6 +187,9 @@ rm -rf $RPM_BUILD_ROOT @@ -177,6 +187,9 @@ rm -rf $RPM_BUILD_ROOT
177 %dir %{_datadir}/@PACKAGE_NAME@/sample 187 %dir %{_datadir}/@PACKAGE_NAME@/sample
178 %{_datadir}/@PACKAGE_NAME@/sample/* 188 %{_datadir}/@PACKAGE_NAME@/sample/*
179 189
  190 +%files plugin-dbus
  191 +%{_datadir}/@PACKAGE_NAME@/plugins/dbus3270.so
  192 +
180 #---[ Scripts ]------------------------------------------------------------------------------------------------------- 193 #---[ Scripts ]-------------------------------------------------------------------------------------------------------
181 194
182 %post 195 %post