Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 243dd6e9 authored by hhakim's avatar hhakim
Browse files

Fix error on doxydoc generation for pyfaust on Windows and macOS.

The bug was related to charset problem and the need to use preferably python3.
Issue #80 related.
parent 59dad04e
No related branches found
No related tags found
No related merge requests found
......@@ -62,7 +62,7 @@ package_macos:
- SHA_START=$(echo $CI_COMMIT_SHA | sed -e 's/^\(.\{8\}\).*/\1/')
- if [[ ! -d 'build' ]]; then mkdir build;fi; cd build
- 'cmake -DBUILD_WRAPPER_PYTHON=ON -DBUILD_WRAPPER_MATLAB=ON -DBUILD_DOCUMENTATION=ON -DCPACK_PACKAGE_VERSION=$SHA_START -DCMAKE_INSTALL_PREFIX=/opt/local/faust-$SHA_START -DBUILD_TESTING=OFF ..'
- make
- make LANG=en_GB.UTF-8
- 'echo $MACOS_PASS | sudo -S make install'
#- 'echo $MACOS_PASS | sudo -S hdiutil create -volname Faust-$SHA_START-MatlabR2016a-Py2.7 -srcfolder /opt/local/faust-$SHA_START -ov -format UDRW faust-$SHA_START'
- pkgbuild --identifier fr.inria.faust --version $SHA_START --root /opt/local/faust-$SHA_START --install-location /opt/local/faust-$SHA_START --scripts . ./faust-$SHA_START.pkg
......@@ -126,14 +126,14 @@ package_linux:
- schedules
- tags
# jobs triggered by git tag can force cpack to use the tag name as version but it's not necessary for MacOSX (not using cpack for that sys.)
# it's done for linux packages
# jobs triggered by git tag can force cpack to use the tag name as version but it's not necessary for MacOSX (not using cpack for that sys.)
#it's done for linux packages
package_macos_release:
script:
- if [[ ! -d 'build' ]]; then mkdir build;fi; cd build
- 'cmake -DBUILD_WRAPPER_PYTHON=ON -DBUILD_WRAPPER_MATLAB=ON -DBUILD_DOCUMENTATION=ON -DCMAKE_INSTALL_PREFIX=/opt/local/faust -DCPACK_PACKAGE_VERSION=$CI_COMMIT_TAG -DCMAKE_BUILD_TYPE=Release -DEXCLUDE_FAUST_LIB_INSTALL=ON -DBUILD_TESTING=OFF ..'
- make
- make LANG=en_GB.UTF-8
- 'echo $MACOS_PASS | sudo -S make install'
- 'echo $MACOS_PASS | sudo -S hdiutil create -volname Faust-$CI_COMMIT_TAG-MatlabR2016a-Py2.7 -srcfolder /opt/local/faust -ov -format UDRW faust-$CI_COMMIT_TAG'
- pkgbuild --identifier fr.inria.faust --version $CI_COMMIT_TAG --root /opt/local/faust --install-location /opt/local/faust --scripts . ./faust-$CI_COMMIT_TAG.pkg
......
......@@ -183,4 +183,17 @@ foreach(PYTHON_EXE IN LISTS PYTHON_EXES)
message(STATUS "CYTHON_BIN_DIR has been found : ${CYTHON_BIN_DIR}")
message(STATUS "------------------------------------------------")
list(APPEND CYTHON_EXES ${CYTHON_BIN_DIR})
# store python path in variable PYTHON2_EXE or PYTHON3_EXE according to
# its version (overridding previous iteration versions)
exec_program("${PYTHON_EXE}" ARGS "--version" OUTPUT_VARIABLE PY_VER RETURN_VALUE PY_RES)
#message(STATUS "PY_VER=${PY_VER}")
string(REGEX REPLACE "Python ([0-9]\\.[0-9]).*$" "\\1" PY_VER_WITH_POINTS ${PY_VER})
string(REGEX REPLACE "Python ([0-9])\\.([0-9]).*$" "\\1\\2" PY_VER ${PY_VER})
if(PY_VER MATCHES 3)
set(PYTHON3_EXE ${PYTHON_EXE})
else()
set(PYTHON2_EXE ${PYTHON_EXE})
endif()
endforeach()
@PYTHON_EXECUTABLE@ -m doxypypy.doxypypy -a -c %1 %2 | @PYTHON_EXECUTABLE@ py_filterout_namespace.py pyfaust.__init__. pyfaust.factparams. pyfaust.demo.
@PYTHON3_EXE@ -m doxypypy.doxypypy -a -c %1 %2 %3 | @PYTHON3_EXE@ py_filterout_namespace.py pyfaust.__init__. pyfaust.factparams. pyfaust.demo.
#!/bin/bash
@PYTHON_EXECUTABLE@ -m doxypypy.doxypypy -a -c $* | @PYTHON_EXECUTABLE@ py_filterout_namespace.py pyfaust.__init__. pyfaust.factparams. pyfaust.demo.
@PYTHON3_EXE@ -m doxypypy.doxypypy -a -c $* | @PYTHON3_EXE@ py_filterout_namespace.py pyfaust.__init__. pyfaust.factparams. pyfaust.demo.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment