automate-em 0.0.3 → 0.0.4

data/LICENSE

@@ -0,0 +1,59 @@
+AutomateEM is copyrighted free software co-owned by Stephen von Takach & 
+Advanced Control & Acoustics. The Owner of this software permits you to
+redistribute and/or modify the software under either the terms of the GPL
+version 2 (see the file GPL), or the conditions below ("Ruby License"):
+
+  1. You may make and give away verbatim copies of the source form of this
+     software without restriction, provided that you retain ALL of the
+     original copyright notices and associated disclaimers.
+
+  2. You may modify your copy of the software in any way, provided that
+     you do at least ONE of the following:
+
+       a) place your modifications in the Public Domain or otherwise
+          make them Freely Available, such as by posting said
+	  modifications to Usenet or an equivalent medium, or by allowing
+	  the author to include your modifications in the software.
+
+       b) use the modified software only within your corporation or
+          organization.
+
+       c) give non-standard binaries non-standard names, with
+          instructions on where to get the original software distribution.
+
+       d) make other distribution arrangements with the Owner.
+
+  3. You may distribute the software in object code or binary form,
+     provided that you do at least ONE of the following:
+
+       a) distribute the binaries and library files of the software,
+	  together with instructions (in a manual page or equivalent)
+	  on where to get the original distribution.
+
+       b) accompany the distribution with the machine-readable source of
+	  the software.
+
+       c) give non-standard binaries non-standard names, with
+          instructions on where to get the original software distribution.
+
+       d) make other distribution arrangements with the Owner.
+
+  4. You may modify and include parts of the software into any other
+     software (possibly commercial), provided you comply with the terms in
+     Sections 1, 2, and 3 above. But some files in the distribution
+     are not written by the Owner, so they may be made available to you
+     under different terms.
+
+     For the list of those files and their copying conditions, see the
+     file LEGAL.
+
+  5. The scripts and library files supplied as input to or produced as 
+     output from the software do not automatically fall under the
+     copyright of the software, but belong to whoever generated them, 
+     and may be sold commercially, and may be aggregated with this
+     software.
+
+  6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+     IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+     PURPOSE.

data/README.textile

@@ -24,21 +24,21 @@ h2. Generating module scaffolding
 From a console
 
 # type: @rails g module module/scope/and_name@
-#* An example would be: @rails g module NEC/Projectors/NP2000@
-#* This will create a file at @app/modules/nec/projectors/np2000.rb@
+#* An example would be: @rails g module NecCorp/Projectors/Np2000@
+#* This will create a file at @app/modules/nec_corp/projectors/np2000.rb@
 # You will be asked what type of module you would like to generate
 #* Type: @device@ for a generic device module (a raw TCP or UDP protocol including telnet)
 #* Type: @service@ for any module that will be interfacing with a HTTP(S) service
 #* Type: @logic@ to generate a controller/interfacing module
 
-Note: The scope (@NEC/Projectors@ in the example above) is optional and can be as deep or shallow as makes sense.
+Note: The name space (@NecCorp/Projectors@ in the example above) is optional and can be as deep or shallow as makes sense.
 
 h2. Writing Modules
 
 Please see: "writing modules":https://github.com/stakach/automate-em/wiki/writing-modules
 
 
-h2. Database Configuration
+h2. System Configuration
 
 Please see: "system configuration":https://github.com/stakach/automate-em/wiki/system-configuration
 

data/app/assets/javascripts/jquery.automate.js

@@ -83,7 +83,7 @@ var AutomateEm = {
 		this.send = send;
 
 		//
-		// Requests to recieve notifications of a value change from the server
+		// Requests to receive notifications of a value change from the server
 		//	Triggers the functions passed in when the server informs us of an update
 		//
 		this.bind = function (events, func) {

data/lib/automate-em.rb

@@ -118,7 +118,7 @@ module AutomateEm
 			#
 			# Start the UDP server
 			#
-			EM.open_datagram_socket "0.0.0.0", 0, DatagramServer
+			EM.open_datagram_socket "0.0.0.0", Rails.configuration.automate.datagram_port, DatagramServer
 			
 			#
 			# Load the system based on the database

data/lib/automate-em/core/modules.rb

@@ -50,7 +50,7 @@ module AutomateEm
 
 	#
 	# TODO:: Consider allowing different dependancies use the same connection
-	# 	Means only the first will call received - others must use recieve blocks
+	# 	Means only the first will call received - others must use receive blocks
 	#
 	class DeviceModule
 		@@instances = {}	# db id => @instance
@@ -158,7 +158,7 @@ module AutomateEm
 				if !controllerDevice.udp
 					res = ResolverJob.new(controllerDevice.ip)
 					res.callback {|ip|
-						EM.connect ip, controllerDevice.port, Device::Base, @instance
+						EM.connect ip, controllerDevice.port, Device::Base, @instance, false # controllerDevice.udp
 						loaded.call
 					}
 					res.errback {|error|
@@ -176,7 +176,7 @@ module AutomateEm
 					# => TODO::test!!
 					#	Call connected
 					#
-					devBase = DatagramBase.new(@instance)
+					devBase = DatagramBase.new(@instance, true)
 					$datagramServer.add_device(controllerDevice, devBase)
 					loaded.call
 				end

data/lib/automate-em/device/datagram_server.rb

@@ -9,7 +9,13 @@ module AutomateEm
 		include DeviceConnection
 		
 		def do_send_data(data)
-			$datagramServer.do_send_data(DeviceModule.lookup(@parent), data)
+			EM.defer do
+				$datagramServer.do_send_data(DeviceModule.lookup(@parent), data)
+			end
+		end
+		
+		def error?
+			false
 		end
 	end
 
@@ -26,7 +32,7 @@ module AutomateEm
 			@ips = {}
 			
 			EM.defer do
-				System.logger.info 'running datagram server on an ephemeral port'
+				System.logger.info 'datagram server is now running'
 			end
 		end
 
@@ -39,10 +45,10 @@ module AutomateEm
 			port, ip = Socket.unpack_sockaddr_in(get_peername)
 			begin
 				@devices["#{ip}:#{port}"].do_receive_data(data)
-			rescue
-				#
-				# TODO:: error messages here if device is null ect
-				#
+			rescue => e
+				EM.defer do
+					System.logger.info e.message + "\nDatagram receive failed..."
+				end
 			end
 		end
 		
@@ -62,37 +68,36 @@ module AutomateEm
 				text = "#{scheme.ip}:#{scheme.port}"
 				old_ip = @ips[text]
 				if old_ip != ip
-					EM.schedule do	# All modifications are on the reactor thread instead of locking
-						device = @devices.delete("#{old_ip}:#{scheme.port}")
-						@ips[text] = ip
-						@devices["#{ip}:#{scheme.port}"] = device
-					end
+					device = @devices.delete("#{old_ip}:#{scheme.port}")
+					@ips[text] = ip
+					@devices["#{ip}:#{scheme.port}"] = device
 				end
+				
 				send_datagram(data, ip, scheme.port)
 			}
 			res.errback {|error|
 				EM.defer do
-					System.logger.info e.message + " calling UDP send for #{scheme.dependency.actual_name} @ #{scheme.ip} in #{scheme.control_system.name}"
+					System.logger.info error.message + " calling UDP send for #{scheme.dependency.actual_name} @ #{scheme.ip} in #{scheme.control_system.name}"
 				end
 			}
 		end
 
 		def add_device(scheme, device)
-			EM.schedule do
-				res = ResolverJob.new(scheme.ip)
-				res.callback {|ip|
-					@devices["#{ip}:#{scheme.port}"] = device
-					@ips["#{scheme.ip}:#{scheme.port}"] = ip
-				}
-				res.errback {|error|
-					@devices["#{scheme.ip}:#{scheme.port}"] = device
-					@ips["#{scheme.ip}:#{scheme.port}"] = scheme.ip
-				}
+
+			res = ResolverJob.new(scheme.ip)
+			res.callback {|ip|
+				@devices["#{ip}:#{scheme.port}"] = device
+				@ips["#{scheme.ip}:#{scheme.port}"] = ip
+			}
+			res.errback {|error|
+				@devices["#{scheme.ip}:#{scheme.port}"] = device
+				@ips["#{scheme.ip}:#{scheme.port}"] = scheme.ip
 				
 				EM.defer do
-					System.logger.info e.message + " adding UDP #{scheme.dependency.actual_name} @ #{scheme.ip} in #{scheme.control_system.name}"
+					System.logger.info error.message + " adding UDP #{scheme.dependency.actual_name} @ #{scheme.ip} in #{scheme.control_system.name}"
 				end
-			end
+			}
+
 		end
 		
 		def remove_device(scheme)
@@ -100,7 +105,7 @@ module AutomateEm
 				begin
 					ip = @ips.delete("#{scheme.ip}:#{scheme.port}")
 					@devices.delete("#{ip}:#{scheme.port}")
-				rescue
+				rescue => e
 					EM.defer do
 						System.logger.info e.message + " removing UDP #{scheme.dependency.actual_name} @ #{scheme.ip} in #{scheme.control_system.name}"
 					end

data/lib/automate-em/device/device_connection.rb

@@ -6,13 +6,13 @@ require 'atomic'
 #
 module AutomateEm
 	module DeviceConnection
-		def initialize( parent )
-			super
+		def initialize( parent, udp )
+			#super
 		
 			@default_send_options = {
 				:wait => true,			# Wait for response
 				:delay => 0,			# Delay next send by x.y seconds
-				:delay_on_recieve => 0,	# Delay next send after a recieve by x.y seconds (only works when we are waiting for responses)
+				:delay_on_receive => 0,	# Delay next send after a receive by x.y seconds (only works when we are waiting for responses)
 				#:emit
 				:max_waits => 3,
 				:callback => nil,		# Alternative to the received function
@@ -28,8 +28,8 @@ module AutomateEm
 				:max_buffer => 524288,		# 512kb
 				:clear_queue_on_disconnect => false,
 				:flush_buffer_on_disconnect => false,
-				:priority_bonus => 20,
-				:inactivity_timeout => 0	# part of make and break options
+				:priority_bonus => 20
+				# :inactivity_timeout => 0	# part of make and break options
 				# :response_length			# an alternative to response_delimiter (lower priority)
 				# :response_delimiter		# here instead of a function call
 			}
@@ -61,7 +61,7 @@ module AutomateEm
 			#
 			# State
 			#
-			@connected = false
+			@connected = udp
 			@connecting = false
 			@disconnecting = false
 			@com_paused = true
@@ -70,7 +70,7 @@ module AutomateEm
 			@waiting = false
 			@processing = false
 			@last_sent_at = 0.0
-			@last_recieve_at = 0.0
+			@last_receive_at = 0.0
 			@timeout = nil
 			
 			
@@ -252,7 +252,7 @@ module AutomateEm
 		#	NOTE: The buffer cannot be defered otherwise there are concurrency issues 
 		#
 		def do_receive_data(data)
-			@last_recieve_at = Time.now.to_f
+			@last_receive_at = Time.now.to_f
 			
 			begin
 				if @config[:response_delimiter].present?
@@ -433,8 +433,8 @@ module AutomateEm
 				@processing = false
 				@waiting = false
 				
-				if @command[:delay_on_recieve] > 0.0
-					delay_for = (@last_recieve_at + @command[:delay_on_recieve] - Time.now.to_f)
+				if @command[:delay_on_receive] > 0.0
+					delay_for = (@last_receive_at + @command[:delay_on_receive] - Time.now.to_f)
 					
 					if delay_for > 0.0
 						EM.add_timer delay_for do
@@ -450,7 +450,7 @@ module AutomateEm
 		end
 		
 		def process_response_complete
-			if (@make_break && @config[:inactivity_timeout] == 0 && @send_queue.empty?) || @command[:force_disconnect]
+			if (@make_break && [nil, 0].include?(@config[:inactivity_timeout]) && @send_queue.empty?) || @command[:force_disconnect]
 				if @connected
 					close_connection_after_writing
 					@disconnecting = true
@@ -608,7 +608,7 @@ module AutomateEm
 			# NOTE:: Same as add parent in device module!!!
 			#	TODO:: Should break into a module and include it
 			#
-			set_comm_inactivity_timeout(@config[:inactivity_timeout])
+			set_comm_inactivity_timeout(@config[:inactivity_timeout]) unless @config[:inactivity_timeout].nil?
 			@task_queue.push lambda {
 				EM.defer do
 					@parent[:connected] = true

data/lib/automate-em/device/tcp_control.rb

@@ -7,10 +7,10 @@ module AutomateEm
 
 		#
 		# This is how sending works
-		#		Send recieves data, turns a mutex on and sends the data
-		#			-- It goes into the recieve mutex critical section and sleeps waiting for a response
+		#		Send receives data, turns a mutex on and sends the data
+		#			-- It goes into the receive mutex critical section and sleeps waiting for a response
 		#			-- a timeout is used as a backup in case no response is received
-		#		The recieve function does the following
+		#		The receive function does the following
 		#			-- If the send lock is not active it processes the received data
 		#			-- otherwise it notifies the send function that data is avaliable
 		#

data/lib/automate-em/engine.rb

@@ -15,6 +15,7 @@ module AutomateEm
 			app.config.automate.module_paths = []
 			app.config.automate.log_level = Logger::INFO
 			app.config.automate.encrypt_key = "Lri2B0yvEVag+raqX9uqMFu9LmGoGwbaO8fzNidf"
+			app.config.automate.datagram_port = 0	# ephemeral port (random selection)
 		end
 		
 		#

data/lib/automate-em/interfaces/html5.rb

@@ -209,7 +209,7 @@ class HTML5Monitor
 				if command.length == 2
 					@system.send_command(command[0], command[1], *data[:data])
 				else
-					AutomateEm::System.logger.info "-- in html5.rb, recieve : invalid command received - #{data[:command]} --"
+					AutomateEm::System.logger.info "-- in html5.rb, receive : invalid command received - #{data[:command]} --"
 				end
 			end
 		}
@@ -219,7 +219,7 @@ class HTML5Monitor
 			logger = @system.nil? ? AutomateEm::System.logger : @system.logger
 		}
 		AutomateEm.print_error(logger, e, {
-			:message => "in html5.rb, recieve : probably malformed JSON data",
+			:message => "in html5.rb, receive : probably malformed JSON data",
 			:level => Logger::ERROR
 		})
 		shutdown

data/lib/automate-em/module_core.rb

@@ -10,6 +10,9 @@ module AutomateEm
 		#
 		def setbase(base)
 			@base = base
+			class << self
+				undef setbase
+			end
 		end
 		
 		

data/lib/automate-em/service/http_service.rb

@@ -50,7 +50,7 @@ module AutomateEm
 			@default_request_options = {
 				:wait => true,			# Wait for response
 				:delay => 0,			# Delay next request by x.y seconds
-				:delay_on_recieve => 0,	# Delay next request after a recieve by x.y seconds (only works when we are waiting for responses)
+				:delay_on_receive => 0,	# Delay next request after a receive by x.y seconds (only works when we are waiting for responses)
 				#:emit
 				:retries => 2,
 				:priority => 50,
@@ -104,7 +104,7 @@ module AutomateEm
 			# State
 			#
 			@last_sent_at = 0.0
-			@last_recieve_at = 0.0
+			@last_receive_at = 0.0
 			
 			
 			#
@@ -371,7 +371,7 @@ module AutomateEm
 		
 		
 		#
-		# Caled from recieve
+		# Caled from receive
 		#
 		def process_response(response, command)
 			EM.defer do
@@ -427,8 +427,8 @@ module AutomateEm
 			
 			#else    result == :abort || result == :success || result == true || waits and retries exceeded
 			
-			if command[:delay_on_recieve] > 0.0
-				delay_for = (@last_recieve_at + command[:delay_on_recieve] - Time.now.to_f)
+			if command[:delay_on_receive] > 0.0
+				delay_for = (@last_receive_at + command[:delay_on_receive] - Time.now.to_f)
 				
 				if delay_for > 0.0
 					EM.add_timer delay_for do

data/lib/automate-em/status.rb

@@ -76,7 +76,7 @@ module AutomateEm
 				if @emit_hasnt_occured.present?
 					begin
 						if @emit_hasnt_occured.has_key?(status)
-							@base.received_lock.mon_exit				# check we are in the recieved queue
+							@base.received_lock.mon_exit				# check we are in the received queue
 							@base.received_lock.mon_enter
 						
 							block = @emit_hasnt_occured.delete(status)

data/lib/automate-em/utilities.rb

@@ -23,24 +23,22 @@ module AutomateEm
 		def initialize(jobs, index, lock)
 			@jobs = jobs
 			@index = index
+			@lock = lock
 			@job = @jobs[@index]	# only ever called from within the lock
 		end
 		
 		
 		def unschedule
-			EM.schedule do
-				begin
-					@job.unschedule
-					@jobs.delete(@index)
-				rescue
-				end
+			@lock.synchronize do
+				@job.unschedule
+				@jobs.delete(@index)
 			end
 		end
 		
 		protected
 		
 		def method_missing(name, *args, &block)
-			EM.schedule do
+			@lock.synchronize do
 				@job.send(name, *args, &block)
 			end
 		end
@@ -53,10 +51,11 @@ module AutomateEm
 		def initialize
 			@jobs = {}
 			@index = 0
+			@job_lock = Mutex.new
 		end
 		
 		def clear_jobs
-			EM.schedule do
+			@job_lock.synchronize do
 				@jobs.each_value do |job|
 					job.unschedule
 				end
@@ -69,49 +68,46 @@ module AutomateEm
 		protected
 		
 		def method_missing(name, *args, &block)
-			EM.schedule do
-				begin
-					if block.present?
-						job = nil
+			@job_lock.synchronize do
+				if block.present?
+					job = nil
+					
+					if [:in, :at].include?(name)
+						index = @index				# local variable for the block
 						
-						if [:in, :at].include?(name)
-							index = @index				# local variable for the block
-							
-							job = AutomateEm::scheduler.send(name, *args) do
-								begin
-									block.call
-								rescue => e
-									AutomateEm.print_error(System.logger, e, :message => "Error in one off scheduled event")
-								ensure
-									EM.schedule do
-										@jobs.delete(index)
-									end
+						job = AutomateEm::scheduler.send(name, *args) do
+							begin
+								block.call
+							rescue => e
+								AutomateEm.print_error(System.logger, e, :message => "Error in one off scheduled event")
+							ensure
+								@job_lock.synchronize do
+									@jobs.delete(index)
 								end
 							end
-						else
-							job = AutomateEm::scheduler.send(name, *args) do
-								begin
-									block.call
-								rescue => e
-									AutomateEm.print_error(System.logger, e, :message => "Error in repeated scheduled event")
-								end
+						end
+					else
+						job = AutomateEm::scheduler.send(name, *args) do
+							begin
+								block.call
+							rescue => e
+								AutomateEm.print_error(System.logger, e, :message => "Error in repeated scheduled event")
 							end
 						end
+					end
+					
+					if job.present?
+						@jobs[@index] = job
+						job = JobProxy.new(@jobs, @index, @job_lock)
 						
-						if job.present?
-							@jobs[@index] = job
-							job = JobProxy.new(@jobs, @index, @job_lock)
-							
-							@index += 1
-							
-							return job
-						end
+						@index += 1
 						
-						return nil
-					else
-						AutomateEm::scheduler.send(name, *args, &block)
+						return job
 					end
-				rescue
+					
+					return nil
+				else
+					AutomateEm::scheduler.send(name, *args, &block)
 				end
 			end
         end

data/lib/automate-em/version.rb

@@ -1,3 +1,3 @@
 module AutomateEm
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: automate-em
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-23 00:00:00.000000000 Z
+date: 2012-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta.4.1
+        version: 1.0.0.rc.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta.4.1
+        version: 1.0.0.rc.4
 - !ruby/object:Gem::Dependency
   name: em-priority-queue
   requirement: !ruby/object:Gem::Requirement
@@ -240,7 +240,7 @@ files:
 - lib/generators/module/module_generator.rb
 - lib/generators/module/USAGE
 - lib/tasks/automate-em_tasks.rake
-- LGPL3-LICENSE
+- LICENSE
 - Rakefile
 - README.textile
 - test/automate-em_test.rb

data/LGPL3-LICENSE

@@ -1,165 +0,0 @@
-                   GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-  This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
-  0. Additional Definitions.
-
-  As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
-  "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
-  An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
-  A "Combined Work" is a work produced by combining or linking an
-Application with the Library.  The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
-  The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
-  The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
-  1. Exception to Section 3 of the GNU GPL.
-
-  You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
-  2. Conveying Modified Versions.
-
-  If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
-   a) under this License, provided that you make a good faith effort to
-   ensure that, in the event an Application does not supply the
-   function or data, the facility still operates, and performs
-   whatever part of its purpose remains meaningful, or
-
-   b) under the GNU GPL, with none of the additional permissions of
-   this License applicable to that copy.
-
-  3. Object Code Incorporating Material from Library Header Files.
-
-  The object code form of an Application may incorporate material from
-a header file that is part of the Library.  You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
-   a) Give prominent notice with each copy of the object code that the
-   Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the object code with a copy of the GNU GPL and this license
-   document.
-
-  4. Combined Works.
-
-  You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
-   a) Give prominent notice with each copy of the Combined Work that
-   the Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the Combined Work with a copy of the GNU GPL and this license
-   document.
-
-   c) For a Combined Work that displays copyright notices during
-   execution, include the copyright notice for the Library among
-   these notices, as well as a reference directing the user to the
-   copies of the GNU GPL and this license document.
-
-   d) Do one of the following:
-
-       0) Convey the Minimal Corresponding Source under the terms of this
-       License, and the Corresponding Application Code in a form
-       suitable for, and under terms that permit, the user to
-       recombine or relink the Application with a modified version of
-       the Linked Version to produce a modified Combined Work, in the
-       manner specified by section 6 of the GNU GPL for conveying
-       Corresponding Source.
-
-       1) Use a suitable shared library mechanism for linking with the
-       Library.  A suitable mechanism is one that (a) uses at run time
-       a copy of the Library already present on the user's computer
-       system, and (b) will operate properly with a modified version
-       of the Library that is interface-compatible with the Linked
-       Version.
-
-   e) Provide Installation Information, but only if you would otherwise
-   be required to provide such information under section 6 of the
-   GNU GPL, and only to the extent that such information is
-   necessary to install and execute a modified version of the
-   Combined Work produced by recombining or relinking the
-   Application with a modified version of the Linked Version. (If
-   you use option 4d0, the Installation Information must accompany
-   the Minimal Corresponding Source and Corresponding Application
-   Code. If you use option 4d1, you must provide the Installation
-   Information in the manner specified by section 6 of the GNU GPL
-   for conveying Corresponding Source.)
-
-  5. Combined Libraries.
-
-  You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
-   a) Accompany the combined library with a copy of the same work based
-   on the Library, uncombined with any other library facilities,
-   conveyed under the terms of this License.
-
-   b) Give prominent notice with the combined library that part of it
-   is a work based on the Library, and explaining where to find the
-   accompanying uncombined form of the same work.
-
-  6. Revised Versions of the GNU Lesser General Public License.
-
-  The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
-  Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
-  If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.