Author: assaf
Date: Tue Mar 25 14:16:46 2008
New Revision: 640989
URL: http://svn.apache.org/viewvc?rev=640989&view=rev
Log:
Now using Docter 1.1.3 (no more Facets or Uv)
Added:
incubator/buildr/trunk/doc/css/syntax.css
Removed:
incubator/buildr/trunk/doc/css/eiffel.css
Modified:
incubator/buildr/trunk/Rakefile
incubator/buildr/trunk/doc/print.haml
incubator/buildr/trunk/doc/web.haml
incubator/buildr/trunk/lib/buildr.rb
incubator/buildr/trunk/lib/buildr/jetty.rb
Modified: incubator/buildr/trunk/Rakefile
URL:
http://svn.apache.org/viewvc/incubator/buildr/trunk/Rakefile?rev=640989&r1=640988&r2=640989&view=diff
==============================================================================
--- incubator/buildr/trunk/Rakefile (original)
+++ incubator/buildr/trunk/Rakefile Tue Mar 25 14:16:46 2008
@@ -2,6 +2,7 @@
require 'rake/gempackagetask'
require 'rake/rdoctask'
require 'spec/rake/spectask'
+gem 'facets', '= 2.3.0'
# Gem specification comes first, other tasks rely on it.
@@ -91,7 +92,6 @@
gems = Gem::SourceIndex.from_installed_gems
dependencies = specify(RUBY_PLATFORM).dependencies
dependencies << Gem::Dependency.new('docter', '~>1.1')
- dependencies << Gem::Dependency.new('ultraviolet', '~>0.10') unless
RUBY_PLATFORM =~ /java/
dependencies << Gem::Dependency.new('rcov', '~>0.8') unless RUBY_PLATFORM =~
/java/
dependencies.select { |dep| gems.search(dep.name,
dep.version_requirements).empty? }.
each do |dep|
@@ -181,7 +181,6 @@
begin
require 'docter'
require 'docter/server'
- require 'docter/ultraviolet'
web_docs = {
:collection => Docter.collection('Buildr').using('doc/web.toc.yaml').
@@ -261,7 +260,7 @@
directories = 'lib', 'spec', 'docs', 'bin'
ignore = 'class', 'opts'
FileList['lib/**/*', 'spec/**/*', 'bin/**', 'doc/css/*', 'doc/scripts/*'].
- exclude('doc/css/eiffel.css').reject { |file| File.directory?(file) ||
ignore.include?(file[/[^.]*$/]) }.each do |file|
+ exclude('doc/css/syntax.css').reject { |file| File.directory?(file) ||
ignore.include?(file[/[^.]*$/]) }.each do |file|
comments =
File.read(file).scan(/(\/\*(.*?)\*\/)|^#\s+(.*?)$|<!--(.*?)-->/m).
map { |match| match.reject(&:nil?) }.flatten.join("\n")
fail "File #{file} missing Apache License, please add it before making a
release!" unless
Added: incubator/buildr/trunk/doc/css/syntax.css
URL:
http://svn.apache.org/viewvc/incubator/buildr/trunk/doc/css/syntax.css?rev=640989&view=auto
==============================================================================
--- incubator/buildr/trunk/doc/css/syntax.css (added)
+++ incubator/buildr/trunk/doc/css/syntax.css Tue Mar 25 14:16:46 2008
@@ -0,0 +1,43 @@
+/**
+ * From Syntax, Copyright © 2005 Jamis Buck
+ */
+
+.ruby .normal {}
+.ruby .comment { color: #005; font-style: italic; }
+.ruby .keyword { color: #A00; font-weight: bold; }
+.ruby .method { color: #077; }
+.ruby .class { color: #074; }
+.ruby .module { color: #050; }
+.ruby .punct { color: #447; font-weight: bold; }
+.ruby .symbol { color: #099; }
+.ruby .string { color: #944; background: #FFE; }
+.ruby .char { color: #F07; }
+.ruby .ident { color: #004; }
+.ruby .constant { color: #07F; }
+.ruby .regex { color: #B66; background: #FEF; }
+.ruby .number { color: #F99; }
+.ruby .attribute { color: #7BB; }
+.ruby .global { color: #7FB; }
+.ruby .expr { color: #227; }
+.ruby .escape { color: #277; }
+
+.xml .normal {}
+.xml .namespace { color: #B66; font-weight: bold; }
+.xml .tag { color: #F88; }
+.xml .comment { color: #005; font-style: italic; }
+.xml .punct { color: #447; font-weight: bold; }
+.xml .string { color: #944; }
+.xml .number { color: #F99; }
+.xml .attribute { color: #BB7; }
+
+.yaml .document { }
+.yaml .type { }
+.yaml .key { color: #00c0c0 }
+.yaml .comment { color: #808080 }
+.yaml .punct { }
+.yaml .string { }
+.yaml .number { }
+.yaml .time { }
+.yaml .date { }
+.yaml .ref { color: 00c0c0 }
+.yaml .anchor { color: 00c0c0 }
Modified: incubator/buildr/trunk/doc/print.haml
URL:
http://svn.apache.org/viewvc/incubator/buildr/trunk/doc/print.haml?rev=640989&r1=640988&r2=640989&view=diff
==============================================================================
--- incubator/buildr/trunk/doc/print.haml (original)
+++ incubator/buildr/trunk/doc/print.haml Tue Mar 25 14:16:46 2008
@@ -5,7 +5,7 @@
%title= collection.title
%style{ :type=>'text/css' }
@import 'css/default.css';
- @import 'css/eiffel.css';
+ @import 'css/syntax.css';
@import 'css/print.css' print;
%meta{ :name=>'subject', :content=>'Official Buildr documentation from the
people in the know' }
%meta{ :name=>'author', :content=>'http://incubator.apache.org/buildr' }
Modified: incubator/buildr/trunk/doc/web.haml
URL:
http://svn.apache.org/viewvc/incubator/buildr/trunk/doc/web.haml?rev=640989&r1=640988&r2=640989&view=diff
==============================================================================
--- incubator/buildr/trunk/doc/web.haml (original)
+++ incubator/buildr/trunk/doc/web.haml Tue Mar 25 14:16:46 2008
@@ -4,7 +4,7 @@
%meta{ 'http-equiv'=>'Content-Type', :content=>'text/html;charset=UTF-8' }/
%title= "#{collection.title} — #{page.title}"
%link{ :rel=>'stylesheet', :type=>'text/css', :href=>'css/default.css' }
- %link{ :rel=>'stylesheet', :type=>'text/css', :href=>'css/eiffel.css' }
+ %link{ :rel=>'stylesheet', :type=>'text/css', :href=>'css/syntax.css' }
%style{ :type=>'text/css', :media=>'print' }
@import 'css/print.css';
\#header { display: none }
Modified: incubator/buildr/trunk/lib/buildr.rb
URL:
http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr.rb?rev=640989&r1=640988&r2=640989&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr.rb (original)
+++ incubator/buildr/trunk/lib/buildr.rb Tue Mar 25 14:16:46 2008
@@ -22,9 +22,8 @@
require 'highline'
require 'highline/import'
-require 'facets/symbol/to_proc'
+require 'symbol/to_proc'
require 'facets/string/blank'
-require 'facets/kernel/__DIR__'
require 'facets/module/alias_method_chain'
require 'facets/string/starts_with'
require 'facets/openobject'
Modified: incubator/buildr/trunk/lib/buildr/jetty.rb
URL:
http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/jetty.rb?rev=640989&r1=640988&r2=640989&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/jetty.rb (original)
+++ incubator/buildr/trunk/lib/buildr/jetty.rb Tue Mar 25 14:16:46 2008
@@ -52,7 +52,7 @@
"org.slf4j:slf4j-simple:jar:#{SLF4J_VERSION}",
"org.slf4j:jcl104-over-slf4j:jar:#{SLF4J_VERSION}" ]
Java.classpath << REQUIRES
- Java.classpath << File.join(__DIR__)
+ Java.classpath << File.dirname(__FILE__)
# Default URL for Jetty (change with options.jetty.url).
URL = "http://localhost:8080";
