Skip to content

Commit 41f0912

Browse files
PlaneshifterPlaneshifter
committed
Update require paths
1 parent 0da03b9 commit 41f0912

10 files changed

Lines changed: 23 additions & 23 deletions

File tree

‎bin/cli‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ var spawn = require( 'child_process' ).spawn;
2727
var readFileSync = require( './../lib/node_modules/@stdlib/fs/read-file' ).sync;
2828
var cwd = require( './../lib/node_modules/@stdlib/process/cwd' );
2929
var ENV = require( './../lib/node_modules/@stdlib/process/env' );
30-
var CLI = require( './../lib/node_modules/@stdlib/tools/cli' );
30+
var CLI = require( './../lib/node_modules/@stdlib/cli' );
3131
var getKeys = require( './../lib/node_modules/@stdlib/utils/keys' );
3232
var COMMANDS = require( './cli_commands.json' );
3333

‎bin/cli_commands.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@
392392
{
393393
"command": "library-manifest",
394394
"description": "Load a manifest for compiling source files.",
395-
"path": "@stdlib/tools/library-manifest",
395+
"path": "@stdlib/utils/library-manifest",
396396
"group": "meta"
397397
},
398398
{
@@ -878,7 +878,7 @@
878878
{
879879
"command": "temp-http-server",
880880
"description": "Create a temporary HTTP server.",
881-
"path": "@stdlib/tools/disposable-http-server",
881+
"path": "@stdlib/net/disposable-http-server",
882882
"group": "utilities"
883883
},
884884
{

‎tools/make/lib/repl/browser.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
# VARIABLES #
2020

2121
# Define the command to create a disposable HTTP server:
22-
repl_tmp_http_server := $(NODE) $(SRC_DIR)/@stdlib/tools/disposable-http-server/bin/cli
22+
repl_tmp_http_server := $(NODE) $(SRC_DIR)/@stdlib/net/disposable-http-server/bin/cli
2323

2424
# Define the source file to bundle:
2525
REPL_BROWSER_BUNDLE ?= $(DIST_DIR)/stdlib-repl.min.js

‎tools/scripts/compile_c_benchmark‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ resolve_includes() {
166166
opts="{'task':'benchmark'}"
167167
fi
168168
# Generate the script for resolving `include` directories:
169-
script='"'"var path = require('path'); var arr = require('@stdlib/tools/library-manifest')(path.join('$1','manifest.json'),${opts},{'basedir':'$1','paths':'posix'}).include; var str = ''; for (var i = 0; i < arr.length; i++){var p = path.resolve('$1', arr[i]); str += '-I '+p+' ';}; console.log(str.substring(0, str.length-1));"'"'
169+
script='"'"var path = require('path'); var arr = require('@stdlib/utils/library-manifest')(path.join('$1','manifest.json'),${opts},{'basedir':'$1','paths':'posix'}).include; var str = ''; for (var i = 0; i < arr.length; i++){var p = path.resolve('$1', arr[i]); str += '-I '+p+' ';}; console.log(str.substring(0, str.length-1));"'"'
170170

171171
# Resolve `include` directories:
172172
includes=$(eval NODE_PATH="${node_path}" "${node_cmd}" -e "${script}")
@@ -197,7 +197,7 @@ resolve_source_files() {
197197
opts="{'task':'benchmark'}"
198198
fi
199199
# Generate the script for resolving source files:
200-
script='"'"var path = require('path'); var arr = require('@stdlib/tools/library-manifest')(path.join('$1','manifest.json'),${opts},{'basedir':'$1','paths':'posix'}).src; var str = ''; for (var i = 0; i < arr.length; i++){var p = path.resolve('$1', arr[i]); str += p+' ';}; console.log(str.substring(0, str.length-1));"'"'
200+
script='"'"var path = require('path'); var arr = require('@stdlib/utils/library-manifest')(path.join('$1','manifest.json'),${opts},{'basedir':'$1','paths':'posix'}).src; var str = ''; for (var i = 0; i < arr.length; i++){var p = path.resolve('$1', arr[i]); str += p+' ';}; console.log(str.substring(0, str.length-1));"'"'
201201

202202
# Resolve files:
203203
source_files=$(eval NODE_PATH="${node_path}" "${node_cmd}" -e "${script}")
@@ -220,7 +220,7 @@ resolve_libraries() {
220220
opts="{'task':'benchmark'}"
221221
fi
222222
# Generate the script for resolving libraries:
223-
script='"'"var path = require('path'); var arr = require('@stdlib/tools/library-manifest')(path.join('$1','manifest.json'),${opts},{'basedir':'$1','paths':'posix'}).libraries; var str = ''; for (var i = 0; i < arr.length; i++){str += arr[i]+' ';}; console.log(str.substring(0, str.length-1));"'"'
223+
script='"'"var path = require('path'); var arr = require('@stdlib/utils/library-manifest')(path.join('$1','manifest.json'),${opts},{'basedir':'$1','paths':'posix'}).libraries; var str = ''; for (var i = 0; i < arr.length; i++){str += arr[i]+' ';}; console.log(str.substring(0, str.length-1));"'"'
224224

225225
# Resolve libraries:
226226
libraries=$(eval NODE_PATH="${node_path}" "${node_cmd}" -e "${script}")
@@ -243,7 +243,7 @@ resolve_libpaths() {
243243
opts="{'task':'benchmark'}"
244244
fi
245245
# Generate the script for resolving library paths:
246-
script='"'"var path = require('path'); var arr = require('@stdlib/tools/library-manifest')(path.join('$1','manifest.json'),${opts},{'basedir':'$1','paths':'posix'}).libpath; var str = ''; for (var i = 0; i < arr.length; i++){var p = path.resolve('$1', arr[i]); str += '-L '+p+' ';}; console.log(str.substring(0, str.length-1));"'"'
246+
script='"'"var path = require('path'); var arr = require('@stdlib/utils/library-manifest')(path.join('$1','manifest.json'),${opts},{'basedir':'$1','paths':'posix'}).libpath; var str = ''; for (var i = 0; i < arr.length; i++){var p = path.resolve('$1', arr[i]); str += '-L '+p+' ';}; console.log(str.substring(0, str.length-1));"'"'
247247

248248
# Resolve library paths:
249249
libpath=$(eval NODE_PATH="${node_path}" "${node_cmd}" -e "${script}")

‎tools/scripts/compile_c_example‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ resolve_includes() {
166166
opts="{'task':'examples'}"
167167
fi
168168
# Generate the script for resolving `include` directories:
169-
script='"'"var path = require('path'); var arr = require('@stdlib/tools/library-manifest')(path.join('$1','manifest.json'),${opts},{'basedir':'$1','paths':'posix'}).include; var str = ''; for (var i = 0; i < arr.length; i++){var p = path.resolve('$1', arr[i]); str += '-I '+p+' ';}; console.log(str.substring(0, str.length-1));"'"'
169+
script='"'"var path = require('path'); var arr = require('@stdlib/utils/library-manifest')(path.join('$1','manifest.json'),${opts},{'basedir':'$1','paths':'posix'}).include; var str = ''; for (var i = 0; i < arr.length; i++){var p = path.resolve('$1', arr[i]); str += '-I '+p+' ';}; console.log(str.substring(0, str.length-1));"'"'
170170

171171
# Resolve `include` directories:
172172
includes=$(eval NODE_PATH="${node_path}" "${node_cmd}" -e "${script}")
@@ -197,7 +197,7 @@ resolve_source_files() {
197197
opts="{'task':'examples'}"
198198
fi
199199
# Generate the script for resolving source files:
200-
script='"'"var path = require('path'); var arr = require('@stdlib/tools/library-manifest')(path.join('$1','manifest.json'),${opts},{'basedir':'$1','paths':'posix'}).src; var str = ''; for (var i = 0; i < arr.length; i++){var p = path.resolve('$1', arr[i]); str += p+' ';}; console.log(str.substring(0, str.length-1));"'"'
200+
script='"'"var path = require('path'); var arr = require('@stdlib/utils/library-manifest')(path.join('$1','manifest.json'),${opts},{'basedir':'$1','paths':'posix'}).src; var str = ''; for (var i = 0; i < arr.length; i++){var p = path.resolve('$1', arr[i]); str += p+' ';}; console.log(str.substring(0, str.length-1));"'"'
201201

202202
# Resolve files:
203203
source_files=$(eval NODE_PATH="${node_path}" "${node_cmd}" -e "${script}")
@@ -220,7 +220,7 @@ resolve_libraries() {
220220
opts="{'task':'examples'}"
221221
fi
222222
# Generate the script for resolving libraries:
223-
script='"'"var path = require('path'); var arr = require('@stdlib/tools/library-manifest')(path.join('$1','manifest.json'),${opts},{'basedir':'$1','paths':'posix'}).libraries; var str = ''; for (var i = 0; i < arr.length; i++){str += arr[i]+' ';}; console.log(str.substring(0, str.length-1));"'"'
223+
script='"'"var path = require('path'); var arr = require('@stdlib/utils/library-manifest')(path.join('$1','manifest.json'),${opts},{'basedir':'$1','paths':'posix'}).libraries; var str = ''; for (var i = 0; i < arr.length; i++){str += arr[i]+' ';}; console.log(str.substring(0, str.length-1));"'"'
224224

225225
# Resolve libraries:
226226
libraries=$(eval NODE_PATH="${node_path}" "${node_cmd}" -e "${script}")
@@ -243,7 +243,7 @@ resolve_libpaths() {
243243
opts="{'task':'examples'}"
244244
fi
245245
# Generate the script for resolving library paths:
246-
script='"'"var path = require('path'); var arr = require('@stdlib/tools/library-manifest')(path.join('$1','manifest.json'),${opts},{'basedir':'$1','paths':'posix'}).libpath; var str = ''; for (var i = 0; i < arr.length; i++){var p = path.resolve('$1', arr[i]); str += '-L '+p+' ';}; console.log(str.substring(0, str.length-1));"'"'
246+
script='"'"var path = require('path'); var arr = require('@stdlib/utils/library-manifest')(path.join('$1','manifest.json'),${opts},{'basedir':'$1','paths':'posix'}).libpath; var str = ''; for (var i = 0; i < arr.length; i++){var p = path.resolve('$1', arr[i]); str += '-L '+p+' ';}; console.log(str.substring(0, str.length-1));"'"'
247247

248248
# Resolve library paths:
249249
libpath=$(eval NODE_PATH="${node_path}" "${node_cmd}" -e "${script}")

‎tools/scripts/compile_cpp_example‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ resolve_includes() {
146146
opts="{'task':'examples'}"
147147

148148
# Generate the script for resolving `include` directories:
149-
script='"'"var path = require('path'); var arr = require('@stdlib/tools/library-manifest')(path.join('$1','manifest.json'),${opts},{'basedir':'$1','paths':'posix'}).include; var str = ''; for (var i = 0; i < arr.length; i++){var p = path.resolve('$1', arr[i]); str += '-I '+p+' ';}; console.log(str.substring(0, str.length-1));"'"'
149+
script='"'"var path = require('path'); var arr = require('@stdlib/utils/library-manifest')(path.join('$1','manifest.json'),${opts},{'basedir':'$1','paths':'posix'}).include; var str = ''; for (var i = 0; i < arr.length; i++){var p = path.resolve('$1', arr[i]); str += '-I '+p+' ';}; console.log(str.substring(0, str.length-1));"'"'
150150

151151
# Resolve `include` directories:
152152
includes=$(eval NODE_PATH="${node_path}" "${node_cmd}" -e "${script}")
@@ -165,7 +165,7 @@ resolve_source_files() {
165165
opts="{'task':'examples'}"
166166

167167
# Generate the script for resolving source files:
168-
script='"'"var path = require('path'); var arr = require('@stdlib/tools/library-manifest')(path.join('$1','manifest.json'),${opts},{'basedir':'$1','paths':'posix'}).src; var str = ''; for (var i = 0; i < arr.length; i++){var p = path.resolve('$1', arr[i]); str += p+' ';}; console.log(str.substring(0, str.length-1));"'"'
168+
script='"'"var path = require('path'); var arr = require('@stdlib/utils/library-manifest')(path.join('$1','manifest.json'),${opts},{'basedir':'$1','paths':'posix'}).src; var str = ''; for (var i = 0; i < arr.length; i++){var p = path.resolve('$1', arr[i]); str += p+' ';}; console.log(str.substring(0, str.length-1));"'"'
169169

170170
# Resolve files:
171171
source_files=$(eval NODE_PATH="${node_path}" "${node_cmd}" -e "${script}")
@@ -184,7 +184,7 @@ resolve_libraries() {
184184
opts="{'task':'examples'}"
185185

186186
# Generate the script for resolving libraries:
187-
script='"'"var path = require('path'); var arr = require('@stdlib/tools/library-manifest')(path.join('$1','manifest.json'),${opts},{'basedir':'$1','paths':'posix'}).libraries; var str = ''; for (var i = 0; i < arr.length; i++){str += arr[i]+' ';}; console.log(str.substring(0, str.length-1));"'"'
187+
script='"'"var path = require('path'); var arr = require('@stdlib/utils/library-manifest')(path.join('$1','manifest.json'),${opts},{'basedir':'$1','paths':'posix'}).libraries; var str = ''; for (var i = 0; i < arr.length; i++){str += arr[i]+' ';}; console.log(str.substring(0, str.length-1));"'"'
188188

189189
# Resolve libraries:
190190
libraries=$(eval NODE_PATH="${node_path}" "${node_cmd}" -e "${script}")
@@ -203,7 +203,7 @@ resolve_libpaths() {
203203
opts="{'task':'examples'}"
204204

205205
# Generate the script for resolving library paths:
206-
script='"'"var path = require('path'); var arr = require('@stdlib/tools/library-manifest')(path.join('$1','manifest.json'),${opts},{'basedir':'$1','paths':'posix'}).libpath; var str = ''; for (var i = 0; i < arr.length; i++){var p = path.resolve('$1', arr[i]); str += '-L '+p+' ';}; console.log(str.substring(0, str.length-1));"'"'
206+
script='"'"var path = require('path'); var arr = require('@stdlib/utils/library-manifest')(path.join('$1','manifest.json'),${opts},{'basedir':'$1','paths':'posix'}).libpath; var str = ''; for (var i = 0; i < arr.length; i++){var p = path.resolve('$1', arr[i]); str += '-L '+p+' ';}; console.log(str.substring(0, str.length-1));"'"'
207207

208208
# Resolve library paths:
209209
libpath=$(eval NODE_PATH="${node_path}" "${node_cmd}" -e "${script}")

‎tools/scripts/compile_fortran_benchmark‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ resolve_includes() {
138138
opts="{'task':'benchmark'}"
139139

140140
# Generate the script for resolving `include` directories:
141-
script='"'"var path = require('path'); var arr = require('@stdlib/tools/library-manifest')(path.join('$1','manifest.json'),${opts},{'basedir':'$1','paths':'posix'}).include; var str = ''; for (var i = 0; i < arr.length; i++){var p = path.resolve('$1', arr[i]); str += '-I '+p+' ';}; console.log(str.substring(0, str.length-1));"'"'
141+
script='"'"var path = require('path'); var arr = require('@stdlib/utils/library-manifest')(path.join('$1','manifest.json'),${opts},{'basedir':'$1','paths':'posix'}).include; var str = ''; for (var i = 0; i < arr.length; i++){var p = path.resolve('$1', arr[i]); str += '-I '+p+' ';}; console.log(str.substring(0, str.length-1));"'"'
142142

143143
# Resolve `include` directories:
144144
includes=$(eval NODE_PATH="${node_path}" "${node_cmd}" -e "${script}")

‎tools/scripts/compile_wasm‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ resolve_includes() {
126126
opts="{'wasm':true}"
127127

128128
# Generate the script for resolving external include directories:
129-
script='"'"var path = require('path'); var arr = require('@stdlib/tools/library-manifest')(path.join('$1','manifest.json'),${opts},{'basedir':'$1','paths':'posix'}).include; var str = ''; for (var i = 0; i < arr.length; i++){var p = path.resolve('$1', arr[i]); if (p.indexOf('$1') === 0) {continue;}; str += '-I '+p+' ';}; console.log(str.substring(0, str.length-1));"'"'
129+
script='"'"var path = require('path'); var arr = require('@stdlib/utils/library-manifest')(path.join('$1','manifest.json'),${opts},{'basedir':'$1','paths':'posix'}).include; var str = ''; for (var i = 0; i < arr.length; i++){var p = path.resolve('$1', arr[i]); if (p.indexOf('$1') === 0) {continue;}; str += '-I '+p+' ';}; console.log(str.substring(0, str.length-1));"'"'
130130

131131
# Resolve include directories:
132132
includes=$(eval NODE_PATH="${node_path}" "${node_cmd}" -e "${script}")
@@ -145,7 +145,7 @@ resolve_source_files() {
145145
opts="{'wasm':true}"
146146

147147
# Generate the script for resolving external source files:
148-
script='"'"var path = require('path'); var arr = require('@stdlib/tools/library-manifest')(path.join('$1','manifest.json'),${opts},{'basedir':'$1','paths':'posix'}).src; var str = ''; for (var i = 0; i < arr.length; i++){var p = path.resolve('$1', arr[i]); if (p.indexOf('$1') === 0) {continue;}; str += p+' ';}; console.log(str.substring(0, str.length-1));"'"'
148+
script='"'"var path = require('path'); var arr = require('@stdlib/utils/library-manifest')(path.join('$1','manifest.json'),${opts},{'basedir':'$1','paths':'posix'}).src; var str = ''; for (var i = 0; i < arr.length; i++){var p = path.resolve('$1', arr[i]); if (p.indexOf('$1') === 0) {continue;}; str += p+' ';}; console.log(str.substring(0, str.length-1));"'"'
149149

150150
# Resolve files:
151151
source_files=$(eval NODE_PATH="${node_path}" "${node_cmd}" -e "${script}")
@@ -164,7 +164,7 @@ resolve_libraries() {
164164
opts="{'wasm':true}"
165165

166166
# Generate the script for resolving libraries:
167-
script='"'"var path = require('path'); var arr = require('@stdlib/tools/library-manifest')(path.join('$1','manifest.json'),${opts},{'basedir':'$1','paths':'posix'}).libraries; var str = ''; for (var i = 0; i < arr.length; i++){str += arr[i]+' ';}; console.log(str.substring(0, str.length-1));"'"'
167+
script='"'"var path = require('path'); var arr = require('@stdlib/utils/library-manifest')(path.join('$1','manifest.json'),${opts},{'basedir':'$1','paths':'posix'}).libraries; var str = ''; for (var i = 0; i < arr.length; i++){str += arr[i]+' ';}; console.log(str.substring(0, str.length-1));"'"'
168168

169169
# Resolve libraries:
170170
libraries=$(eval NODE_PATH="${node_path}" "${node_cmd}" -e "${script}")
@@ -183,7 +183,7 @@ resolve_libpaths() {
183183
opts="{'wasm':true}"
184184

185185
# Generate the script for resolving library paths:
186-
script='"'"var path = require('path'); var arr = require('@stdlib/tools/library-manifest')(path.join('$1','manifest.json'),${opts},{'basedir':'$1','paths':'posix'}).libpath; var str = ''; for (var i = 0; i < arr.length; i++){var p = path.resolve('$1', arr[i]); str += '-L '+p+' ';}; console.log(str.substring(0, str.length-1));"'"'
186+
script='"'"var path = require('path'); var arr = require('@stdlib/utils/library-manifest')(path.join('$1','manifest.json'),${opts},{'basedir':'$1','paths':'posix'}).libpath; var str = ''; for (var i = 0; i < arr.length; i++){var p = path.resolve('$1', arr[i]); str += '-L '+p+' ';}; console.log(str.substring(0, str.length-1));"'"'
187187

188188
# Resolve library paths:
189189
libpath=$(eval NODE_PATH="${node_path}" "${node_cmd}" -e "${script}")

‎tools/snippets/bin/cli‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
var resolve = require( 'path' ).resolve;
2626
var readFileSync = require( '@stdlib/fs/read-file' ).sync;
27-
var CLI = require( '@stdlib/tools/cli' );
27+
var CLI = require( '@stdlib/cli' );
2828
var foo = require( './../lib' );
2929

3030

‎tools/snippets/bin/cli_stdin‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
var resolve = require( 'path' ).resolve;
2626
var readFileSync = require( '@stdlib/fs/read-file' ).sync;
27-
var CLI = require( '@stdlib/tools/cli' );
27+
var CLI = require( '@stdlib/cli' );
2828
var stdin = require( '@stdlib/process/read-stdin' );
2929
var stdinStream = require( '@stdlib/streams/node/stdin' );
3030
var RE_EOL = require( '@stdlib/regexp/eol' );

0 commit comments

Comments
 (0)