Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Use vendor/oniguruma.

  • Loading branch information...
commit efa3a582bff22ca9f8ad99074dc5eee4d6ad5ed2 1 parent 27d7ca8
@brixen brixen authored
View
8 rakelib/blueprint.rb
@@ -145,8 +145,8 @@
end
end
- onig = i.external_lib "vendor/onig" do |l|
- l.cflags = ["-Ivendor/onig"]
+ oniguruma = i.external_lib "vendor/oniguruma" do |l|
+ l.cflags = ["-Ivendor/oniguruma"]
l.objects = [l.file(".libs/libonig.a")]
l.to_build do |x|
x.command "sh -c ./configure" unless File.exists?("Makefile")
@@ -204,7 +204,7 @@
gcc.add_library udis
gcc.add_library ffi
gcc.add_library gdtoa
- gcc.add_library onig
+ gcc.add_library oniguruma
gcc.add_library ltm
%w[ /usr/local/include /opt/local/include ].each do |path|
@@ -230,7 +230,7 @@
files << udis
files << ffi
files << gdtoa
- files << onig
+ files << oniguruma
files << ltm
cli = files.dup
View
2  rakelib/vm.rake
@@ -189,7 +189,7 @@ files TYPE_GEN, field_extract_headers + %w[vm/codegen/field_extract.rb] + [:run_
end
file encoding_database => 'vm/codegen/encoding_extract.rb' do |t|
- dir = File.expand_path "../vendor/onig"
+ dir = File.expand_path "../vendor/oniguruma"
ruby 'vm/codegen/encoding_extract.rb', dir, t.name
end
View
14 vendor/.gitignore
@@ -39,13 +39,13 @@ libffi/src/x86/.dirstamp
libffi/testsuite/Makefile
# oniguruma
-onig/Makefile
-onig/config.h
-onig/config.log
-onig/config.status
-onig/libtool
-onig/onig-config
-onig/sample/Makefile
+oniguruma/Makefile
+oniguruma/config.h
+oniguruma/config.log
+oniguruma/config.status
+oniguruma/libtool
+oniguruma/onig-config
+oniguruma/sample/Makefile
# libudis
udis86/Makefile
View
2  vm/builtin/regexp.hpp
@@ -5,7 +5,7 @@
#include "type_info.hpp"
// HACK gross.
-// Forward declare ONLY if we haven't already included onig.h
+// Forward declare ONLY if we haven't already included oniguruma.h
// We do this because onigurama seems to have regex_t be a weird
// typedef. It's easier to just not bother with trying to duplicate
// what it does and do this.
Please sign in to comment.
Something went wrong with that request. Please try again.