Updates & fixes.

.github/workflows/codeql.yml

@@ -57,8 +57,8 @@ jobs:
 
     - name: Install Packages
       run: |
-        echo 'deb https://download.opensuse.org/repositories/home:/PerryWerneck:/udjat/xUbuntu_24.04/ /' | sudo tee /etc/apt/sources.list.d/home:PerryWerneck:udjat.list
-        curl -fsSL https://download.opensuse.org/repositories/home:/PerryWerneck:/udjat/xUbuntu_24.04/Release.key | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/home_PerryWerneck_udjat.gpg > /dev/null
+        echo 'deb http://download.opensuse.org/repositories/home:/PerryWerneck:/pw3270/xUbuntu_24.04/ /' | sudo tee /etc/apt/sources.list.d/home:PerryWerneck:pw3270.list
+        curl -fsSL https://download.opensuse.org/repositories/home:PerryWerneck:pw3270/xUbuntu_24.04/Release.key | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/home_PerryWerneck_pw3270.gpg > /dev/null
         sudo apt-get update
         sudo apt-get install --yes meson pkg-config python3-dev pkg-config gettext libssl-dev libcurl4-openssl-dev libglib2.0-dev
 

README.md

@@ -5,7 +5,6 @@ Created originally as part of PW3270 application.
 [![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
 ![CodeQL](https://github.com/PerryWerneck/lib3270/workflows/CodeQL/badge.svg)
 [![build result](https://build.opensuse.org/projects/home:PerryWerneck:pw3270/packages/lib3270/badge.svg?type=percent)](https://build.opensuse.org/package/show/home:PerryWerneck:pw3270/lib3270)
-[![Publish](https://github.com/PerryWerneck/lib3270/actions/workflows/publish.yml/badge.svg)](https://github.com/PerryWerneck/lib3270/actions/workflows/publish.yml)
 ![Downloads](https://img.shields.io/github/downloads/PerryWerneck/lib3270/total.svg)
 
 ## Installation
@@ -76,7 +75,7 @@ You can download installation package for supported linux distributions in [Open
 		mingw64-cross-gcc-c++
 	```
 
-3. Configure and build
+4. Configure and build
 
 	```shell
 	meson setup --cross-file /usr/lib/rpm/macros.d/meson-mingw64-cross-file.txt .build

meson.build

@@ -353,7 +353,8 @@ pkg_variables = [
   'library_name=lib3270',
   'product_id=br.app.@0@'.format(product_name),
 
-  'plugin_path=@0@/@0@/@1@.@2@/plugins/'.format(
+  'plugin_path=@0@/@1@/@2@/@3@.@4@/plugins/'.format(
+      get_option('prefix'),
       get_option('libdir'),
       product_name,
       pkg_major_version,
@@ -372,6 +373,13 @@ if host_machine.system() == 'windows'
     libraries: [ '-l3270.dll' ]
   )
 
+  pkg.generate(
+    name: meson.project_name() + '-delayed',
+    description: project_description,
+    variables: pkg_variables,
+    libraries: [ '-l3270.delayed' ]
+  )
+
   pkg.generate(
     name: meson.project_name() + '-static',
     description: project_description,
@@ -386,6 +394,8 @@ if host_machine.system() == 'windows'
       '-lwtsapi32',
       '-lcomdlg32' 
     ]
+
+
   )
 
 #  pkg.generate(
@@ -525,33 +535,47 @@ if host_machine.system() == 'windows'
     dlltool = find_program('dlltool', required: true)
   endif
 
+  static_library = declare_dependency(
+      link_with : static_library(
+      '3270', 
+      config_src + lib_src,
+      pic: true,
+      c_args: [ '-DSTATIC_LIBRARY' ],
+      install: true,
+      dependencies: lib_deps,
+      include_directories: includes_dir
+    ),
+    include_directories : includes_dir,
+    variables: pkg_variables,
+    link_args: [
+      '-lwinhttp',
+      '-lws2_32',
+      '-lwtsapi32',
+      '-lcomdlg32',
+    ],
+  ) 
+
   # https://mesonbuild.com/Reference-manual_functions.html#custom_target
-  #custom_target(
-  #  'delaylib',
-  #  depends: dynamic,
-  #  build_by_default: true,
-  #  command: [ 
-  #    dlltool,
-  #      '--input-def','lib3270.def',
-  #      '--dllname','lib3270.dll',
-  #      '--kill-at',
-  #      '--output-lib','lib3270.delayed.a' 
-  #    ],
-  #  output: 'lib3270.delayed.a',
-  #  install: true,
-  #  install_tag: 'devel',
-  #  install_dir: get_option('libdir')
-  #)
-
-  static = static_library(
-    '3270', 
-    config_src + lib_src,
-    pic: true,
-    c_args: [ '-DSTATIC_LIBRARY' ],
-    install: true,
-    dependencies: lib_deps,
-    include_directories: includes_dir
-  )
+  delayed_library = declare_dependency(
+    link_with : custom_target(
+      'delaylib',
+      depends: dynamic,
+      build_by_default: true,
+      command: [ 
+        dlltool,
+          '--input-def','lib3270.def',
+          '--dllname','lib3270.dll',
+          '--kill-at',
+          '--output-lib','lib3270.delayed.a' 
+        ],
+      output: 'lib3270.delayed.a',
+      install: true,
+      install_tag: 'devel',
+      install_dir: get_option('libdir')
+    ),
+    include_directories : includes_dir,
+    variables: pkg_variables,
+  ) 
 
 elif host_machine.system() == 'darwin'
 
@@ -566,15 +590,19 @@ elif host_machine.system() == 'darwin'
     include_directories: includes_dir
   )
 
-  static = static_library(
-    '3270', 
-    config_src + lib_src,
-    pic: true,
-    c_args: [ '-DSTATIC_LIBRARY' ],
-    install: true,
-    dependencies: lib_deps,
-    include_directories: includes_dir
-  )
+  static_library = declare_dependency(
+      link_with : static_library(
+      '3270', 
+      config_src + lib_src,
+      pic: true,
+      c_args: [ '-DSTATIC_LIBRARY' ],
+      install: true,
+      dependencies: lib_deps,
+      include_directories: includes_dir
+    ),
+    include_directories : includes_dir,
+    variables: pkg_variables,
+  ) 
 
 else
 
@@ -590,15 +618,19 @@ else
     include_directories: includes_dir
   )
 
-  static = static_library(
-    '3270', 
-    config_src + lib_src,
-    pic: true,
-    c_args: [ '-DSTATIC_LIBRARY', '-fno-lto' ],
-    install: true,
-    dependencies: lib_deps,
-    include_directories: includes_dir
-  )
+  static_library = declare_dependency(
+    link_with : static_library(
+      '3270', 
+      config_src + lib_src,
+      pic: true,
+      c_args: [ '-DSTATIC_LIBRARY', '-fno-lto' ],
+      install: true,
+      dependencies: lib_deps,
+      include_directories: includes_dir
+    ),
+  include_directories : includes_dir,
+  variables: pkg_variables,
+  ) 
 
 endif
 
@@ -608,12 +640,6 @@ dynamic_library = declare_dependency(
   variables: pkg_variables,
 ) 
 
-static_library = declare_dependency(
-  link_with : static,
-  include_directories : includes_dir,
-  variables: pkg_variables,
-) 
-
 executable(
   meson.project_name(),
   config_src + [ 'src/testprogram/testprogram.c' ],

po/POTFILES.in

@@ -59,94 +59,33 @@ src/library/toggles/getset.c
 src/library/toggles/init.c
 src/library/toggles/listener.c
 src/library/toggles/table.c
-src/library/ansi.c
-src/library/bounds.c
-src/library/ctlr.c
+src/library/array.c
+src/library/connect.c
 src/library/cursor.c
 src/library/host.c
-src/library/iocalls.c
-src/library/model.c
+src/library/init.c
+src/library/log.c
+src/library/options.c
 src/library/popup.c
-src/library/rpq.c
+src/library/resources.c
+src/library/screen.c
 src/library/session.c
 src/library/state.c
 src/library/telnet.c
-src/library/trace_ds.c
-src/library/array.c
-src/library/connect.c
-src/library/field.c
-src/library/init.c
-src/library/log.c
-src/library/paste.c
-src/library/resources.c
-src/library/see.c
 src/library/util.c
+src/library/wait.c
+src/library/ansi.c
+src/library/bounds.c
+src/library/ctlr.c
+src/library/field.c
 src/library/html.c
 src/library/linkedlist.c
-src/library/options.c
+src/library/model.c
+src/library/paste.c
 src/library/printer.c
-src/library/screen.c
+src/library/rpq.c
+src/library/see.c
 src/library/sf.c
-src/library/wait.c
+src/library/trace_ds.c
+src/library/iocalls.c
 src/tools/mkfb/mkfb.c
-src/include/X11keysym.h
-src/include/arpa_telnet.h
-src/include/cg.h
-src/include/darwin/lib3270/os.h
-src/include/ft_cut_ds.h
-src/include/ft_cutc.h
-src/include/ft_dft_ds.h
-src/include/ft_dftc.h
-src/include/ftc.h
-src/include/lib3270/charset.h
-src/include/lib3270/selection.h
-src/include/lib3270/ssl.h
-src/include/lib3270/actions.h
-src/include/lib3270/filetransfer.h
-src/include/lib3270/html.h
-src/include/lib3270/internals.h
-src/include/lib3270/keyboard.h
-src/include/lib3270/log.h
-src/include/lib3270/popup.h
-src/include/lib3270/properties.h
-src/include/lib3270/session.h
-src/include/lib3270/toggle.h
-src/include/lib3270/trace.h
-src/include/linux/lib3270/os.h
-src/include/private/intl.h
-src/include/seec.h
-src/include/tn3270e.h
-src/include/utf8c.h
-src/include/w3miscc.h
-src/include/widec.h
-src/include/windows/lib3270/os.h
-src/include/3270ds.h
-src/include/ansic.h
-src/include/array.h
-src/include/ctlrc.h
-src/include/hostc.h
-src/include/internals.h
-src/include/kybdc.h
-src/include/lib3270.h
-src/include/linkedlist.h
-src/include/localdefs.h
-src/include/networking.h
-src/include/popupsc.h
-src/include/resources.h
-src/include/screen.h
-src/include/screenc.h
-src/include/sf.h
-src/include/shlobj_missing.h
-src/include/statusc.h
-src/include/telnetc.h
-src/include/togglesc.h
-src/include/trace_dsc.h
-src/include/utilc.h
-src/include/winversc.h
-src/include/xioc.h
-src/include/xl.h
-src/library/network/default/private.h
-src/library/network/openssl/private.h
-src/library/os/darwin/private.h
-src/library/os/linux/private.h
-src/library/os/windows/private.h