update build, licenses, and cleaned up comments

Makefile.js

@@ -1,12 +1,27 @@
 var VERSION = "0.0.1",
-    smoosh = require('smoosh'),
-    fs = require('fs');
+    smoosh = require("smoosh"),
+    fs = require("fs");
 
-smoosh.make('config/smoosh.json');
+smoosh.make("config/smoosh.json");
 
-var copyright = fs.readFileSync('./src/copyright.js', 'utf8'),
-    sslac     = fs.readFileSync('./tmp/sslac.js', 'utf8'),
-    sslacMin  = fs.readFileSync('./tmp/sslac.min.js', 'utf8') + ";";
+var copyright = fs.readFileSync("./src/copyright.js", "utf8"),
+    sslac     = fs.readFileSync("./tmp/sslac.js", "utf8"),
+    sslacMin  = fs.readFileSync("./tmp/sslac.min.js", "utf8") + ";",
+    licenses  = {
+      "yui_bsd":    fs.readFileSync("./src/licenses/yui_bsd.js", "utf8"),
+      "sslac_mit":  fs.readFileSync("./src/licenses/yui_bsd.js", "utf8"),
+      "header":     fs.readFileSync("./src/licenses.js", "utf8"),
+    };
 
-fs.writeFileSync('./artifacts/sslac-'+VERSION+'.js', [copyright, sslac].join(''), 'utf8');
-fs.writeFileSync('./artifacts/sslac-'+VERSION+'.min.js', [copyright, sslacMin].join(''), 'utf8');
+fs.writeFileSync("./artifacts/sslac-"+VERSION+".js", [
+  copyright,
+  licenses.header,
+  licenses.sslac_mit,
+  sslac,
+  licenses.yui_bsd
+].join("\n"), "utf8");
+
+fs.writeFileSync("./artifacts/sslac-"+VERSION+".min.js", [
+  copyright,
+  sslacMin
+].join(""), "utf8");

src/copyright.js

@@ -1,28 +1,5 @@
 /*
 Library: Sslac
 Homepage: https://github.com/jakobo/sslac
-
----
-
-The MIT License
-
-Copyright (c) 2008 Jakob Heuser <jakob@felocity.org>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+License: MIT License
 */

src/licenses.js

@@ -0,0 +1,11 @@
+/*
+ADDITIONAL LICENSES USED IN THIS PACKAGE:
+Segments of this code are (c) specific individuals and groups, listed
+below with their licensing. Please see
+https://github.com/Jakobo/Sslac/tree/master/src/licenses or the bottom of
+this file for full copyrights and licenses.
+
+sslac.js contains:
+BSD Licensed code Copyright (c) 2010, Yahoo! Inc.
+
+*/

src/licenses/sslac_mit.js

@@ -0,0 +1,23 @@
+/*
+The MIT License
+
+Copyright (c) 2008 Jakob Heuser <jakob@felocity.org>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+*/

src/licenses/yui_bsd.js

@@ -0,0 +1,29 @@
+/*
+Copyright (c) 2010, Yahoo! Inc.
+All rights reserved.
+Redistribution and use of this software in source and binary forms, with or
+without modification, are permitted provided that the following conditions are
+met:
+
+* Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+
+* Neither the name of Yahoo! Inc. nor the names of its contributors may be used
+to endorse or promote products derived from this software without specific prior
+written permission of Yahoo! Inc.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/