Skip to content
Snippets Groups Projects
Commit 525b448a authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

test new (simpler) pypi wheel, where the executable app is replaced by a python script (cf. #1023)

parent 4da5f268
No related branches found
No related tags found
No related merge requests found
#!/usr/bin/env python3 #!/usr/bin/env python
import os
import sys import sys
import subprocess import gmsh
# this script's directory gmsh.initialize(sys.argv, run = True)
dirname, _ = os.path.split(__file__) gmsh.finalize()
# the directory where the shared lib and the exe are located
libdirname = os.path.join(dirname, '..', 'lib')
# set environment
envvar = 'PATH' if 'win' in sys.platform else 'LD_LIBRARY_PATH'
envval = os.environ[envvar] if envvar in os.environ.keys() else ''
os.environ[envvar] = libdirname + os.pathsep + envval
# run the exe
command = os.path.join(libdirname, 'gmsh')
subprocess.call([command] + sys.argv[1:])
#!/usr/bin/env python3 #!/usr/bin/env python
import os
import sys import sys
import subprocess import gmsh
# this script's directory gmsh.initialize(sys.argv, run = True)
dirname, _ = os.path.split(__file__) gmsh.finalize()
# the directory where the shared lib and the exe are located
libdirname = os.path.join(dirname, '..', 'lib')
# set environment
envvar = 'PATH' if 'win' in sys.platform else 'LD_LIBRARY_PATH'
envval = os.environ[envvar] if envvar in os.environ.keys() else ''
os.environ[envvar] = libdirname + os.pathsep + envval
# run the exe
command = os.path.join(libdirname, 'gmsh')
subprocess.call([command] + sys.argv[1:])
#!/usr/bin/env python3 #!/usr/bin/env python
import os
import sys import sys
import subprocess import gmsh
# this script's directory gmsh.initialize(sys.argv, run = True)
dirname, _ = os.path.split(__file__) gmsh.finalize()
# the directory where the shared lib and the exe are located
libdirname = os.path.join(dirname, '..', 'lib')
# set environment
envvar = 'PATH' if 'win' in sys.platform else 'LD_LIBRARY_PATH'
envval = os.environ[envvar] if envvar in os.environ.keys() else ''
os.environ[envvar] = libdirname + os.pathsep + envval
# run the exe
command = os.path.join(libdirname, 'gmsh')
subprocess.call([command] + sys.argv[1:])
...@@ -28,18 +28,15 @@ if os.path.isfile(sdkdir + '/lib/gmsh-' + libversion + '.dll'): ...@@ -28,18 +28,15 @@ if os.path.isfile(sdkdir + '/lib/gmsh-' + libversion + '.dll'):
libs = [os.path.join(sdkdir, 'lib', 'gmsh.lib'), libs = [os.path.join(sdkdir, 'lib', 'gmsh.lib'),
os.path.join(sdkdir, 'lib', 'gmsh-' + libversion + '.dll'), os.path.join(sdkdir, 'lib', 'gmsh-' + libversion + '.dll'),
os.path.join(sdkdir, 'lib', 'gmsh.jl')] os.path.join(sdkdir, 'lib', 'gmsh.jl')]
exes = [os.path.join(sdkdir, 'bin', 'gmsh.exe')]
scripts = [os.path.join(setupdir, 'gmsh'), scripts = [os.path.join(setupdir, 'gmsh'),
os.path.join(setupdir, 'gmsh.bat')] os.path.join(setupdir, 'gmsh.bat')]
elif os.path.isfile(sdkdir + '/lib/libgmsh.so.' + libversion): elif os.path.isfile(sdkdir + '/lib/libgmsh.so.' + libversion):
libs = [os.path.join(sdkdir, 'lib', 'libgmsh.so.' + libversion), libs = [os.path.join(sdkdir, 'lib', 'libgmsh.so.' + libversion),
os.path.join(sdkdir, 'lib', 'gmsh.jl')] os.path.join(sdkdir, 'lib', 'gmsh.jl')]
exes = [os.path.join(sdkdir, 'bin', 'gmsh')]
scripts = [os.path.join(setupdir, 'gmsh')] scripts = [os.path.join(setupdir, 'gmsh')]
elif os.path.isfile(sdkdir + '/lib/libgmsh.' + libversion + '.dylib'): elif os.path.isfile(sdkdir + '/lib/libgmsh.' + libversion + '.dylib'):
libs = [os.path.join(sdkdir + 'lib', 'libgmsh.' + libversion + '.dylib'), libs = [os.path.join(sdkdir + 'lib', 'libgmsh.' + libversion + '.dylib'),
os.path.join(sdkdir + 'lib', 'gmsh.jl')] os.path.join(sdkdir + 'lib', 'gmsh.jl')]
exes = [os.path.join(sdkdir, 'bin', 'gmsh')]
scripts = [os.path.join(setupdir, 'gmsh')] scripts = [os.path.join(setupdir, 'gmsh')]
else : else :
print("library not found") print("library not found")
...@@ -52,16 +49,15 @@ def gen_install_list(subdir): ...@@ -52,16 +49,15 @@ def gen_install_list(subdir):
relpath = os.path.relpath(dirpath, sdkdir) relpath = os.path.relpath(dirpath, sdkdir)
data_files.append((relpath, filepaths)) data_files.append((relpath, filepaths))
data_files = [('lib', libs + exes), ('bin', scripts)] data_files = [('lib', libs)]
gen_install_list(sdkdir + '/share') gen_install_list(sdkdir + '/share')
gen_install_list(sdkdir + '/include') gen_install_list(sdkdir + '/include')
setuptools.setup( setuptools.setup(
name = name, name = name,
version = iversion, version = iversion,
description = 'Gmsh app and SDK installer. Gmsh is a three-dimensional ' description = 'Gmsh is a three-dimensional finite element mesh generator '
'finite element mesh generator with built-in pre- and ' 'with built-in pre- and post-processing facilities.',
'post-processing facilities.',
long_description = open(os.path.join(setupdir, 'README.rst'), 'r').read(), long_description = open(os.path.join(setupdir, 'README.rst'), 'r').read(),
long_description_content_type = 'text/x-rst', long_description_content_type = 'text/x-rst',
maintainer = 'Christophe Geuzaine', maintainer = 'Christophe Geuzaine',
...@@ -83,6 +79,7 @@ setuptools.setup( ...@@ -83,6 +79,7 @@ setuptools.setup(
'Programming Language :: Python', 'Programming Language :: Python',
'Programming Language :: Julia', 'Programming Language :: Julia',
'Topic :: Scientific/Engineering'], 'Topic :: Scientific/Engineering'],
scripts = scripts,
packages = [''], packages = [''],
package_dir = {'' : os.path.join(sdkdir + '/lib')}, package_dir = {'' : os.path.join(sdkdir + '/lib')},
data_files = data_files) data_files = data_files)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment