Moved the experimental branch to be the default for libraries.

git-svn-id: https://svn.origo.ethz.ch/eiffelstudio/trunk/Src/library/cURL@82581 8089f293-4706-0410-a29e-feb5c42a2edf

cURL-safe.ecf

@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-5-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-5-0 http://www.eiffel.com/developers/xml/configuration-1-5-0.xsd" name="curl" uuid="D51EF190-6157-4B47-8E73-FA93DCBB7A71" library_target="curl">
+	<target name="curl">
+		<description>cURL: libcURL wrapper library for Eiffel.
+      Copyright (c) 1984-2006, Eiffel Software and others.
+      Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt).</description>
+		<root all_classes="true"/>
+		<file_rule>
+			<exclude>/\.svn$</exclude>
+			<exclude>/EIFGEN.{0,1}$</exclude>
+			<exclude>/temp$</exclude>
+		</file_rule>
+		<option warning="true" full_class_checking="true" cat_call_detection="false" is_attached_by_default="true" void_safety="all" namespace="EiffelSoftware.Library">
+		</option>
+		<setting name="dotnet_naming_convention" value="true"/>
+		<external_include location="$(ISE_LIBRARY)\library\cURL\spec\include">
+			<condition>
+				<platform value="windows"/>
+			</condition>
+		</external_include>
+		<external_include location="$(ISE_LIBRARY)/library/cURL/spec/include">
+			<condition>
+				<platform excluded_value="windows"/>
+			</condition>
+		</external_include>
+		<external_object location="$(ISE_LIBRARY)/library/cURL/spec/$(ISE_PLATFORM)/lib/eiffel_curl.o">
+			<condition>
+				<platform excluded_value="windows"/>
+				<multithreaded value="false"/>
+			</condition>
+		</external_object>
+		<external_object location="$(ISE_LIBRARY)/library/cURL/spec/$(ISE_PLATFORM)/lib/MTeiffel_curl.o">
+			<condition>
+				<platform excluded_value="windows"/>
+				<multithreaded value="true"/>
+			</condition>
+		</external_object>
+		<external_object location="$(ISE_LIBRARY)\library\cURL\spec\$(ISE_C_COMPILER)\$(ISE_PLATFORM)\lib\eiffel_curl.lib">
+			<condition>
+				<platform value="windows"/>
+				<multithreaded value="false"/>
+				<dotnet value="false"/>
+			</condition>
+		</external_object>
+		<external_object location="$(ISE_LIBRARY)\library\cURL\spec\$(ISE_C_COMPILER)\$(ISE_PLATFORM)\lib\mteiffel_curl.lib">
+			<condition>
+				<platform value="windows"/>
+				<multithreaded value="true"/>
+				<dotnet value="false"/>
+			</condition>
+		</external_object>
+		<external_object location="$(ISE_LIBRARY)\library\cURL\spec\$(ISE_C_COMPILER)\$(ISE_PLATFORM)\lib\ileiffel_curl.lib">
+			<condition>
+				<platform value="windows"/>
+				<dotnet value="true"/>
+			</condition>
+		</external_object>
+		<library name="api_wrapper" location="$ISE_LIBRARY\library\api_wrapper\api_wrapper-safe.ecf"/>
+		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
+		<cluster name="curl" location=".\" recursive="true">
+			<file_rule>
+				<exclude>/spec$</exclude>
+				<exclude>/Clib$</exclude>
+			</file_rule>
+			<file_rule>
+				<exclude>/gtk$</exclude>
+				<exclude>/mac$</exclude>
+				<condition>
+					<platform value="windows"/>
+				</condition>
+			</file_rule>
+			<file_rule>
+				<exclude>/mswin$</exclude>
+				<exclude>/gtk$</exclude>
+				<condition>
+					<platform value="macintosh"/>
+					<custom name="vision_implementation" value="cocoa"/>
+				</condition>
+			</file_rule>
+			<file_rule>
+				<exclude>/mswin$</exclude>
+				<exclude>/mac$</exclude>
+				<condition>
+					<platform excluded_value="windows"/>
+					<custom name="vision_implementation" excluded_value="cocoa"/>
+				</condition>
+			</file_rule>
+		</cluster>
+	</target>
+	<target name="curl_dotnet" extends="curl">
+		<setting name="msil_generation" value="true"/>
+	</target>
+</system>

cURL.ecf

@@ -87,4 +87,7 @@
 			</file_rule>
 		</cluster>
 	</target>
+	<target name="curl_dotnet" extends="curl">
+		<setting name="msil_generation" value="true"/>
+	</target>
 </system>

curl_easy_externals.e

@@ -202,7 +202,7 @@ feature -- Special setting
 	curl_function: CURL_FUNCTION
 			-- cURL functions in curl_easy_setopt.
 		do
-			if attached {like curl_function} internal_curl_function as l_curl_function then
+			if attached internal_curl_function as l_curl_function then
 				Result := l_curl_function
 			else
 				create {CURL_DEFAULT_FUNCTION} Result.make
@@ -396,11 +396,11 @@ feature {NONE} -- C externals
 
 note
 	library:   "cURL: Library of reusable components for Eiffel."
-	copyright: "Copyright (c) 1984-2006, Eiffel Software and others"
+	copyright: "Copyright (c) 1984-2009, Eiffel Software and others"
 	license:   "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 	source: "[
 			Eiffel Software
-			356 Storke Road, Goleta, CA 93117 USA
+			5949 Hollister Ave., Goleta, CA 93117 USA
 			Telephone 805-685-1006, Fax 805-685-6869
 			Website http://www.eiffel.com
 			Customer support http://support.eiffel.com

curl_function.e

@@ -187,11 +187,11 @@ feature {NONE} -- Implementation
 
 note
 	library:   "cURL: Library of reusable components for Eiffel."
-	copyright: "Copyright (c) 1984-2006, Eiffel Software and others"
+	copyright: "Copyright (c) 1984-2009, Eiffel Software and others"
 	license:   "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 	source: "[
 			Eiffel Software
-			356 Storke Road, Goleta, CA 93117 USA
+			5949 Hollister Ave., Goleta, CA 93117 USA
 			Telephone 805-685-1006, Fax 805-685-6869
 			Website http://www.eiffel.com
 			Customer support http://support.eiffel.com

curl_opt_constants.e

@@ -114,6 +114,16 @@ feature -- Enumerations.
 			]"
 		end
 
+	curlopt_cookielist: INTEGER
+			-- Declared as CURLOPT_COOKIELIST.
+		external
+			"C inline use <curl/curl.h>"
+		alias
+			"[
+				return CURLOPT_COOKIELIST
+			]"
+		end
+
 	curlopt_ssl_verifypeer: INTEGER
 			-- Declared as CURLOPT_SSL_VERIFYPEER.
 		external
@@ -286,11 +296,32 @@ feature -- Enumerations.
 			]"
 		end
 
+	curlopt_encoding: INTEGER
+			-- Declared as CURLOPT_ENCODING.
+		external
+			"C inline use <curl/curl.h>"
+		alias
+			"[
+				return CURLOPT_ENCODING;
+			]"
+		end
+
+	curlopt_timeout: INTEGER
+			-- Declared as CURLOPT_TIMEOUT.
+		external
+			"C inline use <curl/curl.h>"
+		alias
+			"[
+				return CURLOPT_TIMEOUT
+			]"
+		end
+
 	is_valid (a_integer: INTEGER): BOOLEAN
 			-- If `a_integer' value valid?
 		do
 			Result := 	a_integer = curlopt_cookie or
 						a_integer = curlopt_cookiefile or
+						a_integer = curlopt_cookielist or
 						a_integer = curlopt_debugfunction or
 						a_integer = curlopt_followlocation or
 						a_integer = curlopt_httpheader or
@@ -314,16 +345,18 @@ feature -- Enumerations.
 						a_integer = curlopt_put or
 						a_integer = curlopt_readdata or
 						a_integer = curlopt_infilesize_large or
-						a_integer = curlopt_proxy
+						a_integer = curlopt_proxy or
+						a_integer = curlopt_encoding or
+						a_integer = curlopt_timeout
 		end
 
 note
 	library:   "cURL: Library of reusable components for Eiffel."
-	copyright: "Copyright (c) 1984-2006, Eiffel Software and others"
+	copyright: "Copyright (c) 1984-2009, Eiffel Software and others"
 	license:   "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 	source: "[
 			Eiffel Software
-			356 Storke Road, Goleta, CA 93117 USA
+			5949 Hollister Ave., Goleta, CA 93117 USA
 			Telephone 805-685-1006, Fax 805-685-6869
 			Website http://www.eiffel.com
 			Customer support http://support.eiffel.com