Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Recompiling the website #9

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

[WIP] Recompiling the website #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74e9b0a
Initial fixes for compiling the website
ggam Sep 8, 2018
c8400d0
Fixes
ggam Sep 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,26 +29,26 @@

source "https://rubygems.org"

ruby '1.9.3', :engine => 'jruby', :engine_version => '1.7.17'
ruby '1.9.3', :engine => 'jruby', :engine_version => '1.7.27'

gem "awestruct", "0.5.5"

gem "slim"
gem "kramdown"
gem "slim", "2.1.0"
gem "kramdown", "1.4.1"
gem "asciidoctor"
gem "uglifier"
gem "htmlcompressor"
gem "coffee-script"

gem "rest-client"
gem "hpricot"
gem "git"
gem "git", "1.2.8"

gem "bouncy-castle-java", :platforms => :jruby
gem "therubyrhino", :platforms => :jruby
gem "therubyracer", "0.10.1", :platforms => :ruby
gem "jruby-openssl", :platforms => :jruby
gem "rb-inotify", :platforms => [:ruby, :jruby]

gem "puma"
gem "puma", "2.10.2"
gem "rspec", ">= 2.9"
6 changes: 3 additions & 3 deletions README.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ The website rely on running some Java code, e.g. JavaDoc, so we need to use JRub

[source,console]
----
rvm install jruby-1.7.9
rvm install jruby-1.7.27
----

NOTE: If the install aborts with messages regarding permission errors, try re executing with root permissions; "sudo rvm.."
Expand Down Expand Up @@ -53,7 +53,7 @@ javaee-samples
Create file *.ruby-version* in your favorite editor and add this as content:
[source,ruby]
----
jruby-1.7.9
jruby-1.7.27
----

At this point you can allow RVM to pickup the new environment settings by leaving the folder and re-entering.
Expand All @@ -70,7 +70,7 @@ Run the next command to verify that the environment is picked up correctly:
rvm info
----

The first line should tell you something like *jruby-1.7.9@javaee-samples*.
The first line should tell you something like *jruby-1.7.27@javaee-samples*.

Then on to the Awestruct bits!

Expand Down
2 changes: 1 addition & 1 deletion _ext/javadoc.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ def self.parse(source_path, quiet = true, &block)

com.sun.tools.javadoc.DocEnv.instance(context).silent = quiet

root = tool.getRootDocImpl('en', 'ascii', filter, empty, empty, options_list, false, sub_packages, empty, false, false, quiet)
root = tool.getRootDocImpl('en', 'ascii', filter, empty, options_list, false, sub_packages, empty, false, false, quiet)

block.call(root) if block
return root
Expand Down