Author: benny
Date: 2006-07-10 13:50:07 +0000 (Mon, 10 Jul 2006)
New Revision: 22394
Modified:
installit/branches/installer-single-file/ChangeLog
installit/branches/installer-single-file/i2t-generate/InstallIt/Settings.rb
Log:
2006-07-10 Benedikt Meurer <[EMAIL PROTECTED]>
* i2t-generate/InstallIt/Settings.rb: Update the parser.
Modified: installit/branches/installer-single-file/ChangeLog
===================================================================
--- installit/branches/installer-single-file/ChangeLog 2006-07-10 12:56:05 UTC
(rev 22393)
+++ installit/branches/installer-single-file/ChangeLog 2006-07-10 13:50:07 UTC
(rev 22394)
@@ -1,3 +1,7 @@
+2006-07-10 Benedikt Meurer <[EMAIL PROTECTED]>
+
+ * i2t-generate/InstallIt/Settings.rb: Update the parser.
+
2005-07-02 Benedikt Meurer <[EMAIL PROTECTED]>
* Remove autogenerated files from the repository.
Modified:
installit/branches/installer-single-file/i2t-generate/InstallIt/Settings.rb
===================================================================
--- installit/branches/installer-single-file/i2t-generate/InstallIt/Settings.rb
2006-07-10 12:56:05 UTC (rev 22393)
+++ installit/branches/installer-single-file/i2t-generate/InstallIt/Settings.rb
2006-07-10 13:50:07 UTC (rev 22394)
@@ -1,6 +1,6 @@
# $Id: Config.rb 5 2004-10-26 10:27:32Z bmeurer $
#
-# Copyright (c) 2003-2004 os-cillation
+# Copyright (c) 2003-2006 os-cillation
# All rights reserved.
#
# Written by Benedikt Meurer <[EMAIL PROTECTED]>
@@ -63,8 +63,8 @@
root = doc.root
# verify version
- if root.attributes['i2t:version'] then
- fileVersion = Version.new(root.attributes['i2t:version'])
+ if root.attributes['version'] then
+ fileVersion = Version.new(root.attributes['version'])
siteVersion = Version.new(InstallIt::Site.version())
if siteVersion.lessThan(fileVersion) then
raise RuntimeError, "#{File.basename(path)} requires InstallIt
#{fileVersion.to_s} or above."
@@ -115,42 +115,42 @@
#
def parseApplication(node)
# load general application settings
- @appName = lookupNode(node, 'i2t:name').text
- @appTitle = lookupNode(node, 'i2t:title').text
- @appVersion = lookupNode(node, 'i2t:version').text
+ @appName = lookupNode(node, 'name').text
+ @appTitle = lookupNode(node, 'title').text
+ @appVersion = lookupNode(node, 'version').text
# check for extra dist files
- REXML::XPath.match(node, 'i2t:extra-dist', NAMESPACES).each do |distNode|
+ REXML::XPath.match(node, 'extra-dist', NAMESPACES).each do |distNode|
file = distNode.text
@appExtraDist.push(file)
end
# load application images
@appImages = Hash.new
- REXML::XPath.match(node, 'i2t:image', NAMESPACES).each do |imageNode|
+ REXML::XPath.match(node, 'image', NAMESPACES).each do |imageNode|
name = imageNode.attributes['name']
if not name then
- raise RuntimeError, "<i2t:image> requires attribute name"
+ raise RuntimeError, "<image> requires attribute name"
end
@appImages[name] = imageNode.text
end
# check for a predefined prefix
- prefixNode = lookupNode(node, 'i2t:prefix', false)
+ prefixNode = lookupNode(node, 'prefix', false)
if prefixNode then
if prefixNode.attributes['type'] != 'forced' then
- raise RuntimeError, "forced is currently the only supported type for
<i2t:prefix>"
+ raise RuntimeError, "forced is currently the only supported type for
<prefix>"
end
@appPrefix = Prefix.new
- sourceNode = lookupNode(prefixNode, 'i2t:source')
+ sourceNode = lookupNode(prefixNode, 'source')
if sourceNode.attributes['type'] != 'package' and
sourceNode.attributes['type'] != 'program' then
- raise RuntimeError, "package and program are currently the only
supported types for <i2t:source>"
+ raise RuntimeError, "package and program are currently the only
supported types for <source>"
end
@appPrefix.sourceType = sourceNode.attributes['type']
@appPrefix.sourceName = reformatCString(sourceNode.text)
- exNode = lookupNode(prefixNode, 'i2t:explanation', false)
+ exNode = lookupNode(prefixNode, 'explanation', false)
if exNode then
@appPrefix.explanation = reformatCString(exNode.text)
end
@@ -173,31 +173,31 @@
# Parses the <i2t:dependencies> node.
#
def parseDependencies(node)
- REXML::XPath.match(node, 'i2t:dependency', NAMESPACES).each do |depNode|
+ REXML::XPath.match(node, 'dependency', NAMESPACES).each do |depNode|
# check dependency type
type = depNode.attributes['type']
if not type then
- raise RuntimeError, "<i2t:dependency> requires attribute type"
+ raise RuntimeError, "<dependency> requires attribute type"
end
if type == 'package' then
package = DependenciesPackage.new
- package.name = lookupNode(depNode, 'i2t:name').text
- package.version = lookupNode(depNode, 'i2t:version').text
- package.description = lookupNode(depNode, 'i2t:description').text
+ package.name = lookupNode(depNode, 'name').text
+ package.version = lookupNode(depNode, 'version').text
+ package.description = lookupNode(depNode, 'description').text
@depPackages.push(package)
elsif type == 'program' then
program = DependenciesProgram.new
- program.name = lookupNode(depNode, 'i2t:name').text
- program.description = lookupNode(depNode, 'i2t:description').text
+ program.name = lookupNode(depNode, 'name').text
+ program.description = lookupNode(depNode, 'description').text
@depPrograms.push(program)
elsif type == 'library' then
library = DependenciesLibrary.new
- library.name = lookupNode(depNode, 'i2t:name').text
- library.description = lookupNode(depNode, 'i2t:description').text
+ library.name = lookupNode(depNode, 'name').text
+ library.description = lookupNode(depNode, 'description').text
@depLibraries.push(library)
else
- raise RuntimeError, "Unsupported type \"#{type}\" for
<i2t:dependency>"
+ raise RuntimeError, "Unsupported type \"#{type}\" for <dependency>"
end
end
end
@@ -207,19 +207,19 @@
# Parses the <i2t:options> node.
#
def parseOptions(node)
- REXML::XPath.match(node, 'i2t:option', NAMESPACES).each do |optionNode|
+ REXML::XPath.match(node, 'option', NAMESPACES).each do |optionNode|
option = Option.new
option.enabled = (optionNode.attributes['default'] == 'enabled')
- option.title = lookupNode(optionNode, 'i2t:title').text
- option.description = reformatCString(lookupNode(optionNode,
'i2t:description').text)
+ option.title = lookupNode(optionNode, 'title').text
+ option.description = reformatCString(lookupNode(optionNode,
'description').text)
- REXML::XPath.match(optionNode, 'i2t:action', NAMESPACES).each do
|actionNode|
+ REXML::XPath.match(optionNode, 'action', NAMESPACES).each do
|actionNode|
if actionNode.attributes['case'] == 'enabled' then
option.actionEnabled = reformatCString(actionNode.text) + "\\n"
elsif actionNode.attributes['case'] == 'disabled' then
option.actionDisabled = reformatCString(actionNode.text) + "\\n"
else
- raise RuntimeError, "Unsupported case
\"#{actionNode.attributes['case']}\" for <i2t:action>"
+ raise RuntimeError, "Unsupported case
\"#{actionNode.attributes['case']}\" for <action>"
end
end
@@ -227,7 +227,7 @@
end
if @options.empty? then
- raise RuntimeError, '<i2t:options> requires atleast one <i2t:option>
node'
+ raise RuntimeError, '<options> requires atleast one <option> node'
end
end
@@ -237,19 +237,19 @@
#
def parsePackages(node)
# check for a default base directory
- basedirNode = lookupNode(node, 'i2t:default-basedir', false)
+ basedirNode = lookupNode(node, 'default-basedir', false)
if basedirNode then
defaultBaseDirectory = basedirNode.text.gsub(/^\s+/, '').gsub(/\s+$/,
'')
end
# process packages
- REXML::XPath.match(node, 'i2t:package', NAMESPACES).each do |packageNode|
+ REXML::XPath.match(node, 'package', NAMESPACES).each do |packageNode|
package = Package.new
- package.name = lookupNode(packageNode, 'i2t:name').text
- package.title = lookupNode(packageNode, 'i2t:title').text
+ package.name = lookupNode(packageNode, 'name').text
+ package.title = lookupNode(packageNode, 'title').text
# check for override base directory
- basedirNode = lookupNode(packageNode, 'i2t:basedir', false)
+ basedirNode = lookupNode(packageNode, 'basedir', false)
if basedirNode then
package.baseDirectory = basedirNode.text.gsub(/^\s+/,
'').gsub(/\s+$/, '')
elsif defaultBaseDirectory then
@@ -265,7 +265,7 @@
end
# query pre-actions
- REXML::XPath.match(packageNode, 'i2t:pre-action', NAMESPACES).each do
|preNode|
+ REXML::XPath.match(packageNode, 'pre-action', NAMESPACES).each do
|preNode|
stage = preNode.attributes['stage']
if not package.preActions[stage] then
package.preActions[stage] = String.new
@@ -274,7 +274,7 @@
end
# query post-actions
- REXML::XPath.match(packageNode, 'i2t:post-action', NAMESPACES).each do
|postNode|
+ REXML::XPath.match(packageNode, 'post-action', NAMESPACES).each do
|postNode|
stage = postNode.attributes['stage']
if not package.postActions[stage] then
package.postActions[stage] = String.new
@@ -286,7 +286,7 @@
end
if @packages.empty? then
- raise RuntimeError, '<i2t:packages> requires atleast one <i2t:package>
node'
+ raise RuntimeError, '<i2t:packages> requires atleast one <package>
node'
end
end
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
