Skip to content

Commit

Permalink
move sc-classes -> supercollider-js for increased obviousness
Browse files Browse the repository at this point in the history
  • Loading branch information
crucialfelix committed Jun 27, 2016
1 parent fd826a5 commit 47ebe05
Show file tree
Hide file tree
Showing 10 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"jsstyle": "jscs src bin examples/*.js",
"compile": "babel --source-maps --out-dir=./lib src",
"watch": "babel --watch --source-maps --out-dir=./lib src",
"copy": "cp src/server/*.json lib/server/ && cp -R src/sc-classes lib/",
"copy": "cp src/server/*.json lib/server/ && cp -R src/supercollider-js lib/",
"docs": "esdoc -c esdoc.json",
"build": "npm run compile && npm run copy",
"prepublish": "npm run build",
Expand Down
10 changes: 5 additions & 5 deletions src/lang/__tests__/sclang-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@ describe('sclang', function() {

describe('sclangConfigOptions', function() {

it('should include sc-classes', function() {
it('should include supercollider-js', function() {
var sclang = new SCLang();
var opts = sclang.sclangConfigOptions();
expect(opts.includePaths.length).toEqual(1);
var isIn = _.some(opts.includePaths, function(p) {
// and that directory should really exist
return p.match(/sc\-classes/) && fs.existsSync(p);
return p.match(/supercollider\-js/) && fs.existsSync(p);
});
expect(isIn).toBeTruthy();
});
Expand All @@ -51,7 +51,7 @@ describe('sclang', function() {
var opts = sclang.sclangConfigOptions({
sclang_conf: path.join(__dirname, 'fixtures', 'sclang_test_conf.yaml')
});
// as well as sc-classes
// as well as supercollider-js
expect(opts.includePaths.length).toEqual(2 + 1);
expect(opts.excludePaths.length).toEqual(1);
});
Expand Down Expand Up @@ -104,11 +104,11 @@ describe('sclang', function() {
});

describe('sclangConfigOptions', function() {
it('should include sc-classes', function() {
it('should include supercollider-js', function() {
var sclang = new SCLang();
var config = sclang.sclangConfigOptions();
expect(config.includePaths.length).toEqual(1);
expect(config.includePaths[0].match(/sc-classes/)).toBeTruthy();
expect(config.includePaths[0].match(/supercollider-js/)).toBeTruthy();
});

it('postInlineWarning should not be undefined', function() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ empty
compiling class library...
NumPrimitives = 710
compiling dir: '/Users/crucial/code/supercollider/build/Install/SuperCollider/SuperCollider.app/Contents/Resources/SCClassLibrary'
compiling dir: '/Users/crucial/github/atom-supercollider/node_modules/supercolliderjs/lib/sc-classes'
compiling dir: '/Users/crucial/github/atom-supercollider/node_modules/supercolliderjs/lib/supercollider-js'
compiling dir: '/Users/crucial/Library/Application Support/SuperCollider/downloaded-quarks/Steno'
pass 1 done
numentries = 819694 / 11593660 = 0.071
Expand Down
2 changes: 1 addition & 1 deletion src/lang/sclang.js
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ export class SCLang extends EventEmitter {
sclangConfigOptions(options={}) {
var
runtimeIncludePaths = [
path.resolve(__dirname, '../../lib/sc-classes')
path.resolve(__dirname, '../../lib/supercollider-js')
],
sclang_conf = {};

Expand Down
4 changes: 0 additions & 4 deletions src/sc-classes/sc-classes.quark

This file was deleted.

File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@

*prSaveConfig {
var scjs = LanguageConfig.includePaths.detect({ arg p;
p.contains("supercolliderjs/lib/sc-classes");
p.contains("supercolliderjs/lib/supercollider-js");
});

if (scjs.notNil, {
Expand Down
4 changes: 4 additions & 0 deletions src/supercollider-js/supercollider-js.quark
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
(
'summary': "supercollider.js adds this quark to support two-way communication between supercollider and the node.js host. It also overides methods of the Error classes so that they print errors as JSON data.",
'version': "0.11.0"
)

0 comments on commit 47ebe05

Please sign in to comment.