Download as
Browse Code »

Commit 71a677f1a88eff020ec9b398cf515874479968c7

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

Ajustes para empacotamento windows

Showing 5 changed files with 46 additions and 6 deletions   Show diff stats
@@ -68,6 +68,7 @@ dnl --------------------------------------------------------------------------- @@ -68,6 +68,7 @@ dnl ---------------------------------------------------------------------------
68 DBG_CFLAGS="-g -fstack-check -DDEBUG=1" 68 DBG_CFLAGS="-g -fstack-check -DDEBUG=1"
69 RLS_CFLAGS="-DNDEBUG=1" 69 RLS_CFLAGS="-DNDEBUG=1"
70 PLUGINS="" 70 PLUGINS=""
  71 +APP_RESOURCES=""
71 72
72 dnl --------------------------------------------------------------------------- 73 dnl ---------------------------------------------------------------------------
73 dnl Check for OS specifics 74 dnl Check for OS specifics
@@ -85,6 +86,7 @@ case "$host" in @@ -85,6 +86,7 @@ case "$host" in
85 EXEEXT=".exe" 86 EXEEXT=".exe"
86 DLLPREFIX="" 87 DLLPREFIX=""
87 DLLEXT=".dll" 88 DLLEXT=".dll"
  89 + APP_RESOURCES="resources.rc"
88 90
89 DBG_CFLAGS="-DDEBUG=1" 91 DBG_CFLAGS="-DDEBUG=1"
90 RLS_CFLAGS="-DNDEBUG=1" 92 RLS_CFLAGS="-DNDEBUG=1"
@@ -94,6 +96,7 @@ case "$host" in @@ -94,6 +96,7 @@ case "$host" in
94 96
95 AC_CONFIG_FILES(win/makegtkruntime.sh) 97 AC_CONFIG_FILES(win/makegtkruntime.sh)
96 AC_CONFIG_FILES(win/pw3270.nsi) 98 AC_CONFIG_FILES(win/pw3270.nsi)
  99 + AC_CONFIG_FILES(src/pw3270/resources.rc)
97 100
98 PLUGINS="$PLUGINS hllapi" 101 PLUGINS="$PLUGINS hllapi"
99 102
@@ -140,6 +143,7 @@ AC_SUBST(RLS_CFLAGS) @@ -140,6 +143,7 @@ AC_SUBST(RLS_CFLAGS)
140 AC_SUBST(EXEEXT) 143 AC_SUBST(EXEEXT)
141 AC_SUBST(DLLPREFIX) 144 AC_SUBST(DLLPREFIX)
142 AC_SUBST(DLLEXT) 145 AC_SUBST(DLLEXT)
  146 +AC_SUBST(APP_RESOURCES)
143 147
144 dnl --------------------------------------------------------------------------- 148 dnl ---------------------------------------------------------------------------
145 dnl Check for other programs 149 dnl Check for other programs
@@ -169,6 +173,8 @@ AC_DEFINE_UNQUOTED(PACKAGE_MINOR_VERSION, $app_vrs_minor) @@ -169,6 +173,8 @@ AC_DEFINE_UNQUOTED(PACKAGE_MINOR_VERSION, $app_vrs_minor)
169 AC_SUBST(PACKAGE_MAJOR_VERSION,$app_vrs_major) 173 AC_SUBST(PACKAGE_MAJOR_VERSION,$app_vrs_major)
170 AC_SUBST(PACKAGE_MINOR_VERSION,$app_vrs_minor) 174 AC_SUBST(PACKAGE_MINOR_VERSION,$app_vrs_minor)
171 175
  176 +AC_SUBST(PACKAGE_DESCRIPTION,"3270 Emulator for windows/gtk")
  177 +
172 dnl --------------------------------------------------------------------------- 178 dnl ---------------------------------------------------------------------------
173 dnl Check for D-Bus 179 dnl Check for D-Bus
174 dnl --------------------------------------------------------------------------- 180 dnl ---------------------------------------------------------------------------
locale/pw3270.pot
  Diff comments   View file @71a677f
@@ -9,7 +9,7 @@ msgstr "" @@ -9,7 +9,7 @@ msgstr ""
9 "#-#-#-#-# lib3270.pot (PACKAGE VERSION) #-#-#-#-#\n" 9 "#-#-#-#-# lib3270.pot (PACKAGE VERSION) #-#-#-#-#\n"
10 "Project-Id-Version: PACKAGE VERSION\n" 10 "Project-Id-Version: PACKAGE VERSION\n"
11 "Report-Msgid-Bugs-To: \n" 11 "Report-Msgid-Bugs-To: \n"
12 -"POT-Creation-Date: 2017-02-01 10:30-0200\n" 12 +"POT-Creation-Date: 2017-02-01 10:41-0200\n"
13 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 13 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
14 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 14 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
15 "Language-Team: LANGUAGE <LL@li.org>\n" 15 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,7 +20,7 @@ msgstr &quot;&quot; @@ -20,7 +20,7 @@ msgstr &quot;&quot;
20 "#-#-#-#-# pw3270.pot (PACKAGE VERSION) #-#-#-#-#\n" 20 "#-#-#-#-# pw3270.pot (PACKAGE VERSION) #-#-#-#-#\n"
21 "Project-Id-Version: PACKAGE VERSION\n" 21 "Project-Id-Version: PACKAGE VERSION\n"
22 "Report-Msgid-Bugs-To: \n" 22 "Report-Msgid-Bugs-To: \n"
23 -"POT-Creation-Date: 2017-02-01 10:30-0200\n" 23 +"POT-Creation-Date: 2017-02-01 10:41-0200\n"
24 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 24 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
25 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 25 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
26 "Language-Team: LANGUAGE <LL@li.org>\n" 26 "Language-Team: LANGUAGE <LL@li.org>\n"
src/pw3270/Makefile.in
  Diff comments   View file @71a677f
@@ -29,7 +29,7 @@ LIBNAME=@DLLPREFIX@@PACKAGE_TARNAME@@DLLEXT@ @@ -29,7 +29,7 @@ LIBNAME=@DLLPREFIX@@PACKAGE_TARNAME@@DLLEXT@
29 LIB_SOURCES=window.c actions.c fonts.c dialog.c hostdialog.c print.c colors.c \ 29 LIB_SOURCES=window.c actions.c fonts.c dialog.c hostdialog.c print.c colors.c \
30 tools.c plugin.c trace.c 30 tools.c plugin.c trace.c
31 31
32 -APP_SOURCES=main.c 32 +APP_SOURCES=main.c @APP_RESOURCES@
33 33
34 MODULES=v3270 uiparser v3270ft common 34 MODULES=v3270 uiparser v3270ft common
35 35
@@ -72,6 +72,7 @@ CC=@CC@ @@ -72,6 +72,7 @@ CC=@CC@
72 LD=@CC@ 72 LD=@CC@
73 XGETTEXT=@XGETTEXT@ 73 XGETTEXT=@XGETTEXT@
74 MSGCAT=@MSGCAT@ 74 MSGCAT=@MSGCAT@
  75 +WINDRES=@WINDRES@
75 76
76 CFLAGS=@CFLAGS@ @LIB3270_CFLAGS@ \ 77 CFLAGS=@CFLAGS@ @LIB3270_CFLAGS@ \
77 -Wno-deprecated-declarations \ 78 -Wno-deprecated-declarations \
@@ -98,6 +99,12 @@ $(OBJDBG)/%.o: \ @@ -98,6 +99,12 @@ $(OBJDBG)/%.o: \
98 -DBUILD_DATE=`date +"0x%Y%m%d"`\ 99 -DBUILD_DATE=`date +"0x%Y%m%d"`\
99 -o $@ -c $< 100 -o $@ -c $<
100 101
  102 +$(OBJDBG)/%.o: \
  103 + %.rc \
  104 + $(DEPENDS)
  105 +
  106 + @$(WINDRES) --include-dir=$(BASEDIR)/win -i $< -o $@
  107 +
101 $(BASEDIR)/.obj/Debug/%.a: \ 108 $(BASEDIR)/.obj/Debug/%.a: \
102 ./%/* \ 109 ./%/* \
103 $(DEPENDS) 110 $(DEPENDS)
@@ -115,6 +122,12 @@ $(OBJRLS)/%.o: \ @@ -115,6 +122,12 @@ $(OBJRLS)/%.o: \
115 -DBUILD_DATE=`date +"0x%Y%m%d"` \ 122 -DBUILD_DATE=`date +"0x%Y%m%d"` \
116 -o $@ -c $< 123 -o $@ -c $<
117 124
  125 +$(OBJRLS)/%.o: \
  126 + %.rc \
  127 + $(DEPENDS)
  128 +
  129 + @$(WINDRES) --include-dir=$(BASEDIR)/win -i $< -o $@
  130 +
118 $(BASEDIR)/.obj/Release/%.a: \ 131 $(BASEDIR)/.obj/Release/%.a: \
119 ./%/* \ 132 ./%/* \
120 $(DEPENDS) 133 $(DEPENDS)
@@ -237,7 +250,7 @@ $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@: \ @@ -237,7 +250,7 @@ $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@: \
237 $(BINDBG)/$(LIBNAME) \ 250 $(BINDBG)/$(LIBNAME) \
238 $(foreach SRC, $(basename $(APP_SOURCES)), $(OBJDBG)/$(SRC).o) 251 $(foreach SRC, $(basename $(APP_SOURCES)), $(OBJDBG)/$(SRC).o)
239 252
240 - @$(LD) -Wl,--rpath,$(BINDBG) -o $@ $^ -L$(BINDBG) $(LIBS) -l@PACKAGE_TARNAME@ 253 + $(LD) -Wl,--rpath,$(BINDBG) -o $@ $^ -L$(BINDBG) $(LIBS) -l@PACKAGE_TARNAME@
241 254
242 $(BINDBG)/$(LIBNAME): \ 255 $(BINDBG)/$(LIBNAME): \
243 $(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@ 256 $(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@
src/pw3270/resources.rc
View file @af7ebdc
@@ -1,2 +0,0 @@ @@ -1,2 +0,0 @@
1 -LANGUAGE 0, 0  
2 -100 ICON pw3270.ico  
src/pw3270/resources.rc.in 0 → 100644
  Diff comments   View file @71a677f
@@ -0,0 +1,23 @@ @@ -0,0 +1,23 @@
  1 +1 ICON @PACKAGE_NAME@.ico
  2 +
  3 +2 VERSIONINFO
  4 +FILEVERSION @PACKAGE_MAJOR_VERSION@,@PACKAGE_MINOR_VERSION@,0,0
  5 +PRODUCTVERSION @PACKAGE_MAJOR_VERSION@,@PACKAGE_MINOR_VERSION@,0,0
  6 +BEGIN
  7 + BLOCK "StringFileInfo"
  8 + BEGIN
  9 + BLOCK "040904E4"
  10 + BEGIN
  11 + VALUE "FileDescription", "@PACKAGE_DESCRIPTION@"
  12 + VALUE "FileVersion", "@PACKAGE_VERSION@"
  13 + VALUE "InternalName", "@PACKAGE_NAME@"
  14 + VALUE "LegalCopyright", "Copyright (c) Banco do Brasil S.A."
  15 + VALUE "OriginalFilename", "@PACKAGE_NAME@.exe"
  16 + VALUE "ProductName", "@PACKAGE_NAME@"
  17 + VALUE "ProductVersion", "@PACKAGE_VERSION@"
  18 + END
  19 + END
  20 +END
  21 +
  22 +
  23 +