44from setuptools .command .develop import develop
55import epicscorelibs .path
66import epicscorelibs .version
7- from setuptools_dso import DSO , Extension , setup
7+ from setuptools_dso import Extension , setup
88from epicscorelibs .config import get_config_var
99
1010# Place the directory containing _version_git on the path
1515
1616from _version_git import __version__ , get_cmdclass # noqa
1717
18+ sources = ['softioc/extension.c' ]
19+
1820devIocStats_OSI = [
1921 "devIocStatsAnalog.c" ,
2022 "devIocStatsString.c" ,
2123 "devIocStatsWaveform.c" ,
2224 "devIocStatsSub.c" ,
23- "devIocStatsTest.c"
25+ "devIocStatsTest.c" ,
26+ "devIocStats.h" ,
2427]
2528
2629devIocStats_OSD = [
3639 "osdSystemInfo.c" ,
3740 "osdHostInfo.c" ,
3841 "osdPIDInfo.c" ,
42+ "devIocStatsOSD.h" ,
3943]
4044
41- devIocStats_srcs = []
42- devIocStats_src = os .path .join ("softioc" , "iocStats" , "devIocStats" )
43- devIocStats_default = os .path .join (devIocStats_src , "os" , "default" )
45+ devIocStats_src = os .path .join ("iocStats" , "devIocStats" )
4446devIocStats_os = os .path .join (devIocStats_src , "os" , get_config_var ('OS_CLASS' ))
47+ devIocStats_default = os .path .join (devIocStats_src , "os" , "default" )
48+
49+ def _add_file (f ):
50+ if f .endswith (".h" ):
51+ # Only add header files if making an sdist
52+ # https://github.com/pypa/packaging-problems/issues/84#issuecomment-383718492
53+ should_add = "sdist" in sys .argv
54+ else :
55+ should_add = True
56+ if should_add :
57+ sources .append (f )
4558
4659for f in devIocStats_OSI :
47- devIocStats_srcs . append (os .path .join (devIocStats_src , f ))
60+ _add_file (os .path .join (devIocStats_src , f ))
4861for f in devIocStats_OSD :
4962 if os .path .exists (os .path .join (devIocStats_os , f )):
50- devIocStats_srcs . append (os .path .join (devIocStats_os , f ))
63+ _add_file (os .path .join (devIocStats_os , f ))
5164 else :
52- devIocStats_srcs .append (os .path .join (devIocStats_default , f ))
53-
54- #dso = DSO(
55- # 'softioc.lib.devIocStats',
56- # devIocStats_srcs,
57- # include_dirs=[epicscorelibs.path.include_path, devIocStats_src, devIocStats_os, devIocStats_default],
58- # dsos=['epicscorelibs.lib.Com']
59- #)
65+ _add_file (os .path .join (devIocStats_default , f ))
6066
6167# Extension with all our C code
6268ext = Extension (
6369 name = 'softioc._extension' ,
64- sources = [ 'softioc/extension.c' ] + devIocStats_srcs ,
70+ sources = sources ,
6571 include_dirs = [epicscorelibs .path .include_path , devIocStats_src , devIocStats_os , devIocStats_default ],
6672 dsos = ['epicscorelibs.lib.dbCore' , 'epicscorelibs.lib.Com' ],
6773 define_macros = get_config_var ('CPPFLAGS' ),
@@ -85,11 +91,10 @@ def install_for_development(self):
8591 version = __version__ ,
8692 ext_modules = [ext ],
8793 install_requires = [
88- "epicscorelibs==7.0.4.99.1.0a1" ,
89- # epicscorelibs.version.abi_requires(),
94+ # Dependency declared in pyproject.toml
95+ epicscorelibs .version .abi_requires (),
9096 "numpy>=1.18" ,
9197 "epicsdbbuilder>=1.4"
9298 ],
93- #x_dsos = [dso],
9499 zip_safe = False , # setuptools_dso is not compatible with eggs!
95100)
0 commit comments