Add windows CI back

Signed-off-by: Alexis Jeandet <alexis.jeandet@member.fsf.org>
SciQLop · Mar 12, 2024 · 7a6a2c7 · 7a6a2c7
1 parent a7d123e
commit 7a6a2c7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml
@@ -36,8 +36,8 @@ jobs:
         include:
           - os: ubuntu-latest
             arch: x86_64
-          #- os: windows-latest
-          #  arch: x86_64
+          - os: windows-latest
+            arch: x86_64
           - os: macos-13  # Intel
             arch: x86_64
           - os: macos-14 # Apple Silicon

diff --git a/SciQLopPlots/bindings/helper_scripts/shiboken-helper.py b/SciQLopPlots/bindings/helper_scripts/shiboken-helper.py
@@ -17,10 +17,9 @@
 parser.add_argument('--modules')
 parser.add_argument('--qmake')
 parser.add_argument('--build-dir', nargs='?')
-parser.add_argument('--pyside_version', default='2')
 args = parser.parse_args()
 
-pyside_ver = args.pyside_version
+pyside_ver = 6
 
 shiboken_generator = importlib.import_module(f'shiboken{pyside_ver}_generator')
 shiboken = importlib.import_module(f'shiboken{pyside_ver}')
@@ -62,6 +61,7 @@ def make_link_flag(lib_path):
 
 
 def make_link_flags(libs_paths):
+    print(f"platform: {platform.system().lower()}", file=sys.stderr)
     if platform.system().lower() == 'linux':
         link_flag="-Wl,-rpath="
     else:
@@ -86,8 +86,10 @@ def make_link_flags(libs_paths):
     modules = args.modules.split(',')
 
     if args.libs:
-        main_lib = [find_lib(f'(lib)?shiboken{pyside_ver}.*{ext_sufix}', [f'{shiboken_mod_path}', '/usr/lib64/'])]
+        main_lib = [find_lib(f'(lib)?shiboken{pyside_ver}.*{ext_sufix}', [f'{shiboken_mod_path}', '/usr/lib64/'])]   
+        print(f"main_lib: {main_lib}", file=sys.stderr)
         main_lib += [find_lib(f'(lib)?[Pp]y[sS]ide{pyside_ver}\..*{ext_sufix}.*', [f'{PySide_mod_path}', '/usr/lib64/'])]
+        print(f"main_lib: {main_lib}", file=sys.stderr)
         if platform.system().lower() == 'windows':
             main_lib += [find_lib('python3.lib', [f'{os.path.dirname(sys.executable)}{os.path.sep}libs'])]
         if platform.system().lower() == 'darwin' or platform.system().lower() == 'windows':

diff --git a/SciQLopPlots/meson.build b/SciQLopPlots/meson.build
@@ -33,9 +33,9 @@ generated_srcs  = run_command(python3, src_list, '--build-system', 'meson', '--b
 
 modules_arg = '--modules=@0@'.format(','.join(qt_modules))
 
-shiboken_build_flags = run_command(python3, shiboken_helper, '--qmake', qmake.full_path(), '--pyside_version', pyside_version, '--includes', modules_arg).stdout().strip('\n').split(' ')
-shiboken_link_flags  = run_command(python3, shiboken_helper, '--qmake', qmake.full_path(), '--pyside_version', pyside_version, '--build-dir', meson.current_build_dir(), '--libs', modules_arg).stdout().strip('\n').split(' ')
-shiboken_typesystem  = run_command(python3, shiboken_helper, '--qmake', qmake.full_path(), '--pyside_version', pyside_version, '--typesystem').stdout().strip('\n')
+shiboken_build_flags = run_command(python3, shiboken_helper, '--qmake', qmake.full_path(), '--includes', modules_arg).stdout().strip('\n').split(' ')
+shiboken_link_flags  = run_command(python3, shiboken_helper, '--qmake', qmake.full_path(), '--build-dir', meson.current_build_dir(), '--libs', modules_arg).stdout().strip('\n').split(' ')
+shiboken_typesystem  = run_command(python3, shiboken_helper, '--qmake', qmake.full_path(), '--typesystem').stdout().strip('\n')
 
 
 sciqlopplots_bindings_src = []