Skip to content

Commit 9f56eca

Browse files
committed
Reintroduce build.sh for compilation
1 parent eed258b commit 9f56eca

5 files changed

Lines changed: 5 additions & 32 deletions

File tree

conda/bld.bat

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
sip-install --verbose

conda/bld.bat.old

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
11
#!/bin/bash
22

3-
if [ "$(uname)" == "Darwin" ];
4-
then
5-
export MACOSX_VERSION_MIN=10.9
6-
fi
7-
83
if [ "$(uname)" == "Linux" ];
94
then
10-
export QMAKESPEC=linux-g++
5+
USED_BUILD_PREFIX=${BUILD_PREFIX:-${PREFIX}}
116

127
ln -s ${GXX} g++ || true
138
ln -s ${GCC} gcc || true
@@ -19,19 +14,11 @@ then
1914
export PKG_CONFIG_EXECUTABLE=$(basename $(which pkg-config))
2015

2116
export PATH=${PWD}:${PATH}
22-
export SYSROOT="${CONDA_BUILD_SYSROOT}"
2317
fi
2418

25-
alias qmake='${CONDA_PREFIX}/bin/qmake'
26-
27-
export SIP_DIR="${PREFIX}/lib/python${PY_VER}/site-packages/PyQt5/bindings"
28-
echo "
29-
sip-include-dirs = [\"${SIP_DIR}\", \"${PREFIX}/share/sip\"]
30-
" >> pyproject.toml
31-
3219

3320
echo "**** BUILD"
34-
pip install -v .
21+
sip-install --verbose
3522

3623
echo
3724
echo "****** CHECK PYTHON LIB"

conda/meta.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ about:
1717
build:
1818
number: 2
1919
string: py{{ PY_VER }}
20-
script: |
21-
export PATH=${PWD}:${PATH} # [linux]
22-
sip-install --verbose
2320
script_env:
2421
- SETUPTOOLS_SCM_PRETEND_VERSION
2522

project.py

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@
2121
import os
2222

2323
from pyqtbuild import PyQtBindings, PyQtProject
24-
from sipbuild import Option
25-
26-
print("project.py")
2724

2825
class PyQGLViewerProject(PyQtProject):
2926
""" The libQGLViewer project. """
@@ -39,8 +36,7 @@ def __init__(self):
3936

4037
def get_metadata_overrides(self):
4138
import os, subprocess
42-
43-
39+
4440
version = os.environ.get("SETUPTOOLS_SCM_PRETEND_VERSION",None)
4541
if version is None:
4642
try:
@@ -57,14 +53,7 @@ def get_metadata_overrides(self):
5753
class PyQGLViewerBindings(PyQtBindings):
5854
def __init__(self, project):
5955
""" Initialise the project. """
60-
import platform
61-
62-
if platform.system() == 'Linux':
63-
qmake_CONFIG = ['c++14']
64-
else:
65-
qmake_CONFIG = []
66-
67-
super().__init__(project, 'PyQGLViewer', qmake_CONFIG=qmake_CONFIG)
56+
super().__init__(project, 'PyQGLViewer')
6857

6958
print("Instanciation of the PyQGLViewerBindings ")
7059

0 commit comments

Comments
 (0)