Commit 3db268afbc9aabc6fe7da13b01916f709ea59271
1 parent
e384a27d
Exists in
master
Fixing usage of pkg-config in windows build
Adding option to build a zipfile with the python extension (usefull for windows users).
Showing
5 changed files
with
27 additions
and
9 deletions
Show diff stats
.gitignore
Makefile.in
| ... | ... | @@ -218,6 +218,18 @@ install: \ |
| 218 | 218 | $(BINRLS)/$(LIBNAME)@DLLEXT@ \ |
| 219 | 219 | $(DESTDIR)$(PYTHON_SITELIB) |
| 220 | 220 | |
| 221 | +zip: \ | |
| 222 | + python-@PYTHON_VERSION@-tn3270-@PACKAGE_VERSION@.@host_cpu@.zip | |
| 223 | + | |
| 224 | +python-@PYTHON_VERSION@-tn3270-@PACKAGE_VERSION@.@host_cpu@.zip: \ | |
| 225 | + $(BINRLS)/$(LIBNAME)@DLLEXT@ | |
| 226 | + | |
| 227 | + @rm -f $@ | |
| 228 | + @$(ZIP) \ | |
| 229 | + -9 \ | |
| 230 | + -j \ | |
| 231 | + $@ \ | |
| 232 | + $(BINRLS)/$(LIBNAME)@DLLEXT@ | |
| 221 | 233 | |
| 222 | 234 | #---[ Debug Targets ]-------------------------------------------------------------------- |
| 223 | 235 | ... | ... |
README.md
| ... | ... | @@ -37,10 +37,10 @@ Compiling for Windows (With MSYS2) |
| 37 | 37 | |
| 38 | 38 | * git clone https://github.com/PerryWerneck/python-tn3270.git |
| 39 | 39 | |
| 40 | -6. Build library using the mingw shell | |
| 40 | +6. Build zip file with the modules using the mingw shell | |
| 41 | 41 | |
| 42 | 42 | * cd python-tn3270 |
| 43 | 43 | * ./autogen.sh |
| 44 | - * make all | |
| 44 | + * make zip | |
| 45 | 45 | |
| 46 | 46 | ... | ... |
configure.ac
| ... | ... | @@ -60,11 +60,6 @@ dnl --------------------------------------------------------------------------- |
| 60 | 60 | dnl Version info |
| 61 | 61 | dnl --------------------------------------------------------------------------- |
| 62 | 62 | |
| 63 | -app_cv_description="Python bindings for lib3270/pw3270" | |
| 64 | - | |
| 65 | -AC_SUBST(PACKAGE_DESCRIPTION,"$app_cv_description") | |
| 66 | -AC_DEFINE_UNQUOTED(PACKAGE_DESCRIPTION,"$app_cv_description") | |
| 67 | - | |
| 68 | 63 | app_vrs_major=$(echo $VERSION | cut -d. -f1) |
| 69 | 64 | app_vrs_minor=$(echo $VERSION | cut -d. -f2) |
| 70 | 65 | |
| ... | ... | @@ -145,6 +140,7 @@ dnl --------------------------------------------------------------------------- |
| 145 | 140 | AC_PATH_TOOL([AR], [ar], [ar]) |
| 146 | 141 | AC_PATH_TOOL([WINDRES], [windres], [no]) |
| 147 | 142 | AC_PATH_TOOL([VALGRIND], [valgrind], [no]) |
| 143 | +AC_PATH_TOOL([ZIP], [zip], [zip]) | |
| 148 | 144 | |
| 149 | 145 | PKG_CHECK_EXISTS |
| 150 | 146 | |
| ... | ... | @@ -191,7 +187,7 @@ fi |
| 191 | 187 | AC_SUBST(IPC3270_LIBS) |
| 192 | 188 | AC_SUBST(IPC3270_CFLAGS) |
| 193 | 189 | |
| 194 | -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` ]) | |
| 190 | +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` ]) | |
| 195 | 191 | AC_DEFINE_UNQUOTED(PRODUCT_NAME, $app_cv_product) |
| 196 | 192 | AC_SUBST(PRODUCT_NAME,$app_cv_product) |
| 197 | 193 | |
| ... | ... | @@ -208,6 +204,10 @@ AC_ARG_WITH([python-sitelib], [AS_HELP_STRING([--with-python-sitelib], [Set pyth |
| 208 | 204 | AC_DEFINE_UNQUOTED(PYTHON_SITELIB, $app_cv_python_sitelib) |
| 209 | 205 | AC_SUBST(PYTHON_SITELIB,$app_cv_python_sitelib) |
| 210 | 206 | |
| 207 | +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` ]) | |
| 208 | +AC_DEFINE_UNQUOTED(PYTHON_VERSION, $app_cv_python_version) | |
| 209 | +AC_SUBST(PYTHON_VERSION,$app_cv_python_version) | |
| 210 | + | |
| 211 | 211 | dnl --------------------------------------------------------------------------- |
| 212 | 212 | dnl Check for ELF symbol visibility support |
| 213 | 213 | dnl --------------------------------------------------------------------------- |
| ... | ... | @@ -296,6 +296,11 @@ dnl --------------------------------------------------------------------------- |
| 296 | 296 | dnl Configure program options |
| 297 | 297 | dnl --------------------------------------------------------------------------- |
| 298 | 298 | |
| 299 | +app_cv_description="Python $app_cv_python_version bindings for lib3270/pw3270" | |
| 300 | + | |
| 301 | +AC_SUBST(PACKAGE_DESCRIPTION,"$app_cv_description") | |
| 302 | +AC_DEFINE_UNQUOTED(PACKAGE_DESCRIPTION,"$app_cv_description") | |
| 303 | + | |
| 299 | 304 | AC_SUBST(OSNAME,$app_cv_osname) |
| 300 | 305 | AC_SUBST(LIBS) |
| 301 | 306 | AC_SUBST(DLLEXT) | ... | ... |
src/module/windows/resources.rc.in
| ... | ... | @@ -14,7 +14,7 @@ BEGIN |
| 14 | 14 | VALUE "CompanyName", "Banco do Brasil S/A.\0" |
| 15 | 15 | VALUE "FileVersion", "@WIN32_VERSION@\0" |
| 16 | 16 | VALUE "LegalCopyright", "(C) 2019 Banco do Brasil S/A. All Rights Reserved\0" |
| 17 | - VALUE "OriginalFilename", "py3270@DLLEXT@3270@DLLEXT@\0"" | |
| 17 | + VALUE "OriginalFilename", "tn3270@DLLEXT@3270@DLLEXT@\0"" | |
| 18 | 18 | VALUE "ProductName", "@PRODUCT_NAME@\0" |
| 19 | 19 | VALUE "ProductVersion", "@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@.@PACKAGE_MAJOR_RELEASE@.@PACKAGE_MINOR_RELEASE@\0" |
| 20 | 20 | END | ... | ... |