Added combined javascript to .gitignore. Rake minify now uses configuration for the source directory

This commit is contained in:
Brandon Mathis 2012-06-17 09:36:56 -05:00
parent 17368e93c4
commit c2e14bf88e
2 changed files with 3 additions and 2 deletions

1
.gitignore vendored
View File

@ -9,6 +9,7 @@ sass.old
source.old source.old
source/_stash source/_stash
source/stylesheets/screen.css source/stylesheets/screen.css
source/javascripts/octopress.min.js
source/images/icon-*.png source/images/icon-*.png
vendor vendor
node_modules node_modules

View File

@ -61,9 +61,9 @@ task :generate do
end end
Rake::Minify.new(:minify_and_combine) do Rake::Minify.new(:minify_and_combine) do
files = FileList.new("source/javascripts/group/*.*") files = FileList.new("#{source_dir}/javascripts/group/*.*")
output_file = "source/javascripts/octopress.min.js" output_file = "#{source_dir}/javascripts/octopress.min.js"
puts "BEGIN Minifying #{output_file}" puts "BEGIN Minifying #{output_file}"
group(output_file) do group(output_file) do