Skip to content

Commit c810651

Browse files
authored
Merge pull request rails#51650 from zzak/guides-process_scss-dir
Fix building guides outside ./guides directory
2 parents 2c35684 + 6be0b7f commit c810651

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

Rakefile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,12 @@ task :preview_docs do
5959
require "guides/rails_guides"
6060
Rake::Task[:rdoc].invoke
6161

62-
FileUtils.cp_r("doc/rdoc", "preview/api")
63-
FileUtils.cp_r("guides/output", "preview/guides")
62+
FileUtils.mv("doc/rdoc", "preview/api")
63+
FileUtils.mv("guides/output", "preview/guides")
6464

65-
system("tar -czf preview.tar.gz preview")
65+
Dir.chdir("preview") do
66+
system("tar -czf preview.tar.gz .")
67+
end
6668
end
6769

6870
desc "Bump all versions to match RAILS_VERSION"

guides/rails_guides/generator.rb

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,10 @@ def select_only(guides)
107107
end
108108

109109
def process_scss
110-
system "bundle exec dartsass ./assets/stylesrc/style.scss:#{@output_dir}/stylesheets/style.css ./assets/stylesrc/highlight.scss:#{@output_dir}/stylesheets/highlight.css ./assets/stylesrc/print.scss:#{@output_dir}/stylesheets/print.css"
110+
system "bundle exec dartsass \
111+
#{@guides_dir}/assets/stylesrc/style.scss:#{@output_dir}/stylesheets/style.css \
112+
#{@guides_dir}/assets/stylesrc/highlight.scss:#{@output_dir}/stylesheets/highlight.css \
113+
#{@guides_dir}/assets/stylesrc/print.scss:#{@output_dir}/stylesheets/print.css"
111114
end
112115

113116
def copy_assets

0 commit comments

Comments
 (0)