Merge pull request #642 from nasa/open460

[Build] Move to npm-based build

platform/core/bundle.js

@@ -99,25 +99,25 @@ define([
             "versions": [
                 {
                     "name": "Version",
-                    "value": "${project.version}",
+                    "value": "@@version",
                     "priority": 999
                 },
                 {
                     "name": "Built",
-                    "value": "${timestamp}",
+                    "value": "@@timestamp",
                     "description": "The date on which this version of the client was built.",
                     "priority": 990
                 },
                 {
                     "name": "Revision",
-                    "value": "${buildNumber}",
+                    "value": "@@revision",
                     "description": "A unique revision identifier for the client sources.",
                     "priority": 995
                 },
                 {
                     "name": "Branch",
-                    "value": "${scmBranch}",
-                    "description": "The date on which this version of the client was built.",
+                    "value": "@@branch",
+                    "description": "The name of the branch that was used during the build.",
                     "priority": 994
                 }
             ],
@@ -407,11 +407,11 @@ define([
             "licenses": [
                 {
                     "name": "Math.uuid.js",
-                    "version": "1.4",
+                    "version": "1.4.7",
                     "description": "Unique identifer generation (code adapted.)",
                     "author": "Robert Kieffer",
                     "website": "https://github.com/broofa/node-uuid",
-                    "copyright": "Copyright (c) 2010 Robert Kieffer",
+                    "copyright": "Copyright (c) 2010-2012 Robert Kieffer",
                     "license": "license-mit",
                     "link": "http://opensource.org/licenses/MIT"
                 }

platform/core/lib/uuid.js

@@ -1,40 +0,0 @@
-/*global define*/
-
-
-/*
-  Adapted from:
-  Math.uuid.js (v1.4)
-  http://www.broofa.com
-  mailto:robert@broofa.com
-
-  Copyright (c) 2010 Robert Kieffer
-  Dual licensed under the MIT and GPL licenses.
-*/
-define(
-    function () {
-        'use strict';
-        return function generateUUID() {
-            var chars = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'],
-                uuid = new Array(36),
-                rnd = 0,
-                r,
-                i,
-                offset = Math.floor(Date.now()) % 0xF;
-            for (i = 0; i < 36; i = i + 1) {
-                if (i === 8 || i === 13 || i === 18 || i === 23) {
-                    uuid[i] = '-';
-                } else if (i === 14) {
-                    uuid[i] = '4';
-                } else {
-                    if (rnd <= 0x02) {
-                        rnd = 0x2000000 + Math.floor(Math.random() * 0x1000000);
-                    }
-                    r = rnd % 0xf;
-                    rnd = Math.floor(rnd / 16);
-                    uuid[i] = chars[(i === 19) ? ((r % 0x3) + 0x8) : r];
-                }
-            }
-            return uuid.join('');
-        };
-    }
-);

platform/core/src/identifiers/IdentifierProvider.js

@@ -22,7 +22,7 @@
 /*global define*/
 
 define(
-    ["../../lib/uuid", "./Identifier"],
+    ["uuid", "./Identifier"],
     function (uuid, Identifier) {
         'use strict';