Skip to content

Commit 7899961

Browse files
erossignonerossignon
committed
use standard distrib package for occt
- fix for mac and occ 7.4.0 - use occt from freecad repository on linux - use own OpenWebCad occt library on windows
1 parent 6e26fa1 commit 7899961

File tree

8 files changed

+204
-365
lines changed

8 files changed

+204
-365
lines changed

‎.travis.yml‎

Lines changed: 30 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
language: cpp
2-
dist: bionic // 18.04
2+
# 18.04
3+
dist: bionic
4+
# - focal
5+
36
os:
47
- linux
58
- osx
9+
osx_image: xcode12
610

711
# we use travis container based infrastructure
812
# https://docs.travis-ci.com/user/installing-dependencies/#Installing-Packages-on-Container-Based-Infrastructure
@@ -39,21 +43,35 @@ matrix:
3943
# env: TRAVIS_NODE_VERSION="7" ARCH="x86"
4044
allow_failures:
4145
- os: osx
46+
4247
addons:
4348
apt:
4449
sources:
45-
- ubuntu-toolchain-r-test
50+
- sourceline: 'ppa:ubuntu-toolchain-r/test'
51+
- sourceline: 'deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-10 main'
52+
key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
4653
packages:
47-
- g++
48-
- libtbb2
49-
- libtbb-dev
54+
- g++
55+
- libtbb2
56+
- libtbb-dev
57+
update: true
58+
homebrew:
59+
packages:
60+
- tbb
61+
- freetype
62+
- opencascade
63+
update: true
5064

5165
before_install:
52-
#
53-
- if [[ $TRAVIS_OS_NAME == "linux" ]]; then sudo apt-get install -y libtbb2 libtbb-dev; fi
54-
#
55-
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi
56-
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install tbb; fi
66+
- >
67+
if [[ $TRAVIS_OS_NAME == "linux" ]]; then
68+
cat /etc/apt/sources.list
69+
sudo add-apt-repository universe
70+
sudo add-apt-repository multiverse
71+
sudo apt-add-repository -y ppa:freecad-maintainers/freecad-daily
72+
sudo apt-get update -qq
73+
sudo apt-get install -y --no-install-recommends libocct-data-exchange-dev
74+
fi
5775
5876
# reinstall latest nvm
5977
- rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh
@@ -96,8 +114,8 @@ install:
96114
script:
97115
- >
98116
if [[ -z $TRAVIS_ELECTRON_VERSION ]]; then
99-
export LD_LIBRARY_PATH=`pwd`/occt-7.2.0/lib
100-
export DYLD_LIBRARY_PATH=`pwd`/occt-7.2.0/lib
117+
# export LD_LIBRARY_PATH=`pwd`/occt-7.2.0/lib
118+
# export DYLD_LIBRARY_PATH=`pwd`/occt-7.2.0/lib
101119
node ./
102120
npm test
103121
else

‎binding.gyp‎

Lines changed: 2 additions & 125 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,9 @@
2424
]
2525
},
2626
"library_dirs": [
27-
"<!(pwd)/occt-7.2.0/lib",
2827
],
2928
"include_dirs": [
30-
"<!(pwd)/occt-7.2.0/include/opencascade",
29+
"/usr/local/include/opencascade",
3130
"<!(node -e \"require('nan')\")"
3231
],},
3332
],
@@ -61,10 +60,9 @@
6160
],
6261

6362
"library_dirs": [
64-
"<!(pwd)/occt-7.2.0/lib",
6563
],
6664
"include_dirs": [
67-
"<!(pwd)/occt-7.2.0/include/opencascade",
65+
"/usr/include/opencascade",
6866
"<!(node -e \"require('nan')\")"
6967
],}
7068
],
@@ -190,128 +188,7 @@
190188
"<(module_name)"
191189
],
192190
"conditions": [
193-
["OS=='mac'",
194-
{
195-
"variables": {
196-
"bin_folder": "./occt-7.2.0/lib"
197-
},
198-
"copies": [
199-
{
200-
"files": [
201-
"<(bin_folder)/libTKBO.7.dylib",
202-
"<(bin_folder)/libTKBool.7.dylib",
203-
"<(bin_folder)/libTKBRep.7.dylib",
204-
"<(bin_folder)/libTKernel.7.dylib",
205-
"<(bin_folder)/libTKFeat.7.dylib",
206-
"<(bin_folder)/libTKFillet.7.dylib",
207-
"<(bin_folder)/libTKG2d.7.dylib",
208-
"<(bin_folder)/libTKG3d.7.dylib",
209-
"<(bin_folder)/libTKGeomAlgo.7.dylib",
210-
"<(bin_folder)/libTKGeomBase.7.dylib",
211-
"<(bin_folder)/libTKIGES.7.dylib",
212-
213-
"<(bin_folder)/libTKMath.7.dylib",
214-
"<(bin_folder)/libTKMesh.7.dylib",
215-
"<(bin_folder)/libTKOffset.7.dylib",
216-
"<(bin_folder)/libTKPrim.7.dylib",
217-
"<(bin_folder)/libTKShHealing.7.dylib",
218-
"<(bin_folder)/libTKSTEP.7.dylib",
219-
"<(bin_folder)/libTKSTEP209.7.dylib",
220-
"<(bin_folder)/libTKSTEPAttr.7.dylib",
221-
"<(bin_folder)/libTKSTEPBase.7.dylib",
222-
"<(bin_folder)/libTKSTL.7.dylib",
223-
"<(bin_folder)/libTKTopAlgo.7.dylib",
224-
"<(bin_folder)/libTKXSBase.7.dylib",
225-
226-
"<(bin_folder)/libTKBO.7.2.1.dylib",
227-
"<(bin_folder)/libTKBool.7.2.1.dylib",
228-
"<(bin_folder)/libTKBRep.7.2.1.dylib",
229-
"<(bin_folder)/libTKernel.7.2.1.dylib",
230-
"<(bin_folder)/libTKFeat.7.2.1.dylib",
231-
"<(bin_folder)/libTKFillet.7.2.1.dylib",
232-
"<(bin_folder)/libTKG2d.7.2.1.dylib",
233-
"<(bin_folder)/libTKG3d.7.2.1.dylib",
234-
"<(bin_folder)/libTKGeomAlgo.7.2.1.dylib",
235-
"<(bin_folder)/libTKGeomBase.7.2.1.dylib",
236-
"<(bin_folder)/libTKIGES.7.2.1.dylib",
237191

238-
"<(bin_folder)/libTKMath.7.2.1.dylib",
239-
"<(bin_folder)/libTKMesh.7.2.1.dylib",
240-
"<(bin_folder)/libTKOffset.7.2.1.dylib",
241-
"<(bin_folder)/libTKPrim.7.2.1.dylib",
242-
"<(bin_folder)/libTKShHealing.7.2.1.dylib",
243-
"<(bin_folder)/libTKSTEP.7.2.1.dylib",
244-
"<(bin_folder)/libTKSTEP209.7.2.1.dylib",
245-
"<(bin_folder)/libTKSTEPAttr.7.2.1.dylib",
246-
"<(bin_folder)/libTKSTEPBase.7.2.1.dylib",
247-
"<(bin_folder)/libTKSTL.7.2.1.dylib",
248-
"<(bin_folder)/libTKTopAlgo.7.2.1.dylib",
249-
"<(bin_folder)/libTKXSBase.7.2.1.dylib",
250-
251-
252-
] ,
253-
"destination": "<(module_path)"
254-
}]
255-
}],
256-
["OS=='linux'",
257-
{
258-
"variables": {
259-
"bin_folder": "./occt-7.2.0/lib"
260-
},
261-
"copies": [
262-
{
263-
"files": [
264-
"<(bin_folder)/libTKBO.so.7",
265-
"<(bin_folder)/libTKBool.so.7",
266-
"<(bin_folder)/libTKBRep.so.7",
267-
"<(bin_folder)/libTKernel.so.7",
268-
"<(bin_folder)/libTKFillet.so.7",
269-
"<(bin_folder)/libTKFeat.so.7",
270-
"<(bin_folder)/libTKIGES.so.7",
271-
"<(bin_folder)/libTKG2d.so.7",
272-
"<(bin_folder)/libTKG3d.so.7",
273-
"<(bin_folder)/libTKGeomAlgo.so.7",
274-
"<(bin_folder)/libTKGeomBase.so.7",
275-
"<(bin_folder)/libTKMath.so.7",
276-
"<(bin_folder)/libTKMesh.so.7",
277-
"<(bin_folder)/libTKOffset.so.7",
278-
"<(bin_folder)/libTKPrim.so.7",
279-
"<(bin_folder)/libTKShHealing.so.7",
280-
"<(bin_folder)/libTKSTEP.so.7",
281-
"<(bin_folder)/libTKSTEP209.so.7",
282-
"<(bin_folder)/libTKSTEPAttr.so.7",
283-
"<(bin_folder)/libTKSTEPBase.so.7",
284-
"<(bin_folder)/libTKSTL.so.7",
285-
"<(bin_folder)/libTKTopAlgo.so.7",
286-
"<(bin_folder)/libTKXSBase.so.7",
287-
288-
"<(bin_folder)/libTKBO.so.7.2.1",
289-
"<(bin_folder)/libTKBool.so.7.2.1",
290-
"<(bin_folder)/libTKBRep.so.7.2.1",
291-
"<(bin_folder)/libTKernel.so.7.2.1",
292-
"<(bin_folder)/libTKFillet.so.7.2.1",
293-
"<(bin_folder)/libTKFeat.so.7.2.1",
294-
"<(bin_folder)/libTKIGES.so.7.2.1",
295-
"<(bin_folder)/libTKG2d.so.7.2.1",
296-
"<(bin_folder)/libTKG3d.so.7.2.1",
297-
"<(bin_folder)/libTKGeomAlgo.so.7.2.1",
298-
"<(bin_folder)/libTKGeomBase.so.7.2.1",
299-
"<(bin_folder)/libTKMath.so.7.2.1",
300-
"<(bin_folder)/libTKMesh.so.7.2.1",
301-
"<(bin_folder)/libTKOffset.so.7.2.1",
302-
"<(bin_folder)/libTKPrim.so.7.2.1",
303-
"<(bin_folder)/libTKShHealing.so.7.2.1",
304-
"<(bin_folder)/libTKSTEP.so.7.2.1",
305-
"<(bin_folder)/libTKSTEP209.so.7.2.1",
306-
"<(bin_folder)/libTKSTEPAttr.so.7.2.1",
307-
"<(bin_folder)/libTKSTEPBase.so.7.2.1",
308-
"<(bin_folder)/libTKSTL.so.7.2.1",
309-
"<(bin_folder)/libTKTopAlgo.so.7.2.1",
310-
"<(bin_folder)/libTKXSBase.so.7.2.1",
311-
] ,
312-
"destination": "<(module_path)"
313-
}]
314-
}],
315192
["OS=='win'",
316193
{
317194
"variables": {

0 commit comments

Comments
 (0)