Skip to content

Commit 6f86e44

Browse files
committed
Update lock
1 parent 0f3d0c9 commit 6f86e44

File tree

7 files changed

+122
-52
lines changed

7 files changed

+122
-52
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
.lock-wscript
44
.DS_Store
55
.project
6-
.DS_Store
6+
.vscode
77
.eslintrc
88
node_modules/
99
bin-*/

.travis.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ matrix:
22
include:
33
- name: "Linux Test"
44
language: node_js
5-
node_js: "10.16.1"
5+
node_js: "12.13.0"
66
os: linux
77
if: NOT commit_message =~ /^:hammer:/
88
dist: xenial
@@ -12,7 +12,7 @@ matrix:
1212
- npm ci
1313
- name: "OSX Test"
1414
language: node_js
15-
node_js: "10.16.1"
15+
node_js: "12.13.0"
1616
os: osx
1717
if: NOT commit_message =~ /^:hammer:/
1818
install:
@@ -35,14 +35,14 @@ matrix:
3535
- if [[ ! -d /home/travis/qt-linux/Qt ]]; then
3636
chmod +x ./install-qt.sh;
3737
chmod +x ./extract-qt-installer.sh;
38-
export QT_CI_PACKAGES=qt.qt5.5111.gcc_64;
39-
./install-qt.sh 5.11.1 /home/travis/qt-linux;
38+
export QT_CI_PACKAGES=qt.qt5.5130.gcc_64;
39+
./install-qt.sh 5.13.0 /home/travis/qt-linux;
4040
fi;
4141
- ls /home/travis/qt-linux/Qt
42-
- export PATH=/home/travis/qt-linux/Qt/5.11.1/gcc_64/bin:$PATH
42+
- export PATH=/home/travis/qt-linux/Qt/5.13.0/gcc_64/bin:$PATH
4343
script:
4444
- chmod +x src/unpack.sh && src/unpack.sh
45-
- qmake -spec linux-g++-64 "INCLUDEPATH+=/home/travis/qt-linux/Qt/5.11.1/gcc_64/include" src/LabSound-master/qmake/labsound.pro
45+
- qmake -spec linux-g++-64 "INCLUDEPATH+=/home/travis/qt-linux/Qt/5.13.0/gcc_64/include" src/LabSound-master/qmake/labsound.pro
4646
- make
4747
- name: "OSX Build"
4848
os: osx
@@ -60,13 +60,13 @@ matrix:
6060
- if [[ ! -d /Users/travis/qt-osx/Qt ]]; then
6161
chmod +x ./install-qt.sh;
6262
chmod +x ./extract-qt-installer.sh;
63-
export QT_CI_PACKAGES=qt.qt5.5111.clang_64;
64-
./install-qt.sh 5.11.1 /Users/travis/qt-osx;
63+
export QT_CI_PACKAGES=qt.qt5.5130.clang_64;
64+
./install-qt.sh 5.13.0 /Users/travis/qt-osx;
6565
fi;
66-
- export PATH=/Users/travis/qt-osx/Qt/5.11.1/clang_64/bin:$PATH
66+
- export PATH=/Users/travis/qt-osx/Qt/5.13.0/clang_64/bin:$PATH
6767
script:
6868
- chmod +x src/unpack.sh && src/unpack.sh
69-
- qmake -spec macx-clang "QMAKE_CXXFLAGS+=-ObjC++" "QMAKE_LFLAGS_SONAME=-Wl,-install_name,@rpath/" "INCLUDEPATH+=/Users/travis/qt-osx/Qt/5.11.1/clang_64/include" src/LabSound-master/qmake/labsound.pro
69+
- qmake -spec macx-clang "QMAKE_CXXFLAGS+=-ObjC++" "QMAKE_LFLAGS_SONAME=-Wl,-install_name,@rpath/" "INCLUDEPATH+=/Users/travis/qt-osx/Qt/5.13.0/clang_64/include" src/LabSound-master/qmake/labsound.pro
7070
- make
7171

7272

README.md

Lines changed: 84 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ This is a part of [Node3D](https://github.com/node-3d) project.
77
[![Build Status](https://api.travis-ci.com/node-3d/deps-labsound-raub.svg?branch=master)](https://travis-ci.com/node-3d/deps-labsound-raub)
88
[![CodeFactor](https://www.codefactor.io/repository/github/node-3d/deps-labsound-raub/badge)](https://www.codefactor.io/repository/github/node-3d/deps-labsound-raub)
99

10-
> npm i -s deps-labsound-raub
10+
> npm i deps-labsound-raub
1111
1212

1313
## Synopsis
@@ -22,32 +22,100 @@ binaries through **NPM** for **Node.js** addons.
2222

2323
## Usage
2424

25-
**binding.gyp**
25+
### Example binding.gyp
26+
27+
As in [webaudio-raub](https://github.com/node-3d/webaudio-raub/tree/master/src) Node.js addon.
2628

2729
```javascript
30+
{
2831
'variables': {
29-
'labsound_include' : '<!(node -p "require(\'deps-labsound-raub\').include")',
30-
'labsound_bin' : '<!(node -p "require(\'deps-labsound-raub\').bin")',
32+
'bin' : '<!(node -p "require(\'addon-tools-raub\').bin")',
33+
'ls_include' : '<!(node -p "require(\'deps-labsound-raub\').include")',
34+
'ls_bin' : '<!(node -p "require(\'deps-labsound-raub\').bin")',
3135
},
32-
...
3336
'targets': [
3437
{
35-
'target_name': '...',
36-
38+
'target_name': 'webaudio',
39+
'sources': [
40+
'cpp/bindings.cpp',
41+
'cpp/common.cpp',
42+
'cpp/analyser-node.cpp',
43+
'cpp/audio-buffer.cpp',
44+
'cpp/audio-buffer-source-node.cpp',
45+
'cpp/audio-context.cpp',
46+
'cpp/audio-destination-node.cpp',
47+
'cpp/audio-listener.cpp',
48+
'cpp/audio-node.cpp',
49+
'cpp/audio-param.cpp',
50+
'cpp/audio-scheduled-source-node.cpp',
51+
'cpp/base-audio-context.cpp',
52+
'cpp/biquad-filter-node.cpp',
53+
'cpp/convolver-node.cpp',
54+
'cpp/delay-node.cpp',
55+
'cpp/gain-node.cpp',
56+
'cpp/oscillator-node.cpp',
57+
'cpp/panner-node.cpp',
58+
],
3759
'include_dirs': [
38-
'<(labsound_include)',
39-
...
60+
'<(ls_include)',
61+
'<!@(node -p "require(\'addon-tools-raub\').include")',
4062
],
41-
42-
'library_dirs': ['<(labsound_bin)'],
43-
'libraries' : ['-llabsound'],
44-
63+
'cflags!': ['-fno-exceptions'],
64+
'cflags_cc!': ['-fno-exceptions'],
65+
'library_dirs': [ '<(ls_bin)' ],
66+
'libraries': [ '-llabsound' ],
4567
'conditions': [
46-
['OS=="win"', {
47-
'libraries' : [ '-lwinmm', '-lole32', '-luser32', '-lgdi32' ],
48-
}],
68+
69+
[
70+
'OS=="linux"',
71+
{
72+
'libraries': [
73+
"-Wl,-rpath,'$$ORIGIN'",
74+
"-Wl,-rpath,'$$ORIGIN/../node_modules/deps-labsound-raub/<(bin)'",
75+
"-Wl,-rpath,'$$ORIGIN/../../deps-labsound-raub/<(bin)'",
76+
],
77+
'defines': ['__linux__'],
78+
}
79+
],
80+
81+
[
82+
'OS=="mac"',
83+
{
84+
'libraries': [
85+
'-Wl,-rpath,@loader_path',
86+
'-Wl,-rpath,@loader_path/../node_modules/deps-labsound-raub/<(bin)',
87+
'-Wl,-rpath,@loader_path/../../deps-labsound-raub/<(bin)',
88+
],
89+
'defines': ['__APPLE__'],
90+
}
91+
],
92+
93+
[
94+
'OS=="win"',
95+
{
96+
'libraries' : [ '-lwinmm', '-lole32', '-luser32', '-lgdi32' ],
97+
'defines' : [
98+
'WIN32_LEAN_AND_MEAN',
99+
'VC_EXTRALEAN',
100+
'_WIN32',
101+
],
102+
'msvs_settings' : {
103+
'VCCLCompilerTool' : {
104+
'AdditionalOptions' : [
105+
'/GL', '/GF', '/EHsc', '/GS', '/Gy', '/GR-',
106+
]
107+
},
108+
'VCLinkerTool' : {
109+
'AdditionalOptions' : ['/RELEASE','/OPT:REF','/OPT:ICF','/LTCG'],
110+
},
111+
},
112+
},
113+
],
114+
49115
],
50116
},
117+
]
118+
}
51119
```
52120

53121
LabSound C++ interface is available as documented (if) in the

package-lock.json

Lines changed: 20 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,14 @@
4141
"postinstall": "node install"
4242
},
4343
"engines": {
44-
"node": ">=10.16.1",
45-
"npm": ">=6.9.0"
44+
"node": ">=12.13.0",
45+
"npm": ">=6.12.0"
4646
},
4747
"repository": {
4848
"type": "git",
4949
"url": "https://github.com/node-3d/deps-labsound-raub.git"
5050
},
5151
"dependencies": {
52-
"addon-tools-raub": "https://github.com/node-3d/addon-tools-raub.git"
52+
"addon-tools-raub": "5.0.0"
5353
}
5454
}

src/LabSound-master.zip

-342 Bytes
Binary file not shown.

test/test.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@ const deps = require('..');
77

88
describe('Paths', () => {
99

10-
it(`exports an object`, () => {
10+
it('exports an object', () => {
1111
expect(deps).to.be.an('object');
1212
});
1313

14-
it(`exports "bin" string`, () => {
14+
it('exports "bin" string', () => {
1515
expect(deps.bin).to.be.a('string');
1616
});
1717

18-
it(`exports "include" string`, () => {
18+
it('exports "include" string', () => {
1919
expect(deps.include).to.be.a('string');
2020
});
2121

22-
it(`has installed the "bin" directory`, () => {
22+
it('has installed the "bin" directory', () => {
2323
expect(require('fs').existsSync(deps.bin)).to.be.true;
2424
});
2525

0 commit comments

Comments
 (0)