Author: assaf
Date: Mon Jun 15 23:55:29 2009
New Revision: 785031
URL: http://svn.apache.org/viewvc?rev=785031&view=rev
Log:
Upgraded to Jekyll 0.5.1, now reading Jekyll configuration from doc/_config.yml.
Fixed link to community wiki in contributing page.
Added bio for Assaf in contributing page.
Fixed line breaks and other rendering issues in more stuff section.
Fixed link in preface.
Added:
buildr/trunk/doc/_config.yml
Modified:
buildr/trunk/doc/contributing.textile
buildr/trunk/doc/more_stuff.textile
buildr/trunk/doc/preface.textile
buildr/trunk/rakelib/doc.rake
buildr/trunk/rakelib/jekylltask.rb
Added: buildr/trunk/doc/_config.yml
URL:
http://svn.apache.org/viewvc/buildr/trunk/doc/_config.yml?rev=785031&view=auto
==============================================================================
--- buildr/trunk/doc/_config.yml (added)
+++ buildr/trunk/doc/_config.yml Mon Jun 15 23:55:29 2009
@@ -0,0 +1 @@
+pygments: true
Modified: buildr/trunk/doc/contributing.textile
URL:
http://svn.apache.org/viewvc/buildr/trunk/doc/contributing.textile?rev=785031&r1=785030&r2=785031&view=diff
==============================================================================
--- buildr/trunk/doc/contributing.textile (original)
+++ buildr/trunk/doc/contributing.textile Mon Jun 15 23:55:29 2009
@@ -36,7 +36,7 @@
h2(#wiki). Community Wiki
-Our community Wiki is available at
"http://cwiki.apache.org/confluence/display/BUILDR/Index":http://cwiki.apache.org/confluence/display/BUILDR/Index.
+"Our community Wiki":http://cwiki.apache.org/confluence/display/BUILDR/Index.
h2(#code). Contributing Code
@@ -195,6 +195,8 @@
*"Assaf Arkin":http://labnotes.org* (assaf at apache.org)
+Started working on Buildr because Maven was too much pain and Rake wasn't
enough. Assaf has been hanging around Apache since 1999, as founding
contributor to XML Apache, Ode and Buildr. Assaf is also co-author of "Ruby In
Practice":http://manning.com/mcanally/.
+
*Alex Boisvert*
Came to Buildr as a refuge from the Maven Uncertainty Principle. Alex has
been working mostly on the Scala integration and believes Ruby scripting is a
great complement to statically typed languages.
Modified: buildr/trunk/doc/more_stuff.textile
URL:
http://svn.apache.org/viewvc/buildr/trunk/doc/more_stuff.textile?rev=785031&r1=785030&r2=785031&view=diff
==============================================================================
--- buildr/trunk/doc/more_stuff.textile (original)
+++ buildr/trunk/doc/more_stuff.textile Mon Jun 15 23:55:29 2009
@@ -107,22 +107,20 @@
{% endhighlight %}
Save this script as @dbuildr@, make it executable and use it to invoke tasks.
-
+
+<notextile>
{% highlight sh %}
$ dbuildr clean compile
{% endhighlight %}
+</notextile>
-...@dbuildr@ will start the BuildrServer if there isn't one already running.
-Subsequent calls to dbuildr will act as the client and invoke the tasks you
-provide to the server.
-If the buildfile has been modified it will be reloaded on the BuildrServer.
+The @dbuildr@ command will start the BuildrServer if there isn't one already
running. Subsequent calls to dbuildr will act as the client and invoke the
tasks you provide to the server. If the buildfile has been modified it will be
reloaded on the BuildrServer.
h3(#nailgun). Nailgun
"Nailgun":http://www.martiansoftware.com/nailgun/index.html is a client,
protocol, and server for running Java programs from the command line without
incurring the JVM startup overhead. Nailgun integration is available only when
running Buildr within JRuby.
-JRuby users need not to create the @dbuildr@ script listed on the previous
section, as they can benefit from
-using a nailgun client to invoke tasks without having to wait for JVM+JRuby to
load.
+JRuby users need not to create the @dbuildr@ script listed on the previous
section, as they can benefit from using a nailgun client to invoke tasks
without having to wait for JVM+JRuby to load.
Start the BuildrServer by executing
@@ -182,14 +180,8 @@
The @eclipse@ task will generate a @.classpath@ and @.project@ file for each
of projects (and sub-project) that compiles source code. It will not generate
files for other projects, for examples, projects you use strictly for packaging
a distribution, or creating command line scripts, etc.
-If you add a new project, change the dependencies, or make any other change to
your Buildfile, just run the @eclipse@ task again to re-generate the Eclipse
project files.
-
-To have your libraries' source code available in Eclipse, run:
+If you add a new project, change the dependencies, or make any other change to
your Buildfile, just run the @eclipse@ task again to re-generate the Eclipse
project files. To have your libraries' source code available in Eclipse, run
the @artifacts:sources@ task.
-{% highlight sh %}
-$ buildr artifacts:sources
-{% endhighlight %}
-
If you prefer IntelliJ IDEA, you can always:
{% highlight sh %}
Modified: buildr/trunk/doc/preface.textile
URL:
http://svn.apache.org/viewvc/buildr/trunk/doc/preface.textile?rev=785031&r1=785030&r2=785031&view=diff
==============================================================================
--- buildr/trunk/doc/preface.textile (original)
+++ buildr/trunk/doc/preface.textile Mon Jun 15 23:55:29 2009
@@ -2,7 +2,7 @@
layout: preface
---
-div(title). !{width:20em}images/buildr-hires.png!
+p(title). !images/buildr-hires.png!
#(toc) "Getting Started":getting_started.html
# "Projects":projects.html
@@ -21,8 +21,7 @@
Licensed under the Apache License, Version 2.0 (the "License"); you may not
use this file except in compliance with the License. You may obtain a copy of
the License at
-"http://www.apache.org/licenses/LICENSE-2.0":http://www.apache.org/licenses/LICENSE-2.0
+http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
License for the specific language governing permissions and limitations under
the License.
-p(preface). <blank>
Modified: buildr/trunk/rakelib/doc.rake
URL:
http://svn.apache.org/viewvc/buildr/trunk/rakelib/doc.rake?rev=785031&r1=785030&r2=785031&view=diff
==============================================================================
--- buildr/trunk/rakelib/doc.rake (original)
+++ buildr/trunk/rakelib/doc.rake Mon Jun 15 23:55:29 2009
@@ -47,7 +47,7 @@
rescue LoadError
puts "Buildr uses the mojombo-jekyll to generate the Web site. You can
install it by running rake doc:setup"
task 'doc:setup' do
- install_gem 'mojombo-jekyll', :source=>'http://gems.github.com',
:version=>'0.4.1'
+ install_gem 'mojombo-jekyll', :source=>'http://gems.github.com',
:version=>'0.5.1'
if `pygmentize -V`.empty?
args = %w{easy_install Pygments}
args.unshift 'sudo' unless Config::CONFIG['host_os'] =~ /windows/
Modified: buildr/trunk/rakelib/jekylltask.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/rakelib/jekylltask.rb?rev=785031&r1=785030&r2=785031&view=diff
==============================================================================
--- buildr/trunk/rakelib/jekylltask.rb (original)
+++ buildr/trunk/rakelib/jekylltask.rb Mon Jun 15 23:55:29 2009
@@ -14,7 +14,7 @@
# the License.
-gem 'RedCloth', '4.1.1'
+#gem 'RedCloth', '4.2.0'
require 'rake/tasklib'
require 'jekyll'
@@ -73,18 +73,6 @@
end
end
-class Jekyll::HighlightBlock
- def render_pygments(context, code)
- if context["content_type"] == 'markdown'
- return "\n" + Albino.new(code, @lang).to_s(@options) + "\n"
- elsif context["content_type"] == 'textile'
- return "<notextile>" + Albino.new(code, @lang).to_s(@options) +
"</notextile>"
- else
- return Albino.new(code, @lang).to_s(@options)
- end
- end
-end
-
module TocFilter
def toc(input)
