Skip to content

Commit

Permalink
BNC#876536. After convert Ycp to Ruby by YaST,
Browse files Browse the repository at this point in the history
merge master to the reconvert branch manually.
Still need to do some modification to make the
module really works.
  • Loading branch information
nick-wang committed May 22, 2014
2 parents 1f521f7 + 50d5156 commit 0d4a694
Show file tree
Hide file tree
Showing 11 changed files with 215 additions and 44 deletions.
33 changes: 33 additions & 0 deletions .gitignore
@@ -0,0 +1,33 @@
#all generated Makefile and Makefile.in, try to contain all subdirs
Makefile
Makefile.in

*.out.tmp
*.err.tmp
/package/*.tar.bz2
/Makefile.am
/Makefile.am.common
/acinclude.m4
/aclocal.m4
/autodocs-cc-base.ami
/autodocs-cc-off.ami
/autodocs-cc.ami
/autodocs-ycp.ami
/autom4te.cache/
/config.guess
/config.log
/config.status
/config.sub
/configure
/configure.ac
/configure.in
/depcomp
/install-sh
/libtool
/libtool.m4
/ltmain.sh
/ltoptions.m4
/ltsugar.m4
/ltversion.m4
/lt~obsolete.m4
/missing
87 changes: 87 additions & 0 deletions CONTRIBUTING.md
@@ -0,0 +1,87 @@
YaST Contribution Guidelines
============================

YaST is an open source project and as such it welcomes all kinds of
contributions. If you decide to contribute, please follow these guidelines to
ensure the process is effective and pleasant both for you and YaST maintainers.

There are two main forms of contribution: reporting bugs and performing code
changes.

Bug Reports
-----------

If you find a problem, please report it either using
[Bugzilla](https://bugzilla.novell.com/enter_bug.cgi?format=guided&product=openSUSE+Factory&component=YaST2)
or [GitHub issues](../../issues). (For Bugzilla, use the [simplified
registration](https://secure-www.novell.com/selfreg/jsp/createSimpleAccount.jsp)
if you don't have an account yet.)

If you find a problem, please report it either using
[Bugzilla](https://bugzilla.novell.com/) or GitHub issues. We can't guarantee
that every bug will be fixed, but we'll try.

When creating a bug report, please follow our [bug reporting
guidelines](http://en.opensuse.org/openSUSE:Report_a_YaST_bug).

Code Changes
------------

We welcome all kinds of code contributions, from simple bug fixes to significant
refactorings and implementation of new features. However, before making any
non-trivial contribution, get in touch with us first — this can prevent wasted
effort on both sides. Also, have a look at our [development
documentation](http://en.opensuse.org/openSUSE:YaST_development).

To send us your code change, use GitHub pull requests. The workflow is as
follows:

1. Fork the project.

2. Create a topic branch based on `master`.

3. Implement your change, including tests (if possible). Make sure you adhere
to the [Ruby style
guide](https://github.com/SUSE/style-guides/blob/master/Ruby.md).

4. Make sure your change didn't break anything by building the RPM package
(`rake osc:build`). The build process includes running the full testsuite.

5. Publish the branch and create a pull request.

6. YaST developers will review your change and possibly point out issues.
Adapt the code under their guidance until they are all resolved.

7. Finally, the pull request will get merged or rejected.

See also [GitHub's guide on
contributing](https://help.github.com/articles/fork-a-repo).

If you want to do multiple unrelated changes, use separate branches and pull
requests.

Do not change the `VERSION` and `*.changes` files as this could lead to
conflicts.

### Commits

Each commit in the pull request should do only one thing, which is clearly
described by its commit message. Especially avoid mixing formatting changes and
functional changes into one commit. When writing commit messages, adhere to
[widely used
conventions](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).

If your commit is related to a bug in Buzgilla or an issue on GitHub, make sure
you mention it in the commit message for cross-reference. Use format like
bnc#775814 or gh#yast/yast-foo#42. See also [GitHub
autolinking](https://help.github.com/articles/github-flavored-markdown#references)
and [openSUSE abbreviation
reference](http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines#Current_set_of_abbreviations).

Additional Information
----------------------

If you have any question, feel free to ask at the [development mailing
list](http://lists.opensuse.org/yast-devel/) or at the
[#yast](http://webchat.freenode.net/?channels=%23yast) IRC channel on freenode.
We'll do our best to provide a timely and accurate answer.
2 changes: 1 addition & 1 deletion MAINTAINER
@@ -1 +1 @@
xwhu <xwhu@novell.com>
Nick Wang <nwang@suse.com>
6 changes: 6 additions & 0 deletions Rakefile
@@ -0,0 +1,6 @@
require "yast/rake"

Yast::Tasks.configuration do |conf|
#lets ignore license check for now
conf.skip_license_check << /.*/
end
1 change: 0 additions & 1 deletion VERSION

This file was deleted.

20 changes: 20 additions & 0 deletions package/yast2-drbd.changes
@@ -1,3 +1,23 @@
-------------------------------------------------------------------
Fri May 9 04:24:44 UTC 2014 - nwang@suse.com

- BNC#875677. Change desktop file,move DRBD from Misc to
High_Availability categorie.

-------------------------------------------------------------------
Wed Sep 18 15:56:35 UTC 2013 - lslezak@suse.cz

- do not use *.spec.in template, use *.spec file with RPM macros
instead
- 3.1.0

-------------------------------------------------------------------
Wed Jul 31 08:28:43 UTC 2013 - yast-devel@opensuse.org

- converted from YCP to Ruby by YCP Killer
(https://github.com/yast/ycp-killer)
- version 3.0.0

-------------------------------------------------------------------
Thu May 9 09:39:36 UTC 2013 - lslezak@suse.cz

Expand Down
64 changes: 64 additions & 0 deletions package/yast2-drbd.spec
@@ -0,0 +1,64 @@
#
# spec file for package yast2-drbd
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.

# Please submit bugfixes or comments via http://bugs.opensuse.org/
#

Name: yast2-drbd
Version: 3.1.0
Release: 0

BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2

License: GPL v2 or later
Group: System/YaST
BuildRequires: perl-XML-Writer ruby rubygem-racc update-desktop-files yast2 yast2-devtools yast2-testsuite
BuildRequires: yast2-devtools >= 3.1.10
Requires: yast2
BuildArch: noarch
Requires: yast2-ruby-bindings >= 1.0.0

Summary: YaST2 - DRBD Configuration

%description
YaST2 - Configuration of Distributed Replicated Block Devices. With
this module you can configure a distributed storage system, frequently
used on high availability (HA) clusters.


Authors:
--------
cmeng@novell.com

%prep
%setup -n %{name}-%{version}

%build
%yast_build

%install
%yast_install


%files
%defattr(-,root,root)
%{yast_yncludedir}/drbd/
%{yast_clientdir}/drbd.rb
%{yast_moduledir}/Drbd.*
%{yast_desktopdir}/drbd.desktop
%{yast_scrconfdir}/*.scr
%{yast_agentdir}/ag_drbd
%doc %{yast_docdir}

2 changes: 1 addition & 1 deletion src/Makefile.am
Expand Up @@ -27,4 +27,4 @@ desktop_DATA = \

EXTRA_DIST = $(module_DATA) $(client_DATA) $(ynclude_DATA) $(scrconf_DATA) $(desktop_DATA)

include $(top_srcdir)/Makefile.am.common
include $(top_srcdir)/Makefile.am.common
3 changes: 2 additions & 1 deletion src/include/drbd/wizards.rb
Expand Up @@ -77,6 +77,7 @@ def TabSequence
end

Wizard.CreateTree(tree, "DRBD")
Wizard.SetDesktopTitleAndIcon("drbd")

# Buttons redefinition
Wizard.SetNextButton(:next, Label.FinishButton)
Expand Down Expand Up @@ -116,7 +117,7 @@ def DrbdSequence
"ws_start" => "read",
"read" => { :abort => :abort, :next => "main" },
"main" => { :abort => :abort, :next => "write" },
"write" => { :abort => :abort, :main => "main", :next => :next }
"write" => { :abort => :abort, :next => :next }
}

Wizard.CreateDialog
Expand Down
2 changes: 1 addition & 1 deletion testsuite/Makefile.am
Expand Up @@ -5,7 +5,7 @@
#

AUTOMAKE_OPTIONS = dejagnu
EXTRA_DIST = $(wildcard tests/*.out) $(wildcard tests/*.err) $(wildcard tests/*.ycp)
EXTRA_DIST = $(wildcard tests/*.out) $(wildcard tests/*.err) $(wildcard tests/*.rb)

testsuite_prepare = @ydatadir@/testsuite/Makefile.testsuite

Expand Down
39 changes: 0 additions & 39 deletions yast2-drbd.spec.in

This file was deleted.

0 comments on commit 0d4a694

Please sign in to comment.