From: <my...@us...> - 2009-12-04 16:05:37
|
Revision: 2151 http://aperture.svn.sourceforge.net/aperture/?rev=2151&view=rev Author: mylka Date: 2009-12-04 16:05:28 +0000 (Fri, 04 Dec 2009) Log Message: ----------- modifications in scripts for the bibsonomy api Modified Paths: -------------- scripts/deploy-deps-internal.rb scripts/deploy-deps-mvn.rb Added Paths: ----------- scripts/deploy-deps-bibsonomy.rb Added: scripts/deploy-deps-bibsonomy.rb =================================================================== --- scripts/deploy-deps-bibsonomy.rb (rev 0) +++ scripts/deploy-deps-bibsonomy.rb 2009-12-04 16:05:28 UTC (rev 2151) @@ -0,0 +1,91 @@ +#!/usr/bin/ruby + +# Copyright (c) 2008 Aduna and Deutsches Forschungszentrum fuer Kuenstliche Intelligenz DFKI GmbH. +# All rights reserved. +# +# Licensed under the Aperture BSD-style license. + +require "deploy-deps-internal.rb" + +processmvndep ({ + :repo => "http://dev.bibsonomy.org/maven2/", + :groupId => "it.unimi.dsi.fastutil.chars", + :artifactId => "charopenhashset", + :version => "5.0.9", + :bname => "it.unimi.dsi.fastutil.chars.charopenhashset", + :bversion => "5.0.9", + :nouses => true +}) + +processmvndep ({ + :repo => "http://dev.bibsonomy.org/maven2/", + :groupId => "jtidy", + :artifactId => "jtidy", + :version => "8.0-SNAPSHOT", + :bname => "org.jtidy", + :bversion => "8.0.0.SNAPSHOT" +}) + +BIBSONOMY_VERSION = "2.0.4-SNAPSHOT" +BIBSONOMY_BVERSION = "2.0.4.SNAPSHOT" + +processmvndep ({ + :repo => "http://dev.bibsonomy.org/maven2/", + :groupId => "org.bibsonomy", + :artifactId => "bibsonomy-rest-client", + :version => BIBSONOMY_VERSION, + :bname => "org.bibsonomy.restclient", + :bversion => BIBSONOMY_BVERSION, + :generatePom => true, + :deps => {"org.bibsonomy.bibsonomy-rest-common" => repomvnver(BIBSONOMY_VERSION), + "commons-httpclient.commons-httpclient" => orbitmvnver(COMMONS_HTTPCLIENT_VERSION) + } +}) + +processorbitdep ({ + :orbitver => "R20090825191606", + :bname => "org.antlr.runtime", + :bversion => "3.0.0.v200803061811", + :pom => "http://repo2.maven.org/maven2/org/antlr/antlr-runtime/3.0/antlr-runtime-3.0.pom" +}) + +processmvndep ({ + :repo => "http://dev.bibsonomy.org/maven2/", + :groupId => "org.bibsonomy", + :artifactId => "bibsonomy-rest-common", + :version => BIBSONOMY_VERSION, + :bname => "org.bibsonomy.restcommon", + :bversion => BIBSONOMY_BVERSION, + :generatePom => true, + :deps => {"org.bibsonomy.bibsonomy-model" => repomvnver(BIBSONOMY_VERSION), + "commons-io.commons-io" => orbitmvnver(COMMONS_IO_VERSION) + } +}) + +processmvndep ({ + :repo => "http://dev.bibsonomy.org/maven2/", + :groupId => "org.bibsonomy", + :artifactId => "bibsonomy-model", + :version => BIBSONOMY_VERSION, + :bname => "org.bibsonomy.model", + :bversion => BIBSONOMY_BVERSION, + :generatePom => true, + :deps => {"org.bibsonomy.bibsonomy-common" => repomvnver(BIBSONOMY_VERSION), + "org.antlr.antlr-runtime" => orbitmvnver("3.0.0.v200803061811") + } +}) + +processmvndep ({ + :repo => "http://dev.bibsonomy.org/maven2/", + :groupId => "org.bibsonomy", + :artifactId => "bibsonomy-common", + :version => "2.0.4-SNAPSHOT", + :bname => "org.bibsonomy.common", + :bversion => "2.0.4.SNAPSHOT", + :generatePom => true, + :deps => {"commons-io.commons-io" => orbitmvnver(COMMONS_IO_VERSION), + "commons-logging.commons-logging" => {:groupId => "org.slf4j", :artifactId => "jcl-over-slf4j", :version => "1.5.6"}, + "jtidy.jtidy" => repomvnver("8.0-SNAPSHOT"), + "it.unimi.dsi.fastutil.chars.charopenhashset" => repomvnver("5.0.9") + } +}) Property changes on: scripts/deploy-deps-bibsonomy.rb ___________________________________________________________________ Added: svn:executable + * Modified: scripts/deploy-deps-internal.rb =================================================================== --- scripts/deploy-deps-internal.rb 2009-12-04 15:57:58 UTC (rev 2150) +++ scripts/deploy-deps-internal.rb 2009-12-04 16:05:28 UTC (rev 2151) @@ -128,9 +128,37 @@ ele.elements[1,'artifactId'].text = deps[id][:artifactId] ele.elements[1,'version'].text = deps[id][:version] end + deps.delete(id) end end + dependenciesNode = doc.elements['project/dependencies'] + + # and any remaining dependencies that should be added + deps.each_key do |id| + if deps[id].is_a?(String) + puts "Adding dependency #{id} version #{deps[id]}" + grId = id.split("\.")[0..-2].join(".") + arId = id.split("\.")[-1] + dependenciesNode.add_element REXML::Document.new " + <dependency> + <groupId>#{grId}</groupId> + <artifactId>#{arId}</artifactId> + <version>#{deps[id]}</version> + </dependency> + " + elsif deps[id].is_a?(Hash) + puts "Adding dependency #{id} to #{deps[id][:groupId]}:#{deps[id][:artifactId]}:#{deps[id][:version]}" + dependenciesNode.add_element REXML::Document.new " + <dependency> + <groupId>#{deps[id][:groupId]}</groupId> + <artifactId>#{deps[id][:artifactId]}</artifactId> + <version>#{deps[id][:version]}</version> + </dependency> + " + end + end + f = File.open(pom,'w+') doc.write f f.truncate f.pos @@ -227,10 +255,12 @@ deps = params.has_key?(:deps) ? params[:deps] : {} cpath = params.has_key?(:nativelibs) ? params[:nativelibs] : [] priv = params.has_key?(:private) ? params[:private] : "" - targzfile = params.has_key?(:targzfile) ? params[:targzfile] : "" fragmenthost = params.has_key?(:fragmenthost) ? params[:fragmenthost] : "" index = params.has_key?(:index) ? params[:index] : "" remove = params.has_key?(:remove) ? params[:remove] : [] + exports = params.has_key?(:exports) ? params[:exports] : "" + nouses = params.has_key?(:nouses) ? true : false + generatePom = params.has_key?(:generatePom) ? true : false # initialize appropriate variables dir = "#{repo}#{params[:groupId].gsub(/\./,'/')}/#{params[:artifactId]}/#{params[:version]}/" @@ -242,22 +272,30 @@ howtoname = "#{prefix}-howtoregenerate.txt" bndinfodir = "#{prefix}-bundleinfo" - - if targzfile.empty? - # download the jar and the pom - download("#{dir}#{jarname}",jarname); - download("#{dir}#{pomname}",pomname); - - # download the classpath libs - downloadclasspath(cpath); + # download the jar and the pom + download("#{dir}#{jarname}",jarname); + if generatePom + File.open(pomname,"w+") do |f| + f.puts "<?xml version='1.0' encoding='UTF-8'?> +<project> + <modelVersion>4.0.0</modelVersion> + <groupId>#{params[:groupId]}</groupId> + <artifactId>#{params[:artifactId]}</artifactId> + <version>#{repomvnver(params[:artifactId],index)}</version> + <description>Auto generated POM</description> + <dependencies> + </dependencies> +</project> + " + end else - targzfilename = targzfile.split('/').last - # download the targz - download(targzfile,targzfilename) - extractfilefromtargz(targzfilename,jarname) - extractpomfromjar(jarname,params[:groupId],params[:artifactId],params[:version]) + download("#{dir}#{pomname}",pomname); end + + # download the classpath libs + downloadclasspath(cpath); + # change the artifact version in the pom changeversion( pomname,repomvnver(params[:version],index)) changedeps( pomname,deps) @@ -268,6 +306,9 @@ if params.has_key?(:bnd) f.puts params[:bnd].strip else + if nouses + f.puts "-nouses: true" + end f.puts "Bundle-Name: #{params[:artifactId]} bundle." f.puts "Bundle-ClassPath: . " f.puts "Bundle-ManifestVersion: 2" @@ -280,8 +321,10 @@ f.puts "Fragment-Host: #{fragmenthost}" end - if priv.empty? - f.puts "Export-Package: *;version=#{bversion}" + if priv.empty? && exports.empty? + f.puts "Export-Package: *;version=#{bversion}" + elsif priv.empty? + f.puts "Export-Package: #{exports}" else f.puts "Export-Package: #{priv.collect{|x| "!#{x}"}.join(", ")}, *;version=#{bversion}" f.puts "Private-Package: #{priv.join(", ")}" Modified: scripts/deploy-deps-mvn.rb =================================================================== --- scripts/deploy-deps-mvn.rb 2009-12-04 15:57:58 UTC (rev 2150) +++ scripts/deploy-deps-mvn.rb 2009-12-04 16:05:28 UTC (rev 2151) @@ -8,6 +8,24 @@ require "deploy-deps-internal.rb" processmvndep ({ + :repo => "http://dev.bibsonomy.org/maven2/", + :groupId => "it.unimi.dsi.fastutil.chars", + :artifactId => "charopenhashset", + :version => "5.0.9", + :bname => "it.unimi.dsi.fastutil.chars.charopenhashset", + :bversion => "5.0.9", +}) + +processmvndep ({ + :repo => "http://dev.bibsonomy.org/maven2/", + :groupId => "jtidy", + :artifactId => "jtidy", + :version => "8.0-SNAPSHOT", + :bname => "org.jtidy", + :bversion => "8.0.0.SNAPSHOT", +}) + +processmvndep ({ :groupId => "javax.activation", :artifactId => "activation", :version => "1.1.1", This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |