Skip to content

Commit 6d546f8

Browse files
jordancarlinjordancarlin
committed
update more node_module paths
1 parent 6da03ef commit 6d546f8

File tree

10 files changed

+19
-21
lines changed

10 files changed

+19
-21
lines changed

‎backends/cfg_html_doc/html_gen.rake‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,9 @@ rule %r{#{$root}/gen/cfg_html_doc/.*/antora/playbook.yaml} => proc { |tname|
119119
snapshot: true
120120
supplemental_files:
121121
- path: css/vendor/tabs.css
122-
contents: #{$root}/node_modules/@asciidoctor/tabs/dist/css/tabs.css
122+
contents: /opt/node/node_modules/@asciidoctor/tabs/dist/css/tabs.css
123123
- path: js/vendor/tabs.js
124-
contents: #{$root}/node_modules/@asciidoctor/tabs/dist/js/tabs.js
124+
contents: /opt/node/node_modules/@asciidoctor/tabs/dist/js/tabs.js
125125
- path: partials/footer-scripts.hbs
126126
contents: |
127127
<script id="site-script" src="{{{uiRootPath}}}/js/site.js" data-ui-root-path="{{{uiRootPath}}}"></script>
@@ -234,10 +234,9 @@ rule %r{#{$root}/\.stamps/html-gen-.*\.stamp} => proc { |tname|
234234
playbook_path = $root / "gen" / "cfg_html_doc" / config_name / "antora" / "playbook.yaml"
235235
Rake::Task[playbook_path].invoke
236236

237-
$logger.info "Running Antora under npm to create #{config_name}"
238-
237+
$logger.info "Running Antora to create #{config_name}"
239238
sh [
240-
"npm exec -- antora",
239+
"/opt/node/node_modules/.bin/antora",
241240
"--stacktrace",
242241
"generate",
243242
"--cache-dir=#{$root}/.home/.antora",
@@ -247,7 +246,7 @@ rule %r{#{$root}/\.stamps/html-gen-.*\.stamp} => proc { |tname|
247246
playbook_path
248247
].join(" ")
249248

250-
$logger.info "Done running Antora under npm to create #{config_name}"
249+
$logger.info "Done running Antora to create #{config_name}"
251250

252251
FileUtils.touch t.name
253252
end

‎backends/ext_pdf_doc/tasks.rake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ rule %r{#{$resolver.gen_path}/ext_pdf_doc/.*/pdf/.*_extension\.pdf} => proc { |t
3434
"-a pdf-theme=#{ENV['THEME']}",
3535
"-a pdf-fontsdir=#{$root}/ext/docs-resources/fonts",
3636
"-a imagesdir=#{$root}/ext/docs-resources/images",
37-
"-a wavedrom=#{$root}/node_modules/.bin/wavedrom-cli",
37+
"-a wavedrom=/opt/node/node_modules/.bin/wavedrom-cli",
3838
"-r asciidoctor-diagram",
3939
"-r idl_highlighter",
4040
"-o #{t.name}",
@@ -63,7 +63,7 @@ rule %r{#{$resolver.gen_path}/ext_pdf_doc/.*/html/.*_extension\.html} => proc {
6363
"-v",
6464
"-a toc",
6565
"-r asciidoctor-diagram",
66-
"-a wavedrom=#{$root}/node_modules/.bin/wavedrom-cli",
66+
"-a wavedrom=/opt/node/node_modules/.bin/wavedrom-cli",
6767
"-o #{t.name}",
6868
adoc_file
6969
].join(" ")

‎backends/instructions_appendix/all_instructions.golden.adoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
= Instruction Appendix
22
:doctype: book
3-
:wavedrom: /workspaces/riscv-unified-db/node_modules/.bin/wavedrom-cli
3+
:wavedrom: /opt/node/node_modules/.bin/wavedrom-cli
44
// Now the document header is complete and the wavedrom attribute is active.
55

66

‎backends/instructions_appendix/templates/instructions.adoc.erb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
= Instruction Appendix
22
:doctype: book
3-
:wavedrom: <%= $root %>/node_modules/.bin/wavedrom-cli
3+
:wavedrom: /opt/node/node_modules/.bin/wavedrom-cli
44
// Now the document header is complete and the wavedrom attribute is active.
55

66
<% instructions.sort_by(&:name).each do |inst| %>

‎backends/manual/tasks.rake‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -434,10 +434,10 @@ namespace :gen do
434434
playbook_path = MANUAL_GEN_DIR / ENV["MANUAL_NAME"] / "top" / output_hash / "antora" / "playbook" / "playbook.yml"
435435
Rake::Task[playbook_path].invoke
436436

437-
$logger.info "Running Antora under npm for HTML site to create '#{MANUAL_GEN_DIR / ENV['MANUAL_NAME'] / output_hash / 'html'}'"
437+
$logger.info "Running Antora for HTML site to create '#{MANUAL_GEN_DIR / ENV['MANUAL_NAME'] / output_hash / 'html'}'"
438438

439439
sh [
440-
"npm exec -- antora",
440+
"/opt/node/node_modules/.bin/antora",
441441
"--stacktrace",
442442
"generate",
443443
"--cache-dir=#{$root}/.home/.antora",
@@ -447,7 +447,7 @@ namespace :gen do
447447
playbook_path.to_s
448448
].join(" ")
449449

450-
$logger.info "Done running Antora under npm for HTML site to create '#{MANUAL_GEN_DIR / ENV['MANUAL_NAME'] / output_hash / 'html'}'"
450+
$logger.info "Done running Antora for HTML site to create '#{MANUAL_GEN_DIR / ENV['MANUAL_NAME'] / output_hash / 'html'}'"
451451
end
452452
end
453453

‎backends/manual/templates/playbook.yml.erb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ ui:
2828
snapshot: true
2929
supplemental_files:
3030
- path: css/vendor/tabs.css
31-
contents: <%= $root %>/node_modules/@asciidoctor/tabs/dist/css/tabs.css
31+
contents: /opt/node/node_modules/@asciidoctor/tabs/dist/css/tabs.css
3232
- path: js/vendor/tabs.js
33-
contents: <%= $root %>/node_modules/@asciidoctor/tabs/dist/js/tabs.js
33+
contents: /opt/node/node_modules/@asciidoctor/tabs/dist/js/tabs.js
3434
- path: partials/footer-scripts.hbs
3535
contents: |
3636
<script id="site-script" src="{{{uiRootPath}}}/js/site.js" data-ui-root-path="{{{uiRootPath}}}"></script>

‎backends/portfolio/tasks.rake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ def pf_adoc2pdf(adoc_file, target_pname)
9999
"-a pdf-theme=#{$root}/ext/docs-resources/themes/riscv-pdf.yml",
100100
"-a pdf-fontsdir=#{$root}/ext/docs-resources/fonts",
101101
"-a imagesdir=#{$root}/ext/docs-resources/images",
102-
"-a bytefield-svg=#{$root}/node_modules/.bin/bytefield-svg",
102+
"-a bytefield-svg=/opt/node/node_modules/.bin/bytefield-svg",
103103
"-r asciidoctor-diagram",
104104
"-r idl_highlighter",
105105
"-o #{target_pname}",
@@ -135,7 +135,7 @@ def pf_adoc2html(adoc_file, target_pname)
135135
"-v",
136136
"-a toc",
137137
"-a imagesdir=#{$root}/ext/docs-resources/images",
138-
"-a bytefield-svg=#{$root}/node_modules/.bin/bytefield-svg",
138+
"-a bytefield-svg=/opt/node/node_modules/.bin/bytefield-svg",
139139
"-r asciidoctor-diagram",
140140
"-r idl_highlighter",
141141
"-o #{target_pname}",

‎backends/portfolio/templates/beginning.adoc.erb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// Settings
1414
:experimental:
1515
:reproducible:
16-
:wavedrom: <%= $root %>/node_modules/.bin/wavedrom-cli
16+
:wavedrom: /opt/node/node_modules/.bin/wavedrom-cli
1717
// TODO: needs to be changed
1818
:imagesoutdir: images
1919
:icons: font

‎backends/prm_pdf/templates/prm_main.adoc.erb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
:pdf-themesdir: <%= @prm_pdf_dir / 'pdf-theme' %>
1414
:pdf-theme: custom
1515
:title-logo-image: image:<%= @prm_pdf_dir / 'pdf-theme' / 'logo.svg' %>[top=10%,align=left,pdfwidth=4in]
16-
<%- wavedrom_path = @root_path / "node_modules/.bin/wavedrom-cli" -%>
16+
<%- wavedrom_path = Pathname.new("/opt/node") / "node_modules/.bin/wavedrom-cli" -%>
1717
<%- if File.exist?(wavedrom_path) -%>
1818
:wavedrom: <%= wavedrom_path %>
1919
<%- end -%>
20-
<%- bytefield_path = @root_path / "node_modules/.bin/bytefield-svg" -%>
20+
<%- bytefield_path = Pathname.new("/opt/node") / "node_modules/.bin/bytefield-svg" -%>
2121
<%- if File.exist?(bytefield_path) -%>
2222
:bytefield-svg: <%= bytefield_path %>
2323
<%- end -%>

‎bin/clobber‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,4 @@ rm -rf \
88
${ROOT}/.bundle \
99
${ROOT}/.singularity \
1010
${ROOT}/gen \
11-
${ROOT}/node_modules \
1211
${ROOT}/sorbet

0 commit comments

Comments
 (0)