Commit 6efdce72 authored by Romain Courteaud's avatar Romain Courteaud

Keep a local copy of the dependencies.

parent 0b8595f2
...@@ -24,12 +24,13 @@ SRCDIR = src ...@@ -24,12 +24,13 @@ SRCDIR = src
LINTDIR = lint LINTDIR = lint
TESTDIR = test TESTDIR = test
EXAMPLEDIR = examples EXAMPLEDIR = examples
EXTERNALDIR = external
VERSION = 3.32.1 VERSION = 3.32.1
JIOVERSION = ${DISTDIR}/jio-v${VERSION}.js JIOVERSION = ${DISTDIR}/jio-v${VERSION}.js
JIOLATEST = ${DISTDIR}/jio-latest.js JIOLATEST = ${DISTDIR}/jio-latest.js
all: checktest build all: fetch checktest build
############################################# #############################################
# Lint # Lint
...@@ -101,16 +102,16 @@ ${JIOLATEST}: ${JIOVERSION} ...@@ -101,16 +102,16 @@ ${JIOLATEST}: ${JIOVERSION}
cp $< $@ cp $< $@
${JIOVERSION}: lib/uri/URI.js \ ${JIOVERSION}: lib/uri/URI.js \
node_modules/uritemplate/bin/uritemplate.js \ ${EXTERNALDIR}/uritemplate.js \
node_modules/lz-string/libs/lz-string.js \ ${EXTERNALDIR}/lz-string.js \
node_modules/moment/moment.js \ ${EXTERNALDIR}/moment.js \
${SRCDIR}/queries/parser-begin.js \ ${SRCDIR}/queries/parser-begin.js \
${SRCDIR}/queries/build/parser.js \ ${SRCDIR}/queries/build/parser.js \
${SRCDIR}/queries/parser-end.js \ ${SRCDIR}/queries/parser-end.js \
${LINTDIR}/queries/query.js \ ${LINTDIR}/queries/query.js \
${LINTDIR}/jio.date/jiodate.js \ ${LINTDIR}/jio.date/jiodate.js \
${LINTDIR}/jio.js \ ${LINTDIR}/jio.js \
node_modules/rusha/rusha.js \ ${EXTERNALDIR}/rusha.js \
${LINTDIR}/jio.storage/replicatestorage.js \ ${LINTDIR}/jio.storage/replicatestorage.js \
${LINTDIR}/jio.storage/shastorage.js \ ${LINTDIR}/jio.storage/shastorage.js \
${LINTDIR}/jio.storage/uuidstorage.js \ ${LINTDIR}/jio.storage/uuidstorage.js \
...@@ -144,7 +145,68 @@ ${SRCDIR}/queries/build/parser.js: ${SRCDIR}/queries/core/parser.par ...@@ -144,7 +145,68 @@ ${SRCDIR}/queries/build/parser.js: ${SRCDIR}/queries/core/parser.par
@mkdir -p $(@D) @mkdir -p $(@D)
${JISON} -m js -o $@ $< ${JISON} -m js -o $@ $<
#############################################
# Dependencies
#############################################
fetch: ${EXTERNALDIR}/uritemplate.js \
${EXTERNALDIR}/lz-string.js \
${EXTERNALDIR}/moment.js \
${EXTERNALDIR}/rusha.js \
${EXTERNALDIR}/rsvp-2.0.4.js \
${EXTERNALDIR}/qunit.css \
${EXTERNALDIR}/qunit.js \
${EXTERNALDIR}/sinon.js \
${EXTERNALDIR}/renderjs-latest.js
${EXTERNALDIR}/uritemplate.js: node_modules/uritemplate/bin/uritemplate.js
@echo copy
@mkdir -p $(@D)
cp $< $@
${EXTERNALDIR}/lz-string.js: node_modules/lz-string/libs/lz-string.js
@echo copy
@mkdir -p $(@D)
cp $< $@
${EXTERNALDIR}/moment.js: node_modules/moment/moment.js
@echo copy
@mkdir -p $(@D)
cp $< $@
${EXTERNALDIR}/rusha.js: node_modules/rusha/rusha.js
@echo copy
@mkdir -p $(@D)
cp $< $@
${EXTERNALDIR}/rsvp-2.0.4.js: node_modules/rsvp/dist/rsvp-2.0.4.js
@echo copy
@mkdir -p $(@D)
cp $< $@
${EXTERNALDIR}/qunit.css: node_modules/grunt-contrib-qunit/test/libs/qunit.css
@echo copy
@mkdir -p $(@D)
cp $< $@
${EXTERNALDIR}/qunit.js: node_modules/grunt-contrib-qunit/test/libs/qunit.js
@echo copy
@mkdir -p $(@D)
cp $< $@
${EXTERNALDIR}/sinon.js: node_modules/sinon/pkg/sinon.js
@echo copy
@mkdir -p $(@D)
cp $< $@
${EXTERNALDIR}/renderjs-latest.js: node_modules/renderjs/dist/renderjs-latest.js
@echo copy
@mkdir -p $(@D)
cp $< $@
.phony: clean .phony: clean
clean: clean:
rm -rf ${LINTDIR} rm -rf ${LINTDIR}
forceclean: clean
rm -rf ${EXTERNALDIR} ${SRCDIR}/queries/build/parser.js
...@@ -24,12 +24,12 @@ See https://www.nexedi.com/licensing for rationale and options. ...@@ -24,12 +24,12 @@ See https://www.nexedi.com/licensing for rationale and options.
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<title>jIO Coverage Scenario</title> <title>jIO Coverage Scenario</title>
<script src="../node_modules/rsvp/dist/rsvp-2.0.4.js"></script> <script src="../external/rsvp-2.0.4.js"></script>
<script src="../node_modules/renderjs/dist/renderjs-latest.js"></script> <script src="../external/renderjs-latest.js"></script>
<script src="../dist/jio-latest.js"></script> <script src="../dist/jio-latest.js"></script>
<link rel="stylesheet" href="../node_modules/grunt-contrib-qunit/test/libs/qunit.css" type="text/css" media="screen"/> <link rel="stylesheet" href="../external/qunit.css" type="text/css" media="screen"/>
<script src="../node_modules/grunt-contrib-qunit/test/libs/qunit.js" type="text/javascript"></script> <script src="../external/qunit.js" type="text/javascript"></script>
<script src="scenario.js"></script> <script src="scenario.js"></script>
</head> </head>
......
This diff is collapsed.
This diff is collapsed.
/**
* QUnit v1.12.0 - A JavaScript Unit Testing Framework
*
* http://qunitjs.com
*
* Copyright 2012 jQuery Foundation and other contributors
* Released under the MIT license.
* http://jquery.org/license
*/
/** Font Family and Sizes */
#qunit-tests, #qunit-header, #qunit-banner, #qunit-testrunner-toolbar, #qunit-userAgent, #qunit-testresult {
font-family: "Helvetica Neue Light", "HelveticaNeue-Light", "Helvetica Neue", Calibri, Helvetica, Arial, sans-serif;
}
#qunit-testrunner-toolbar, #qunit-userAgent, #qunit-testresult, #qunit-tests li { font-size: small; }
#qunit-tests { font-size: smaller; }
/** Resets */
#qunit-tests, #qunit-header, #qunit-banner, #qunit-userAgent, #qunit-testresult, #qunit-modulefilter {
margin: 0;
padding: 0;
}
/** Header */
#qunit-header {
padding: 0.5em 0 0.5em 1em;
color: #8699a4;
background-color: #0d3349;
font-size: 1.5em;
line-height: 1em;
font-weight: normal;
border-radius: 5px 5px 0 0;
-moz-border-radius: 5px 5px 0 0;
-webkit-border-top-right-radius: 5px;
-webkit-border-top-left-radius: 5px;
}
#qunit-header a {
text-decoration: none;
color: #c2ccd1;
}
#qunit-header a:hover,
#qunit-header a:focus {
color: #fff;
}
#qunit-testrunner-toolbar label {
display: inline-block;
padding: 0 .5em 0 .1em;
}
#qunit-banner {
height: 5px;
}
#qunit-testrunner-toolbar {
padding: 0.5em 0 0.5em 2em;
color: #5E740B;
background-color: #eee;
overflow: hidden;
}
#qunit-userAgent {
padding: 0.5em 0 0.5em 2.5em;
background-color: #2b81af;
color: #fff;
text-shadow: rgba(0, 0, 0, 0.5) 2px 2px 1px;
}
#qunit-modulefilter-container {
float: right;
}
/** Tests: Pass/Fail */
#qunit-tests {
list-style-position: inside;
}
#qunit-tests li {
padding: 0.4em 0.5em 0.4em 2.5em;
border-bottom: 1px solid #fff;
list-style-position: inside;
}
#qunit-tests.hidepass li.pass, #qunit-tests.hidepass li.running {
display: none;
}
#qunit-tests li strong {
cursor: pointer;
}
#qunit-tests li a {
padding: 0.5em;
color: #c2ccd1;
text-decoration: none;
}
#qunit-tests li a:hover,
#qunit-tests li a:focus {
color: #000;
}
#qunit-tests li .runtime {
float: right;
font-size: smaller;
}
.qunit-assert-list {
margin-top: 0.5em;
padding: 0.5em;
background-color: #fff;
border-radius: 5px;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
}
.qunit-collapsed {
display: none;
}
#qunit-tests table {
border-collapse: collapse;
margin-top: .2em;
}
#qunit-tests th {
text-align: right;
vertical-align: top;
padding: 0 .5em 0 0;
}
#qunit-tests td {
vertical-align: top;
}
#qunit-tests pre {
margin: 0;
white-space: pre-wrap;
word-wrap: break-word;
}
#qunit-tests del {
background-color: #e0f2be;
color: #374e0c;
text-decoration: none;
}
#qunit-tests ins {
background-color: #ffcaca;
color: #500;
text-decoration: none;
}
/*** Test Counts */
#qunit-tests b.counts { color: black; }
#qunit-tests b.passed { color: #5E740B; }
#qunit-tests b.failed { color: #710909; }
#qunit-tests li li {
padding: 5px;
background-color: #fff;
border-bottom: none;
list-style-position: inside;
}
/*** Passing Styles */
#qunit-tests li li.pass {
color: #3c510c;
background-color: #fff;
border-left: 10px solid #C6E746;
}
#qunit-tests .pass { color: #528CE0; background-color: #D2E0E6; }
#qunit-tests .pass .test-name { color: #366097; }
#qunit-tests .pass .test-actual,
#qunit-tests .pass .test-expected { color: #999999; }
#qunit-banner.qunit-pass { background-color: #C6E746; }
/*** Failing Styles */
#qunit-tests li li.fail {
color: #710909;
background-color: #fff;
border-left: 10px solid #EE5757;
white-space: pre;
}
#qunit-tests > li:last-child {
border-radius: 0 0 5px 5px;
-moz-border-radius: 0 0 5px 5px;
-webkit-border-bottom-right-radius: 5px;
-webkit-border-bottom-left-radius: 5px;
}
#qunit-tests .fail { color: #000000; background-color: #EE5757; }
#qunit-tests .fail .test-name,
#qunit-tests .fail .module-name { color: #000000; }
#qunit-tests .fail .test-actual { color: #EE5757; }
#qunit-tests .fail .test-expected { color: green; }
#qunit-banner.qunit-fail { background-color: #EE5757; }
/** Result */
#qunit-testresult {
padding: 0.5em 0.5em 0.5em 2.5em;
color: #2b81af;
background-color: #D2E0E6;
border-bottom: 1px solid white;
}
#qunit-testresult .module-name {
font-weight: bold;
}
/** Fixture */
#qunit-fixture {
position: absolute;
top: -10000px;
left: -10000px;
width: 1000px;
height: 1000px;
}
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -28,10 +28,7 @@ ...@@ -28,10 +28,7 @@
"cloud" "cloud"
], ],
"dependencies": { "dependencies": {
"rsvp": "git+https://lab.nexedi.com/romain/rsvp.js.git#wip", "rsvp": "git+https://lab.nexedi.com/romain/rsvp.js.git#wip"
"uritemplate": "git+https://lab.nexedi.com/nexedi/uritemplate-js.git",
"moment": "2.21.0",
"rusha": "0.8.2"
}, },
"devDependencies": { "devDependencies": {
"renderjs": "git+https://lab.nexedi.com/romain/renderjs.git#wip", "renderjs": "git+https://lab.nexedi.com/romain/renderjs.git#wip",
...@@ -39,7 +36,10 @@ ...@@ -39,7 +36,10 @@
"jslint": "0.9.2", "jslint": "0.9.2",
"lz-string": "^1.4.4", "lz-string": "^1.4.4",
"sinon": "~1.7.3", "sinon": "~1.7.3",
"jison": "0.4.16" "jison": "0.4.16",
"uritemplate": "git+https://lab.nexedi.com/nexedi/uritemplate-js.git",
"moment": "2.21.0",
"rusha": "0.8.2"
}, },
"engines": { "engines": {
"npm": ">=1.3" "npm": ">=1.3"
......
...@@ -3,11 +3,11 @@ ...@@ -3,11 +3,11 @@
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>jIO in WebWorker Tests</title> <title>jIO in WebWorker Tests</title>
<link rel="stylesheet" href="../node_modules/qunitjs/qunit/qunit.css" type="text/css" media="screen"/> <link rel="stylesheet" href="../external/qunit.css" type="text/css" media="screen"/>
</head> </head>
<body> <body>
<div id="qunit"></div> <div id="qunit"></div>
<script src="../node_modules/qunitjs/qunit/qunit.js" type="text/javascript"></script> <script src="../external/qunit.js" type="text/javascript"></script>
<script> <script>
QUnit.config.autorun = false; QUnit.config.autorun = false;
</script> </script>
......
...@@ -22,12 +22,12 @@ See https://www.nexedi.com/licensing for rationale and options. ...@@ -22,12 +22,12 @@ See https://www.nexedi.com/licensing for rationale and options.
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>JIO Qunit/Sinon Unit Tests</title> <title>JIO Qunit/Sinon Unit Tests</title>
<script src="../node_modules/rsvp/dist/rsvp-2.0.4.js"></script> <script src="../external/rsvp-2.0.4.js"></script>
<script src="../dist/jio-latest.js"></script> <script src="../dist/jio-latest.js"></script>
<link rel="stylesheet" href="../node_modules/grunt-contrib-qunit/test/libs/qunit.css" type="text/css" media="screen"/> <link rel="stylesheet" href="../external/qunit.css" type="text/css" media="screen"/>
<script src="../node_modules/grunt-contrib-qunit/test/libs/qunit.js" type="text/javascript"></script> <script src="../external/qunit.js" type="text/javascript"></script>
<script src="../node_modules/sinon/pkg/sinon.js" type="text/javascript"></script> <script src="../external/sinon.js" type="text/javascript"></script>
<script> <script>
QUnit.config.testTimeout = 5000; QUnit.config.testTimeout = 5000;
......
...@@ -10,15 +10,15 @@ var global = self, ...@@ -10,15 +10,15 @@ var global = self,
self.openDatabase = {}; self.openDatabase = {};
importScripts( importScripts(
"../node_modules/rsvp/dist/rsvp-2.0.4.js", "../external/rsvp-2.0.4.js",
"../dist/jio-latest.js" "../dist/jio-latest.js"
); );
self.exports = self; self.exports = self;
importScripts("../node_modules/qunitjs/qunit/qunit.js"); importScripts("../external/qunit.js");
self.exports = undefined; self.exports = undefined;
//QUnit.config.autorun = false; //QUnit.config.autorun = false;
//QUnit.config.testTimeout = 5000; //QUnit.config.testTimeout = 5000;
importScripts("../node_modules/sinon/pkg/sinon.js"); importScripts("../external/sinon.js");
importScripts("../node_modules/qunit-tap/lib/qunit-tap.js"); importScripts("../node_modules/qunit-tap/lib/qunit-tap.js");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment