@@ -11,15 +11,11 @@ PACKAGE_DIRNAME = '_package'
1111BLANK_STRING_RE = Regexp . new ( '^\s*$' )
1212
1313def source_dir
14- @source_dir ||= File . expand_path ( '..' , Dir . pwd )
14+ @source_dir ||= File . expand_path ( Dir . pwd )
1515end
1616
17- def builder_dir
18- @builder_dir = File . join ( source_dir , BUILDER_DIRNAME )
19- end
20-
21- def builder_template_dir
22- @builder_template_dir ||= File . join ( builder_dir , 'templates' )
17+ def template_dir
18+ @template_dir ||= File . join ( source_dir , '_templates' )
2319end
2420
2521def preview_dir
115111
116112task :build do
117113 # Copy stylesheets into preview area
118- system ( "cp -r #{ builder_dir } /stylesheets #{ preview_dir } " )
114+ system ( "cp -r _stylesheets #{ preview_dir } /stylesheets " )
119115 # Build the topic files
120116 build_config . each do |topic_group |
121117 src_group_path = File . join ( source_dir , topic_group [ 'Dir' ] )
@@ -130,7 +126,7 @@ task :build do
130126 src_file_path = File . join ( src_group_path , "#{ topic [ 'File' ] } .adoc" )
131127 tgt_file_path = File . join ( tgt_group_path , "#{ topic [ 'File' ] } .adoc" )
132128 system ( 'cp' , src_file_path , tgt_file_path )
133- Asciidoctor . render_file tgt_file_path , :in_place => true , :safe => :unsafe , :template_dir => builder_template_dir , :attributes => [ 'source-highlighter=coderay' , 'coderay-css=style' , "stylesdir=#{ preview_dir } /stylesheets" , "imagesdir=#{ src_group_path } /images" , 'stylesheet=origin.css' , 'linkcss!' , 'icons=font' , 'idprefix=' , 'idseparator=-' , 'sectanchors' ]
129+ Asciidoctor . render_file tgt_file_path , :in_place => true , :safe => :unsafe , :template_dir => template_dir , :attributes => [ 'source-highlighter=coderay' , 'coderay-css=style' , "stylesdir=#{ preview_dir } /stylesheets" , "imagesdir=#{ src_group_path } /images" , 'stylesheet=origin.css' , 'linkcss!' , 'icons=font' , 'idprefix=' , 'idseparator=-' , 'sectanchors' ]
134130 system ( 'rm' , tgt_file_path )
135131 end
136132 end
0 commit comments