Download as
Browse Code »

Commit 8c97ec842cd9ec6845c247b614e7785dc8999d19

Authored by Perry Werneck
1 parent 10558008
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Fixing OSNAME problem on windows build.

Showing 4 changed files with 50 additions and 64 deletions   Show diff stats
configure.ac
  Diff comments   View file @8c97ec8
... ... @@ -194,7 +194,6 @@ AC_ARG_WITH([release], [AS_HELP_STRING([--with-release], [Set release])], [ app_
194 194 AC_ARG_WITH([session-name], [AS_HELP_STRING([--with-session-name], [Set default session name])], [ AC_DEFINE_UNQUOTED(DEFAULT_SESSION_NAME, $withval) ],[ AC_MSG_NOTICE([No default session name.]) ])
195 195 AC_ARG_WITH([application-name], [AS_HELP_STRING([--with-application-name], [Set application name])], [ AC_DEFINE_UNQUOTED(APPLICATION_NAME, $withval) ],[ AC_MSG_NOTICE([No default application name.]) ])
196 196  
197   -
198 197 app_rls_major=$(echo $app_cv_release.0.0 | cut -d. -f1)
199 198 app_rls_minor=$(echo $app_cv_release.0.0 | cut -d. -f2)
200 199  
... ... @@ -211,6 +210,20 @@ AC_ARG_WITH([source-locales], [AS_HELP_STRING([--with-source-locales], [Set path
211 210 AC_DEFINE_UNQUOTED(LIBRARY_POT_FILES, $app_cv_source_locales)
212 211 AC_SUBST(LIBRARY_POT_FILES,$app_cv_source_locales)
213 212  
  213 +case "$host" in
  214 + *-mingw32|*-pc-msys)
  215 + AC_SUBST(LIBEXT,.dll)
  216 + ;;
  217 +
  218 + s390x-*)
  219 + AC_SUBST(LIBEXT,.so)
  220 + ;;
  221 +
  222 + *)
  223 + AC_SUBST(LIBEXT,.so.$app_vrs_major.$app_vrs_minor)
  224 +
  225 +esac
  226 +
214 227 dnl ---------------------------------------------------------------------------
215 228 dnl Check for libintl
216 229 dnl ---------------------------------------------------------------------------
... ...
locale/pt_BR.po
  Diff comments   View file @8c97ec8
... ... @@ -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: 2019-08-06 14:43-0300\n"
  8 +"POT-Creation-Date: 2019-08-07 16:02-0300\n"
9 9 "PO-Revision-Date: 2019-08-06 14:45-0300\n"
10 10 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
11 11 "Language-Team: Português <>\n"
... ... @@ -558,8 +558,8 @@ msgstr &quot;Não é possível salvar&quot;
558 558 msgid "Can't save \"%s\": %s"
559 559 msgstr "Não foi possível salvar %s: %s"
560 560  
561   -#: src/filetransfer/save.c:116 src/filetransfer/activitylist.c:438
562   -#: src/trace/trace.c:451 src/dialogs/transfer.c:97 src/dialogs/save/save.c:454
  561 +#: src/filetransfer/save.c:117 src/filetransfer/activitylist.c:438
  562 +#: src/trace/trace.c:473 src/dialogs/transfer.c:97 src/dialogs/save/save.c:454
563 563 #, c-format
564 564 msgid "Can't save %s"
565 565 msgstr "Não foi possível salvar arquivo %s"
... ... @@ -1972,7 +1972,7 @@ msgstr &quot;&quot;
1972 1972 "%s"
1973 1973  
1974 1974 #: src/filetransfer/v3270ft.c:217 src/filetransfer/activitylist.c:455
1975   -#: src/trace/trace.c:470 src/dialogs/transfer.c:73
  1975 +#: src/trace/trace.c:492 src/dialogs/transfer.c:73
1976 1976 msgid "Save"
1977 1977 msgstr "Salvar"
1978 1978  
... ... @@ -2004,7 +2004,7 @@ msgstr &quot;Salvar área selecionada&quot;
2004 2004 msgid "Save terminal contents"
2005 2005 msgstr "Salvar conteúdo da tela"
2006 2006  
2007   -#: src/trace/trace.c:469
  2007 +#: src/trace/trace.c:491
2008 2008 msgid "Save trace to file"
2009 2009 msgstr "Salvar trace para arquivo"
2010 2010  
... ... @@ -2349,7 +2349,7 @@ msgstr &quot;Nome da sessão TN3270&quot;
2349 2349 msgid "Terminal colors"
2350 2350 msgstr "Cores do terminal"
2351 2351  
2352   -#: src/trace/trace.c:473
  2352 +#: src/trace/trace.c:495
2353 2353 msgid "Text file"
2354 2354 msgstr "Arquivo texto"
2355 2355  
... ...
locale/pw3270.pot
  Diff comments   View file @8c97ec8
... ... @@ -9,7 +9,7 @@ msgstr &quot;&quot;
9 9 "#-#-#-#-# pw3270.pot (PACKAGE VERSION) #-#-#-#-#\n"
10 10 "Project-Id-Version: PACKAGE VERSION\n"
11 11 "Report-Msgid-Bugs-To: \n"
12   -"POT-Creation-Date: 2019-08-06 14:43-0300\n"
  12 +"POT-Creation-Date: 2019-08-07 16:05-0300\n"
13 13 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
14 14 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
15 15 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -20,7 +20,7 @@ msgstr &quot;&quot;
20 20 "#-#-#-#-# lib3270.pot (PACKAGE VERSION) #-#-#-#-#\n"
21 21 "Project-Id-Version: PACKAGE VERSION\n"
22 22 "Report-Msgid-Bugs-To: \n"
23   -"POT-Creation-Date: 2019-08-06 16:48+0000\n"
  23 +"POT-Creation-Date: 2019-08-07 13:02+0000\n"
24 24 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
25 25 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
26 26 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -31,7 +31,7 @@ msgstr &quot;&quot;
31 31 "#-#-#-#-# libv3270.pot (PACKAGE VERSION) #-#-#-#-#\n"
32 32 "Project-Id-Version: PACKAGE VERSION\n"
33 33 "Report-Msgid-Bugs-To: \n"
34   -"POT-Creation-Date: 2019-08-06 16:50+0000\n"
  34 +"POT-Creation-Date: 2019-08-07 13:40+0000\n"
35 35 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
36 36 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
37 37 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -576,8 +576,8 @@ msgstr &quot;&quot;
576 576 msgid "Can't save \"%s\": %s"
577 577 msgstr ""
578 578  
579   -#: src/filetransfer/save.c:116 src/filetransfer/activitylist.c:438
580   -#: src/trace/trace.c:451 src/dialogs/transfer.c:97 src/dialogs/save/save.c:454
  579 +#: src/filetransfer/save.c:117 src/filetransfer/activitylist.c:438
  580 +#: src/trace/trace.c:473 src/dialogs/transfer.c:97 src/dialogs/save/save.c:454
581 581 #, c-format
582 582 msgid "Can't save %s"
583 583 msgstr ""
... ... @@ -1947,7 +1947,7 @@ msgid &quot;&quot;
1947 1947 msgstr ""
1948 1948  
1949 1949 #: src/filetransfer/v3270ft.c:217 src/filetransfer/activitylist.c:455
1950   -#: src/trace/trace.c:470 src/dialogs/transfer.c:73
  1950 +#: src/trace/trace.c:492 src/dialogs/transfer.c:73
1951 1951 msgid "Save"
1952 1952 msgstr ""
1953 1953  
... ... @@ -1979,7 +1979,7 @@ msgstr &quot;&quot;
1979 1979 msgid "Save terminal contents"
1980 1980 msgstr ""
1981 1981  
1982   -#: src/trace/trace.c:469
  1982 +#: src/trace/trace.c:491
1983 1983 msgid "Save trace to file"
1984 1984 msgstr ""
1985 1985  
... ... @@ -2312,7 +2312,7 @@ msgstr &quot;&quot;
2312 2312 msgid "Terminal colors"
2313 2313 msgstr ""
2314 2314  
2315   -#: src/trace/trace.c:473
  2315 +#: src/trace/trace.c:495
2316 2316 msgid "Text file"
2317 2317 msgstr ""
2318 2318  
... ...
src/pw3270/Makefile.in
  Diff comments   View file @8c97ec8
... ... @@ -24,7 +24,7 @@
24 24 # erico.mendonca@gmail.com (Erico Mascarenhas de Mendonça)
25 25 #
26 26  
27   -LIBNAME=@DLLPREFIX@@PACKAGE_TARNAME@@DLLEXT@
  27 +LIBNAME=@DLLPREFIX@@PACKAGE_TARNAME@@LIBEXT@
28 28  
29 29 LIB_SOURCES=\
30 30 window.c \
... ... @@ -229,8 +229,8 @@ $(BASEDIR)/.pot/pw3270.pot: \
229 229 @$(MSGCAT) --sort-output $^ > $@
230 230  
231 231 $(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@: \
232   - $(BINRLS)/$(LIBNAME) \
233   - $(foreach SRC, $(basename $(APP_SOURCES)), $(OBJRLS)/$(SRC).o)
  232 + $(foreach SRC, $(basename $(APP_SOURCES)), $(OBJRLS)/$(SRC).o) \
  233 + $(BINRLS)/$(LIBNAME)
234 234  
235 235 @$(LD) \
236 236 $(LDFLAGS) \
... ... @@ -238,26 +238,9 @@ $(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@: \
238 238 -o $@ \
239 239 $^ \
240 240 -L$(BINRLS) \
241   - $(LIBS) \
242   - -l@PACKAGE_TARNAME@
  241 + $(LIBS)
243 242  
244 243 $(BINRLS)/$(LIBNAME): \
245   - $(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@
246   -
247   - @echo $(basename $@) ...
248   - @$(MKDIR) `dirname $@`
249   - @rm -f $@
250   - @$(LN_S) $^ $@
251   -
252   -$(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@: \
253   - $(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@
254   -
255   - @echo $(basename $@) ...
256   - @$(MKDIR) `dirname $@`
257   - @rm -f $@
258   - @$(LN_S) $^ $@
259   -
260   -$(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \
261 244 $(foreach SRC, $(basename $(LIB_SOURCES)), $(OBJRLS)/$(SRC).o) \
262 245 $(foreach MOD, $(MODULES), $(BASEDIR)/.obj/Release/$(MOD).a)
263 246  
... ... @@ -276,8 +259,17 @@ install: \
276 259 @$(MKDIR) $(DESTDIR)$(libdir)
277 260  
278 261 @$(INSTALL_PROGRAM) \
279   - $(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ \
280   - $(DESTDIR)$(libdir)
  262 + $(BINRLS)/$(LIBNAME) \
  263 + $(DESTDIR)$(libdir)/@DLLPREFIX@@PACKAGE_TARNAME@@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@
  264 +
  265 +
  266 + @$(LN_S) \
  267 + @DLLPREFIX@@PACKAGE_TARNAME@@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ \
  268 + $(DESTDIR)$(libdir)/@DLLPREFIX@@PACKAGE_TARNAME@@DLLEXT@.@PACKAGE_MAJOR_VERSION@
  269 +
  270 + @$(LN_S) \
  271 + @DLLPREFIX@@PACKAGE_TARNAME@@DLLEXT@.@PACKAGE_MAJOR_VERSION@ \
  272 + $(DESTDIR)$(libdir)/@DLLPREFIX@@PACKAGE_TARNAME@@DLLEXT@
281 273  
282 274 @$(MKDIR) $(DESTDIR)$(bindir)
283 275  
... ... @@ -299,8 +291,8 @@ Debug: \
299 291 $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@
300 292  
301 293 $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@: \
302   - $(BINDBG)/$(LIBNAME) \
303   - $(foreach SRC, $(basename $(APP_SOURCES)), $(OBJDBG)/$(SRC).o)
  294 + $(foreach SRC, $(basename $(APP_SOURCES)), $(OBJDBG)/$(SRC).o) \
  295 + $(BINDBG)/$(LIBNAME)
304 296  
305 297 @$(LD) \
306 298 $(LDFLAGS) \
... ... @@ -308,26 +300,9 @@ $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@: \
308 300 -o $@ \
309 301 $^ \
310 302 -L$(BINDBG) \
311   - $(LIBS) \
312   - -l@PACKAGE_TARNAME@
  303 + $(LIBS)
313 304  
314 305 $(BINDBG)/$(LIBNAME): \
315   - $(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@
316   -
317   - @echo $(basename $@) ...
318   - @$(MKDIR) `dirname $@`
319   - @rm -f $@
320   - @$(LN_S) $^ $@
321   -
322   -$(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@: \
323   - $(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@
324   -
325   - @echo $(basename $@) ...
326   - @$(MKDIR) `dirname $@`
327   - @rm -f $@
328   - @$(LN_S) $^ $@
329   -
330   -$(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \
331 306 $(foreach SRC, $(basename $(LIB_SOURCES)), $(OBJDBG)/$(SRC).o) \
332 307 $(foreach MOD, $(MODULES), $(BASEDIR)/.obj/Debug/$(MOD).a)
333 308  
... ... @@ -347,9 +322,8 @@ $(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \
347 322 cleanDebug:
348 323  
349 324 @rm -fr $(OBJDBG) \
350   - $(BINDBG)/$(LIBNAME) \
351   - $(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@ \
352   - $(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@
  325 + $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@ \
  326 + $(BINDBG)/$(LIBNAME)
353 327  
354 328 @make -C uiparser cleanDebug
355 329 @make -C common cleanDebug
... ... @@ -357,9 +331,8 @@ cleanDebug:
357 331 cleanRelease:
358 332  
359 333 @rm -fr $(OBJRLS) \
360   - $(BINRLS)/$(LIBNAME) \
361   - $(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@ \
362   - $(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@
  334 + $(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@ \
  335 + $(BINRLS)/$(LIBNAME)
363 336  
364 337 @make -C uiparser cleanRelease
365 338 @make -C common cleanRelease
... ...