October 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r59251 - in /trunk/ruby-bindings/examples/ruby: Foo.rb ruby_from_ycp.sh ruby_from_ycp.ycp
by mvidner＠svn.opensuse.org 30 Oct '09

30 Oct '09

Author: mvidner Date: Fri Oct 30 09:28:18 2009 New Revision: 59251 URL: http://svn.opensuse.org/viewcvs/yast?rev=59251&view=rev Log: Added a working example. Added: trunk/ruby-bindings/examples/ruby/ruby_from_ycp.sh (with props) Modified: trunk/ruby-bindings/examples/ruby/Foo.rb trunk/ruby-bindings/examples/ruby/ruby_from_ycp.ycp Modified: trunk/ruby-bindings/examples/ruby/Foo.rb URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/examples/ruby/Foo.… ============================================================================== --- trunk/ruby-bindings/examples/ruby/Foo.rb (original) +++ trunk/ruby-bindings/examples/ruby/Foo.rb Fri Oct 30 09:28:18 2009 @@ -0,0 +1,5 @@ +module Foo + def self.multiply_by_eight(n) + n * 8 + end +end Added: trunk/ruby-bindings/examples/ruby/ruby_from_ycp.sh URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/examples/ruby/ruby… ============================================================================== --- trunk/ruby-bindings/examples/ruby/ruby_from_ycp.sh (added) +++ trunk/ruby-bindings/examples/ruby/ruby_from_ycp.sh Fri Oct 30 09:28:18 2009 @@ -0,0 +1 @@ +ln -snf . modules; Y2DIR=. /sbin/yast2 ./ruby_from_ycp.ycp Modified: trunk/ruby-bindings/examples/ruby/ruby_from_ycp.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/examples/ruby/ruby… ============================================================================== --- trunk/ruby-bindings/examples/ruby/ruby_from_ycp.ycp (original) +++ trunk/ruby-bindings/examples/ruby/ruby_from_ycp.ycp Fri Oct 30 09:28:18 2009 @@ -1,7 +1,7 @@ { import "Foo"; - string result = (string) multiply_by_eight(10); + string result = tostring(Foo::multiply_by_eight(10)); UI::OpenDialog( `VBox( `Label(result), @@ -10,4 +10,4 @@ ); UI::UserInput(); UI::CloseDialog(); -} \ No newline at end of file +} -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <rest-service> master : fixed restdoc packaging
by Ladislav Slezak 30 Oct '09

30 Oct '09

ref: refs/heads/master commit 9617ec1c2db08f384e733512e7926d8dc591dcf5 Author: Ladislav Slezak <lslezak(a)novell.com> Date: Fri Oct 30 08:15:44 2009 +0100 fixed restdoc packaging --- .../package/yast2-webservice-administrator.changes | 6 ++++++ .../package/yast2-webservice-administrator.spec | 11 ++++++----- .../package/yast2-webservice-language.changes | 6 ++++++ .../package/yast2-webservice-language.spec | 10 +++++----- .../package/yast2-webservice-mailsettings.changes | 6 ++++++ .../package/yast2-webservice-mailsettings.spec | 11 ++++++----- .../package/yast2-webservice-network.changes | 6 ++++++ .../network/package/yast2-webservice-network.spec | 8 ++++---- plugins/ntp/package/yast2-webservice-ntp.changes | 6 ++++++ plugins/ntp/package/yast2-webservice-ntp.spec | 10 +++++----- .../package/yast2-webservice-services.changes | 6 ++++++ .../package/yast2-webservice-services.spec | 11 ++++++----- .../system/package/yast2-webservice-system.changes | 6 ++++++ .../system/package/yast2-webservice-system.spec | 11 ++++++----- 14 files changed, 80 insertions(+), 34 deletions(-) diff --git a/plugins/administrator/package/yast2-webservice-administrator.changes b/plugins/administrator/package/yast2-webservice-administrator.changes index 8655be3..4f6445d 100644 --- a/plugins/administrator/package/yast2-webservice-administrator.changes +++ b/plugins/administrator/package/yast2-webservice-administrator.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Oct 30 08:03:19 CET 2009 - lslezak(a)suse.cz + +- fixed restdoc packaging +- 0.0.7 + +------------------------------------------------------------------- Thu Oct 29 14:41:37 CET 2009 - jsuchome(a)suse.cz - licence changed to GPL2 diff --git a/plugins/administrator/package/yast2-webservice-administrator.spec b/plugins/administrator/package/yast2-webservice-administrator.spec index f348ae0..c7b46a4 100644 --- a/plugins/administrator/package/yast2-webservice-administrator.spec +++ b/plugins/administrator/package/yast2-webservice-administrator.spec @@ -15,7 +15,7 @@ Provides: yast2-webservice:/srv/www/yastws/app/controllers/administrator_c License: GPLv2 Group: Productivity/Networking/Web/Utilities Autoreqprov: on -Version: 0.0.6 +Version: 0.0.7 Release: 0 Summary: YaST2 - Webservice - Administrator Source: www.tar.bz2 @@ -51,15 +51,19 @@ Authors: %build # build restdoc documentation -mkdir -p $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/public/administrator/restdoc +mkdir -p public/administrator/restdoc export RAILS_PARENT=/srv/www/yastws env LANG=en rake restdoc +# do not package restdoc sources +rm -rf restdoc + %install # # Install all web and frontend parts. # +mkdir -p $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name} cp -a * $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name} rm -f $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/COPYING @@ -67,9 +71,6 @@ rm -f $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/COPYING mkdir -p $RPM_BUILD_ROOT/usr/share/PolicyKit/policy install -m 0644 %SOURCE1 $RPM_BUILD_ROOT/usr/share/PolicyKit/policy/ -# do not package restdoc sources -rm -rf $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/restdoc - %clean rm -rf $RPM_BUILD_ROOT diff --git a/plugins/language/package/yast2-webservice-language.changes b/plugins/language/package/yast2-webservice-language.changes index d681c7a..c7175bc 100644 --- a/plugins/language/package/yast2-webservice-language.changes +++ b/plugins/language/package/yast2-webservice-language.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Oct 30 08:03:48 CET 2009 - lslezak(a)suse.cz + +- fixed restdoc packaging +- 0.0.8 + +------------------------------------------------------------------- Thu Oct 29 17:32:09 CET 2009 - lslezak(a)suse.cz - GPLv2 license diff --git a/plugins/language/package/yast2-webservice-language.spec b/plugins/language/package/yast2-webservice-language.spec index cecc100..b5fe2d4 100644 --- a/plugins/language/package/yast2-webservice-language.spec +++ b/plugins/language/package/yast2-webservice-language.spec @@ -15,7 +15,7 @@ Provides: yast2-webservice:/srv/www/yastws/app/controllers/language_contro License: GPLv2 Group: Productivity/Networking/Web/Utilities Autoreqprov: on -Version: 0.0.7 +Version: 0.0.8 Release: 0 Summary: YaST2 - Webservice - Language Source: www.tar.bz2 @@ -51,10 +51,13 @@ Authors: %build # build restdoc documentation -mkdir -p $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/public/%{plugin_name}/restdoc +mkdir -p public/language/restdoc export RAILS_PARENT=/srv/www/yastws env LANG=en rake restdoc +# do not package restdoc sources +rm -rf restdoc + %install # @@ -64,9 +67,6 @@ mkdir -p $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name} cp -a * $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name} rm -f $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/COPYING -# do not package restdoc sources -rm -rf $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/restdoc - %clean rm -rf $RPM_BUILD_ROOT diff --git a/plugins/mail_settings/package/yast2-webservice-mailsettings.changes b/plugins/mail_settings/package/yast2-webservice-mailsettings.changes index 3d3804b..f56640c 100644 --- a/plugins/mail_settings/package/yast2-webservice-mailsettings.changes +++ b/plugins/mail_settings/package/yast2-webservice-mailsettings.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Oct 30 08:04:05 CET 2009 - lslezak(a)suse.cz + +- fixed restdoc packaging +- 0.0.6 + +------------------------------------------------------------------- Thu Oct 29 14:50:57 CET 2009 - jsuchome(a)suse.cz - licence changed to GPL2 diff --git a/plugins/mail_settings/package/yast2-webservice-mailsettings.spec b/plugins/mail_settings/package/yast2-webservice-mailsettings.spec index 908fd92..056d75c 100644 --- a/plugins/mail_settings/package/yast2-webservice-mailsettings.spec +++ b/plugins/mail_settings/package/yast2-webservice-mailsettings.spec @@ -15,7 +15,7 @@ Provides: yast2-webservice:/srv/www/yastws/app/controllers/mail_settings_c License: GPLv2 Group: Productivity/Networking/Web/Utilities Autoreqprov: on -Version: 0.0.5 +Version: 0.0.6 Release: 0 Summary: YaST2 - Webservice - Mail Settings Source: www.tar.bz2 @@ -61,15 +61,19 @@ Authors: %build # build restdoc documentation -mkdir -p $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/public/mail_settings/restdoc +mkdir -p public/mail_settings/restdoc export RAILS_PARENT=/srv/www/yastws env LANG=en rake restdoc +# do not package restdoc sources +rm -rf restdoc + %install # # Install all web and frontend parts. # +mkdir -p $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name} cp -a * $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name} rm -f $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/COPYING @@ -81,9 +85,6 @@ install -m 0644 %SOURCE2 $RPM_BUILD_ROOT/usr/share/PolicyKit/policy/ mkdir -p $RPM_BUILD_ROOT/usr/share/YaST2/modules/YaPI/ cp %{SOURCE1} $RPM_BUILD_ROOT/usr/share/YaST2/modules/YaPI/ -# do not package restdoc sources -rm -rf $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/restdoc - %clean rm -rf $RPM_BUILD_ROOT diff --git a/plugins/network/package/yast2-webservice-network.changes b/plugins/network/package/yast2-webservice-network.changes index bdf8ca3..7d8a0f3 100644 --- a/plugins/network/package/yast2-webservice-network.changes +++ b/plugins/network/package/yast2-webservice-network.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Oct 30 08:04:20 CET 2009 - lslezak(a)suse.cz + +- fixed restdoc packaging +- 0.0.9 + +------------------------------------------------------------------- Thu Oct 29 17:56:16 CET 2009 - lslezak(a)suse.cz - GPLv2 license diff --git a/plugins/network/package/yast2-webservice-network.spec b/plugins/network/package/yast2-webservice-network.spec index 3ce7b14..74559e1 100644 --- a/plugins/network/package/yast2-webservice-network.spec +++ b/plugins/network/package/yast2-webservice-network.spec @@ -13,7 +13,7 @@ Name: yast2-webservice-network License: GPLv2 Group: Productivity/Networking/Web/Utilities Autoreqprov: on -Version: 0.0.8 +Version: 0.0.9 Release: 0 Summary: YaST2 - Webservice - Network Source: www.tar.bz2 @@ -50,6 +50,9 @@ Authors: export RAILS_PARENT=/srv/www/yastws env LANG=en rake restdoc +# do not package restdoc sources +rm -rf restdoc + %install # @@ -63,9 +66,6 @@ rm -f $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/COPYING mkdir -p $RPM_BUILD_ROOT/usr/share/PolicyKit/policy install -m 0644 %SOURCE1 $RPM_BUILD_ROOT/usr/share/PolicyKit/policy/ -# do not package restdoc sources -rm -rf $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/restdoc - %clean rm -rf $RPM_BUILD_ROOT diff --git a/plugins/ntp/package/yast2-webservice-ntp.changes b/plugins/ntp/package/yast2-webservice-ntp.changes index a3c3d7d..7a60ef7 100644 --- a/plugins/ntp/package/yast2-webservice-ntp.changes +++ b/plugins/ntp/package/yast2-webservice-ntp.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Oct 30 08:04:32 CET 2009 - lslezak(a)suse.cz + +- fixed restdoc packaging +- 0.0.3 + +------------------------------------------------------------------- Thu Oct 29 17:35:02 CET 2009 - lslezak(a)suse.cz - GPLv2 license diff --git a/plugins/ntp/package/yast2-webservice-ntp.spec b/plugins/ntp/package/yast2-webservice-ntp.spec index 2fc3d0d..aa0b2b7 100644 --- a/plugins/ntp/package/yast2-webservice-ntp.spec +++ b/plugins/ntp/package/yast2-webservice-ntp.spec @@ -18,7 +18,7 @@ Provides: yast2-webservice:/srv/www/yastws/app/controllers/ntp_controller. License: GPLv2 Group: Productivity/Networking/Web/Utilities Autoreqprov: on -Version: 0.0.2 +Version: 0.0.3 Release: 0 Summary: YaST2 - Webservice - NTP Source: www.tar.bz2 @@ -46,10 +46,13 @@ Authors: %build # build restdoc documentation -mkdir -p $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/public/ntp/restdoc +mkdir -p public/ntp/restdoc export RAILS_PARENT=/srv/www/yastws env LANG=en rake restdoc +# do not package restdoc sources +rm -rf restdoc + %install # @@ -63,9 +66,6 @@ cp %{SOURCE1} $RPM_BUILD_ROOT/usr/share/YaST2/modules/YaPI/ mkdir -p $RPM_BUILD_ROOT/usr/share/PolicyKit/policy/ cp %{SOURCE2} $RPM_BUILD_ROOT/usr/share/PolicyKit/policy/ -# do not package restdoc sources -rm -rf $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/restdoc - %clean rm -rf $RPM_BUILD_ROOT diff --git a/plugins/services/package/yast2-webservice-services.changes b/plugins/services/package/yast2-webservice-services.changes index 791c5c3..2d8eee6 100644 --- a/plugins/services/package/yast2-webservice-services.changes +++ b/plugins/services/package/yast2-webservice-services.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Oct 30 08:04:50 CET 2009 - lslezak(a)suse.cz + +- fixed restdoc packaging +- 0.0.10 + +------------------------------------------------------------------- Thu Oct 29 14:48:07 CET 2009 - jsuchome(a)suse.cz - licence changed to GPL2 diff --git a/plugins/services/package/yast2-webservice-services.spec b/plugins/services/package/yast2-webservice-services.spec index 459433d..28ee153 100644 --- a/plugins/services/package/yast2-webservice-services.spec +++ b/plugins/services/package/yast2-webservice-services.spec @@ -15,7 +15,7 @@ Provides: yast2-webservice:/srv/www/yastws/app/controllers/services_contro License: GPLv2 Group: Productivity/Networking/Web/Utilities Autoreqprov: on -Version: 0.0.9 +Version: 0.0.10 Release: 0 Summary: YaST2 - Webservice - Services Source: www.tar.bz2 @@ -54,15 +54,19 @@ Authors: %build # build restdoc documentation -mkdir -p $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/public/services/restdoc +mkdir -p public/services/restdoc export RAILS_PARENT=/srv/www/yastws env LANG=en rake restdoc +# do not package restdoc sources +rm -rf restdoc + %install # # Install all web and frontend parts. # +mkdir -p $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name} cp -a * $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name} rm -f $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/COPYING @@ -70,9 +74,6 @@ rm -f $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/COPYING mkdir -p $RPM_BUILD_ROOT/usr/share/PolicyKit/policy install -m 0644 %SOURCE1 $RPM_BUILD_ROOT/usr/share/PolicyKit/policy/ -# do not package restdoc sources -rm -rf $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/restdoc - %clean rm -rf $RPM_BUILD_ROOT diff --git a/plugins/system/package/yast2-webservice-system.changes b/plugins/system/package/yast2-webservice-system.changes index fad5c57..e0d0033 100644 --- a/plugins/system/package/yast2-webservice-system.changes +++ b/plugins/system/package/yast2-webservice-system.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Oct 30 08:05:04 CET 2009 - lslezak(a)suse.cz + +- fixed restdoc packaging +- 0.0.7 + +------------------------------------------------------------------- Thu Oct 29 17:28:38 CET 2009 - lslezak(a)suse.cz - GPLv2 license diff --git a/plugins/system/package/yast2-webservice-system.spec b/plugins/system/package/yast2-webservice-system.spec index 121405c..a4199e8 100644 --- a/plugins/system/package/yast2-webservice-system.spec +++ b/plugins/system/package/yast2-webservice-system.spec @@ -17,7 +17,7 @@ Provides: yast2-webservice:/srv/www/yastws/app/controllers/system_controll License: GPLv2 Group: Productivity/Networking/Web/Utilities Autoreqprov: on -Version: 0.0.6 +Version: 0.0.7 Release: 0 Summary: YaST2 - Webservice - System Source: www.tar.bz2 @@ -44,21 +44,22 @@ Authors: %build # build restdoc documentation -mkdir -p $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/public/system/restdoc +mkdir -p public/system/restdoc export RAILS_PARENT=/srv/www/yastws env LANG=en rake restdoc +# do not package restdoc sources +rm -rf restdoc + %install # # Install all web and frontend parts. # +mkdir -p $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name} cp -a * $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name} rm -f $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/COPYING -# do not package restdoc sources -rm -rf $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/restdoc - %clean rm -rf $RPM_BUILD_ROOT -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <rest-service> master : don't define the test task, the submit task doesn't work anyway
by Ladislav Slezak 29 Oct '09

29 Oct '09

ref: refs/heads/master commit 6d208683b3aa00b8b517022551467de6ad09e244 Author: Ladislav Slezak <lslezak(a)novell.com> Date: Thu Oct 29 19:29:57 2009 +0100 don't define the test task, the submit task doesn't work anyway the problem is that the submit task cannot change e.g. yast2-webservice-tasks-0.0.7.gem to yast2-webservice-tasks-0.0.8.gem (remove the old file and add a new one), it can only update files --- webservice-tasks/Rakefile | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/webservice-tasks/Rakefile b/webservice-tasks/Rakefile index 51d50c7..95e9f85 100644 --- a/webservice-tasks/Rakefile +++ b/webservice-tasks/Rakefile @@ -6,9 +6,6 @@ require 'rake/rdoctask' require 'lib/tasks/webservice_tasks' WebserviceTasks.loadTasks(:exclude => ["package-local.rake"]) -# define empty test task (rake submit doesn't fail then) -task :test do -end # define clean and clobber tasks require 'rake/clean' -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <rest-service> master : webservice-tasks - small fixes
by Ladislav Slezak 29 Oct '09

29 Oct '09

ref: refs/heads/master commit bfad81c28895855c65b1dec1cf73755dddb5439b Author: Ladislav Slezak <lslezak(a)novell.com> Date: Thu Oct 29 19:24:57 2009 +0100 webservice-tasks - small fixes --- webservice-tasks/Rakefile | 3 +++ webservice-tasks/lib/tasks/build_test.rake | 2 +- webservice-tasks/lib/tasks/osc_submit.rake | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/webservice-tasks/Rakefile b/webservice-tasks/Rakefile index 95e9f85..51d50c7 100644 --- a/webservice-tasks/Rakefile +++ b/webservice-tasks/Rakefile @@ -6,6 +6,9 @@ require 'rake/rdoctask' require 'lib/tasks/webservice_tasks' WebserviceTasks.loadTasks(:exclude => ["package-local.rake"]) +# define empty test task (rake submit doesn't fail then) +task :test do +end # define clean and clobber tasks require 'rake/clean' diff --git a/webservice-tasks/lib/tasks/build_test.rake b/webservice-tasks/lib/tasks/build_test.rake index 8285ebd..ba1226a 100644 --- a/webservice-tasks/lib/tasks/build_test.rake +++ b/webservice-tasks/lib/tasks/build_test.rake @@ -11,7 +11,7 @@ task :'build_test' do end puts "package is #{package_name}" raise "cannot determine package name" if package_name.empty? - puts "checking out osc package to build" + puts "checking out osc package from build" top_dir = Dir.pwd begin `osc checkout 'YaST:Web' #{package_name}` diff --git a/webservice-tasks/lib/tasks/osc_submit.rake b/webservice-tasks/lib/tasks/osc_submit.rake index a4af673..df9c0d8 100644 --- a/webservice-tasks/lib/tasks/osc_submit.rake +++ b/webservice-tasks/lib/tasks/osc_submit.rake @@ -11,7 +11,7 @@ task :'osc_submit' do end puts "package is #{package_name}" raise "cannot determine package name" if package_name.empty? - puts "checking out osc package to build" + puts "checking out osc package from build" top_dir = Dir.pwd begin `osc checkout 'YaST:Web' #{package_name}` @@ -23,7 +23,7 @@ task :'osc_submit' do # long running, `foo` would only show output at the end system "osc commit -m 'new version'" if $?.exitstatus != 0 - raise "Failed to build" + raise "Failed to submit" end puts "package built" ensure -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <rest-service> master : always call 'git ls-files' (bnc#550922)
by Ladislav Slezak 29 Oct '09

29 Oct '09

ref: refs/heads/master commit 121996857160035bec005ac981edabb8190b56a7 Author: Ladislav Slezak <lslezak(a)novell.com> Date: Thu Oct 29 15:50:03 2009 +0100 always call 'git ls-files' (bnc#550922) - refactoring: use PACKAGE_* constants instead hardcoded strings split the functionality to more functions --- webservice-tasks/lib/tasks/package-local.rake | 71 +++++++++++++----------- 1 files changed, 38 insertions(+), 33 deletions(-) diff --git a/webservice-tasks/lib/tasks/package-local.rake b/webservice-tasks/lib/tasks/package-local.rake index a6f34db..a712866 100644 --- a/webservice-tasks/lib/tasks/package-local.rake +++ b/webservice-tasks/lib/tasks/package-local.rake @@ -5,49 +5,54 @@ require 'fileutils' require "#{File.dirname(__FILE__)}/rake_rename_task" -package_backup = '*__package_task_backup__*' +# temporary name for the package task backup +PACKAGE_BACKUP = '*__package_task_backup__*' +# name of the package (base file name) +PACKAGE_NAME = 'www' +# target directory for the package file +PACKAGE_DIR = 'package' # backup the current existing :package task if Rake::Task.task_defined?(:package) - Rake::Task[:package].rename(package_backup) + Rake::Task[:package].rename(PACKAGE_BACKUP) end -# create new package task -Rake::PackageTask.new('www', :noversion) do |p| - p.need_tar_bz2 = true - p.package_dir = 'package' - - # do not call git and do not remove old files if package task won't be executed - # FIXME: this does not support calling the package task from another task! - packaging = ARGV.include?('package') || ARGV.include?('package-local') - - if packaging - #removing old stuff - www_dir = File.join(Dir.pwd,"package", "www") - FileUtils.rm_rf(www_dir) if File.directory?(www_dir) +def remove_old_package + #removing old stuff + www_dir = File.join(Dir.pwd, PACKAGE_DIR, PACKAGE_NAME) + FileUtils.rm_rf(www_dir) if File.directory?(www_dir) +end - # package only the files which are available in the GIT repository - filelist = `git ls-files . --exclude=.gitignore`.split("\n") +# add all GIT files under the current directory to the package_task +def add_git_files(package_task) + # package only the files which are available in the GIT repository + filelist = `git ls-files . --exclude=.gitignore`.split("\n") - if $?.exitstatus.zero? - # add ./ prefix so the exclude patterns match - filelist.map! { |f| "./#{f}"} + if $?.exitstatus.zero? + # add ./ prefix so the exclude patterns match + filelist.map! { |f| "./#{f}"} - p.package_files.include filelist + package_task.package_files.include filelist - ignored = `git ls-files -o .`.split("\n") + ignored = `git ls-files -o .`.split("\n") - if $?.exitstatus.zero? and ignored.size > 0 - $stderr.puts 'WARNING: Ignored files:' - $stderr.puts ignored - end - else - $stderr.puts 'WARNING: Cannot get GIT listing, packaging all files' if packaging - p.package_files.include('./**/*') - end + if $?.exitstatus.zero? and ignored.size > 0 + ignored.each {|f| $stderr.puts "WARNING: Ignoring file: #{f}"} + end else - p.package_files.include('./**/*') + $stderr.puts 'WARNING: Cannot get GIT listing, packaging all files' + package_task.package_files.include('./**/*') end +end + +# create new package task +Rake::PackageTask.new(PACKAGE_NAME, :noversion) do |p| + p.need_tar_bz2 = true + p.package_dir = PACKAGE_DIR + + remove_old_package + + add_git_files p #don't add IDE files p.package_files.exclude('./nbproject') @@ -72,8 +77,8 @@ end Rake::Task[:package].rename(:"package-local") # restore the original :package task -if Rake::Task.task_defined?(package_backup) - Rake::Task[package_backup].rename(:package) +if Rake::Task.task_defined?(PACKAGE_BACKUP) + Rake::Task[PACKAGE_BACKUP].rename(:package) end # vim: ft=ruby -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <rest-service> master : rubygem-yast2-webservice-tasks-0.0.8
by Ladislav Slezak 29 Oct '09

29 Oct '09

ref: refs/heads/master commit ac9ac3eae14dc64f4f0e91dbacabc138221a2743 Author: Ladislav Slezak <lslezak(a)novell.com> Date: Thu Oct 29 18:59:30 2009 +0100 rubygem-yast2-webservice-tasks-0.0.8 --- webservice-tasks/VERSION | 2 +- webservice-tasks/lib/tasks/package-local.rake | 6 ++++-- .../package/rubygem-yast2-webservice-tasks.changes | 11 +++++++++++ 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/webservice-tasks/VERSION b/webservice-tasks/VERSION index 5a5831a..d169b2f 100644 --- a/webservice-tasks/VERSION +++ b/webservice-tasks/VERSION @@ -1 +1 @@ -0.0.7 +0.0.8 diff --git a/webservice-tasks/lib/tasks/package-local.rake b/webservice-tasks/lib/tasks/package-local.rake index 8c337a6..fd5f3d9 100644 --- a/webservice-tasks/lib/tasks/package-local.rake +++ b/webservice-tasks/lib/tasks/package-local.rake @@ -54,8 +54,6 @@ def create_package_task p.need_tar_bz2 = true p.package_dir = PACKAGE_DIR - package_clean - add_git_files p #don't add IDE files @@ -81,7 +79,11 @@ end # this is just a dummy package task which creates the real Rake::PackageTask # when it is invoked - this avoids removing of the old package and # calling 'git ls-files' for every rake call (even 'rake -T') +desc "Build distribution package (no check, for testing only)" task :"package-local" do + # start from scratch, ensure that the package is fresh + package_clean + # create the real package task create_package_task diff --git a/webservice-tasks/package/rubygem-yast2-webservice-tasks.changes b/webservice-tasks/package/rubygem-yast2-webservice-tasks.changes index f19d483..3d2553f 100644 --- a/webservice-tasks/package/rubygem-yast2-webservice-tasks.changes +++ b/webservice-tasks/package/rubygem-yast2-webservice-tasks.changes @@ -1,4 +1,15 @@ ------------------------------------------------------------------- +Thu Oct 29 18:31:38 CET 2009 - lslezak(a)suse.cz + +- refactored 'rake package' task: + - read GIT files when invoked from other tasks (bnc#550922) + - added lazy loading of GIT files ('git ls-files' is not called + in _every_ rake invocation) + - remove 'www' directory when the tarball is built + - code clean up +- 0.0.8 + +------------------------------------------------------------------- Thu Oct 29 12:58:12 CET 2009 - kkaempf(a)suse.de - License is LGPL v2.1 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <rest-service> master : no need to rename package task
by Ladislav Slezak 29 Oct '09

29 Oct '09

ref: refs/heads/master commit 1c473a5bd2412a907202f28574a92f39cefa42d2 Author: Ladislav Slezak <lslezak(a)novell.com> Date: Thu Oct 29 18:16:20 2009 +0100 no need to rename package task Rake::PackageTask is created only when needed, thus renaming 'package' task to 'package-local' is not needed. --- webservice-tasks/lib/tasks/package-local.rake | 17 ++--------------- 1 files changed, 2 insertions(+), 15 deletions(-) diff --git a/webservice-tasks/lib/tasks/package-local.rake b/webservice-tasks/lib/tasks/package-local.rake index f59239e..8c337a6 100644 --- a/webservice-tasks/lib/tasks/package-local.rake +++ b/webservice-tasks/lib/tasks/package-local.rake @@ -1,22 +1,12 @@ require 'rake' -require 'rake/packagetask' require 'fileutils' -require "#{File.dirname(__FILE__)}/rake_rename_task" - -# temporary name for the package task backup -PACKAGE_BACKUP = '*__package_task_backup__*' # name of the package (base file name) PACKAGE_NAME = 'www' # target directory for the package file PACKAGE_DIR = 'package' -# backup the current existing :package task -if Rake::Task.task_defined?(:package) - Rake::Task[:package].rename(PACKAGE_BACKUP) -end - def remove_package_dir # remove the old package directory www_dir = File.join(Dir.pwd, PACKAGE_DIR, PACKAGE_NAME) @@ -58,6 +48,8 @@ end # create new package task def create_package_task + require 'rake/packagetask' + Rake::PackageTask.new(PACKAGE_NAME, :noversion) do |p| p.need_tar_bz2 = true p.package_dir = PACKAGE_DIR @@ -113,9 +105,4 @@ desc "Force a rebuild of the package files" # is always removed before creating a new package task :repackage => :package -# restore the original :package task -if Rake::Task.task_defined?(PACKAGE_BACKUP) - Rake::Task[PACKAGE_BACKUP].rename(:package) -end - # vim: ft=ruby -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <rest-service> master : package-local task - lazy creation of Rake::PackageTask
by Ladislav Slezak 29 Oct '09

29 Oct '09

ref: refs/heads/master commit fe918c03bf745c117ebc63c11cc4a9421fc0e87e Author: Ladislav Slezak <lslezak(a)novell.com> Date: Thu Oct 29 18:12:53 2009 +0100 package-local task - lazy creation of Rake::PackageTask and also remove the www directory when the tarball is built --- webservice-tasks/lib/tasks/package-local.rake | 91 +++++++++++++++++------- 1 files changed, 64 insertions(+), 27 deletions(-) diff --git a/webservice-tasks/lib/tasks/package-local.rake b/webservice-tasks/lib/tasks/package-local.rake index a712866..f59239e 100644 --- a/webservice-tasks/lib/tasks/package-local.rake +++ b/webservice-tasks/lib/tasks/package-local.rake @@ -17,12 +17,23 @@ if Rake::Task.task_defined?(:package) Rake::Task[:package].rename(PACKAGE_BACKUP) end -def remove_old_package - #removing old stuff +def remove_package_dir + # remove the old package directory www_dir = File.join(Dir.pwd, PACKAGE_DIR, PACKAGE_NAME) FileUtils.rm_rf(www_dir) if File.directory?(www_dir) end +def remove_old_package + # remove the old tarball + tarball = File.join(Dir.pwd, PACKAGE_DIR, "#{PACKAGE_NAME}.tar.bz2") + FileUtils.rm_rf(tarball) if File.exists?(tarball) +end + +def package_clean + remove_package_dir + remove_old_package +end + # add all GIT files under the current directory to the package_task def add_git_files(package_task) # package only the files which are available in the GIT repository @@ -46,35 +57,61 @@ def add_git_files(package_task) end # create new package task -Rake::PackageTask.new(PACKAGE_NAME, :noversion) do |p| - p.need_tar_bz2 = true - p.package_dir = PACKAGE_DIR +def create_package_task + Rake::PackageTask.new(PACKAGE_NAME, :noversion) do |p| + p.need_tar_bz2 = true + p.package_dir = PACKAGE_DIR + + package_clean + + add_git_files p + + #don't add IDE files + p.package_files.exclude('./nbproject') + #don't add generated documentation. If you want have it in package, generate it fresh + p.package_files.exclude('./doc/app') + # ignore backups + p.package_files.exclude('./**/*.orig') + p.package_files.exclude('./package') + p.package_files.exclude('./coverage') + p.package_files.exclude('./test') + p.package_files.exclude('./db/*.sqlite3') + p.package_files.exclude('./db/schema.rb') + p.package_files.exclude('./log/*.log') + p.package_files.exclude('./vendor/plugins/rails_rcov') + p.package_files.exclude('./public/vendor/text/locale') + p.package_files.exclude('./public/vendor/text/po') + p.package_files.exclude('./public/vendor/images') + p.package_files.exclude('./public/vendor/stylesheets') + end +end - remove_old_package +# this is just a dummy package task which creates the real Rake::PackageTask +# when it is invoked - this avoids removing of the old package and +# calling 'git ls-files' for every rake call (even 'rake -T') +task :"package-local" do + # create the real package task + create_package_task - add_git_files p - - #don't add IDE files - p.package_files.exclude('./nbproject') - #don't add generated documentation. If you want have it in package, generate it fresh - p.package_files.exclude('./doc/app') - # ignore backups - p.package_files.exclude('./**/*.orig') - p.package_files.exclude('./package') - p.package_files.exclude('./coverage') - p.package_files.exclude('./test') - p.package_files.exclude('./db/*.sqlite3') - p.package_files.exclude('./db/schema.rb') - p.package_files.exclude('./log/*.log') - p.package_files.exclude('./vendor/plugins/rails_rcov') - p.package_files.exclude('./public/vendor/text/locale') - p.package_files.exclude('./public/vendor/text/po') - p.package_files.exclude('./public/vendor/images') - p.package_files.exclude('./public/vendor/stylesheets') + # execute the real package task + Rake::Task[:"#{PACKAGE_DIR}/#{PACKAGE_NAME}.tar.bz2"].invoke + + # remove the package dir, not needed anymore + remove_package_dir end -# rename 'package' task to 'package-local' task -Rake::Task[:package].rename(:"package-local") +# define the same tasks as in Rake::PackageTask +desc "Remove package products" +task :clobber_package do + remove_old_package +end + +task :clobber => :clobber_package + +desc "Force a rebuild of the package files" +# Note: 'repackage' can be simply redirected to 'package', the old package +# is always removed before creating a new package +task :repackage => :package # restore the original :package task if Rake::Task.task_defined?(PACKAGE_BACKUP) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <rest-service> master : yast2-webservice-network-0.0.8
by Ladislav Slezak 29 Oct '09

29 Oct '09

ref: refs/heads/master commit 1715701e3b7382b7c0234fd6906492910bdb0efb Author: Ladislav Slezak <lslezak(a)novell.com> Date: Thu Oct 29 17:56:43 2009 +0100 yast2-webservice-network-0.0.8 --- .../package/yast2-webservice-network.changes | 6 ++++++ .../network/package/yast2-webservice-network.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/plugins/network/package/yast2-webservice-network.changes b/plugins/network/package/yast2-webservice-network.changes index 1c68855..bdf8ca3 100644 --- a/plugins/network/package/yast2-webservice-network.changes +++ b/plugins/network/package/yast2-webservice-network.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Oct 29 17:56:16 CET 2009 - lslezak(a)suse.cz + +- GPLv2 license +- 0.0.8 + +------------------------------------------------------------------- Fri Oct 16 16:28:33 CEST 2009 - mvidner(a)suse.cz - Disabled HTML output, it returned XML anyway (kkaempf) diff --git a/plugins/network/package/yast2-webservice-network.spec b/plugins/network/package/yast2-webservice-network.spec index 1dbd393..3ce7b14 100644 --- a/plugins/network/package/yast2-webservice-network.spec +++ b/plugins/network/package/yast2-webservice-network.spec @@ -13,7 +13,7 @@ Name: yast2-webservice-network License: GPLv2 Group: Productivity/Networking/Web/Utilities Autoreqprov: on -Version: 0.0.7 +Version: 0.0.8 Release: 0 Summary: YaST2 - Webservice - Network Source: www.tar.bz2 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r59250 - /tags/branch-Code-11-SP1-2_17_104/network/
by mzugec＠svn.opensuse.org 29 Oct '09

29 Oct '09

Author: mzugec Date: Thu Oct 29 17:53:23 2009 New Revision: 59250 URL: http://svn.opensuse.org/viewcvs/yast?rev=59250&view=rev Log: Created tag branch-Code-11-SP1-2_17_104 for network Added: tags/branch-Code-11-SP1-2_17_104/network/ (props changed) - copied from r59249, branches/SuSE-Code-11-SP1-Branch/network/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0