Change config files to reflect the move of 'build-tools' away from 'r…

…eadium-cfi-js'
readium · Mar 16, 2018 · e17cb47 · e17cb47
1 parent 1515889
commit e17cb47
Show file tree

Hide file tree

Showing 13 changed files with 85 additions and 86 deletions.
diff --git a/build-config/RequireJS_config_browser.js b/build-config/RequireJS_config_browser.js
@@ -20,10 +20,9 @@ window.process._RJS_baseUrl = function(n)
 
 window.process._RJS_rootDir = function(n)
 {
-    if (n == 3) return ".";
-    if (n == 2) return "readium-js";
-    if (n == 1) return "readium-js/readium-shared-js";
-    if (n == 0) return "readium-js/readium-shared-js/readium-cfi-js";
+    if (n == 2) return ".";
+    if (n == 1) return "readium-js";
+    if (n == 0) return "readium-js/readium-shared-js";
 };
 
 // Used in readium-build-tools/pluginsConfigMaker
@@ -36,6 +35,6 @@ require.config({
     paths:
     {
         "version":
-            process._RJS_rootDir(3) + '/dev/version'
+            process._RJS_rootDir(2) + '/dev/version'
     }
 });
diff --git a/build-config/RequireJS_config_common.js b/build-config/RequireJS_config_common.js
@@ -13,28 +13,28 @@
 
 require.config({
 
-    baseUrl: process._RJS_baseUrl(3),
+    baseUrl: process._RJS_baseUrl(2),
 
     packages: [
 
           {
               name: 'readium_js_viewer',
               location:
-                  process._RJS_rootDir(3) + '/src/js',
+                  process._RJS_rootDir(2) + '/src/js',
 
               main: 'ReadiumViewer'
           },
 
           {
               name: 'readium_js_viewer_html_templates',
               location:
-                  process._RJS_rootDir(3) + '/src/templates'
+                  process._RJS_rootDir(2) + '/src/templates'
           },
 
           {
               name: 'readium_js_viewer_i18n',
               location:
-                  process._RJS_rootDir(3) + '/src/i18n',
+                  process._RJS_rootDir(2) + '/src/i18n',
 
               main: 'Strings'
           }
@@ -45,54 +45,54 @@ require.config({
         // ------ NPM MODULEs
 
         'keymaster':
-            process._RJS_rootDir(3) + '/node_modules/keymaster/keymaster',
+            process._RJS_rootDir(2) + '/node_modules/keymaster/keymaster',
 
         'screenfull':
-            process._RJS_rootDir(3) + '/node_modules/screenfull/dist/screenfull',
+            process._RJS_rootDir(2) + '/node_modules/screenfull/dist/screenfull',
 
         'hgn':
-            process._RJS_rootDir(3) + '/node_modules/requirejs-hogan-plugin/hgn',
+            process._RJS_rootDir(2) + '/node_modules/requirejs-hogan-plugin/hgn',
 
         'hogan':
-            process._RJS_rootDir(3) + '/node_modules/hogan.js/dist/hogan-3.0.2.amd',// version number in file name! :(
+            process._RJS_rootDir(2) + '/node_modules/hogan.js/dist/hogan-3.0.2.amd',// version number in file name! :(
 
         'jath':
-            process._RJS_rootDir(3) + '/node_modules/jath/jath',
+            process._RJS_rootDir(2) + '/node_modules/jath/jath',
 
         'spin':
-            process._RJS_rootDir(3) + '/node_modules/spin.js/spin',
+            process._RJS_rootDir(2) + '/node_modules/spin.js/spin',
 
         'bootstrap':
-            process._RJS_rootDir(3) + '/node_modules/bootstrap/dist/js/bootstrap',
+            process._RJS_rootDir(2) + '/node_modules/bootstrap/dist/js/bootstrap',
 
         'bootstrapA11y':
-            process._RJS_rootDir(3) + '/node_modules/bootstrap-accessibility-plugin/plugins/js/bootstrap-accessibility',
+            process._RJS_rootDir(2) + '/node_modules/bootstrap-accessibility-plugin/plugins/js/bootstrap-accessibility',
 
         'jquery_hammer':
-            process._RJS_rootDir(3) + '/node_modules/jquery-hammerjs/jquery.hammer',
+            process._RJS_rootDir(2) + '/node_modules/jquery-hammerjs/jquery.hammer',
 
         'hammerjs':
-            process._RJS_rootDir(3) + '/node_modules/hammerjs/hammer',
+            process._RJS_rootDir(2) + '/node_modules/hammerjs/hammer',
 
 
 
 
         'i18nStrings':
-            process._RJS_rootDir(3) + '/src/i18n/Strings',
+            process._RJS_rootDir(2) + '/src/i18n/Strings',
 
         'Settings':
-            process._RJS_rootDir(3) + '/src/js/storage/Settings',
+            process._RJS_rootDir(2) + '/src/js/storage/Settings',
 
         'StorageManager':
-            process._RJS_rootDir(3) + '/src/js/storage/StaticStorageManager',
+            process._RJS_rootDir(2) + '/src/js/storage/StaticStorageManager',
 
         'Analytics':
-            process._RJS_rootDir(3) + '/src/js/analytics/Analytics'
+            process._RJS_rootDir(2) + '/src/js/analytics/Analytics'
 
 
 
         // 'remotestorage':
-        //     process._RJS_rootDir(3) + '/node_modules/remotestoragejs/release/head/remotestorage',
+        //     process._RJS_rootDir(2) + '/node_modules/remotestoragejs/release/head/remotestorage',
     },
 
     shim:

diff --git a/build-config/RequireJS_config_multiple-bundles.js b/build-config/RequireJS_config_multiple-bundles.js
@@ -13,7 +13,7 @@
 
 require.config({
 
-    baseUrl: process._RJS_baseUrl(3),
+    baseUrl: process._RJS_baseUrl(2),
 
     // relative to this config file (not baseUrl)
     dir: "../build-output/_multiple-bundles",
@@ -54,6 +54,6 @@ require.config({
     // paths:
     // {
     //     "version":
-    //         process._RJS_rootDir(3) + '/build-output/version',
+    //         process._RJS_rootDir(2) + '/build-output/version',
     // }
 });
diff --git a/build-config/RequireJS_config_multiple-bundles_external-libs.js b/build-config/RequireJS_config_multiple-bundles_external-libs.js
@@ -13,7 +13,7 @@
 
 require.config({
 
-    baseUrl: process._RJS_baseUrl(1),
+    baseUrl: process._RJS_baseUrl(0),
 
     // relative to this config file (not baseUrl)
     dir: "../build-output/_multiple-bundles",

diff --git a/build-config/RequireJS_config_single-bundle.js b/build-config/RequireJS_config_single-bundle.js
@@ -14,7 +14,7 @@
 
 require.config({
 
-    baseUrl: process._RJS_baseUrl(3),
+    baseUrl: process._RJS_baseUrl(2),
 
     name: "readium-js-viewer_all",
 
@@ -34,9 +34,9 @@ require.config({
     paths:
     {
         "version":
-            process._RJS_rootDir(3) + '/build-output/version',
+            process._RJS_rootDir(2) + '/build-output/version',
 
         "readium-js-viewer_all":
-            process._RJS_rootDir(3) + '/readium-js/readium-shared-js/readium-cfi-js/node_modules/almond/almond'
+            process._RJS_rootDir(2) + '/readium-js/readium-shared-js/readium-cfi-js/node_modules/almond/almond'
     }
 });
diff --git a/build-config/RequireJS_config_single-bundle_CHROMEAPP-WORKER.js b/build-config/RequireJS_config_single-bundle_CHROMEAPP-WORKER.js
@@ -14,7 +14,7 @@
 
 require.config({
 
-    baseUrl: process._RJS_baseUrl(3),
+    baseUrl: process._RJS_baseUrl(2),
 
     name: "readium-js-viewer_CHROMEAPP-WORKER",
 
@@ -34,26 +34,26 @@ require.config({
     paths:
     {
         "readium-js-viewer_CHROMEAPP-WORKER":
-            process._RJS_rootDir(3) + '/readium-js/readium-shared-js/readium-cfi-js/node_modules/almond/almond',
+            process._RJS_rootDir(2) + '/readium-js/readium-shared-js/readium-cfi-js/node_modules/almond/almond',
 
         "readium_js_viewer_RJS-CONFIG":
-                process._RJS_rootDir(3) + '/src/chrome-app/requirejs-config',
+                process._RJS_rootDir(2) + '/src/chrome-app/requirejs-config',
 
         'i18nStrings':
-            process._RJS_rootDir(3) + '/src/chrome-app/i18n/Strings',
+            process._RJS_rootDir(2) + '/src/chrome-app/i18n/Strings',
 
         'Settings':
-            process._RJS_rootDir(3) + '/src/chrome-app/storage/ChromeSettings',
+            process._RJS_rootDir(2) + '/src/chrome-app/storage/ChromeSettings',
 
         'StorageManager':
-            process._RJS_rootDir(3) + '/src/chrome-app/storage/FileSystemStorage'
+            process._RJS_rootDir(2) + '/src/chrome-app/storage/FileSystemStorage'
     },
 
     packages: [
           {
               name: 'readium_js_viewer_chromeApp',
               location:
-                  process._RJS_rootDir(3) + '/src/chrome-app',
+                  process._RJS_rootDir(2) + '/src/chrome-app',
 
               main: 'background'
           }

diff --git a/build-config/RequireJS_config_single-bundle_CHROMEAPP.js b/build-config/RequireJS_config_single-bundle_CHROMEAPP.js
@@ -14,7 +14,7 @@
 
 require.config({
 
-    baseUrl: process._RJS_baseUrl(3),
+    baseUrl: process._RJS_baseUrl(2),
 
     name: "readium-js-viewer_all_CHROMEAPP",
 
@@ -34,32 +34,32 @@ require.config({
     paths:
     {
         "version":
-            process._RJS_rootDir(3) + '/build-output/version',
+            process._RJS_rootDir(2) + '/build-output/version',
 
         "readium-js-viewer_all_CHROMEAPP":
-            process._RJS_rootDir(3) + '/readium-js/readium-shared-js/readium-cfi-js/node_modules/almond/almond',
+            process._RJS_rootDir(2) + '/readium-js/readium-shared-js/readium-cfi-js/node_modules/almond/almond',
 
         "readium_js_viewer_RJS-CONFIG":
-            process._RJS_rootDir(3) + '/src/chrome-app/requirejs-config',
+            process._RJS_rootDir(2) + '/src/chrome-app/requirejs-config',
 
         'i18nStrings':
-            process._RJS_rootDir(3) + '/src/chrome-app/i18n/Strings',
+            process._RJS_rootDir(2) + '/src/chrome-app/i18n/Strings',
 
         'Settings':
-            process._RJS_rootDir(3) + '/src/chrome-app/storage/ChromeSettings',
+            process._RJS_rootDir(2) + '/src/chrome-app/storage/ChromeSettings',
 
         'StorageManager':
-            process._RJS_rootDir(3) + '/src/chrome-app/storage/FileSystemStorage',
+            process._RJS_rootDir(2) + '/src/chrome-app/storage/FileSystemStorage',
 
         'Analytics':
-            process._RJS_rootDir(3) + '/src/chrome-app/analytics/ExtensionAnalytics'
+            process._RJS_rootDir(2) + '/src/chrome-app/analytics/ExtensionAnalytics'
     },
 
     packages: [
           {
               name: 'readium_js_viewer_chromeApp',
               location:
-                  process._RJS_rootDir(3) + '/src/chrome-app',
+                  process._RJS_rootDir(2) + '/src/chrome-app',
 
               main: 'background'
           }

diff --git a/build-config/RequireJS_config_single-bundle_LITE.js b/build-config/RequireJS_config_single-bundle_LITE.js
@@ -14,7 +14,7 @@
 
 require.config({
 
-    baseUrl: process._RJS_baseUrl(3),
+    baseUrl: process._RJS_baseUrl(2),
 
     name: "readium-js-viewer_all_LITE",
 
@@ -34,9 +34,9 @@ require.config({
     paths:
     {
         "version":
-            process._RJS_rootDir(3) + '/build-output/version',
+            process._RJS_rootDir(2) + '/build-output/version',
 
         "readium-js-viewer_all_LITE":
-            process._RJS_rootDir(3) + '/readium-js/readium-shared-js/readium-cfi-js/node_modules/almond/almond'
+            process._RJS_rootDir(2) + '/readium-js/readium-shared-js/readium-cfi-js/node_modules/almond/almond'
     }
 });
diff --git a/package/package_base.cson b/package/package_base.cson
@@ -12,17 +12,17 @@
 #
 # ALTERNATIVE METHOD (in case package.json is corrupted):
 #
-#        node ./readium-js/readium-shared-js/readium-cfi-js/readium-build-tools/concat.js "package/*.cson" package.cson
+#        node ./readium-js/readium-shared-js/readium-build-tools/concat.js "package/*.cson" package.cson
 #        &&
-#        node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/cson/bin/cson2json package.cson > package_.json
+#        node ./readium-js/readium-shared-js/node_modules/cson/bin/cson2json package.cson > package_.json
 #        &&
-#        node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/rimraf/bin.js package.json
+#        node ./readium-js/readium-shared-js/node_modules/rimraf/bin.js package.json
 #        &&
-#        node ./readium-js/readium-shared-js/readium-cfi-js/readium-build-tools/concat.js package_.json package.json utf8
+#        node ./readium-js/readium-shared-js/readium-build-tools/concat.js package_.json package.json utf8
 #        &&
-#        node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/rimraf/bin.js package.cson
+#        node ./readium-js/readium-shared-js/node_modules/rimraf/bin.js package.cson
 #        &&
-#        node readium-js/readium-shared-js/readium-cfi-js/readium-build-tools/optimizePackageJsonScripts.js
+#        node readium-js/readium-shared-js/readium-build-tools/optimizePackageJsonScripts.js
 #
 # Note that on some Windows terminals / command line environment (e.g. GitShell),
 # the package.json file generated by the ALTERNATIVE method above
@@ -122,7 +122,7 @@ devDependencies:
 # see readium-js:
 # "crypto-js", "zipjs", "requirejs-text"
 
-# see readium-cfi-js:
+# see readium-shared-js:
 # "requirejs", "almond", "jquery"
 
     #"keymaster": 'latest'
@@ -157,10 +157,10 @@ devDependencies:
 
 # Below dependencies are only used in build tasks (above are runtime deps):
 
-# see readium-cfi-js:
+# see readium-shared-js:
 # "cson", "jshint", "glob", "rimraf", "mkdirp", "watch", "live-reload"
 
-    # see readium-build-tools (in readium-cfi-js)
+    # see readium-build-tools (in readium-shared-js)
     # versionsMaker.js
     "gift": '^0.10.1'
 

diff --git a/package/package_scripts_base.cson b/package/package_scripts_base.cson
@@ -8,13 +8,13 @@ scripts:
 
 #=====================
     cson2json: '
-        node ./readium-js/readium-shared-js/readium-cfi-js/readium-build-tools/concat.js "package/*.cson" package.cson
+        node ./readium-js/readium-shared-js/readium-build-tools/concat.js "package/*.cson" package.cson
         &&
-        node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/cson/bin/cson2json package.cson > package.json
+        node ./readium-js/readium-shared-js/node_modules/cson/bin/cson2json package.cson > package.json
         &&
-        node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/rimraf/bin.js package.cson
+        node ./readium-js/readium-shared-js/node_modules/rimraf/bin.js package.cson
         &&
-        node readium-js/readium-shared-js/readium-cfi-js/readium-build-tools/optimizePackageJsonScripts.js
+        node readium-js/readium-shared-js/readium-build-tools/optimizePackageJsonScripts.js
     '
 
 #=====================
@@ -62,7 +62,7 @@ scripts:
 #=====================
     'prepare:local:common': '
 
-        node readium-js/readium-shared-js/readium-cfi-js/readium-build-tools/gitHubForksUpdater.js
+        node readium-js/readium-shared-js/readium-build-tools/gitHubForksUpdater.js
     '
 
 #=====================

diff --git a/package/package_scripts_build.cson b/package/package_scripts_build.cson
@@ -69,7 +69,7 @@
 
         cd readium-js/readium-shared-js/
         &&
-        node readium-cfi-js/readium-build-tools/pluginsConfigMaker.js
+        node readium-build-tools/pluginsConfigMaker.js
         &&
         cd ../..
     '