Drop pyotherside as submodule

Let buildsystems build it from
source packages.
This commit is contained in:
Dag Heyman 2018-02-08 10:58:39 +01:00
parent b4a269276b
commit ccc75aa109
No known key found for this signature in database
GPG Key ID: 06FC004369E7D338
5 changed files with 13 additions and 10 deletions

3
.gitmodules vendored
View File

@ -4,6 +4,3 @@
[submodule "vendor/yubikey-manager"]
path = vendor/yubikey-manager
url = https://github.com/Yubico/yubikey-manager.git
[submodule "vendor/pyotherside"]
path = vendor/pyotherside
url = https://github.com/thp/pyotherside.git

View File

@ -8,7 +8,7 @@ language: cpp
sudo: required
env:
- PY_VERSION="3.6.4"
- PY_VERSION="3.6.4" PYOTHERSIDE_VERSION="1.5.3"
python:
- '3.5'
@ -37,8 +37,10 @@ before_install:
then
export MACOSX_DEPLOYMENT_TARGET=10.9
brew update
wget https://github.com/thp/pyotherside/archive/$PYOTHERSIDE_VERSION.tar.gz
tar -xzvf $PYOTHERSIDE_VERSION.tar.gz
# Patch PyOtherSide to not be built with debug output
echo "DEFINES += QT_NO_DEBUG_OUTPUT" >> vendor/pyotherside/src/src.pro
echo "DEFINES += QT_NO_DEBUG_OUTPUT" >> pyotherside-$PYOTHERSIDE_VERSION/src/src.pro
fi
install:
@ -55,11 +57,11 @@ install:
env PYTHON_CONFIGURE_OPTS="--enable-framework CC=clang" pyenv install $PY_VERSION
pyenv global system $PY_VERSION
# Build and install PyOtherside
cd vendor/pyotherside
cd pyotherside-$PYOTHERSIDE_VERSION
qmake
make
sudo make install
cd ../../
cd ..
fi
- pip install --upgrade pip
# Install linting tools

View File

@ -12,6 +12,7 @@ environment:
YKPERS_VERSION: "1.18.1"
LIBUSB_VERSION: "1.0.21"
PY_VERSION: "3.6.4"
PYOTHERSIDE_VERSION: "1.5.3"
init:
# Needed for jom to work.
@ -32,7 +33,9 @@ install:
# Build and install PyOtherSide
# Reference: https://pyotherside.readthedocs.io/en/latest/#building-for-windows
- cd .\vendor\pyotherside
- ps: wget "https://github.com/thp/pyotherside/archive/$env:PYOTHERSIDE_VERSION.zip" -OutFile "pyotherside-$env:PYOTHERSIDE_VERSION.zip"
- 7z x pyotherside-%PYOTHERSIDE_VERSION%.zip
- cd .\pyotherside-%PYOTHERSIDE_VERSION%
- ps: (Get-Content .\src\qmldir).replace('pyothersideplugin', 'pyothersideplugin1') | Set-Content .\src\qmldir
- ps: Clear-Content python.pri
- ps: Add-Content python.pri "PYTHON_CONFIG = python3-config`nQMAKE_LIBS += -LC:\Python36\libs -lpython36`nQMAKE_CXXFLAGS += -IC:\Python36\include`n"

View File

@ -21,7 +21,9 @@ and is included as a submodule in the repository. It can also be installed throu
=== Install dependencies on macOS 10.12 (Sierra)
$ brew install python3 swig ykpers libu2f-host libusb qt5
$ cd vendor/pyotherside && qmake && make && make install && cd ../..
$ wget https://github.com/thp/pyotherside/archive/1.5.3.tar.gz
$ tar -xzvf 1.5.3.tar.gz
$ cd pyotherside-1.5.3 && qmake && make && make install && cd ..
=== Compile the app:

1
vendor/pyotherside vendored

@ -1 +0,0 @@
Subproject commit fdb5950acd1fc14eb8926ab939594a95c9602a79