From 591cfb6cfabc9ebd412d8d87ed929ce2e4958ff4 Mon Sep 17 00:00:00 2001
From: jfiat <jfiat@eiffel.com>
Date: Thu, 7 Jul 2011 14:03:36 +0000
Subject: [PATCH] Now if you want to use the json utilities for gobo, you just
 need to include the json_gobo_extension.ecf (note that the related gobo
 classes are not void-safe) + cosmetics

---
 library/json-safe.ecf                        | 10 ++++----
 library/json.ecf                             | 24 ++++----------------
 library/json_gobo_extension.ecf              | 17 ++++++++++++++
 test/autotest/test_suite/test_suite-safe.ecf | 16 +++++++------
 test/autotest/test_suite/test_suite.ecf      | 13 +++++------
 5 files changed, 42 insertions(+), 38 deletions(-)
 create mode 100644 library/json_gobo_extension.ecf

diff --git a/library/json-safe.ecf b/library/json-safe.ecf
index 9acafcbc..b957513f 100644
--- a/library/json-safe.ecf
+++ b/library/json-safe.ecf
@@ -2,6 +2,11 @@
 <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="json" uuid="4E21C3BD-7951-4C6E-A673-431E762D7414" library_target="json">
 	<target name="json">
 		<root all_classes="true"/>
+		<file_rule>
+			<exclude>/EIFGENs$</exclude>
+			<exclude>/CVS$</exclude>
+			<exclude>/.svn$</exclude>
+		</file_rule>
 		<option trace="false" profile="false" debug="false" warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="standard" namespace="EJSON.Library">
 			<assertions/>
 			<warning name="export_class_missing" enabled="false"/>
@@ -11,11 +16,6 @@
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf" readonly="true"/>
 		<cluster name="json" location=".\" recursive="true">
-			<file_rule>
-				<exclude>/EIFGENs$</exclude>
-				<exclude>/CVS$</exclude>
-				<exclude>/.svn$</exclude>
-			</file_rule>
 			<file_rule>
 				<exclude>^/gobo$</exclude>
 				<exclude>^/kernel$</exclude>
diff --git a/library/json.ecf b/library/json.ecf
index fd35350e..ee954e09 100644
--- a/library/json.ecf
+++ b/library/json.ecf
@@ -2,6 +2,11 @@
 <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="json" uuid="4E21C3BD-7951-4C6E-A673-431E762D7414" library_target="json">
 	<target name="json">
 		<root all_classes="true"/>
+		<file_rule>
+			<exclude>/EIFGENs$</exclude>
+			<exclude>/CVS$</exclude>
+			<exclude>/.svn$</exclude>
+		</file_rule>
 		<option trace="false" profile="false" debug="false" warning="true" full_class_checking="true" void_safety="none" syntax="standard" namespace="EJSON.Library">
 			<assertions/>
 			<warning name="export_class_missing" enabled="false"/>
@@ -10,32 +15,13 @@
 			<warning name="vjrv" enabled="false"/>
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf" readonly="true"/>
-		<library name="gobo_argument" location="$ISE_LIBRARY\library\gobo\gobo_argument.ecf"/>
-		<library name="gobo_kernel" location="$ISE_LIBRARY\library\gobo\gobo_kernel.ecf"/>
-		<library name="gobo_lexical" location="$ISE_LIBRARY\library\gobo\gobo_lexical.ecf"/>
-		<library name="gobo_math" location="$ISE_LIBRARY\library\gobo\gobo_math.ecf"/>
-		<library name="gobo_parse" location="$ISE_LIBRARY\library\gobo\gobo_parse.ecf"/>
-		<library name="gobo_pattern" location="$ISE_LIBRARY\library\gobo\gobo_pattern.ecf"/>
-		<library name="gobo_regexp" location="$ISE_LIBRARY\library\gobo\gobo_regexp.ecf"/>
-		<library name="gobo_string" location="$ISE_LIBRARY\library\gobo\gobo_string.ecf"/>
-		<library name="gobo_structure" location="$ISE_LIBRARY\library\gobo\gobo_structure.ecf"/>
-		<library name="gobo_time" location="$ISE_LIBRARY\library\gobo\gobo_time.ecf"/>
-		<library name="gobo_tools" location="$ISE_LIBRARY\library\gobo\gobo_tools.ecf"/>
-		<library name="gobo_utility" location="$ISE_LIBRARY\library\gobo\gobo_utility.ecf"/>
-		<library name="gobo_xml" location="$ISE_LIBRARY\library\gobo\gobo_xml.ecf"/>
 		<cluster name="json" location=".\" recursive="true">
-			<file_rule>
-				<exclude>/EIFGENs$</exclude>
-				<exclude>/CVS$</exclude>
-				<exclude>/.svn$</exclude>
-			</file_rule>
 			<file_rule>
 				<exclude>^/gobo$</exclude>
 				<exclude>^/kernel$</exclude>
 				<exclude>^/extras$</exclude>
 			</file_rule>
 			<cluster name="kernel" location=".\kernel\" recursive="true"/>
-			<cluster name="gobo" location=".\gobo\" recursive="true"/>
 			<cluster name="extras" location=".\extras\" recursive="true"/>
 		</cluster>
 	</target>
diff --git a/library/json_gobo_extension.ecf b/library/json_gobo_extension.ecf
new file mode 100644
index 00000000..dd5f9b75
--- /dev/null
+++ b/library/json_gobo_extension.ecf
@@ -0,0 +1,17 @@
+<?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="json_gobo" uuid="437195AB-8B3C-4238-8998-A932A1423449" library_target="json_gobo">
+	<target name="json_gobo">
+		<root all_classes="true"/>
+		<file_rule>
+			<exclude>/EIFGENs$</exclude>
+			<exclude>/CVS$</exclude>
+			<exclude>/.svn$</exclude>
+		</file_rule>
+		<option trace="false" profile="false" debug="false" warning="true" full_class_checking="true" void_safety="none" syntax="standard" namespace="EJSON.Library">
+		</option>
+		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf" readonly="true"/>
+		<library name="json" location="json.ecf" readonly="true"/>
+		<library name="gobo_structure" location="$ISE_LIBRARY\library\gobo\gobo_structure.ecf"/>
+		<cluster name="json_gobo" location=".\gobo" recursive="true" />
+	</target>
+</system>
diff --git a/test/autotest/test_suite/test_suite-safe.ecf b/test/autotest/test_suite/test_suite-safe.ecf
index 3d3f9c37..35306669 100644
--- a/test/autotest/test_suite/test_suite-safe.ecf
+++ b/test/autotest/test_suite/test_suite-safe.ecf
@@ -2,18 +2,20 @@
 <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="test_suite" uuid="EA141B17-6A21-4781-8B5F-E9939BAE968A">
 	<target name="test_suite">
 		<root cluster="test_suite" class="APPLICATION" feature="make"/>
+		<file_rule>
+			<exclude>/EIFGENs$</exclude>
+			<exclude>/CVS$</exclude>
+			<exclude>/.svn$</exclude>
+		</file_rule>
 		<option warning="true" void_safety="all" syntax="standard">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="json" location="..\..\..\library\json-safe.ecf"/>
 		<library name="testing" location="$ISE_LIBRARY\library\testing\testing-safe.ecf"/>
-		<cluster name="test_suite" location=".\" recursive="true">
-			<file_rule>
-				<exclude>/EIFGENs$</exclude>
-				<exclude>/CVS$</exclude>
-				<exclude>/.svn$</exclude>
-			</file_rule>
-		</cluster>
+		<cluster name="test_suite" location=".\" recursive="true"/>
+	</target>
+	<target name="test_suite_dotnet" extends="test_suite">
+		<setting name="msil_generation" value="true"/>
 	</target>
 </system>
diff --git a/test/autotest/test_suite/test_suite.ecf b/test/autotest/test_suite/test_suite.ecf
index 4d9ec8c7..14496b89 100644
--- a/test/autotest/test_suite/test_suite.ecf
+++ b/test/autotest/test_suite/test_suite.ecf
@@ -2,6 +2,11 @@
 <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="test_suite" uuid="EA141B17-6A21-4781-8B5F-E9939BAE968A">
 	<target name="test_suite">
 		<root cluster="test_suite" class="APPLICATION" feature="make"/>
+		<file_rule>
+			<exclude>/EIFGENs$</exclude>
+			<exclude>/CVS$</exclude>
+			<exclude>/.svn$</exclude>
+		</file_rule>
 		<option warning="true">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
@@ -9,13 +14,7 @@
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="json" location="..\..\..\library\json.ecf"/>
 		<library name="testing" location="$ISE_LIBRARY\library\testing\testing.ecf"/>
-		<cluster name="test_suite" location=".\" recursive="true">
-			<file_rule>
-				<exclude>/EIFGENs$</exclude>
-				<exclude>/CVS$</exclude>
-				<exclude>/.svn$</exclude>
-			</file_rule>
-		</cluster>
+		<cluster name="test_suite" location=".\" recursive="true"/>
 	</target>
 	<target name="test_suite_dotnet" extends="test_suite">
 		<setting name="msil_generation" value="true"/>