Skip to content

Commit a19ec0a

Browse files
author
Krzysztof Palacz
committed
licensing tweaks
1 parent 3b4e8a7 commit a19ec0a

File tree

2 files changed

+264
-3
lines changed

2 files changed

+264
-3
lines changed

ShaderDSL.js

Lines changed: 247 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,20 @@
1-
/*! GENERATED FILE, DO NOT EDIT */
1+
/**
2+
Copyright (c) 2013 Adobe Systems Incorporated. All rights reserved.
3+
Licensed under the Apache License, Version 2.0 (the "License");
4+
you may not use this file except in compliance with the License.
5+
You may obtain a copy of the License at
6+
7+
http://www.apache.org/licenses/LICENSE-2.0
8+
9+
Unless required by applicable law or agreed to in writing, software
10+
distributed under the License is distributed on an "AS IS" BASIS,
11+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
See the License for the specific language governing permissions and
13+
limitations under the License.
14+
*/
15+
16+
17+
/* vim: set sw=4 ts=4 et tw=78: */
218
/* ***** BEGIN LICENSE BLOCK *****
319
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
420
*
@@ -707,6 +723,7 @@ Narcissus.definitions = (function(hostGlobal) {
707723
};
708724
}(this));
709725
;
726+
/* vim: set sw=4 ts=4 et tw=78: */
710727
/* ***** BEGIN LICENSE BLOCK *****
711728
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
712729
*
@@ -1295,6 +1312,51 @@ Narcissus.lexer = (function() {
12951312

12961313
}());
12971314
;
1315+
/* -*- Mode: JS; tab-width: 4; indent-tabs-mode: nil; -*-
1316+
* vim: set sw=4 ts=4 et tw=78:
1317+
* ***** BEGIN LICENSE BLOCK *****
1318+
*
1319+
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
1320+
*
1321+
* The contents of this file are subject to the Mozilla Public License Version
1322+
* 1.1 (the "License"); you may not use this file except in compliance with
1323+
* the License. You may obtain a copy of the License at
1324+
* http://www.mozilla.org/MPL/
1325+
*
1326+
* Software distributed under the License is distributed on an "AS IS" basis,
1327+
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
1328+
* for the specific language governing rights and limitations under the
1329+
* License.
1330+
*
1331+
* The Original Code is the Narcissus JavaScript engine.
1332+
*
1333+
* The Initial Developer of the Original Code is
1334+
* Brendan Eich <brendan@mozilla.org>.
1335+
* Portions created by the Initial Developer are Copyright (C) 2004
1336+
* the Initial Developer. All Rights Reserved.
1337+
*
1338+
* Contributor(s):
1339+
* Tom Austin <taustin@ucsc.edu>
1340+
* Brendan Eich <brendan@mozilla.org>
1341+
* Shu-Yu Guo <shu@rfrn.org>
1342+
* Dave Herman <dherman@mozilla.com>
1343+
* Dimitris Vardoulakis <dimvar@ccs.neu.edu>
1344+
* Patrick Walton <pcwalton@mozilla.com>
1345+
*
1346+
* Alternatively, the contents of this file may be used under the terms of
1347+
* either the GNU General Public License Version 2 or later (the "GPL"), or
1348+
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
1349+
* in which case the provisions of the GPL or the LGPL are applicable instead
1350+
* of those above. If you wish to allow use of your version of this file only
1351+
* under the terms of either the GPL or the LGPL, and not to allow others to
1352+
* use your version of this file under the terms of the MPL, indicate your
1353+
* decision by deleting the provisions above and replace them with the notice
1354+
* and other provisions required by the GPL or the LGPL. If you do not delete
1355+
* the provisions above, a recipient may use your version of this file under
1356+
* the terms of any one of the MPL, the GPL or the LGPL.
1357+
*
1358+
* ***** END LICENSE BLOCK ***** */
1359+
12981360
/*
12991361
* Narcissus - JS implemented in JS.
13001362
*
@@ -3172,6 +3234,7 @@ Narcissus.parser = (function() {
31723234

31733235
}());
31743236
;
3237+
/* vim: set sw=4 ts=4 et tw=78: */
31753238
/* ***** BEGIN LICENSE BLOCK *****
31763239
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
31773240
*
@@ -3728,6 +3791,33 @@ Narcissus.decompiler = (function() {
37283791

37293792
}());
37303793
;
3794+
/*
3795+
* Copyright (c) 2011, Intel Corporation
3796+
* All rights reserved.
3797+
*
3798+
* Redistribution and use in source and binary forms, with or without
3799+
* modification, are permitted provided that the following conditions are met:
3800+
*
3801+
* - Redistributions of source code must retain the above copyright notice,
3802+
* this list of conditions and the following disclaimer.
3803+
* - Redistributions in binary form must reproduce the above copyright notice,
3804+
* this list of conditions and the following disclaimer in the documentation
3805+
* and/or other materials provided with the distribution.
3806+
*
3807+
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
3808+
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
3809+
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
3810+
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
3811+
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
3812+
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
3813+
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
3814+
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
3815+
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
3816+
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
3817+
* THE POSSIBILITY OF SUCH DAMAGE.
3818+
*
3819+
*/
3820+
37313821
if (RiverTrail === undefined) {
37323822
var RiverTrail = {};
37333823
}
@@ -3753,6 +3843,33 @@ RiverTrail.definitions = function () {
37533843

37543844

37553845
;
3846+
/*
3847+
* Copyright (c) 2011, Intel Corporation
3848+
* All rights reserved.
3849+
*
3850+
* Redistribution and use in source and binary forms, with or without
3851+
* modification, are permitted provided that the following conditions are met:
3852+
*
3853+
* - Redistributions of source code must retain the above copyright notice,
3854+
* this list of conditions and the following disclaimer.
3855+
* - Redistributions in binary form must reproduce the above copyright notice,
3856+
* this list of conditions and the following disclaimer in the documentation
3857+
* and/or other materials provided with the distribution.
3858+
*
3859+
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
3860+
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
3861+
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
3862+
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
3863+
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
3864+
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
3865+
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
3866+
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
3867+
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
3868+
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
3869+
* THE POSSIBILITY OF SUCH DAMAGE.
3870+
*
3871+
*/
3872+
37563873
if (RiverTrail === undefined) {
37573874
var RiverTrail = {};
37583875
}
@@ -4277,6 +4394,50 @@ RiverTrail.Helper = function () {
42774394

42784395
}();
42794396
;
4397+
/**
4398+
Copyright (c) 2013 Adobe Systems Incorporated. All rights reserved.
4399+
4400+
Licensed under the Apache License, Version 2.0 (the "License");
4401+
you may not use this file except in compliance with the License.
4402+
You may obtain a copy of the License at
4403+
4404+
http://www.apache.org/licenses/LICENSE-2.0
4405+
4406+
Unless required by applicable law or agreed to in writing, software
4407+
distributed under the License is distributed on an "AS IS" BASIS,
4408+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
4409+
See the License for the specific language governing permissions and
4410+
limitations under the License.
4411+
4412+
4413+
* Copyright (c) 2011, Intel Corporation
4414+
* All rights reserved.
4415+
*
4416+
* Redistribution and use in source and binary forms, with or without
4417+
* modification, are permitted provided that the following conditions are met:
4418+
*
4419+
* - Redistributions of source code must retain the above copyright notice,
4420+
* this list of conditions and the following disclaimer.
4421+
* - Redistributions in binary form must reproduce the above copyright notice,
4422+
* this list of conditions and the following disclaimer in the documentation
4423+
* and/or other materials provided with the distribution.
4424+
*
4425+
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
4426+
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
4427+
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
4428+
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
4429+
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
4430+
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
4431+
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
4432+
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
4433+
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
4434+
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
4435+
* THE POSSIBILITY OF SUCH DAMAGE.
4436+
*
4437+
*/
4438+
4439+
4440+
42804441
(function() {
42814442
eval(Narcissus.definitions.consts);
42824443
eval(RiverTrail.definitions.consts);
@@ -5729,6 +5890,49 @@ RiverTrail.Helper = function () {
57295890
};
57305891

57315892
})();;
5893+
/*
5894+
5895+
Copyright (c) 2013 Adobe Systems Incorporated. All rights reserved.
5896+
5897+
Licensed under the Apache License, Version 2.0 (the "License");
5898+
you may not use this file except in compliance with the License.
5899+
You may obtain a copy of the License at
5900+
5901+
http://www.apache.org/licenses/LICENSE-2.0
5902+
5903+
Unless required by applicable law or agreed to in writing, software
5904+
distributed under the License is distributed on an "AS IS" BASIS,
5905+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
5906+
See the License for the specific language governing permissions and
5907+
limitations under the License.
5908+
5909+
5910+
* Copyright (c) 2011, Intel Corporation
5911+
* All rights reserved.
5912+
*
5913+
* Redistribution and use in source and binary forms, with or without
5914+
* modification, are permitted provided that the following conditions are met:
5915+
*
5916+
* - Redistributions of source code must retain the above copyright notice,
5917+
* this list of conditions and the following disclaimer.
5918+
* - Redistributions in binary form must reproduce the above copyright notice,
5919+
* this list of conditions and the following disclaimer in the documentation
5920+
* and/or other materials provided with the distribution.
5921+
*
5922+
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
5923+
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
5924+
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
5925+
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
5926+
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
5927+
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
5928+
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
5929+
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
5930+
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
5931+
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
5932+
* THE POSSIBILITY OF SUCH DAMAGE.
5933+
*
5934+
*/
5935+
57325936
//
57335937
// Type inference phase
57345938
//
@@ -8185,6 +8389,48 @@ ShaderDSL.Typeinference = function () {
81858389
};
81868390
}();
81878391
;
8392+
/*
8393+
Copyright (c) 2013 Adobe Systems Incorporated. All rights reserved.
8394+
8395+
Licensed under the Apache License, Version 2.0 (the "License");
8396+
you may not use this file except in compliance with the License.
8397+
You may obtain a copy of the License at
8398+
8399+
http://www.apache.org/licenses/LICENSE-2.0
8400+
8401+
Unless required by applicable law or agreed to in writing, software
8402+
distributed under the License is distributed on an "AS IS" BASIS,
8403+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
8404+
See the License for the specific language governing permissions and
8405+
limitations under the License.
8406+
8407+
8408+
* Copyright (c) 2011, Intel Corporation
8409+
* All rights reserved.
8410+
*
8411+
* Redistribution and use in source and binary forms, with or without
8412+
* modification, are permitted provided that the following conditions are met:
8413+
*
8414+
* - Redistributions of source code must retain the above copyright notice,
8415+
* this list of conditions and the following disclaimer.
8416+
* - Redistributions in binary form must reproduce the above copyright notice,
8417+
* this list of conditions and the following disclaimer in the documentation
8418+
* and/or other materials provided with the distribution.
8419+
*
8420+
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
8421+
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
8422+
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
8423+
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
8424+
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
8425+
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
8426+
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
8427+
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
8428+
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
8429+
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
8430+
* THE POSSIBILITY OF SUCH DAMAGE.
8431+
*
8432+
*/
8433+
81888434
if (ShaderDSL === undefined) {
81898435
var ShaderDSL = {};
81908436
}

gruntfile.js

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,24 @@ module.exports = function(grunt) {
1919
pkg: grunt.file.readJSON('package.json'),
2020
concat: {
2121
options: {
22-
stripBanners: true,
22+
stripBanners: false,
2323
separator: ';\n',
24-
banner: '/*! GENERATED FILE, DO NOT EDIT */\n',
24+
banner:
25+
'/**'
26+
+ ' \n'
27+
+ ' Copyright (c) 2013 Adobe Systems Incorporated. All rights reserved.\n'
28+
+ ' Licensed under the Apache License, Version 2.0 (the "License");\n'
29+
+ ' you may not use this file except in compliance with the License.\n'
30+
+ ' You may obtain a copy of the License at\n'
31+
+ '\n'
32+
+ ' http://www.apache.org/licenses/LICENSE-2.0\n'
33+
+ '\n'
34+
+ ' Unless required by applicable law or agreed to in writing, software\n'
35+
+ ' distributed under the License is distributed on an "AS IS" BASIS,\n'
36+
+ ' WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n'
37+
+ ' See the License for the specific language governing permissions and\n'
38+
+ ' limitations under the License.\n'
39+
+ '*/\n\n\n'
2540
},
2641
dist: {
2742
src: ['third-party/rivertrail/jslib/jit/narcissus/jsdefs.js',

0 commit comments

Comments
 (0)