new branch 'curl' for #307

* libcurl rename in setup phase because ethon gem doesn't see the cross compiled libcurl-4.dll name.
shoes · Aug 11, 2017 · 3e850f6 · 3e850f6
1 parent ecb29ab
commit 3e850f6
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 2 deletions.
diff --git a/make/linux/xwin7/env.rb b/make/linux/xwin7/env.rb
@@ -158,8 +158,12 @@ def xfixrvmp(path)
     'rsvg'        => "#{bindll}/librsvg-2-2.dll",
     'thread'      => "#{bindll}/libgthread-2.0-0.dll",
     'zlib1'       => "#{bindll}/zlib1.dll",
+    'curl'        => "#{bindll}/libcurl-4.dll",
     'siji'        => "/usr/lib/gcc/i686-w64-mingw32/4.8/libgcc_s_sjlj-1.dll",
     'pthread'     => "/usr/i686-w64-mingw32/lib/libwinpthread-1.dll" 
     }
 )
+ReNames = {
+   "libcurl-4.dll" => "libcurl.dll"
+}
 
diff --git a/make/linux/xwin7/setup.rb b/make/linux/xwin7/setup.rb
@@ -33,6 +33,13 @@ def static_setup (so_list)
     so_list.each_value do |path|
       cp "#{path}", "#{TGT_DIR}"
     end
+    # the things we do for love...
+    ReNames.each_pair do |k, v|
+      if File.exist? "#{TGT_DIR}/#{k}"
+        mv "#{TGT_DIR}/#{k}", "#{TGT_DIR}/#{v}"
+        $stderr.puts "renamed #{k} to #{v}"
+      end
+    end 
     # copy/setup etc/share
     mkdir_p "#{TGT_DIR}/share/glib-2.0/schemas"
     cp  "#{ShoesDeps}/share/glib-2.0/schemas/gschemas.compiled" ,

diff --git a/make/win32/win7/env.rb b/make/win32/win7/env.rb
@@ -1,4 +1,4 @@
-#require "devkit" unless ENV['MINGW_PREFIX']
+require "devkit"
 cf =(ENV['ENV_CUSTOM'] || "win7-custom.yaml")
 gtk_version = '3'
 if File.exists? cf
@@ -144,7 +144,11 @@
     'thread'      => "#{bindll}/libgthread-2.0-0.dll",
     'zlib1'       => "#{bindll}/zlib1.dll",
     'pthread'     => "#{devdll}/libwinpthread-1.dll",
-    'sjlj'        => "#{devdll}/libgcc_s_sjlj-1.dll" 
+    'sjlj'        => "#{devdll}/libgcc_s_sjlj-1.dll",
+    'curl'        => "#{bindll}/libcurl-4.dll"
   }
 )
+ReNames = {
+   "libcurl-4.dll" => "libcurl.dll"
+}
 
diff --git a/make/win32/win7/setup.rb b/make/win32/win7/setup.rb
@@ -33,6 +33,13 @@ def static_setup (so_list)
     so_list.each_value do |path|
       cp "#{path}", "#{TGT_DIR}"
     end
+    # the things we do for love...
+    ReNames.each_pair do |k, v|
+      if File.exist? "#{TGT_DIR}/#{k}"
+        mv "#{TGT_DIR}/#{k}", "#{TGT_DIR}/#{v}"
+        $stderr.puts "renamed #{k} to #{v}"
+      end
+    end 
     # copy/setup etc/share
     mkdir_p "#{TGT_DIR}/share/glib-2.0/schemas"
     cp  "#{ShoesDeps}/share/glib-2.0/schemas/gschemas.compiled" ,

diff --git a/samples/simple/dowloader.rb → samples/simple/downloader.rb b/samples/simple/dowloader.rb → samples/simple/downloader.rb