From 3db268afbc9aabc6fe7da13b01916f709ea59271 Mon Sep 17 00:00:00 2001
From: Perry Werneck <perry.werneck@gmail.com>
Date: Fri, 4 Oct 2019 13:45:13 -0300
Subject: [PATCH] Fixing usage of pkg-config in windows build Adding option to build a zipfile with the python extension (usefull for windows users).

---
 .gitignore                         |  1 +
 Makefile.in                        | 12 ++++++++++++
 README.md                          |  4 ++--
 configure.ac                       | 17 +++++++++++------
 src/module/windows/resources.rc.in |  2 +-
 5 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index a2ff1a4..4d7bf54 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@ scripts
 *.[0-9]
 *.bak
 *.rc
+*.cache
diff --git a/Makefile.in b/Makefile.in
index 6b16709..68c5cee 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -218,6 +218,18 @@ install: \
 		$(BINRLS)/$(LIBNAME)@DLLEXT@ \
 		$(DESTDIR)$(PYTHON_SITELIB)
 
+zip: \
+	python-@PYTHON_VERSION@-tn3270-@PACKAGE_VERSION@.@host_cpu@.zip
+
+python-@PYTHON_VERSION@-tn3270-@PACKAGE_VERSION@.@host_cpu@.zip: \
+	$(BINRLS)/$(LIBNAME)@DLLEXT@
+
+	@rm -f $@
+	@$(ZIP) \
+		-9 \
+		-j \
+		$@ \
+		$(BINRLS)/$(LIBNAME)@DLLEXT@
 
 #---[ Debug Targets ]--------------------------------------------------------------------
 
diff --git a/README.md b/README.md
index 0835f51..61f07cc 100644
--- a/README.md
+++ b/README.md
@@ -37,10 +37,10 @@ Compiling for Windows (With MSYS2)
 
 	* git clone https://github.com/PerryWerneck/python-tn3270.git
 
-6. Build library using the mingw shell
+6. Build zip file with the modules using the mingw shell
 
 	* cd python-tn3270
 	* ./autogen.sh
-	* make all
+	* make zip
 
 
diff --git a/configure.ac b/configure.ac
index 2e4064f..bc9d624 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,11 +60,6 @@ dnl ---------------------------------------------------------------------------
 dnl Version info
 dnl ---------------------------------------------------------------------------
 
-app_cv_description="Python bindings for lib3270/pw3270"
-
-AC_SUBST(PACKAGE_DESCRIPTION,"$app_cv_description")
-AC_DEFINE_UNQUOTED(PACKAGE_DESCRIPTION,"$app_cv_description")
-
 app_vrs_major=$(echo $VERSION | cut -d. -f1)
 app_vrs_minor=$(echo $VERSION | cut -d. -f2)
 
@@ -145,6 +140,7 @@ dnl ---------------------------------------------------------------------------
 AC_PATH_TOOL([AR], [ar], [ar])
 AC_PATH_TOOL([WINDRES], [windres], [no])
 AC_PATH_TOOL([VALGRIND], [valgrind], [no])
+AC_PATH_TOOL([ZIP], [zip], [zip])
 
 PKG_CHECK_EXISTS
 
@@ -191,7 +187,7 @@ fi
 AC_SUBST(IPC3270_LIBS)
 AC_SUBST(IPC3270_CFLAGS)
 
-AC_ARG_WITH([product-name], [AS_HELP_STRING([--with-product-name], [Set product name])], [ app_cv_product="$withval" ],[ app_cv_product=`pkg-config --variable=product_name ipc3270` ])
+AC_ARG_WITH([product-name], [AS_HELP_STRING([--with-product-name], [Set product name])], [ app_cv_product="$withval" ],[ app_cv_product=`$PKG_CONFIG --variable=product_name ipc3270` ])
 AC_DEFINE_UNQUOTED(PRODUCT_NAME, $app_cv_product)
 AC_SUBST(PRODUCT_NAME,$app_cv_product)
 
@@ -208,6 +204,10 @@ AC_ARG_WITH([python-sitelib], [AS_HELP_STRING([--with-python-sitelib], [Set pyth
 AC_DEFINE_UNQUOTED(PYTHON_SITELIB, $app_cv_python_sitelib)
 AC_SUBST(PYTHON_SITELIB,$app_cv_python_sitelib)
 
+AC_ARG_WITH([python-version], [AS_HELP_STRING([--with-python-version], [Set Python Version])], [ app_cv_python_version="$withval" ],[ app_cv_python_version=`$PKG_CONFIG --modversion python3` ])
+AC_DEFINE_UNQUOTED(PYTHON_VERSION, $app_cv_python_version)
+AC_SUBST(PYTHON_VERSION,$app_cv_python_version)
+
 dnl ---------------------------------------------------------------------------
 dnl Check for ELF symbol visibility support
 dnl ---------------------------------------------------------------------------
@@ -296,6 +296,11 @@ dnl ---------------------------------------------------------------------------
 dnl Configure program options
 dnl ---------------------------------------------------------------------------
 
+app_cv_description="Python $app_cv_python_version bindings for lib3270/pw3270"
+
+AC_SUBST(PACKAGE_DESCRIPTION,"$app_cv_description")
+AC_DEFINE_UNQUOTED(PACKAGE_DESCRIPTION,"$app_cv_description")
+
 AC_SUBST(OSNAME,$app_cv_osname)
 AC_SUBST(LIBS)
 AC_SUBST(DLLEXT)
diff --git a/src/module/windows/resources.rc.in b/src/module/windows/resources.rc.in
index dcbe259..634991a 100644
--- a/src/module/windows/resources.rc.in
+++ b/src/module/windows/resources.rc.in
@@ -14,7 +14,7 @@ BEGIN
 			VALUE "CompanyName",		"Banco do Brasil S/A.\0"
 			VALUE "FileVersion",		"@WIN32_VERSION@\0"
             		VALUE "LegalCopyright",		"(C) 2019 Banco do Brasil S/A. All Rights Reserved\0"
-			VALUE "OriginalFilename",	"py3270@DLLEXT@\0"
+			VALUE "OriginalFilename",	"tn3270@DLLEXT@\0"
 			VALUE "ProductName",		"@PRODUCT_NAME@\0"
 			VALUE "ProductVersion",		"@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@.@PACKAGE_MAJOR_RELEASE@.@PACKAGE_MINOR_RELEASE@\0"
 		END
--
libgit2 0.21.2