Release engineering fixes

Author: jdavidberger

.travis.yml

@@ -30,6 +30,7 @@ before_deploy:
 deploy:
   - provider: releases
     api_key: $GITHUB_TOKEN
+    file_glob: true
     file:
       - libsurvive-$TRAVIS_TAG-$TRAVIS_OS_NAME-$CONFIG$RELEASE_FILE_SUFFIX.zip
       - dist/*.whl

CMakeLists.txt

@@ -186,7 +186,7 @@ file(GLOB REDIST_HEADERS
 )
 install(FILES ${REDIST_HEADERS} DESTINATION include/libsurvive/redist)
 
-if(PYTHON_GENERATED_DIR)
+if(NOT WIN32 AND PYTHON_GENERATED_DIR)
   find_package (Python3 COMPONENTS Interpreter Development)
   find_program(CTYPESGEN ctypesgen REQUIRED)
 

bindings/python/pysurvive/pysurvive_generated.py

@@ -1,7 +1,7 @@
 r"""Wrapper for poser.h
 
 Generated with:
-/home/justin/anaconda3/bin/ctypesgen /home/justin/source/oss/libsurvive/include/libsurvive/poser.h /home/justin/source/oss/libsurvive/include/libsurvive/survive.h /home/justin/source/oss/libsurvive/include/libsurvive/survive_api.h /home/justin/source/oss/libsurvive/include/libsurvive/survive_hooks.h /home/justin/source/oss/libsurvive/include/libsurvive/survive_optimizer.h /home/justin/source/oss/libsurvive/include/libsurvive/survive_reproject.h /home/justin/source/oss/libsurvive/include/libsurvive/survive_reproject_gen2.h /home/justin/source/oss/libsurvive/include/libsurvive/survive_types.h -I/usr/local/include -I/home/justin/source/oss/libsurvive/redist -I/home/justin/source/oss/libsurvive/include/libsurvive -I/home/justin/source/oss/libsurvive/include --no-macros -L/home/justin/source/oss/libsurvive/build/lib.linux-x86_64-3.7 -llibsurvive.so --strip-prefix=survive_ -P Survive -o /home/justin/source/oss/libsurvive/bindings/python/pysurvive/pysurvive_generated.py
+/home/justin/source/oss/libsurvive/.eggs/ctypesgen-1.0.2-py3.7.egg/ctypesgen/ctypesgen /home/justin/source/oss/libsurvive/include/libsurvive/poser.h /home/justin/source/oss/libsurvive/include/libsurvive/survive.h /home/justin/source/oss/libsurvive/include/libsurvive/survive_api.h /home/justin/source/oss/libsurvive/include/libsurvive/survive_hooks.h /home/justin/source/oss/libsurvive/include/libsurvive/survive_optimizer.h /home/justin/source/oss/libsurvive/include/libsurvive/survive_reproject.h /home/justin/source/oss/libsurvive/include/libsurvive/survive_reproject_gen2.h /home/justin/source/oss/libsurvive/include/libsurvive/survive_types.h -I/usr/local/include -I/home/justin/source/oss/libsurvive/redist -I/home/justin/source/oss/libsurvive/include/libsurvive -I/home/justin/source/oss/libsurvive/include --no-macros -L/home/justin/source/oss/libsurvive/build/lib.linux-x86_64-3.7 -llibsurvive.so --strip-prefix=survive_ -P Survive -o /home/justin/source/oss/libsurvive/bindings/python/pysurvive/pysurvive_generated.py
 
 Do not modify this file.
 """

setup.py

@@ -2,18 +2,6 @@
 dist.Distribution().fetch_build_eggs(['wheel', 'cmake_setuptools'])
 ctypesgen_install = dist.Distribution().fetch_build_egg('ctypesgen')
 
-ctypesgen = open(ctypesgen_install.module_path + "/ctypesgen/ctypesgen", "w")
-print(ctypesgen, ctypesgen_install)
-ctypesgen.write('''
-import re
-import sys
-from ctypesgen.main import main
-if __name__ == '__main__':
-    sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0])
-    sys.exit(main())
-''');
-ctypesgen.close()
-
 dist.Distribution().fetch_build_eggs(['cmake_setuptools'])
 
 from setuptools import setup
@@ -28,7 +16,7 @@
 
 setup(name='pysurvive',
       description='',
-      version='0.0.1.dev0',
+      version=os.environ.get("TRAVIS_TAG", "develop"),
       ext_modules=[CMakeExtension('all', sourcedir='.')],      
       packages=['pysurvive'],
       package_dir={'pysurvive': 'bindings/python/pysurvive'},

useful_files/travis/linux.before_deploy.sh

@@ -1 +1,3 @@
-7z a libsurvive-$TRAVIS_TAG-$TRAVIS_OS_NAME-$CONFIG$RELEASE_FILE_SUFFIX.zip ./bin/INSTALL_ROOT/* ./dist/pysurvive-*.egg 
+set -o xtrace
+
+7z a libsurvive-$TRAVIS_TAG-$TRAVIS_OS_NAME-$CONFIG$RELEASE_FILE_SUFFIX.zip ./bin/INSTALL_ROOT/* 

useful_files/travis/linux.sh

@@ -1,3 +1,5 @@
+set -o xtrace
+
 virtualenv --python=python3 venv
 source ./venv/bin/activate
 python3 setup.py install bdist_wheel

useful_files/travis/windows.before_deploy.sh

@@ -1 +1,3 @@
-7z a libsurvive-$TRAVIS_TAG-$TRAVIS_OS_NAME-$CONFIG.7z ./bin/INSTALL_ROOT/ ./*/pysurvive-*.egg
+set -o xtrace
+
+7z a libsurvive-$TRAVIS_TAG-$TRAVIS_OS_NAME-$CONFIG.zip ./bin/INSTALL_ROOT/*

useful_files/travis/windows.sh

@@ -3,7 +3,7 @@ set -o xtrace
 #export VS160COMNTOOLS="/c/Program Files (x86)/Microsoft Visual Studio/2019/Community/Common7/Tools"
 export PATH="/c/Python38/:/c/Python38/scripts:$PATH"
 
-python setup.py install
+python setup.py install bdist_wheel
 cd bindings/python
 python ./example.py --simulator --simulator-time .1 --playback-factor 0
 cd ../..