Change config files to reflect the move of 'build-tools' away from 'readium-cfi-js'
MODIFY
build-config/RequireJS_config_browser.js
build-config/RequireJS_config_browser.js
@@ -20,8 +20,7 @@ window.process._RJS_baseUrl = function(n)
window.process._RJS_rootDir = function(n)
{
- if (n == 1) return ".";
- if (n == 0) return "readium-cfi-js";
+ if (n == 0) return ".";
};
// Used in readium-build-tools/pluginsConfigMaker

MODIFY
build-config/RequireJS_config_common.js
build-config/RequireJS_config_common.js
require.config({
- baseUrl: process._RJS_baseUrl(1),
+ baseUrl: process._RJS_baseUrl(0),
packages: [
{
name: "readium_shared_js",
location:
- process._RJS_rootDir(1) + '/js',
+ process._RJS_rootDir(0) + '/js',
main: "globalsSetup"
}
@@ -30,64 +30,64 @@ require.config({
// ------ NPM MODULEs
"readium_js_plugins":
- process._RJS_rootDir(1) + '/js/plugins_controller',
+ process._RJS_rootDir(0) + '/js/plugins_controller',
// now included in readium-cfi-js
// underscore:
-// process._RJS_rootDir(1) + '/node_modules/underscore/underscore',
+// process._RJS_rootDir(0) + '/node_modules/underscore/underscore',
URIjs:
- process._RJS_rootDir(1) + '/node_modules/urijs/src/URI',
+ process._RJS_rootDir(0) + '/node_modules/urijs/src/URI',
punycode:
- process._RJS_rootDir(1) + '/node_modules/urijs/src/punycode',
+ process._RJS_rootDir(0) + '/node_modules/urijs/src/punycode',
SecondLevelDomains:
- process._RJS_rootDir(1) + '/node_modules/urijs/src/SecondLevelDomains',
+ process._RJS_rootDir(0) + '/node_modules/urijs/src/SecondLevelDomains',
IPv6:
- process._RJS_rootDir(1) + '/node_modules/urijs/src/IPv6',
+ process._RJS_rootDir(0) + '/node_modules/urijs/src/IPv6',
jquerySizes:
- process._RJS_rootDir(1) + '/node_modules/jquery-sizes/lib/jquery.sizes',
+ process._RJS_rootDir(0) + '/node_modules/jquery-sizes/lib/jquery.sizes',
ResizeSensor:
- process._RJS_rootDir(1) + '/node_modules/css-element-queries/src/ResizeSensor',
+ process._RJS_rootDir(0) + '/node_modules/css-element-queries/src/ResizeSensor',
domReady:
- process._RJS_rootDir(1) + '/node_modules/domReady/domReady',
+ process._RJS_rootDir(0) + '/node_modules/domReady/domReady',
eventEmitter:
- process._RJS_rootDir(1) + '/node_modules/eventemitter3/umd/eventemitter3.min',
+ process._RJS_rootDir(0) + '/node_modules/eventemitter3/umd/eventemitter3.min',
"es6-collections":
- process._RJS_rootDir(1) + '/node_modules/es6-collections/index',
+ process._RJS_rootDir(0) + '/node_modules/es6-collections/index',
'cssom':
- process._RJS_rootDir(1) + '/node_modules/cssom/build/CSSOM',
+ process._RJS_rootDir(0) + '/node_modules/cssom/build/CSSOM',
// ------ LIBs
'console_shim':
- process._RJS_rootDir(1) + '/lib/console_shim',
+ process._RJS_rootDir(0) + '/lib/console_shim',
rangy:
- process._RJS_rootDir(1) + '/lib/rangy/rangy',
+ process._RJS_rootDir(0) + '/lib/rangy/rangy',
"rangy-core":
- process._RJS_rootDir(1) + '/lib/rangy/rangy-core',
+ process._RJS_rootDir(0) + '/lib/rangy/rangy-core',
"rangy-textrange":
- process._RJS_rootDir(1) + '/lib/rangy/rangy-textrange',
+ process._RJS_rootDir(0) + '/lib/rangy/rangy-textrange',
"rangy-highlighter":
- process._RJS_rootDir(1) + '/lib/rangy/rangy-highlighter',
+ process._RJS_rootDir(0) + '/lib/rangy/rangy-highlighter',
"rangy-cssclassapplier":
- process._RJS_rootDir(1) + '/lib/rangy/rangy-cssclassapplier',
+ process._RJS_rootDir(0) + '/lib/rangy/rangy-cssclassapplier',
"rangy-position":
- process._RJS_rootDir(1) + '/lib/rangy/rangy-position'
+ process._RJS_rootDir(0) + '/lib/rangy/rangy-position'
},
shim:

MODIFY
build-config/RequireJS_config_multiple-bundles.js
build-config/RequireJS_config_multiple-bundles.js
require.config({
- baseUrl: process._RJS_baseUrl(1),
+ baseUrl: process._RJS_baseUrl(0),
// relative to this config file (not baseUrl)
dir: "../build-output/_multiple-bundles",

MODIFY
build-config/RequireJS_config_multiple-bundles_external-libs.js
build-config/RequireJS_config_multiple-bundles_external-libs.js
require.config({
- baseUrl: process._RJS_baseUrl(1),
+ baseUrl: process._RJS_baseUrl(0),
// relative to this config file (not baseUrl)
dir: "../build-output/_multiple-bundles",

MODIFY
build-config/RequireJS_config_npm-bundle.js
build-config/RequireJS_config_npm-bundle.js
require.config({
- baseUrl: process._RJS_baseUrl(1),
+ baseUrl: process._RJS_baseUrl(0),
name: "readium-shared-js_all",
@@ -23,6 +23,6 @@ require.config({
out: "../build-output/_npm-bundle/readium-shared-js.js",
paths: {
- "readium-shared-js_all": process._RJS_rootDir(1) + '/build-config/npm_main_module'
+ "readium-shared-js_all": process._RJS_rootDir(0) + '/build-config/npm_main_module'
}
});

MODIFY
build-config/RequireJS_config_single-bundle.js
build-config/RequireJS_config_single-bundle.js
require.config({
- baseUrl: process._RJS_baseUrl(1),
+ baseUrl: process._RJS_baseUrl(0),
name: "readium-shared-js_all",
@@ -27,6 +27,6 @@ require.config({
paths:
{
"readium-shared-js_all":
- process._RJS_rootDir(1) + '/readium-cfi-js/node_modules/almond/almond'
+ process._RJS_rootDir(0) + '/readium-cfi-js/node_modules/almond/almond'
}
});

MODIFY
package.cson
package.cson
#
# ALTERNATIVE METHOD (if package.json is corrupted):
# npm install cson
-# node ./readium-cfi-js/node_modules/cson/bin/cson2json package.cson > package.json
+# node ./node_modules/cson/bin/cson2json package.cson > package.json
# Note that on some Windows terminals (e.g. GitShell),
# unfortunately the package.json file might need its encoding
# converted to UTF-no-BOM :(
@@ -108,8 +108,13 @@ dependencies:
# in "npm install --dev readium-shared-js".
devDependencies:
-# see readium-cfi-js:
-# "requirejs", "almond", "jquery"
+ "requirejs": '^2.3.5'
+
+ "almond": '^0.3.3'
+
+ "jquery": '2.x.x'
+
+ "underscore": '^1.8.3'
"jquery-sizes": 'github:bramstein/jsizes#master'
@@ -118,9 +123,6 @@ devDependencies:
"backbone": '^1.3.3'
-# now included in readium-cfi-js
-# "underscore": 'latest'
-
"urijs": 'github:danielweck/URI.js#master'
#"urijs": 'latest'
@@ -136,8 +138,26 @@ devDependencies:
# Below dependencies are only used for building tasks (above are runtime deps):
-# see readium-cfi-js:
-# "cson", "jshint", "glob", "rimraf", "mkdirp", "watch", "live-reload"
+ "cson": '^4.1.0'
+
+ "rimraf": '^2.6.2'
+
+ "cpy-cli": '^1.0.1'
+
+ "ncp": '^2.0.0'
+
+ "mkdirp": '^0.5.1'
+
+ "watch": '^1.0.2'
+
+ #"live-reload": 'latest'
+
+ # see readium-build-tools
+ # jshint_glob.js
+ "jshint": '^2.9.5'
+ "glob": '^7.1.2'
+
+ "yuidocjs": '^0.10.2'
#####################################################################
@@ -147,9 +167,9 @@ scripts:
#=====================
cson2json: '
- node ./readium-cfi-js/node_modules/cson/bin/cson2json package.cson > package.json
+ node ./node_modules/cson/bin/cson2json package.cson > package.json
&&
- node readium-cfi-js/readium-build-tools/optimizePackageJsonScripts.js
+ node readium-build-tools/optimizePackageJsonScripts.js
'
@@ -197,7 +217,7 @@ scripts:
'prepare:local:common': '
node
- readium-cfi-js/readium-build-tools/gitHubForksUpdater.js
+ readium-build-tools/gitHubForksUpdater.js
'
#=====================
@@ -272,7 +292,7 @@ scripts:
#=====================
'genPluginsConfig': '
- node readium-cfi-js/readium-build-tools/pluginsConfigMaker.js
+ node readium-build-tools/pluginsConfigMaker.js
'
#=====================
@@ -386,10 +406,10 @@ scripts:
npm run watch
\"npm run build
- && node readium-cfi-js/readium-build-tools/webbrowser.js
+ && node readium-build-tools/webbrowser.js
&& npm run rimraf
open_webbrowser.js\"
- dev/ js/ plugins/ readium-cfi-js/js/
+ dev/ js/ plugins/
'
# nodemon -q
# -w dev/
@@ -400,7 +420,7 @@ scripts:
'httpServe': '
node
- readium-cfi-js/readium-build-tools/http-server.js
+ readium-build-tools/http-server.js
-LOGFILE
http.log

Change config files to reflect the move of 'build-tools' away from 'readium-cfi-js'