-
-
Save ShinichiU/2434635 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
require 'formula' | |
def build_java?; ARGV.include? "--java"; end | |
def build_perl?; ARGV.include? "--perl"; end | |
def build_python?; ARGV.include? "--python"; end | |
def build_ruby?; ARGV.include? "--ruby"; end | |
def with_unicode_path?; ARGV.include? '--unicode-path'; end | |
class UniversalNeon < Requirement | |
def message; <<-EOS.undent | |
A universal build was requested, but neon was already built for a single arch. | |
You may need to `brew rm neon` first. | |
EOS | |
end | |
def satisfied? | |
f = Formula.factory('neon') | |
!f.installed? || archs_for_command(f.lib+'libneon.dylib').universal? | |
end | |
end | |
class UniversalSqlite < Requirement | |
def message; <<-EOS.undent | |
A universal build was requested, but sqlite was already built for a single arch. | |
You may need to `brew rm sqlite` first. | |
EOS | |
end | |
def satisfied? | |
f = Formula.factory('sqlite') | |
!f.installed? || archs_for_command(f.lib+'libsqlite3.dylib').universal? | |
end | |
end | |
class Subversion < Formula | |
homepage 'http://subversion.apache.org/' | |
url 'http://www.apache.org/dyn/closer.cgi?path=subversion/subversion-1.7.4.tar.bz2' | |
sha1 '57a3cd351c1dbedddd020e7a1952df6cd2674527' | |
depends_on 'pkg-config' => :build | |
# If Subversion can use the Lion versions of these, please | |
# open an issue with a patch. Build against Homebrewed versions | |
# for consistency. - @adamv | |
depends_on 'neon' | |
depends_on 'sqlite' | |
if ARGV.build_universal? | |
depends_on UniversalNeon.new | |
depends_on UniversalSqlite.new | |
end | |
def options | |
[ | |
['--java', 'Build Java bindings.'], | |
['--perl', 'Build Perl bindings.'], | |
['--python', 'Build Python bindings.'], | |
['--ruby', 'Build Ruby bindings.'], | |
['--universal', 'Build as a Universal Intel binary.'], | |
['--unicode-path', 'Include support for OS X unicode (but see caveats!)'] | |
] | |
end | |
def patches | |
DATA | |
end | |
def install | |
if build_java? | |
unless ARGV.build_universal? | |
opoo "A non-Universal Java build was requested." | |
puts "To use Java bindings with various Java IDEs, you might need a universal build:" | |
puts " brew install subversion --universal --java" | |
end | |
unless (ENV["JAVA_HOME"] or "").empty? | |
opoo "JAVA_HOME is set. Try unsetting it if JNI headers cannot be found." | |
end | |
end | |
ENV.universal_binary if ARGV.build_universal? | |
# Use existing system zlib | |
# Use dep-provided other libraries | |
# Don't mess with Apache modules (since we're not sudo) | |
args = ["--disable-debug", | |
"--prefix=#{prefix}", | |
"--with-ssl", | |
"--with-zlib=/usr", | |
"--with-sqlite=#{HOMEBREW_PREFIX}", | |
# use our neon, not OS X's | |
"--disable-neon-version-check", | |
"--disable-mod-activation", | |
"--without-apache-libexecdir", | |
"--without-berkeley-db"] | |
args << "--enable-javahl" << "--without-jikes" if build_java? | |
args << "--with-ruby-sitedir=#{lib}/ruby" if build_ruby? | |
args << "--with-unicode-path" if with_unicode_path? | |
system "./configure", *args | |
system "make" | |
system "make install" | |
if build_python? | |
system "make swig-py" | |
system "make install-swig-py" | |
end | |
if build_perl? | |
ENV.j1 # This build isn't parallel safe | |
# Remove hard-coded ppc target, add appropriate ones | |
if ARGV.build_universal? | |
arches = "-arch x86_64 -arch i386" | |
elsif MacOS.leopard? | |
arches = "-arch i386" | |
else | |
arches = "-arch x86_64" | |
end | |
# Use version-appropriate system Perl | |
if MacOS.leopard? | |
perl_version = "5.8.8" | |
else | |
perl_version = "5.10.0" | |
end | |
inreplace "Makefile" do |s| | |
s.change_make_var! "SWIG_PL_INCLUDES", | |
"$(SWIG_INCLUDES) #{arches} -g -pipe -fno-common -DPERL_DARWIN -fno-strict-aliasing -I/usr/local/include -I/System/Library/Perl/#{perl_version}/darwin-thread-multi-2level/CORE" | |
end | |
system "make swig-pl" | |
system "make install-swig-pl" | |
end | |
if build_java? | |
ENV.j1 # This build isn't parallel safe | |
system "make javahl" | |
system "make install-javahl" | |
end | |
if build_ruby? | |
ENV.j1 # This build isn't parallel safe | |
system "make swig-rb" | |
system "make install-swig-rb" | |
end | |
end | |
def caveats | |
s = "" | |
if with_unicode_path? | |
s += <<-EOS.undent | |
This unicode-path version implements a hack to deal with composed/decomposed | |
unicode handling on Mac OS X which is different from linux and windows. | |
It is an implementation of solution 1 from | |
http://svn.apache.org/repos/asf/subversion/trunk/notes/unicode-composition-for-filenames | |
which _WILL_ break some setups. Please be sure you understand what you | |
are asking for when you install this version. | |
EOS | |
end | |
if build_python? | |
s += <<-EOS.undent | |
You may need to add the Python bindings to your PYTHONPATH from: | |
#{HOMEBREW_PREFIX}/lib/svn-python | |
EOS | |
end | |
if build_ruby? | |
s += <<-EOS.undent | |
You may need to add the Ruby bindings to your RUBYLIB from: | |
#{HOMEBREW_PREFIX}/lib/ruby | |
EOS | |
end | |
if build_java? | |
s += <<-EOS.undent | |
You may need to link the Java bindings into the Java Extensions folder: | |
sudo mkdir -p /Library/Java/Extensions | |
sudo ln -s #{HOMEBREW_PREFIX}/lib/libsvnjavahl-1.dylib /Library/Java/Extensions/libsvnjavahl-1.dylib | |
EOS | |
end | |
return s.empty? ? nil : s | |
end | |
end | |
__END__ | |
diff --git a/subversion/libsvn_subr/path.c b/subversion/libsvn_subr/path.c | |
index 24fcd8f..8adc07d 100644 | |
--- a/subversion/libsvn_subr/path.c | |
+++ b/subversion/libsvn_subr/path.c | |
@@ -40,6 +40,9 @@ | |
#include "dirent_uri.h" | |
+#if defined(DARWIN) | |
+#include <CoreFoundation/CoreFoundation.h> | |
+#endif /* DARWIN */ | |
/* The canonical empty path. Can this be changed? Well, change the empty | |
test below and the path library will work, not so sure about the fs/wc | |
@@ -1120,6 +1123,36 @@ svn_path_cstring_to_utf8(const char **path_utf8, | |
apr_pool_t *pool) | |
{ | |
svn_boolean_t path_is_utf8; | |
+#if defined(DARWIN) | |
+ svn_error_t *err; | |
+ /* | |
+ Compose any decomposed unicode characters precomposed one. | |
+ This will solve the problem that the 'svn status' command sometime | |
+ cannot recognize as same file when files suppose to be comtain | |
+ comopsed characters, like umlaut in some European language or | |
+ 'Daku-ten' in Japanese, and the files are added on windows machines | |
+ then you use svn on Mac OS X checking out the files. | |
+ */ | |
+ CFMutableStringRef cfmsr = CFStringCreateMutable(NULL, 0); | |
+ CFStringAppendCString(cfmsr, path_apr, kCFStringEncodingUTF8); | |
+ CFStringNormalize(cfmsr, kCFStringNormalizationFormC); | |
+ CFIndex path_buff_size = 1 + CFStringGetMaximumSizeForEncoding( | |
+ CFStringGetLength(cfmsr), kCFStringEncodingUTF8); | |
+ char *path = apr_palloc(pool, path_buff_size); | |
+ CFStringGetCString(cfmsr, path, path_buff_size, kCFStringEncodingUTF8); | |
+ | |
+ SVN_ERR(get_path_encoding(&path_is_utf8, pool)); | |
+ | |
+ if (path_is_utf8) | |
+ { | |
+ *path_utf8 = apr_pstrdup(pool, path); | |
+ err = SVN_NO_ERROR; | |
+ } | |
+ else | |
+ err = svn_utf_cstring_to_utf8(path_utf8, path, pool); | |
+ CFRelease(cfmsr); | |
+ return err; | |
+#else | |
SVN_ERR(get_path_encoding(&path_is_utf8, pool)); | |
if (path_is_utf8) | |
{ | |
@@ -1128,6 +1161,7 @@ svn_path_cstring_to_utf8(const char **path_utf8, | |
} | |
else | |
return svn_utf_cstring_to_utf8(path_utf8, path_apr, pool); | |
+#endif | |
} | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment