backup/EWF
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use local curl if compiler is < 7.0.8.7340

Browse Source 
otherwise, use ISE_LIBRARY cURL
This commit is contained in:
Jocelyn Fiat
2011-10-11 11:09:00 +02:00
parent 6758c4aef4
commit c2b66d6ca6
2 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
library/client/http_client/http_client-safe.ecf
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-8-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-8-0 http://www.eiffel.com/developers/xml/configuration-1-8-0.xsd" name="http_client" uuid="628F5A96-021B-4191-926B-B3BF49272866" library_target="http_client">
<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-9-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-9-0 http://www.eiffel.com/developers/xml/configuration-1-9-0.xsd" name="http_client" uuid="628F5A96-021B-4191-926B-B3BF49272866" library_target="http_client">
<target name="http_client">
<root all_classes="true"/>
<file_rule>
@@ -10,12 +10,20 @@
<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="provisional">
</option>
<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
<library name="cURL" location="../../../ext/ise_library/curl-safe.ecf"/>
<library name="encoder" location="../../text/encoder/encoder-safe.ecf"/>
<library name="curl" location="$ISE_LIBRARY\library\cURL\curl-safe.ecf">
<condition>
<version type="compiler" min="7.0.8.7340"/>
</condition>
</library>
<library name="curl_local" location="..\..\..\ext\ise_library\curl-safe.ecf">
<condition>
<version type="compiler" max="7.0.8.7339"/>
</condition>
</library>
<library name="encoder" location="..\..\text\encoder\encoder-safe.ecf"/>
<cluster name="src" location=".\src\" recursive="true"/>
</target>
<target name="tests" extends="http_client" >
<target name="tests" extends="http_client">
<root class="ANY" feature="default_create"/>
<file_rule>
<exclude>/.git$</exclude>
@@ -26,7 +34,6 @@
<assertions precondition="true"/>
</option>
<library name="testing" location="$ISE_LIBRARY\library\testing\testing-safe.ecf"/>
<tests name="tests" location="./tests"/>
<tests name="tests" location=".\tests\"/>
</target>
</system>

11
library/client/http_client/http_client.ecf
View File

@@ -10,7 +10,16 @@
<option warning="true" full_class_checking="true" void_safety="none" syntax="provisional">
</option>
<library name="base" location="$ISE_LIBRARY/library/base/base.ecf"/>
<library name="cURL" location="../../../ext/ise_library/curl.ecf"/>
<library name="curl" location="$ISE_LIBRARY\library\cURL\curl.ecf">
<condition>
<version type="compiler" min="7.0.8.7340"/>
</condition>
</library>
<library name="curl_local" location="..\..\..\ext\ise_library\curl.ecf">
<condition>
<version type="compiler" max="7.0.8.7339"/>
</condition>
</library>
<library name="encoder" location="../../text/encoder/encoder.ecf"/>
<cluster name="src" location=".\src\" recursive="true"/>
</target>