modifpy windows build

Author: Tieqiong

.gitignore

@@ -2,9 +2,10 @@
 __pycache__/
 *.py[cod]
 *$py.class
-.exp
-.lib
-.dll
+*.exp
+*.lib
+*.dll
+*.pdb
 
 # Compiled Dynamic libraries
 *.so

SConstruct

@@ -22,7 +22,6 @@ SCons construction environment can be customized in sconscript.local script.
 import os
 from os.path import join as pjoin
 import re
-import platform
 import sys
 
 
@@ -107,6 +106,9 @@ if env['PLATFORM'] == "win32":
     lib_path = pjoin(env['prefix'], 'Library', 'lib')
     shared_path = pjoin(env['prefix'], 'Library', 'share')
 
+    env.AppendUnique(CPPPATH=[ pjoin(env['prefix'], 'include') ]) # for python headers
+    env.AppendUnique(LIBPATH=[ pjoin(env['prefix'], 'libs') ]) # for python libs
+
     env['ENV']['TMP'] = os.environ.get('TMP', env['ENV'].get('TMP', ''))
 else:
     include_path = pjoin(env['prefix'], 'include')
@@ -137,7 +139,7 @@ env.Help(MY_SCONS_HELP % vars.GenerateHelpText(env))
 
 # Determine python-config script name.
 pyversion = os.environ.get('PY_VER') or f"{sys.version_info.major}.{sys.version_info.minor}"
-if platform.system().lower() != 'windows':
+if env['PLATFORM'] != 'win32':
     pythonconfig = pjoin(env['prefix'], 'bin', f'python{pyversion}-config')
     xpython = pjoin(env['prefix'], 'bin', 'python')
 else:
@@ -155,16 +157,13 @@ if env['PLATFORM'] == 'win32':
     env.AppendUnique(CCFLAGS=['/EHsc', '/MD'])
 
     if env['build'] == 'debug':
-        env.Append(CCFLAGS=['/Zi', '/Od'])
+        env.Append(CCFLAGS=['/Zi', '/Od', '/FS'])
         env.Append(LINKFLAGS=['/DEBUG'])
 
     elif env['build'] == 'fast':
         env.Append(CCFLAGS=['/Ox', '/GL'])
         env.Append(LINKFLAGS=['/LTCG', '/OPT:REF', '/OPT:ICF'])
 
-    if env['profile']:
-        env.Append(CCFLAGS='/Gh')
-
 else:
     # get python flags from python-config script
     # not using sysconfig here because of parsing issues
@@ -202,11 +201,7 @@ else:
         env.Append(CCFLAGS=['-O3'] + fast_opts)
         env.Append(LINKFLAGS=fast_link)
 
-    if env['profile']:
-        env.AppendUnique(CCFLAGS='-pg')
-        env.AppendUnique(LINKFLAGS='-pg')
-
-builddir = env.Dir('build/%s-%s' % (env['build'], platform.machine()))
+builddir = env.Dir('build/%s-%s' % (env['build'], env['PLATFORM']))
 
 Export('env', 'pyversion')
 

requirements/build.txt

@@ -0,0 +1 @@
+setuptools

setup.py

@@ -55,7 +55,12 @@ def create_extensions():
     include_dirs = get_env_config().get("include_dirs") + [np.get_include()]
     library_dirs = get_env_config().get("library_dirs")
 
-    libraries = ["ObjCryst"] + check_boost_libraries(Path(library_dirs[0]))
+    if os.name == "nt":
+        objcryst_lib = "libObjCryst"
+    else:
+        objcryst_lib = "ObjCryst"
+
+    libraries = [objcryst_lib] + check_boost_libraries(Path(library_dirs[0]))
     extra_objects = []
     extra_compile_args = []
     extra_link_args = []

src/extensions/SConscript

@@ -1,6 +1,6 @@
 import numpy as np
 import os
-from setuptools import Distribution, Extension
+from SCons.Script import Clean
 
 Import('env')
 
@@ -11,28 +11,45 @@ env.AppendUnique(CPPPATH=[np.get_include()])
 if not (GetOption('clean') or env.GetOption('help')):
     SConscript('SConscript.configure')
 
+if env['PLATFORM'] == 'win32':
+    if env['profile']:
+        print("Warning: Windows profiling is not enabled; skipping /Gh")
+else:
+    if env['profile']:
+        env.AppendUnique(CCFLAGS='-pg')
+        env.AppendUnique(LINKFLAGS='-pg')
+
 # python extension module
-module = env.SharedLibrary(
+module_nodes = env.SharedLibrary(
     '_pyobjcryst', 
     Glob('*.cpp'),
     SHLIBPREFIX='', 
-    SHLIBSUFFIX='.so')
+    SHLIBSUFFIX = '.pyd' if env['PLATFORM']=='win32' else '.so')
 
-installed = env.Install(Dir('#/src/pyobjcryst'), module)
+ext_module = module_nodes[0]
+installed = env.Install(Dir('#/src/pyobjcryst'), ext_module)
 
 # run `scons develop` to install the extension in development mode
 dev = Alias('dev', installed)
 AlwaysBuild(dev)
 
 
 # run `scons test` to run the tests
+env['ENV']['PYTHONPATH'] = Dir('#').abspath + os.sep + 'src'
 test = env.Alias(
     'test', 
     ['dev'],
-    f'PYTHONPATH={Dir("#").abspath + "/src"} python -m pyobjcryst.tests.run')
+    Action('python -m pyobjcryst.tests.run')
+)
 AlwaysBuild(test)
 
 # default targets:
-Default(module)
+Default(module_nodes)
+
+# clean up the build artifacts
+Clean(None, ['.sconsign.dblite', 'config.log'])
+Clean(None, Dir('.sconf_temp'))
+Clean(None, Dir('build'))
+Clean(None, installed)
 
 # vim: ft=python