From 1baa1a2b7ea9ff25483866ffa5d59c4368f225d9 Mon Sep 17 00:00:00 2001
From: pgcrism <pgcrism@users.sourceforge.net>
Date: Thu, 15 Nov 2012 16:54:13 +0100
Subject: [PATCH 1/7] [Add] .gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000..b5da6641ce
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+EIFGEN*

From 7bc12562eaa245cdd27f7be1dc50304fe9ce3ef8 Mon Sep 17 00:00:00 2001
From: pgcrism <pgcrism@users.sourceforge.net>
Date: Thu, 15 Nov 2012 16:54:53 +0100
Subject: [PATCH 2/7] [Add] Void-confident ECF files

---
 library/gobo-core-confident.ecf               | 28 +++++++++++++++++++
 library/kernel/gobo-kernel-safe.ecf           | 21 ++++++++++++++
 library/math/gobo-math-safe.ecf               | 19 +++++++++++++
 library/pattern/gobo-pattern-safe.ecf         | 19 +++++++++++++
 .../structure/gobo-structure-confident.ecf    | 19 +++++++++++++
 library/time/gobo-time-confident.ecf          | 19 +++++++++++++
 6 files changed, 125 insertions(+)
 create mode 100644 library/gobo-core-confident.ecf
 create mode 100644 library/kernel/gobo-kernel-safe.ecf
 create mode 100644 library/math/gobo-math-safe.ecf
 create mode 100644 library/pattern/gobo-pattern-safe.ecf
 create mode 100644 library/structure/gobo-structure-confident.ecf
 create mode 100644 library/time/gobo-time-confident.ecf

diff --git a/library/gobo-core-confident.ecf b/library/gobo-core-confident.ecf
new file mode 100644
index 0000000000..6bad08e068
--- /dev/null
+++ b/library/gobo-core-confident.ecf
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-10-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-10-0 http://www.eiffel.com/developers/xml/configuration-1-10-0.xsd" name="gobo-core" uuid="C8E29BA5-FA2D-4088-A05B-82AFF31B8E3B" library_target="gobo-core">
+	<target name="gobo-core">
+		<root all_classes="true"/>
+		<option warning="true" full_class_checking="true" is_attached_by_default="true" syntax="transitional">
+			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
+		</option>
+		<setting name="console_application" value="true"/>
+		<library name="base-safe" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
+		<library name="gobo-kernel" location="$GOBO\library\kernel\gobo-kernel.ecf"/>
+		<library name="gobo-pattern" location="$GOBO\library\pattern\gobo-pattern.ecf"/>
+		<library name="gobo-structure" location="$GOBO\library\structure\gobo-structure.ecf"/>
+		<library name="gobo-time" location="$GOBO\library\time\gobo-time.ecf"/>
+		<library name="gobo-decimal" location="$GOBO\library\math\gobo-math.ecf"/>
+		<cluster name="gobo-core" location=".\" recursive="false">
+			<file_rule>
+				<exclude>/EIFGENs$</exclude>
+				<exclude>/CVS$</exclude>
+				<exclude>/.svn$</exclude>
+			</file_rule>
+			<cluster name="gobo-parse" location="$GOBO\library\parse\" recursive="true"/>
+			<cluster name="gobo-string" location="$GOBO\library\string\" recursive="true"/>
+			<cluster name="gobo-utility" location="$GOBO\library\utility\" recursive="true"/>
+			<cluster name="gobo-lexical" location="$GOBO\library\lexical\" recursive="true"/>
+			<cluster name="gobo-regexp" location="$GOBO\library\regexp\" recursive="true"/>
+		</cluster>
+	</target>
+</system>
diff --git a/library/kernel/gobo-kernel-safe.ecf b/library/kernel/gobo-kernel-safe.ecf
new file mode 100644
index 0000000000..8543b2df9e
--- /dev/null
+++ b/library/kernel/gobo-kernel-safe.ecf
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-10-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-10-0 http://www.eiffel.com/developers/xml/configuration-1-10-0.xsd" name="gobo-kernel" uuid="6DF7CC01-A06C-420E-9ED3-28930EB78988" library_target="gobo-kernel">
+	<target name="gobo-kernel">
+		<root all_classes="true"/>
+		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="standard">
+			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
+		</option>
+		<setting name="console_application" value="true"/>
+		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
+		<library name="time" location="$ISE_LIBRARY\library\time\time-safe.ecf"/>
+		<cluster name="gobo-kernel" location="$GOBO\library\kernel\" recursive="true">
+			<file_rule>
+				<exclude>/EIFGENs$</exclude>
+				<exclude>/CVS$</exclude>
+				<exclude>/spec$</exclude>
+				<exclude>/.svn$</exclude>
+			</file_rule>
+		</cluster>
+		<cluster name="spec_eiffel" location=".\spec\$GOBO_EIFFEL\" recursive="true"/>
+	</target>
+</system>
diff --git a/library/math/gobo-math-safe.ecf b/library/math/gobo-math-safe.ecf
new file mode 100644
index 0000000000..757de543ee
--- /dev/null
+++ b/library/math/gobo-math-safe.ecf
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-10-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-10-0 http://www.eiffel.com/developers/xml/configuration-1-10-0.xsd" name="gobo-math" uuid="95784FE0-7B83-497E-BEC0-9F0C4F3035F2" library_target="gobo-math">
+	<target name="gobo-math">
+		<root all_classes="true"/>
+		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="transitional">
+			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
+		</option>
+		<setting name="console_application" value="true"/>
+		<library name="base-safe" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
+		<library name="gobo-kernel" location="$GOBO\library\kernel\gobo-kernel.ecf"/>
+		<cluster name="gobo-math" location="$GOBO\library\math\decimal\" recursive="true">
+			<file_rule>
+				<exclude>/EIFGENs$</exclude>
+				<exclude>/CVS$</exclude>
+				<exclude>/.svn$</exclude>
+			</file_rule>
+		</cluster>
+	</target>
+</system>
\ No newline at end of file
diff --git a/library/pattern/gobo-pattern-safe.ecf b/library/pattern/gobo-pattern-safe.ecf
new file mode 100644
index 0000000000..b3065d42c7
--- /dev/null
+++ b/library/pattern/gobo-pattern-safe.ecf
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-10-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-10-0 http://www.eiffel.com/developers/xml/configuration-1-10-0.xsd" name="gobo-pattern" uuid="9DD3EC52-EF03-4C63-A5C5-4D07AE7B28ED" library_target="gobo-pattern">
+	<target name="gobo-pattern">
+		<root all_classes="true"/>
+		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="transitional">
+			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
+		</option>
+		<setting name="console_application" value="true"/>
+		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
+		<library name="gobo-kernel" location="$GOBO\library\kernel\gobo-kernel-safe.ecf"/>
+		<cluster name="gobo-pattern" location="$GOBO\library\pattern\" recursive="true">
+			<file_rule>
+				<exclude>/EIFGENs$</exclude>
+				<exclude>/CVS$</exclude>
+				<exclude>/.svn$</exclude>
+			</file_rule>
+		</cluster>
+	</target>
+</system>
diff --git a/library/structure/gobo-structure-confident.ecf b/library/structure/gobo-structure-confident.ecf
new file mode 100644
index 0000000000..320acc2c1d
--- /dev/null
+++ b/library/structure/gobo-structure-confident.ecf
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-10-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-10-0 http://www.eiffel.com/developers/xml/configuration-1-10-0.xsd" name="gobo-structure" uuid="FC2A0909-3E1E-4B99-9D49-0CE0E304D38E" library_target="gobo-structure">
+	<target name="gobo-structure">
+		<root all_classes="true"/>
+		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="none" syntax="standard">
+			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
+		</option>
+		<setting name="console_application" value="true"/>
+		<library name="base-safe" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
+		<library name="gobo-kernel" location="$GOBO\library\kernel\gobo-kernel-safe.ecf"/>
+		<cluster name="gobo-regexp" location="$GOBO\library\structure\" recursive="true">
+			<file_rule>
+				<exclude>/EIFGENs$</exclude>
+				<exclude>/CVS$</exclude>
+				<exclude>/.svn$</exclude>
+			</file_rule>
+		</cluster>
+	</target>
+</system>
diff --git a/library/time/gobo-time-confident.ecf b/library/time/gobo-time-confident.ecf
new file mode 100644
index 0000000000..4239c11f9b
--- /dev/null
+++ b/library/time/gobo-time-confident.ecf
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-10-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-10-0 http://www.eiffel.com/developers/xml/configuration-1-10-0.xsd" name="gobo-time" uuid="961563CB-E823-47C1-92EC-F8440D71D06D" library_target="gobo-time">
+	<target name="gobo-time">
+		<root all_classes="true"/>
+		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="initialization" syntax="transitional">
+			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
+		</option>
+		<setting name="console_application" value="true"/>
+		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
+		<library name="gobo-kernel" location="C:\User\Eiffel\Dev\gobo.github.pgcrism\library\kernel\gobo-kernel.ecf"/>
+		<cluster name="gobo-time" location="$GOBO\library\time\" recursive="true">
+			<file_rule>
+				<exclude>/EIFGENs$</exclude>
+				<exclude>/CVS$</exclude>
+				<exclude>/.svn$</exclude>
+			</file_rule>
+		</cluster>
+	</target>
+</system>

From b698a467a6af3036b712032c9967636f50a3197e Mon Sep 17 00:00:00 2001
From: pgcrism <pgcrism@users.sourceforge.net>
Date: Thu, 15 Nov 2012 16:55:49 +0100
Subject: [PATCH 3/7] [Add] void-confident xace. Set variable VOIDCONFIDENT to
 true and pass it to gexace.

---
 library/kernel/library-confident.xace | 29 +++++++++++++++++++++++++++
 library/math/library-confident.xace   | 22 ++++++++++++++++++++
 2 files changed, 51 insertions(+)
 create mode 100644 library/kernel/library-confident.xace
 create mode 100644 library/math/library-confident.xace

diff --git a/library/kernel/library-confident.xace b/library/kernel/library-confident.xace
new file mode 100644
index 0000000000..c66b1c3e3a
--- /dev/null
+++ b/library/kernel/library-confident.xace
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+
+<library name="kernel" prefix="kl_">
+	<description>
+		description: "Xace file for the Gobo Eiffel Kernel Library"
+		library: "Gobo Eiffel Kernel Library"
+		copyright: "Copyright (c) 2001-2004, Eric Bezault and others"
+		license: "MIT License"
+		date: "$Date$"
+		revision: "$Revision$"
+	</description>
+
+	<cluster name="kernel" location="${GOBO}/library/kernel">
+		<option name="full_class_checking" value="true" if="${VOIDCONFIDENT}=true"/>
+		<option name="void_safety" value="full" if="${VOIDCONFIDENT}=true"/>
+		<option name="attached_by_default" value="true" if="${VOIDCONFIDENT}=true"/>
+
+		<option name="abstract" value="true"/>
+		<cluster name="basic"/>
+		<cluster name="io"/>
+		<cluster name="misc"/>
+		<cluster name="unicode"/>
+		<cluster name="support"/>
+		<cluster name="spec">
+			<option name="abstract" value="true"/>
+			<cluster name="${GOBO_EIFFEL}" prefix="spec_"/>
+		</cluster>
+	</cluster>
+</library>
diff --git a/library/math/library-confident.xace b/library/math/library-confident.xace
new file mode 100644
index 0000000000..f6dcbfe873
--- /dev/null
+++ b/library/math/library-confident.xace
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+
+<library name="math"  prefix="ma_">
+	<description>
+		description: "Xace file for the Gobo Eiffel Math Library"
+		library: "Gobo Eiffel Math Library"
+		copyright: "Copyright (c) 2004-2005, Eric Bezault and others"
+		license: "MIT License"
+		date: "$Date$"
+		revision: "$Revision$"
+	</description>
+
+	<cluster name="math" location="${GOBO}/library/math">
+		
+		<option name="full_class_checking" value="true" if="${VOIDCONFIDENT}=true"/>
+		<option name="void_safety" value="full" if="${VOIDCONFIDENT}=true"/>
+		<option name="attached_by_default" value="true" if="${VOIDCONFIDENT}=true"/>
+
+		<option name="abstract" value="true"/>
+		<cluster name="decimal"/>
+	</cluster>
+</library>

From cdcc0eaa51184378fc814ac678b01ed624103eed Mon Sep 17 00:00:00 2001
From: pgcrism <pgcrism@users.sourceforge.net>
Date: Thu, 15 Nov 2012 17:17:50 +0100
Subject: [PATCH 4/7] [FIX] Name libraries according to their status:
 void-'safe' or void-'confident'.

---
 library/gobo-core-confident.ecf                | 10 +++++-----
 library/math/gobo-math-safe.ecf                |  2 +-
 library/structure/gobo-structure-confident.ecf |  4 ++--
 library/time/gobo-time-confident.ecf           |  4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/library/gobo-core-confident.ecf b/library/gobo-core-confident.ecf
index 6bad08e068..863ab74bf1 100644
--- a/library/gobo-core-confident.ecf
+++ b/library/gobo-core-confident.ecf
@@ -7,11 +7,11 @@
 		</option>
 		<setting name="console_application" value="true"/>
 		<library name="base-safe" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
-		<library name="gobo-kernel" location="$GOBO\library\kernel\gobo-kernel.ecf"/>
-		<library name="gobo-pattern" location="$GOBO\library\pattern\gobo-pattern.ecf"/>
-		<library name="gobo-structure" location="$GOBO\library\structure\gobo-structure.ecf"/>
-		<library name="gobo-time" location="$GOBO\library\time\gobo-time.ecf"/>
-		<library name="gobo-decimal" location="$GOBO\library\math\gobo-math.ecf"/>
+		<library name="gobo-kernel-safe" location="$GOBO\library\kernel\gobo-kernel-safe.ecf"/>
+		<library name="gobo-pattern-safe" location="$GOBO\library\pattern\gobo-pattern-safe.ecf"/>
+		<library name="gobo-structure-confident" location="$GOBO\library\structure\gobo-structure-confident.ecf"/>
+		<library name="gobo-time-confident" location="$GOBO\library\time\gobo-time-confident.ecf"/>
+		<library name="gobo-math-safe" location="$GOBO\library\math\gobo-math-safe.ecf"/>
 		<cluster name="gobo-core" location=".\" recursive="false">
 			<file_rule>
 				<exclude>/EIFGENs$</exclude>
diff --git a/library/math/gobo-math-safe.ecf b/library/math/gobo-math-safe.ecf
index 757de543ee..d67194a3bf 100644
--- a/library/math/gobo-math-safe.ecf
+++ b/library/math/gobo-math-safe.ecf
@@ -7,7 +7,7 @@
 		</option>
 		<setting name="console_application" value="true"/>
 		<library name="base-safe" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
-		<library name="gobo-kernel" location="$GOBO\library\kernel\gobo-kernel.ecf"/>
+		<library name="gobo-kernel-safe" location="$GOBO\library\kernel\gobo-kernel-safe.ecf"/>
 		<cluster name="gobo-math" location="$GOBO\library\math\decimal\" recursive="true">
 			<file_rule>
 				<exclude>/EIFGENs$</exclude>
diff --git a/library/structure/gobo-structure-confident.ecf b/library/structure/gobo-structure-confident.ecf
index 320acc2c1d..35adfbc708 100644
--- a/library/structure/gobo-structure-confident.ecf
+++ b/library/structure/gobo-structure-confident.ecf
@@ -7,8 +7,8 @@
 		</option>
 		<setting name="console_application" value="true"/>
 		<library name="base-safe" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
-		<library name="gobo-kernel" location="$GOBO\library\kernel\gobo-kernel-safe.ecf"/>
-		<cluster name="gobo-regexp" location="$GOBO\library\structure\" recursive="true">
+		<library name="gobo-kernel-safe" location="$GOBO\library\kernel\gobo-kernel-safe.ecf"/>
+		<cluster name="gobo-structure" location="$GOBO\library\structure\" recursive="true">
 			<file_rule>
 				<exclude>/EIFGENs$</exclude>
 				<exclude>/CVS$</exclude>
diff --git a/library/time/gobo-time-confident.ecf b/library/time/gobo-time-confident.ecf
index 4239c11f9b..69a7d6eac0 100644
--- a/library/time/gobo-time-confident.ecf
+++ b/library/time/gobo-time-confident.ecf
@@ -6,8 +6,8 @@
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<setting name="console_application" value="true"/>
-		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
-		<library name="gobo-kernel" location="C:\User\Eiffel\Dev\gobo.github.pgcrism\library\kernel\gobo-kernel.ecf"/>
+		<library name="base-safe" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
+		<library name="gobo-kernel-safe" location="C:\User\Eiffel\Dev\gobo.github.pgcrism\library\kernel\gobo-kernel-safe.ecf"/>
 		<cluster name="gobo-time" location="$GOBO\library\time\" recursive="true">
 			<file_rule>
 				<exclude>/EIFGENs$</exclude>

From 85490f0eb4bcc3c242aa58f9f6ed0b34bf5af43d Mon Sep 17 00:00:00 2001
From: Olivier Ligot <oligot@gmail.com>
Date: Tue, 20 Nov 2012 13:57:40 +0100
Subject: [PATCH 5/7] Fix ecf

* Add argument library
* Use GOBO environment variable
---
 .gitignore                           | 1 +
 library/gobo-core-confident.ecf      | 1 +
 library/time/gobo-time-confident.ecf | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index b5da6641ce..9ab13d0938 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 EIFGEN*
+*.swp
diff --git a/library/gobo-core-confident.ecf b/library/gobo-core-confident.ecf
index 863ab74bf1..39b78ea751 100644
--- a/library/gobo-core-confident.ecf
+++ b/library/gobo-core-confident.ecf
@@ -23,6 +23,7 @@
 			<cluster name="gobo-utility" location="$GOBO\library\utility\" recursive="true"/>
 			<cluster name="gobo-lexical" location="$GOBO\library\lexical\" recursive="true"/>
 			<cluster name="gobo-regexp" location="$GOBO\library\regexp\" recursive="true"/>
+			<cluster name="gobo-argument" location="$GOBO\library\argument\" recursive="true"/>
 		</cluster>
 	</target>
 </system>
diff --git a/library/time/gobo-time-confident.ecf b/library/time/gobo-time-confident.ecf
index 69a7d6eac0..5dc5b7e435 100644
--- a/library/time/gobo-time-confident.ecf
+++ b/library/time/gobo-time-confident.ecf
@@ -7,7 +7,7 @@
 		</option>
 		<setting name="console_application" value="true"/>
 		<library name="base-safe" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
-		<library name="gobo-kernel-safe" location="C:\User\Eiffel\Dev\gobo.github.pgcrism\library\kernel\gobo-kernel-safe.ecf"/>
+		<library name="gobo-kernel-safe" location="$GOBO\library\kernel\gobo-kernel-safe.ecf"/>
 		<cluster name="gobo-time" location="$GOBO\library\time\" recursive="true">
 			<file_rule>
 				<exclude>/EIFGENs$</exclude>

From 7575291a866a78c826b7360c8e4f8ac23c92a34d Mon Sep 17 00:00:00 2001
From: Olivier Ligot <oligot@gmail.com>
Date: Fri, 8 Feb 2013 10:21:50 +0100
Subject: [PATCH 6/7] Use Gobo FreeELKS version when GOBO_EIFFEL is ge

---
 library/gobo-core-confident.ecf               | 13 +++++++--
 library/kernel/gobo-kernel-safe.ecf           | 21 --------------
 library/kernel/library-confident.xace         | 29 -------------------
 library/kernel/library.ecf                    |  2 +-
 library/math/gobo-math-safe.ecf               | 15 ++++++++--
 library/pattern/gobo-pattern-safe.ecf         | 13 +++++++--
 .../structure/gobo-structure-confident.ecf    | 13 +++++++--
 library/time/gobo-time-confident.ecf          | 13 +++++++--
 8 files changed, 57 insertions(+), 62 deletions(-)
 delete mode 100644 library/kernel/gobo-kernel-safe.ecf
 delete mode 100644 library/kernel/library-confident.xace

diff --git a/library/gobo-core-confident.ecf b/library/gobo-core-confident.ecf
index 39b78ea751..e8adb71d4b 100644
--- a/library/gobo-core-confident.ecf
+++ b/library/gobo-core-confident.ecf
@@ -6,8 +6,17 @@
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<setting name="console_application" value="true"/>
-		<library name="base-safe" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
-		<library name="gobo-kernel-safe" location="$GOBO\library\kernel\gobo-kernel-safe.ecf"/>
+		<library name="base" location="$ISE_LIBRARY/library/base/base-safe.ecf" readonly="true">
+			<condition>
+				<custom name="GOBO_EIFFEL" excluded_value="ge"/>
+			</condition>
+		</library>
+		<library name="free_elks" location="$GOBO/library/free_elks/library.ecf" readonly="true">
+			<condition>
+				<custom name="GOBO_EIFFEL" value="ge"/>
+			</condition>
+		</library>
+		<library name="gobo-kernel-safe" location="$GOBO\library\kernel\library.ecf"/>
 		<library name="gobo-pattern-safe" location="$GOBO\library\pattern\gobo-pattern-safe.ecf"/>
 		<library name="gobo-structure-confident" location="$GOBO\library\structure\gobo-structure-confident.ecf"/>
 		<library name="gobo-time-confident" location="$GOBO\library\time\gobo-time-confident.ecf"/>
diff --git a/library/kernel/gobo-kernel-safe.ecf b/library/kernel/gobo-kernel-safe.ecf
deleted file mode 100644
index 8543b2df9e..0000000000
--- a/library/kernel/gobo-kernel-safe.ecf
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-10-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-10-0 http://www.eiffel.com/developers/xml/configuration-1-10-0.xsd" name="gobo-kernel" uuid="6DF7CC01-A06C-420E-9ED3-28930EB78988" library_target="gobo-kernel">
-	<target name="gobo-kernel">
-		<root all_classes="true"/>
-		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="standard">
-			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
-		</option>
-		<setting name="console_application" value="true"/>
-		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
-		<library name="time" location="$ISE_LIBRARY\library\time\time-safe.ecf"/>
-		<cluster name="gobo-kernel" location="$GOBO\library\kernel\" recursive="true">
-			<file_rule>
-				<exclude>/EIFGENs$</exclude>
-				<exclude>/CVS$</exclude>
-				<exclude>/spec$</exclude>
-				<exclude>/.svn$</exclude>
-			</file_rule>
-		</cluster>
-		<cluster name="spec_eiffel" location=".\spec\$GOBO_EIFFEL\" recursive="true"/>
-	</target>
-</system>
diff --git a/library/kernel/library-confident.xace b/library/kernel/library-confident.xace
deleted file mode 100644
index c66b1c3e3a..0000000000
--- a/library/kernel/library-confident.xace
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-
-<library name="kernel" prefix="kl_">
-	<description>
-		description: "Xace file for the Gobo Eiffel Kernel Library"
-		library: "Gobo Eiffel Kernel Library"
-		copyright: "Copyright (c) 2001-2004, Eric Bezault and others"
-		license: "MIT License"
-		date: "$Date$"
-		revision: "$Revision$"
-	</description>
-
-	<cluster name="kernel" location="${GOBO}/library/kernel">
-		<option name="full_class_checking" value="true" if="${VOIDCONFIDENT}=true"/>
-		<option name="void_safety" value="full" if="${VOIDCONFIDENT}=true"/>
-		<option name="attached_by_default" value="true" if="${VOIDCONFIDENT}=true"/>
-
-		<option name="abstract" value="true"/>
-		<cluster name="basic"/>
-		<cluster name="io"/>
-		<cluster name="misc"/>
-		<cluster name="unicode"/>
-		<cluster name="support"/>
-		<cluster name="spec">
-			<option name="abstract" value="true"/>
-			<cluster name="${GOBO_EIFFEL}" prefix="spec_"/>
-		</cluster>
-	</cluster>
-</library>
diff --git a/library/kernel/library.ecf b/library/kernel/library.ecf
index 18e0342b9c..f8ac45beda 100644
--- a/library/kernel/library.ecf
+++ b/library/kernel/library.ecf
@@ -60,4 +60,4 @@
 			</file_rule>
 		</cluster>
 	</target>
-</system>
\ No newline at end of file
+</system>
diff --git a/library/math/gobo-math-safe.ecf b/library/math/gobo-math-safe.ecf
index d67194a3bf..25558684ec 100644
--- a/library/math/gobo-math-safe.ecf
+++ b/library/math/gobo-math-safe.ecf
@@ -6,8 +6,17 @@
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<setting name="console_application" value="true"/>
-		<library name="base-safe" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
-		<library name="gobo-kernel-safe" location="$GOBO\library\kernel\gobo-kernel-safe.ecf"/>
+		<library name="base" location="$ISE_LIBRARY/library/base/base-safe.ecf" readonly="true">
+			<condition>
+				<custom name="GOBO_EIFFEL" excluded_value="ge"/>
+			</condition>
+		</library>
+		<library name="free_elks" location="$GOBO/library/free_elks/library.ecf" readonly="true">
+			<condition>
+				<custom name="GOBO_EIFFEL" value="ge"/>
+			</condition>
+		</library>
+		<library name="gobo-kernel-safe" location="$GOBO\library\kernel\library.ecf"/>
 		<cluster name="gobo-math" location="$GOBO\library\math\decimal\" recursive="true">
 			<file_rule>
 				<exclude>/EIFGENs$</exclude>
@@ -16,4 +25,4 @@
 			</file_rule>
 		</cluster>
 	</target>
-</system>
\ No newline at end of file
+</system>
diff --git a/library/pattern/gobo-pattern-safe.ecf b/library/pattern/gobo-pattern-safe.ecf
index b3065d42c7..55b4685888 100644
--- a/library/pattern/gobo-pattern-safe.ecf
+++ b/library/pattern/gobo-pattern-safe.ecf
@@ -6,8 +6,17 @@
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<setting name="console_application" value="true"/>
-		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
-		<library name="gobo-kernel" location="$GOBO\library\kernel\gobo-kernel-safe.ecf"/>
+		<library name="base" location="$ISE_LIBRARY/library/base/base-safe.ecf" readonly="true">
+			<condition>
+				<custom name="GOBO_EIFFEL" excluded_value="ge"/>
+			</condition>
+		</library>
+		<library name="free_elks" location="$GOBO/library/free_elks/library.ecf" readonly="true">
+			<condition>
+				<custom name="GOBO_EIFFEL" value="ge"/>
+			</condition>
+		</library>
+		<library name="gobo-kernel" location="$GOBO\library\kernel\library.ecf"/>
 		<cluster name="gobo-pattern" location="$GOBO\library\pattern\" recursive="true">
 			<file_rule>
 				<exclude>/EIFGENs$</exclude>
diff --git a/library/structure/gobo-structure-confident.ecf b/library/structure/gobo-structure-confident.ecf
index 35adfbc708..73fbb96c47 100644
--- a/library/structure/gobo-structure-confident.ecf
+++ b/library/structure/gobo-structure-confident.ecf
@@ -6,8 +6,17 @@
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<setting name="console_application" value="true"/>
-		<library name="base-safe" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
-		<library name="gobo-kernel-safe" location="$GOBO\library\kernel\gobo-kernel-safe.ecf"/>
+		<library name="base" location="$ISE_LIBRARY/library/base/base-safe.ecf" readonly="true">
+			<condition>
+				<custom name="GOBO_EIFFEL" excluded_value="ge"/>
+			</condition>
+		</library>
+		<library name="free_elks" location="$GOBO/library/free_elks/library.ecf" readonly="true">
+			<condition>
+				<custom name="GOBO_EIFFEL" value="ge"/>
+			</condition>
+		</library>
+		<library name="gobo-kernel-safe" location="$GOBO\library\kernel\library.ecf"/>
 		<cluster name="gobo-structure" location="$GOBO\library\structure\" recursive="true">
 			<file_rule>
 				<exclude>/EIFGENs$</exclude>
diff --git a/library/time/gobo-time-confident.ecf b/library/time/gobo-time-confident.ecf
index 5dc5b7e435..eb2de9b49c 100644
--- a/library/time/gobo-time-confident.ecf
+++ b/library/time/gobo-time-confident.ecf
@@ -6,8 +6,17 @@
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<setting name="console_application" value="true"/>
-		<library name="base-safe" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
-		<library name="gobo-kernel-safe" location="$GOBO\library\kernel\gobo-kernel-safe.ecf"/>
+		<library name="base" location="$ISE_LIBRARY/library/base/base-safe.ecf" readonly="true">
+			<condition>
+				<custom name="GOBO_EIFFEL" excluded_value="ge"/>
+			</condition>
+		</library>
+		<library name="free_elks" location="$GOBO/library/free_elks/library.ecf" readonly="true">
+			<condition>
+				<custom name="GOBO_EIFFEL" value="ge"/>
+			</condition>
+		</library>
+		<library name="gobo-kernel-safe" location="$GOBO\library\kernel\library.ecf"/>
 		<cluster name="gobo-time" location="$GOBO\library\time\" recursive="true">
 			<file_rule>
 				<exclude>/EIFGENs$</exclude>

From 8af3d35aa8ea338fe604af8f86a93f5fbec614d8 Mon Sep 17 00:00:00 2001
From: "Paul G. Crismer" <pgcrism@users.sf.net>
Date: Thu, 25 Apr 2013 14:38:59 +0200
Subject: [PATCH 7/7] [Fix] ecf name consistency

- safe - fully voidsafe
- confident - mix voidsafe/voidunsafe
- <empty> - voidunsafe
---
 library/gobo-core-confident.ecf      |  2 +-
 library/gobo-core.ecf                | 38 +++++++++++++++++
 library/kernel/library-safe.ecf      | 63 ++++++++++++++++++++++++++++
 library/kernel/library.ecf           |  6 +--
 library/math/gobo-math-safe.ecf      |  2 +-
 library/math/gobo-math.ecf           | 28 +++++++++++++
 library/pattern/gobo-pattern.ecf     | 28 +++++++++++++
 library/structure/gobo-structure.ecf | 28 +++++++++++++
 library/time/gobo-time-confident.ecf |  2 +-
 library/time/gobo-time.ecf           | 28 +++++++++++++
 10 files changed, 219 insertions(+), 6 deletions(-)
 create mode 100644 library/gobo-core.ecf
 create mode 100644 library/kernel/library-safe.ecf
 create mode 100644 library/math/gobo-math.ecf
 create mode 100644 library/pattern/gobo-pattern.ecf
 create mode 100644 library/structure/gobo-structure.ecf
 create mode 100644 library/time/gobo-time.ecf

diff --git a/library/gobo-core-confident.ecf b/library/gobo-core-confident.ecf
index e8adb71d4b..4b9ebe4594 100644
--- a/library/gobo-core-confident.ecf
+++ b/library/gobo-core-confident.ecf
@@ -16,7 +16,7 @@
 				<custom name="GOBO_EIFFEL" value="ge"/>
 			</condition>
 		</library>
-		<library name="gobo-kernel-safe" location="$GOBO\library\kernel\library.ecf"/>
+		<library name="gobo-kernel-safe" location="$GOBO\library\kernel\library-safe.ecf"/>
 		<library name="gobo-pattern-safe" location="$GOBO\library\pattern\gobo-pattern-safe.ecf"/>
 		<library name="gobo-structure-confident" location="$GOBO\library\structure\gobo-structure-confident.ecf"/>
 		<library name="gobo-time-confident" location="$GOBO\library\time\gobo-time-confident.ecf"/>
diff --git a/library/gobo-core.ecf b/library/gobo-core.ecf
new file mode 100644
index 0000000000..345515f58b
--- /dev/null
+++ b/library/gobo-core.ecf
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-10-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-10-0 http://www.eiffel.com/developers/xml/configuration-1-10-0.xsd" name="gobo-core" uuid="C8E29BA5-FA2D-4088-A05B-82AFF31B8E3B" library_target="gobo-core">
+	<target name="gobo-core">
+		<root all_classes="true"/>
+		<option warning="true" full_class_checking="true" is_attached_by_default="true" syntax="transitional">
+			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
+		</option>
+		<setting name="console_application" value="true"/>
+		<library name="base" location="$ISE_LIBRARY/library/base/base.ecf" readonly="true">
+			<condition>
+				<custom name="GOBO_EIFFEL" excluded_value="ge"/>
+			</condition>
+		</library>
+		<library name="free_elks" location="$GOBO/library/free_elks/library.ecf" readonly="true">
+			<condition>
+				<custom name="GOBO_EIFFEL" value="ge"/>
+			</condition>
+		</library>
+		<library name="gobo-kernel" location="$GOBO\library\kernel\library.ecf"/>
+		<library name="gobo-pattern" location="$GOBO\library\pattern\gobo-pattern.ecf"/>
+		<library name="gobo-structure" location="$GOBO\library\structure\gobo-structure.ecf"/>
+		<library name="gobo-time" location="$GOBO\library\time\gobo-time.ecf"/>
+		<library name="gobo-math" location="$GOBO\library\math\gobo-math.ecf"/>
+		<cluster name="gobo-core" location=".\" recursive="false">
+			<file_rule>
+				<exclude>/EIFGENs$</exclude>
+				<exclude>/CVS$</exclude>
+				<exclude>/.svn$</exclude>
+			</file_rule>
+			<cluster name="gobo-parse" location="$GOBO\library\parse\" recursive="true"/>
+			<cluster name="gobo-string" location="$GOBO\library\string\" recursive="true"/>
+			<cluster name="gobo-utility" location="$GOBO\library\utility\" recursive="true"/>
+			<cluster name="gobo-lexical" location="$GOBO\library\lexical\" recursive="true"/>
+			<cluster name="gobo-regexp" location="$GOBO\library\regexp\" recursive="true"/>
+			<cluster name="gobo-argument" location="$GOBO\library\argument\" recursive="true"/>
+		</cluster>
+	</target>
+</system>
diff --git a/library/kernel/library-safe.ecf b/library/kernel/library-safe.ecf
new file mode 100644
index 0000000000..f8ac45beda
--- /dev/null
+++ b/library/kernel/library-safe.ecf
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<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="kernel"
+	uuid="6D7FF712-BBA5-4AC0-AABF-2D9880493A23"
+	library_target="kernel">
+
+	<description>
+		description: "ECF file for the Gobo Eiffel Kernel Library"
+		library: "Gobo Eiffel Kernel Library"
+		copyright: "Copyright (c) 2001-2012, Eric Bezault and others"
+		license: "MIT License"
+	</description>
+
+	<target name="kernel">
+		<root all_classes="true"/>
+		<file_rule>
+			<exclude>/\.svn$</exclude>
+			<exclude>/\.git$</exclude>
+		</file_rule>
+		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" is_void_safe="true"/>
+
+		<library name="base" location="$ISE_LIBRARY/library/base/base-safe.ecf" readonly="true">
+			<condition>
+				<custom name="GOBO_EIFFEL" excluded_value="ge"/>
+			</condition>
+		</library>
+
+		<library name="time" location="$ISE_LIBRARY/library/time/time-safe.ecf" readonly="true">
+			<condition>
+				<custom name="GOBO_EIFFEL" excluded_value="ge"/>
+			</condition>
+		</library>
+
+		<library name="free_elks" location="$GOBO/library/free_elks/library.ecf" readonly="true">
+			<condition>
+				<custom name="GOBO_EIFFEL" value="ge"/>
+			</condition>
+		</library>
+
+		<assembly name="eiffelsoftware_runtime" location="$ISE_EIFFEL\studio\spec\$ISE_PLATFORM\lib\EiffelSoftware.Runtime.dll"/>
+		<assembly name="mscorlib" location="$ISE_DOTNET_FRAMEWORK\mscorlib.dll"/>
+		<assembly name="system_" location="$ISE_DOTNET_FRAMEWORK\System.dll" prefix="SYSTEM_DLL_"/>
+		<assembly name="system_xml" location="$ISE_DOTNET_FRAMEWORK\System.Xml.dll" prefix="XML_"/>
+
+		<cluster name="kernel" location="./" recursive="true">
+			<file_rule>
+				<exclude>/ge$</exclude>
+				<condition>
+					<custom name="GOBO_EIFFEL" excluded_value="ge"/>
+				</condition>
+			</file_rule>
+			<file_rule>
+				<exclude>/ise$</exclude>
+				<condition>
+					<custom name="GOBO_EIFFEL" value="ge"/>
+				</condition>
+			</file_rule>
+		</cluster>
+	</target>
+</system>
diff --git a/library/kernel/library.ecf b/library/kernel/library.ecf
index f8ac45beda..9e609fd3a2 100644
--- a/library/kernel/library.ecf
+++ b/library/kernel/library.ecf
@@ -20,15 +20,15 @@
 			<exclude>/\.svn$</exclude>
 			<exclude>/\.git$</exclude>
 		</file_rule>
-		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" is_void_safe="true"/>
+		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="none"/>
 
-		<library name="base" location="$ISE_LIBRARY/library/base/base-safe.ecf" readonly="true">
+		<library name="base" location="$ISE_LIBRARY/library/base/base.ecf" readonly="true">
 			<condition>
 				<custom name="GOBO_EIFFEL" excluded_value="ge"/>
 			</condition>
 		</library>
 
-		<library name="time" location="$ISE_LIBRARY/library/time/time-safe.ecf" readonly="true">
+		<library name="time" location="$ISE_LIBRARY/library/time/time.ecf" readonly="true">
 			<condition>
 				<custom name="GOBO_EIFFEL" excluded_value="ge"/>
 			</condition>
diff --git a/library/math/gobo-math-safe.ecf b/library/math/gobo-math-safe.ecf
index 25558684ec..94f969480a 100644
--- a/library/math/gobo-math-safe.ecf
+++ b/library/math/gobo-math-safe.ecf
@@ -16,7 +16,7 @@
 				<custom name="GOBO_EIFFEL" value="ge"/>
 			</condition>
 		</library>
-		<library name="gobo-kernel-safe" location="$GOBO\library\kernel\library.ecf"/>
+		<library name="gobo-kernel-safe" location="$GOBO\library\kernel\library-safe.ecf"/>
 		<cluster name="gobo-math" location="$GOBO\library\math\decimal\" recursive="true">
 			<file_rule>
 				<exclude>/EIFGENs$</exclude>
diff --git a/library/math/gobo-math.ecf b/library/math/gobo-math.ecf
new file mode 100644
index 0000000000..436b7405b5
--- /dev/null
+++ b/library/math/gobo-math.ecf
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-10-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-10-0 http://www.eiffel.com/developers/xml/configuration-1-10-0.xsd" name="gobo-math" uuid="95784FE0-7B83-497E-BEC0-9F0C4F3035F2" library_target="gobo-math">
+	<target name="gobo-math">
+		<root all_classes="true"/>
+		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="none" syntax="transitional">
+			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
+		</option>
+		<setting name="console_application" value="true"/>
+		<library name="base" location="$ISE_LIBRARY/library/base/base.ecf" readonly="true">
+			<condition>
+				<custom name="GOBO_EIFFEL" excluded_value="ge"/>
+			</condition>
+		</library>
+		<library name="free_elks" location="$GOBO/library/free_elks/library.ecf" readonly="true">
+			<condition>
+				<custom name="GOBO_EIFFEL" value="ge"/>
+			</condition>
+		</library>
+		<library name="gobo-kernel-safe" location="$GOBO\library\kernel\library.ecf"/>
+		<cluster name="gobo-math" location="$GOBO\library\math\decimal\" recursive="true">
+			<file_rule>
+				<exclude>/EIFGENs$</exclude>
+				<exclude>/CVS$</exclude>
+				<exclude>/.svn$</exclude>
+			</file_rule>
+		</cluster>
+	</target>
+</system>
diff --git a/library/pattern/gobo-pattern.ecf b/library/pattern/gobo-pattern.ecf
new file mode 100644
index 0000000000..10a4c88c33
--- /dev/null
+++ b/library/pattern/gobo-pattern.ecf
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-10-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-10-0 http://www.eiffel.com/developers/xml/configuration-1-10-0.xsd" name="gobo-pattern" uuid="9DD3EC52-EF03-4C63-A5C5-4D07AE7B28ED" library_target="gobo-pattern">
+	<target name="gobo-pattern">
+		<root all_classes="true"/>
+		<option warning="true" full_class_checking="true" is_attached_by_default="true" syntax="transitional">
+			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
+		</option>
+		<setting name="console_application" value="true"/>
+		<library name="base" location="$ISE_LIBRARY/library/base/base-safe.ecf" readonly="true">
+			<condition>
+				<custom name="GOBO_EIFFEL" excluded_value="ge"/>
+			</condition>
+		</library>
+		<library name="free_elks" location="$GOBO/library/free_elks/library.ecf" readonly="true">
+			<condition>
+				<custom name="GOBO_EIFFEL" value="ge"/>
+			</condition>
+		</library>
+		<library name="gobo-kernel" location="$GOBO\library\kernel\library.ecf"/>
+		<cluster name="gobo-pattern" location="$GOBO\library\pattern\" recursive="true">
+			<file_rule>
+				<exclude>/EIFGENs$</exclude>
+				<exclude>/CVS$</exclude>
+				<exclude>/.svn$</exclude>
+			</file_rule>
+		</cluster>
+	</target>
+</system>
diff --git a/library/structure/gobo-structure.ecf b/library/structure/gobo-structure.ecf
new file mode 100644
index 0000000000..b17f12f6ca
--- /dev/null
+++ b/library/structure/gobo-structure.ecf
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-10-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-10-0 http://www.eiffel.com/developers/xml/configuration-1-10-0.xsd" name="gobo-structure" uuid="FC2A0909-3E1E-4B99-9D49-0CE0E304D38E" library_target="gobo-structure">
+	<target name="gobo-structure">
+		<root all_classes="true"/>
+		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="none" syntax="standard">
+			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
+		</option>
+		<setting name="console_application" value="true"/>
+		<library name="base" location="$ISE_LIBRARY/library/base/base.ecf" readonly="true">
+			<condition>
+				<custom name="GOBO_EIFFEL" excluded_value="ge"/>
+			</condition>
+		</library>
+		<library name="free_elks" location="$GOBO/library/free_elks/library.ecf" readonly="true">
+			<condition>
+				<custom name="GOBO_EIFFEL" value="ge"/>
+			</condition>
+		</library>
+		<library name="gobo-kernel-safe" location="$GOBO\library\kernel\library.ecf"/>
+		<cluster name="gobo-structure" location="$GOBO\library\structure\" recursive="true">
+			<file_rule>
+				<exclude>/EIFGENs$</exclude>
+				<exclude>/CVS$</exclude>
+				<exclude>/.svn$</exclude>
+			</file_rule>
+		</cluster>
+	</target>
+</system>
diff --git a/library/time/gobo-time-confident.ecf b/library/time/gobo-time-confident.ecf
index eb2de9b49c..99304665ed 100644
--- a/library/time/gobo-time-confident.ecf
+++ b/library/time/gobo-time-confident.ecf
@@ -16,7 +16,7 @@
 				<custom name="GOBO_EIFFEL" value="ge"/>
 			</condition>
 		</library>
-		<library name="gobo-kernel-safe" location="$GOBO\library\kernel\library.ecf"/>
+		<library name="gobo-kernel-safe" location="$GOBO\library\kernel\library-safe.ecf"/>
 		<cluster name="gobo-time" location="$GOBO\library\time\" recursive="true">
 			<file_rule>
 				<exclude>/EIFGENs$</exclude>
diff --git a/library/time/gobo-time.ecf b/library/time/gobo-time.ecf
new file mode 100644
index 0000000000..0a8e8cf8d7
--- /dev/null
+++ b/library/time/gobo-time.ecf
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-10-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-10-0 http://www.eiffel.com/developers/xml/configuration-1-10-0.xsd" name="gobo-time" uuid="961563CB-E823-47C1-92EC-F8440D71D06D" library_target="gobo-time">
+	<target name="gobo-time">
+		<root all_classes="true"/>
+		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="none" syntax="transitional">
+			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
+		</option>
+		<setting name="console_application" value="true"/>
+		<library name="base" location="$ISE_LIBRARY/library/base/base.ecf" readonly="true">
+			<condition>
+				<custom name="GOBO_EIFFEL" excluded_value="ge"/>
+			</condition>
+		</library>
+		<library name="free_elks" location="$GOBO/library/free_elks/library.ecf" readonly="true">
+			<condition>
+				<custom name="GOBO_EIFFEL" value="ge"/>
+			</condition>
+		</library>
+		<library name="gobo-kernel-safe" location="$GOBO\library\kernel\library.ecf"/>
+		<cluster name="gobo-time" location="$GOBO\library\time\" recursive="true">
+			<file_rule>
+				<exclude>/EIFGENs$</exclude>
+				<exclude>/CVS$</exclude>
+				<exclude>/.svn$</exclude>
+			</file_rule>
+		</cluster>
+	</target>
+</system>