Skip to content

Commit 2890dfb

Browse files
erossignonerossignon
committed
improve on appveyor building
1 parent 52c09ee commit 2890dfb

5 files changed

Lines changed: 96 additions & 58 deletions

File tree

‎appveyor.yml‎

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -19,30 +19,38 @@ environment:
1919
VisualStudioVersion: "12"
2020
matrix:
2121

22-
- electron_version: "1.4.14"
23-
nodejs_version: 6
24-
platform: x86
22+
# - electron_version: "1.4.14"
23+
# nodejs_version: 6
24+
# platform: x86
2525

2626
- electron_version: "1.4.14"
2727
nodejs_version: 6
2828
platform: x64
2929

30-
- electron_version: "1.6.2"
31-
nodejs_version: 6
32-
platform: x86
30+
# - electron_version: "1.6.10"
31+
# nodejs_version: 6
32+
# platform: x86
3333

34-
- electron_version: "1.6.2"
34+
- electron_version: "1.6.10"
3535
nodejs_version: 6
3636
platform: x64
3737

38-
- nodejs_version: 6
39-
platform: x86
38+
# - electron_version: "1.6.10"
39+
# nodejs_version: 7.4
40+
# platform: x86
41+
42+
- electron_version: "1.6.10"
43+
nodejs_version: 7.4
44+
platform: x64
45+
46+
# - nodejs_version: 6
47+
# platform: x86
4048

4149
- nodejs_version: 6
4250
platform: x64
4351

44-
- nodejs_version: 7
45-
platform: x86
52+
# - nodejs_version: 7
53+
# platform: x86
4654

4755
- nodejs_version: 7
4856
platform: x64
@@ -83,7 +91,7 @@ install:
8391
8492
8593
- cmd: npm install mocha node-pre-gyp-github -g
86-
- cmd: build_oce.bat %PLATFORM%
94+
# - cmd: build_oce.bat %PLATFORM%
8795
- cmd: build.bat %PLATFORM%
8896

8997

@@ -92,11 +100,8 @@ build_script:
92100
# - npm install --build-from-source --target_arch=%npm_config_arch%
93101

94102
cache:
95-
- c:\projects\node-occ\build_oce_2013_Win64
96-
- c:\projects\node-occ\build_oce_2013_Win32
97-
- c:\projects\node-occ\build_oce_2015_Win64
98-
- c:\projects\node-occ\build_oce_2015_Win32
99-
- c:\OCE-0.18
103+
- c:\projects\node-occ\occt-7.1.0
104+
100105

101106
configuration:
102107
- Release
@@ -116,5 +121,3 @@ after_test:
116121
deploy: off
117122

118123
build: off
119-
120-

‎binding.gyp‎

Lines changed: 54 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -6,29 +6,57 @@
66
"targets": [
77
{
88
"target_name": "occ",
9-
"cflags!": [
10-
"-fno-exceptions"
11-
],
12-
"cflags_cc!": [
13-
"-fno-exceptions"
14-
],
15-
"cflags": [
16-
"-O3",
17-
"-frtti",
18-
"-Wno-ignored-qualifiers",
19-
"-Wno-unused-variable",
20-
"-Wno-reorder",
21-
"-Wno-extra"
22-
],
23-
"cflags_cc": [
24-
"-Wl,-rpath,\${ORIGIN}",
25-
"-O3",
26-
"-frtti",
27-
"-Wno-ignored-qualifiers",
28-
"-Wno-unused-variable",
29-
"-Wno-reorder",
30-
"-Wno-extra"
31-
],
9+
10+
"conditions": [
11+
[
12+
"OS=='linux'", {
13+
"cflags!": [
14+
"-fno-exceptions"
15+
],
16+
"cflags_cc!": [
17+
"-fno-exceptions"
18+
],
19+
"cflags": [
20+
"-O3",
21+
"-frtti",
22+
"-Wno-ignored-qualifiers",
23+
"-Wno-unused-variable",
24+
"-Wno-reorder",
25+
"-Wno-extra"
26+
],
27+
"cflags_cc": [
28+
"-Wl,-rpath,\${ORIGIN}",
29+
"-O3",
30+
"-frtti",
31+
"-Wno-ignored-qualifiers",
32+
"-Wno-unused-variable",
33+
"-Wno-reorder",
34+
"-Wno-extra"
35+
],
36+
37+
"library_dirs": [
38+
"<!(pwd)/occt-7.1.0/lib",
39+
],
40+
"include_dirs": [
41+
"<!(pwd)/occt-7.1.0/include/opencascade",
42+
"<!(node -e \"require('nan')\")"
43+
],
44+
45+
}
46+
],
47+
[
48+
"OS=='win'", {
49+
"library_dirs": [
50+
"./occt-7.1.0/win64/vc14/lib",
51+
],
52+
"include_dirs": [
53+
"./occt-7.1.0/inc",
54+
"<!(node -e \"require('nan')\")"
55+
],
56+
}
57+
]
58+
],
59+
3260
"xcode_settings": {
3361
"GCC_ENABLE_CPP_EXCEPTIONS": "YES"
3462
},
@@ -83,13 +111,6 @@
83111
"OCE_HAVE_IOSTREAM",
84112
"OCE_HAVE_CLIMITS"
85113
],
86-
"library_dirs": [
87-
"<!(pwd)/occt-7.1.0/lib",
88-
],
89-
"include_dirs": [
90-
"<!(pwd)/occt-7.1.0/include/opencascade",
91-
"<!(node -e \"require('nan')\")"
92-
],
93114
"libraries+": [
94115
"-Wl,-rpath=<(OOO)",
95116
"-lTKBO<(dbg)",
@@ -115,10 +136,10 @@
115136
"-lTKSTEPAttr<(dbg)",
116137
"-lTKSTEPBase<(dbg)",
117138
"-lTKFillet<(dbg)",
118-
"-lTKXSBase<(dbg)"
139+
"-lTKXSBase<(dbg)",
140+
"-lTKSTL<(dbg)",
119141
],
120142
"other_libraries": [
121-
"-lTKSTL<(dbg)",
122143
"-lTKTObj<(dbg)",
123144
"-lTKLCAF<(dbg)"
124145
],
@@ -205,7 +226,7 @@
205226
"OS=='win'",
206227
{
207228
"variables": {
208-
"bin_folder": '<!(ECHO %PREFIX%)\<!(ECHO %ARCH%)/bin'
229+
"bin_folder": 'occt-7.1.0/win64/vc14/bin'
209230
},
210231
"copies": [
211232
{

‎build.bat‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ ECHO NPM
4343
SET GYP_MSVS_VERSION=%VSVER%
4444

4545
ECHO PREFIX = %PREFIX%
46-
ECHO PREFIX = %GENERATOR%
4746

4847
cd /d %~dp0"
4948

‎lib/shape.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ exports.init= function() {
170170
if (edge.isSeam) continue;
171171
let polygone = edge.polygonize();
172172

173-
console.log( "polygone.length = ",polygone.length);
173+
//xx console.log( "polygone.length = ",polygone.length);
174174
let pts = [];
175175
for (let j = 0; j < polygone.length; j++) {
176176
pts.push(polygone[j]);

‎setenv.bat‎

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,28 @@ if '%ARCH%' == 'unset' (
99
echo "USAGE : SETENV 32|64"
1010
exit /B 1
1111
)
12+
13+
14+
SET CWD=%~dp0
15+
SET OCCT_FOLDER="%CWD%occt-7.1.0\"
16+
ECHO %OCCT_FOLDER%
17+
IF EXIST "%OCCT_FOLDER%" (
18+
echo OCCT-7.1.0 prebuild stuff already installed
19+
) else (
20+
IF NOT EXIST occt-7.0.1 (
21+
curl -OL https://github.com/OpenWebCAD/occt_builder/releases/download/v7.1.0l/occt-7.1.0-win64.zip
22+
)
23+
7z x occt-7.1.0-win64.zip -y > a.txt
24+
echo DONE
25+
)
26+
1227
::
1328
:: Note CL and LINK require unix style like path
1429
::
15-
SET OCE=OCE-0.18
16-
SET PREFIX=c:/%OCE%
17-
SET CL=/I%PREFIX%/include/oce
18-
SET LINK=/LIBPATH:%PREFIX%/%ARCH%/lib
30+
SET OCE=occt-7.1.0
31+
SET PREFIX=%OCCT_FOLDER%
32+
SET CL=/I%PREFIX%/inc
33+
SET LINK=/LIBPATH:%PREFIX%/%ARCH%/vc14/lib
1934
SET CMAKE_BIN=C:\Program Files (x86)\CMake\bin
2035
SET GIT_BIN=C:\Program Files (x86)\Git\bin
2136
::

0 commit comments

Comments
 (0)