aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Richard Brown <rbrown@exherbo.org> 2007-07-09 20:11:13 +0000
committerAvatar Richard Brown <rbrown@exherbo.org> 2007-07-09 20:11:13 +0000
commit1ca05a0e7a21cce9646ba0df61d88f195f87e55f (patch)
treed22f92aa9a10f04d8682888d2403fa3dc6facbdb
parentd68fd591a03b2da991dc5de3439a61f0243493bc (diff)
downloadpaludis-1ca05a0e7a21cce9646ba0df61d88f195f87e55f.tar.gz
paludis-1ca05a0e7a21cce9646ba0df61d88f195f87e55f.tar.xz
(ruby) disable qa until it works.
-rw-r--r--ruby/Makefile.am62
-rw-r--r--ruby/paludis_ruby.cc12
-rw-r--r--ruby/paludis_ruby.hh4
3 files changed, 46 insertions, 32 deletions
diff --git a/ruby/Makefile.am b/ruby/Makefile.am
index 0c826fa..ea7299b 100644
--- a/ruby/Makefile.am
+++ b/ruby/Makefile.am
@@ -35,12 +35,12 @@ IF_RUBY_TESTS = \
dep_tag_TEST.rb \
package_id_TEST.rb
-IF_RUBY_QA_TESTS = \
- message_TEST.rb \
- check_result_TEST.rb \
- metadata_file_TEST.rb \
- qa_environment_TEST.rb \
- check_TEST.rb
+### IF_RUBY_QA_TESTS = \
+### message_TEST.rb \
+### check_result_TEST.rb \
+### metadata_file_TEST.rb \
+### qa_environment_TEST.rb \
+### check_TEST.rb
IF_RUBY_SOURCES = \
paludis_ruby.cc paludis_ruby.hh \
@@ -62,12 +62,12 @@ IF_RUBY_SOURCES = \
eapi.cc \
name.cc
-IF_RUBY_QA_SOURCES = \
- message.cc \
- check.cc \
- check_result.cc \
- qa_environment.cc \
- metadata_file.cc
+### IF_RUBY_QA_SOURCES = \
+### message.cc \
+### check.cc \
+### check_result.cc \
+### qa_environment.cc \
+### metadata_file.cc
EXTRA_DIST = $(IF_RUBY_TESTS) $(IF_RUBY_SOURCES) \
$(IF_RUBY_QA_TESTS) $(IF_RUBY_QA_SOURCES) \
@@ -119,24 +119,24 @@ paludis_ruby_so.o : paludis_ruby_so.cc
$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS) -I$(RUBY_SITEARCHDIR) -I$(RUBY_ARCHDIR) -c \
-o $@ $(srcdir)/paludis_ruby_so.cc ; then ln -fs .libs/paludis_ruby_so.o $@ ; else rm -f $@ ; exit 1 ; fi
-if ENABLE_QA
-
-libpaludisruby_la_SOURCES = $(IF_RUBY_SOURCES) $(IF_RUBY_QA_SOURCES)
-libpaludisruby_la_LIBADD = \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
- $(top_builddir)/paludis/dep_list/libpaludisdeplist.la \
- $(top_builddir)/paludis/tasks/libpaludistasks.la \
- $(top_builddir)/paludis/repositories/libpaludisrepositories.la \
- $(top_builddir)/paludis/environments/paludis/libpaludispaludisenvironment.la \
- $(top_builddir)/paludis/environments/no_config/libpaludisnoconfigenvironment.la \
- $(top_builddir)/paludis/environments/adapted/libpaludisadaptedenvironment.la \
- $(top_builddir)/paludis/environments/libpaludisenvironments.la \
- $(top_builddir)/paludis/qa/libpaludisqa.la
-
-TESTS = $(IF_RUBY_QA_TESTS) $(IF_RUBY_TESTS)
-
-else
+### if ENABLE_QA
+###
+### libpaludisruby_la_SOURCES = $(IF_RUBY_SOURCES) $(IF_RUBY_QA_SOURCES)
+### libpaludisruby_la_LIBADD = \
+### $(top_builddir)/paludis/libpaludis.la \
+### $(top_builddir)/paludis/util/libpaludisutil.la \
+### $(top_builddir)/paludis/dep_list/libpaludisdeplist.la \
+### $(top_builddir)/paludis/tasks/libpaludistasks.la \
+### $(top_builddir)/paludis/repositories/libpaludisrepositories.la \
+### $(top_builddir)/paludis/environments/paludis/libpaludispaludisenvironment.la \
+### $(top_builddir)/paludis/environments/no_config/libpaludisnoconfigenvironment.la \
+### $(top_builddir)/paludis/environments/adapted/libpaludisadaptedenvironment.la \
+### $(top_builddir)/paludis/environments/libpaludisenvironments.la \
+### $(top_builddir)/paludis/qa/libpaludisqa.la
+###
+### TESTS = $(IF_RUBY_QA_TESTS) $(IF_RUBY_TESTS)
+###
+### else
libpaludisruby_la_SOURCES = $(IF_RUBY_SOURCES)
libpaludisruby_la_LIBADD = \
@@ -152,7 +152,7 @@ libpaludisruby_la_LIBADD = \
TESTS = $(IF_RUBY_TESTS)
-endif
+### endif
check_DATA = .libs/Paludis.so
rubylibdir = @RUBY_INSTALL_DIR@
diff --git a/ruby/paludis_ruby.cc b/ruby/paludis_ruby.cc
index 98ec965..0d2b15e 100644
--- a/ruby/paludis_ruby.cc
+++ b/ruby/paludis_ruby.cc
@@ -29,8 +29,10 @@
#include <ctype.h>
#ifdef ENABLE_RUBY_QA
+#if 0
#include <paludis/qa/qa_environment.hh>
#endif
+#endif
using namespace paludis;
using namespace paludis::ruby;
@@ -79,12 +81,14 @@ namespace
static VALUE c_no_config_environment;
#ifdef ENABLE_RUBY_QA
+#if 0
static VALUE c_paludis_qa_module;
static VALUE c_profiles_desc_error;
static VALUE c_no_such_file_check_type_error;
static VALUE c_no_such_package_dir_check_type_error;
static VALUE c_no_such_ebuild_check_type_error;
#endif
+#endif
/* Document-method: match_package
*
@@ -187,6 +191,7 @@ void paludis::ruby::exception_to_ruby_exception(const std::exception & ee)
else if (0 != dynamic_cast<const paludis::DepListError *>(&ee))
rb_raise(c_dep_list_error, dynamic_cast<const paludis::DepListError *>(&ee)->message().c_str());
#ifdef ENABLE_RUBY_QA
+#if 0
else if (0 != dynamic_cast<const paludis::qa::NoSuchFileCheckTypeError *>(&ee))
rb_raise(c_no_such_file_check_type_error, dynamic_cast<const paludis::qa::NoSuchFileCheckTypeError *>(&ee)->message().c_str());
else if (0 != dynamic_cast<const paludis::qa::NoSuchPackageDirCheckTypeError *>(&ee))
@@ -194,6 +199,7 @@ void paludis::ruby::exception_to_ruby_exception(const std::exception & ee)
else if (0 != dynamic_cast<const paludis::qa::NoSuchEbuildCheckTypeError *>(&ee))
rb_raise(c_no_such_ebuild_check_type_error, dynamic_cast<const paludis::qa::NoSuchEbuildCheckTypeError *>(&ee)->message().c_str());
#endif
+#endif
else if (0 != dynamic_cast<const paludis::ConfigFileError *>(&ee))
rb_raise(c_config_file_error, dynamic_cast<const paludis::ConfigFileError *>(&ee)->message().c_str());
else if (0 != dynamic_cast<const paludis::ConfigurationError *>(&ee))
@@ -249,12 +255,14 @@ paludis::ruby::no_config_environment_class()
}
#ifdef ENABLE_RUBY_QA
+#if 0
VALUE
paludis::ruby::paludis_qa_module()
{
return c_paludis_qa_module;
}
#endif
+#endif
static VALUE
has_query_property_error_init(int argc, VALUE* argv, VALUE self)
@@ -348,11 +356,13 @@ void PALUDIS_VISIBLE paludis::ruby::init()
rb_define_const(c_paludis_module, "Version", rb_str_new2((stringify(PALUDIS_VERSION_MAJOR) + "."
+ stringify(PALUDIS_VERSION_MINOR) + "." + stringify(PALUDIS_VERSION_MICRO)).c_str()));
#ifdef ENABLE_RUBY_QA
+#if 0
c_paludis_qa_module = rb_define_module_under(c_paludis_module,"QA");
c_profiles_desc_error = rb_define_class_under(c_paludis_qa_module, "ProfilesDescError", c_configuration_error);
c_no_such_file_check_type_error = rb_define_class_under(c_paludis_qa_module, "NoSuchFileCheckTypeError", rb_eTypeError);
c_no_such_package_dir_check_type_error = rb_define_class_under(c_paludis_qa_module, "NoSuchPackageDirCheckTypeError", rb_eTypeError);
- c_no_such_ebuild_check_type_error = rb_define_class_under(c_paludis_qa_module, "NoSuchEbuildCheckTypeError", rb_eTypeError);
+ cno_such_ebuild_check_type_error = rb_define_class_under(c_paludis_qa_module, "NoSuchEbuildCheckTypeError", rb_eTypeError);
+#endif
#endif
RegisterRubyClass::get_instance()->execute();
}
diff --git a/ruby/paludis_ruby.hh b/ruby/paludis_ruby.hh
index 2fdac89..dd062bd 100644
--- a/ruby/paludis_ruby.hh
+++ b/ruby/paludis_ruby.hh
@@ -39,8 +39,10 @@
#include <paludis/util/stringify.hh>
#ifdef ENABLE_RUBY_QA
+#if 0
#include <paludis/qa/qa.hh>
#endif
+#endif
#include <ruby.h>
@@ -90,6 +92,7 @@ namespace paludis
tr1::shared_ptr<const Repository> value_to_repository(VALUE);
#ifdef ENABLE_RUBY_QA
+#if 0
VALUE paludis_qa_module();
qa::Message value_to_message(VALUE v);
qa::EbuildCheckData value_to_ebuild_check_data(VALUE v);
@@ -109,6 +112,7 @@ namespace paludis
VALUE message_to_value(const qa::Message &);
VALUE metadata_file_to_value(const qa::MetadataFile &);
#endif
+#endif
/* registration */