Skip to content

Commit b47b00e

Browse files
committed
remove java and windows refs
1 parent 333ff8e commit b47b00e

File tree

6 files changed

+12
-103
lines changed

6 files changed

+12
-103
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ source 'https://rubygems.org'
22
gemspec
33

44
group :compilation do
5-
gem 'rvm', '~> 1.2.6'
5+
gem 'rvm', '~> 1.11.3.9'
66
gem 'rake-compiler', '~> 0.7.1'
77
end

README.rdoc

Lines changed: 6 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
= RedCloth - Textile parser for Ruby
22

33
Homepage:: http://redcloth.org
4-
Author:: Jason Garber
54
Maintainer:: Joshua Siler https://github.com/joshuasiler
5+
Author:: Jason Garber
66
Copyright:: (c) 2011 Jason Garber
77
License:: MIT
88

@@ -14,34 +14,16 @@ License:: MIT
1414

1515
RedCloth is a Ruby library for converting Textile into HTML.
1616

17-
== RedCloth needs new maintainers
18-
19-
The {owner of this gem since 2007}[https://github.com/jgarber] is unable to
20-
keep fixing bugs or work on the next major release, {RedCloth
21-
5}[https://github.com/jgarber/redcloth-parslet]. He's looking for one or more
22-
developers who can:
23-
24-
<b>Current version</b>
25-
26-
* Fix any urgent {bugs}[http://jgarber.lighthouseapp.com/projects/13054-redcloth/overview] in RedCloth 4.x. You'll probably need to know Ragel and understand Ruby extensions in C and perhaps Java.
27-
* Precompile the gem for Windows and JRuby or fix broken cross-compilation to automate the process
28-
* Cut releases on the 4.x series.
17+
== Attention - Deprecating JRuby and Windows support in upcoming 4.3 release
2918

30-
<b>Future version</b>
31-
32-
* Complete {redcloth-parslet}[https://github.com/jgarber/redcloth-parslet], which will be a major release and replace this repository when finished. You need to understand the Parslet DSL, which can be learned in a couple hours.
33-
* Meet or exceed the current level of unit and integration testing. Unit testing of the individual patterns makes it much easier to develop and maintain than the old parser.
34-
* Release RedCloth 5.0 to much fanfare.
19+
In order to prioritize merging a fix for the long standing vulnerability *CVE-2012-6684*, our {new maintainer}[https://github.com/joshuasiler] has elected to stop maintaining the precompiled versions for Windows and JRuby.
3520

3621
== Installing
3722

3823
RedCloth can be installed via RubyGems:
3924

4025
gem install RedCloth
4126

42-
It will install the appropriate Ruby, JRuby, or Win32 gem. If using JRuby,
43-
version 1.1.5 or greater is required.
44-
4527
== Compiling
4628

4729
If you just want to use RedCloth, you do NOT need to build/compile it. It is
@@ -53,29 +35,15 @@ required. Again, Ragel is NOT needed to simply use RedCloth.
5335

5436
=== Supported platforms
5537

56-
By default, the rake compile task builds a native C extension (MRI 1.8 or 1.9)
57-
or Java extension (JRuby 1.3). A pure Ruby version can also be generated, but
58-
it's super slow and Ruby 1.8-only. The JRuby and pure-Ruby extensions don't
59-
support multi-byte characters. Cross-compiling for win32 uses rake-compiler.
38+
By default, the rake compile task builds a native C extension (MRI 1.8 or 1.9). A pure Ruby version can also be generated, but it's super slow and Ruby 1.8-only, and doesn't
39+
support multi-byte characters.
6040

6141
The RedCloth::EXTENSION_LANGUAGE constant indicates in which language your
6242
copy of RedCloth is compiled.
6343

64-
=== Compiling gems
65-
66-
To compile MRI, JRuby, and win32 gems, you need rvm and rake-compiler. These
67-
and other dependencies can be installed with bundler. Then rake build:all
68-
takes care of compiling and packaging all gems.
69-
70-
1. gem install bundler
71-
2. bundle install
72-
3. rake-compiler cross-ruby VERSION=1.8.6-p398
73-
4. rake-compiler cross-ruby VERSION=1.9.1-p243
74-
5. rake build:all
75-
7644
== Bugs
7745

78-
Please submit bugs to http://jgarber.lighthouseapp.com/projects/13054-redcloth/overview
46+
Please submit bugs as issues to this repo.
7947

8048
== Using RedCloth
8149

tasks/compile.rake

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,14 @@ CLOBBER.include [
1212
]
1313

1414
# Load the Gem specification for the current platform (Ruby or JRuby).
15-
def gemspec(platform = RUBY_PLATFORM[/java/] || 'ruby')
15+
def gemspec(platform = 'ruby')
1616
Gem::Specification.load(File.expand_path('../../redcloth.gemspec', __FILE__))
1717
end
1818

1919
require 'rake/extensiontask'
20-
require 'rake/javaextensiontask'
2120
require File.dirname(__FILE__) + '/ragel_extension_task'
2221

23-
if defined?(JRUBY_VERSION)
24-
Rake::JavaRagelExtensionTask.new('redcloth_scan', gemspec)
25-
else
22+
2623
extconf = "ext/redcloth_scan/extconf.rb"
2724
file extconf do
2825
FileUtils.mkdir(File.dirname(extconf)) unless File.directory?(File.dirname(extconf))
@@ -36,12 +33,4 @@ have_library("c", "main")
3633
create_makefile("redcloth_scan")
3734
EOF
3835
end
39-
end
40-
41-
Rake::RagelExtensionTask.new("redcloth_scan", gemspec) do |ext|
42-
if ENV['RUBY_CC_VERSION']
43-
ext.cross_compile = true
44-
ext.cross_platform = ['i386-mingw32', 'i386-mswin32-60']
45-
end
46-
end
4736
end

tasks/gems.rake

Lines changed: 0 additions & 37 deletions
This file was deleted.

tasks/ragel_extension_task.rb

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,17 +42,14 @@ def target(machine)
4242
{
4343
'scan' => {
4444
'c' => "#{@ext_dir}/redcloth_scan.c",
45-
'java' => "#{@ext_dir}/RedclothScanService.java",
4645
'rb' => "#{@ext_dir}/redcloth_scan.rb"
4746
},
4847
'inline' => {
4948
'c' => "#{@ext_dir}/redcloth_inline.c",
50-
'java' => "#{@ext_dir}/RedclothInline.java",
5149
'rb' => "#{@ext_dir}/redcloth_inline.rb"
5250
},
5351
'attributes' => {
5452
'c' => "#{@ext_dir}/redcloth_attributes.c",
55-
'java' => "#{@ext_dir}/RedclothAttributes.java",
5653
'rb' => "#{@ext_dir}/redcloth_attributes.rb"
5754
}
5855
}[machine][lang]
@@ -88,15 +85,13 @@ def flags
8885
def host_language_flag
8986
{
9087
'c' => 'C',
91-
'java' => 'J',
9288
'rb' => 'R'
9389
}[lang]
9490
end
9591

9692
def preferred_code_style
9793
{
9894
'c' => 'T0',
99-
'java' => nil,
10095
'rb' => 'F1'
10196
}[lang]
10297
end
@@ -117,11 +112,5 @@ def lang
117112
"c"
118113
end
119114
end
120-
class JavaRagelExtensionTask < JavaExtensionTask
121-
include RagelGenerationTasks
122-
123-
def lang
124-
"java"
125-
end
126-
end
115+
127116
end

tasks/rvm.rake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
namespace :rvm do
22

3-
RVM_RUBIES = ['jruby-1.5.6' , 'ruby-1.8.6-p398', 'ruby-1.9.1-p243', 'ruby-1.9.2-p136', 'ree-1.8.7-2010.02']
3+
RVM_RUBIES = ['ruby-1.8.6-p398', 'ruby-1.9.1-p243', 'ruby-1.9.2-p136', 'ruby-2.2.3p173']
44
RVM_GEMSET_NAME = 'redcloth'
55

66
task :setup do
77
unless @rvm_setup
88
rvm_lib_path = "#{`echo $rvm_path`.strip}/lib"
9-
$LOAD_PATH.unshift(rvm_lib_path) unless $LOAD_PATH.include?(rvm_lib_path)
9+
#$LOAD_PATH.unshift(rvm_lib_path) unless $LOAD_PATH.include?(rvm_lib_path)
1010
require 'rvm'
1111
require 'tmpdir'
1212
@rvm_setup = true

0 commit comments

Comments
 (0)