From 71a677f1a88eff020ec9b398cf515874479968c7 Mon Sep 17 00:00:00 2001
From: Perry Werneck <perry.werneck@gmail.com>
Date: Wed, 1 Feb 2017 11:43:05 -0200
Subject: [PATCH] Ajustes para empacotamento windows

---
 configure.ac               |  6 ++++++
 locale/pw3270.pot          |  4 ++--
 src/pw3270/Makefile.in     | 17 +++++++++++++++--
 src/pw3270/resources.rc    |  2 --
 src/pw3270/resources.rc.in | 23 +++++++++++++++++++++++
 5 files changed, 46 insertions(+), 6 deletions(-)
 delete mode 100644 src/pw3270/resources.rc
 create mode 100644 src/pw3270/resources.rc.in

diff --git a/configure.ac b/configure.ac
index 2aeed09..cc33536 100644
--- a/configure.ac
+++ b/configure.ac
@@ -68,6 +68,7 @@ dnl ---------------------------------------------------------------------------
 DBG_CFLAGS="-g -fstack-check -DDEBUG=1"
 RLS_CFLAGS="-DNDEBUG=1"
 PLUGINS=""
+APP_RESOURCES=""
 
 dnl ---------------------------------------------------------------------------
 dnl Check for OS specifics
@@ -85,6 +86,7 @@ case "$host" in
 		EXEEXT=".exe"
 		DLLPREFIX=""
 		DLLEXT=".dll"
+		APP_RESOURCES="resources.rc"
 
 		DBG_CFLAGS="-DDEBUG=1"
 		RLS_CFLAGS="-DNDEBUG=1"
@@ -94,6 +96,7 @@ case "$host" in
 
 		AC_CONFIG_FILES(win/makegtkruntime.sh)
 		AC_CONFIG_FILES(win/pw3270.nsi)
+		AC_CONFIG_FILES(src/pw3270/resources.rc)
 
 		PLUGINS="$PLUGINS hllapi"
 
@@ -140,6 +143,7 @@ AC_SUBST(RLS_CFLAGS)
 AC_SUBST(EXEEXT)
 AC_SUBST(DLLPREFIX)
 AC_SUBST(DLLEXT)
+AC_SUBST(APP_RESOURCES)
 
 dnl ---------------------------------------------------------------------------
 dnl Check for other programs
@@ -169,6 +173,8 @@ AC_DEFINE_UNQUOTED(PACKAGE_MINOR_VERSION, $app_vrs_minor)
 AC_SUBST(PACKAGE_MAJOR_VERSION,$app_vrs_major)
 AC_SUBST(PACKAGE_MINOR_VERSION,$app_vrs_minor)
 
+AC_SUBST(PACKAGE_DESCRIPTION,"3270 Emulator for windows/gtk")
+
 dnl ---------------------------------------------------------------------------
 dnl Check for D-Bus
 dnl ---------------------------------------------------------------------------
diff --git a/locale/pw3270.pot b/locale/pw3270.pot
index 160b327..0188cc9 100644
--- a/locale/pw3270.pot
+++ b/locale/pw3270.pot
@@ -9,7 +9,7 @@ msgstr ""
 "#-#-#-#-#  lib3270.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-01 10:30-0200\n"
+"POT-Creation-Date: 2017-02-01 10:41-0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,7 +20,7 @@ msgstr ""
 "#-#-#-#-#  pw3270.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-01 10:30-0200\n"
+"POT-Creation-Date: 2017-02-01 10:41-0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/src/pw3270/Makefile.in b/src/pw3270/Makefile.in
index cf95b1a..4566862 100644
--- a/src/pw3270/Makefile.in
+++ b/src/pw3270/Makefile.in
@@ -29,7 +29,7 @@ LIBNAME=@DLLPREFIX@@PACKAGE_TARNAME@@DLLEXT@
 LIB_SOURCES=window.c actions.c fonts.c dialog.c hostdialog.c print.c colors.c \
 				tools.c plugin.c trace.c
 
-APP_SOURCES=main.c
+APP_SOURCES=main.c @APP_RESOURCES@
 
 MODULES=v3270 uiparser v3270ft common
 
@@ -72,6 +72,7 @@ CC=@CC@
 LD=@CC@
 XGETTEXT=@XGETTEXT@
 MSGCAT=@MSGCAT@
+WINDRES=@WINDRES@
 
 CFLAGS=@CFLAGS@ @LIB3270_CFLAGS@ \
 			-Wno-deprecated-declarations \
@@ -98,6 +99,12 @@ $(OBJDBG)/%.o: \
 				-DBUILD_DATE=`date +"0x%Y%m%d"`\
 				-o $@ -c $<
 
+$(OBJDBG)/%.o: \
+	%.rc \
+	$(DEPENDS)
+
+	@$(WINDRES) --include-dir=$(BASEDIR)/win -i $< -o $@
+
 $(BASEDIR)/.obj/Debug/%.a: \
 	./%/* \
 	$(DEPENDS)
@@ -115,6 +122,12 @@ $(OBJRLS)/%.o: \
 				-DBUILD_DATE=`date +"0x%Y%m%d"` \
 				-o $@ -c $<
 
+$(OBJRLS)/%.o: \
+	%.rc \
+	$(DEPENDS)
+
+	@$(WINDRES) --include-dir=$(BASEDIR)/win -i $< -o $@
+
 $(BASEDIR)/.obj/Release/%.a: \
 	./%/* \
 	$(DEPENDS)
@@ -237,7 +250,7 @@ $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@: \
 	$(BINDBG)/$(LIBNAME) \
 	$(foreach SRC, $(basename $(APP_SOURCES)), $(OBJDBG)/$(SRC).o)
 
-	@$(LD) -Wl,--rpath,$(BINDBG) -o $@ $^ -L$(BINDBG) $(LIBS) -l@PACKAGE_TARNAME@
+	$(LD) -Wl,--rpath,$(BINDBG) -o $@ $^ -L$(BINDBG) $(LIBS) -l@PACKAGE_TARNAME@
 
 $(BINDBG)/$(LIBNAME): \
 	$(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@
diff --git a/src/pw3270/resources.rc b/src/pw3270/resources.rc
deleted file mode 100644
index 72481e1..0000000
--- a/src/pw3270/resources.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-LANGUAGE 0, 0
-100 ICON pw3270.ico
diff --git a/src/pw3270/resources.rc.in b/src/pw3270/resources.rc.in
new file mode 100644
index 0000000..028e24b
--- /dev/null
+++ b/src/pw3270/resources.rc.in
@@ -0,0 +1,23 @@
+1 ICON @PACKAGE_NAME@.ico
+
+2 VERSIONINFO
+FILEVERSION     @PACKAGE_MAJOR_VERSION@,@PACKAGE_MINOR_VERSION@,0,0
+PRODUCTVERSION  @PACKAGE_MAJOR_VERSION@,@PACKAGE_MINOR_VERSION@,0,0
+BEGIN
+  BLOCK "StringFileInfo"
+  BEGIN
+    BLOCK "040904E4"
+    BEGIN
+      VALUE "FileDescription", "@PACKAGE_DESCRIPTION@"
+      VALUE "FileVersion", "@PACKAGE_VERSION@"
+      VALUE "InternalName", "@PACKAGE_NAME@"
+      VALUE "LegalCopyright", "Copyright (c) Banco do Brasil S.A."
+      VALUE "OriginalFilename", "@PACKAGE_NAME@.exe"
+      VALUE "ProductName", "@PACKAGE_NAME@"
+      VALUE "ProductVersion", "@PACKAGE_VERSION@"
+    END
+  END
+END
+
+
+
--
libgit2 0.21.2