RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Eric Veith
Root: /v/rpm/cvs Email: eve...@rpm5.org
Module: rpm Date: 13-Nov-2010 22:42:48
Branch: HEAD Handle: 2010111321424701
Modified files:
rpm/ruby package-rb.c rpm-rb.c rpm-rb.h rpmds-rb.c
rpmfi-rb.c rpmfi-rb.h rpmhdr-rb.c rpmmi-rb.c
rpmps-rb.c rpmps-rb.h rpmte-rb.c rpmte-rb.h
rpmts-rb.c rpmts-rb.h spec-rb.c spec-rb.h
rpm/ruby/test/unit test_spec.rb
Log:
Header file rearrangement & minor bugfixing
Summary:
Revision Changes Path
1.2 +6 -0 rpm/ruby/package-rb.c
1.7 +8 -0 rpm/ruby/rpm-rb.c
1.6 +2 -8 rpm/ruby/rpm-rb.h
1.7 +8 -1 rpm/ruby/rpmds-rb.c
1.4 +8 -0 rpm/ruby/rpmfi-rb.c
1.3 +9 -2 rpm/ruby/rpmfi-rb.h
1.5 +4 -0 rpm/ruby/rpmhdr-rb.c
1.8 +1 -0 rpm/ruby/rpmmi-rb.c
1.4 +11 -2 rpm/ruby/rpmps-rb.c
1.2 +7 -1 rpm/ruby/rpmps-rb.h
1.3 +5 -0 rpm/ruby/rpmte-rb.c
1.2 +8 -2 rpm/ruby/rpmte-rb.h
1.12 +3 -2 rpm/ruby/rpmts-rb.c
1.4 +10 -7 rpm/ruby/rpmts-rb.h
1.4 +10 -6 rpm/ruby/spec-rb.c
1.3 +4 -1 rpm/ruby/spec-rb.h
1.2 +0 -5 rpm/ruby/test/unit/test_spec.rb
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/ruby/package-rb.c
============================================================================
$ cvs diff -u -r1.1 -r1.2 package-rb.c
--- rpm/ruby/package-rb.c 8 Nov 2010 01:18:04 -0000 1.1
+++ rpm/ruby/package-rb.c 13 Nov 2010 21:42:47 -0000 1.2
@@ -9,6 +9,12 @@
#include "rpmds-rb.h"
#include "package-rb.h"
+#define _RPMFI_INTERNAL
+#define _RPMDS_INTERNAL
+#include <rpmtag.h>
+#include <rpmtypes.h>
+#include <rpmio.h>
+#include <rpmfi.h>
#include <rpmspec.h>
#include <rpmds.h>
@@ .
patch -p0 <<'@@ .'
Index: rpm/ruby/rpm-rb.c
============================================================================
$ cvs diff -u -r1.6 -r1.7 rpm-rb.c
--- rpm/ruby/rpm-rb.c 8 Nov 2010 01:17:26 -0000 1.6
+++ rpm/ruby/rpm-rb.c 13 Nov 2010 21:42:47 -0000 1.7
@@ -21,6 +21,9 @@
#include "rpmds-rb.h"
#include "rpmmc-rb.h"
+#include <rpmrc.h>
+#include <rpmcb.h>
+
#ifndef _GNU_SOURCE
#define _GNU_SOURCE
#endif
@@ -32,6 +35,11 @@
void Init_rpm(void)
{
+ rpmIncreaseVerbosity();
+ rpmIncreaseVerbosity();
+ rpmIncreaseVerbosity();
+ (void)rpmReadConfigFiles(NULL, NULL);
+
rpmModule = rb_define_module("RPM");
Init_rpmts();
@@ .
patch -p0 <<'@@ .'
Index: rpm/ruby/rpm-rb.h
============================================================================
$ cvs diff -u -r1.5 -r1.6 rpm-rb.h
--- rpm/ruby/rpm-rb.h 8 Nov 2010 01:17:26 -0000 1.5
+++ rpm/ruby/rpm-rb.h 13 Nov 2010 21:42:47 -0000 1.6
@@ -9,15 +9,9 @@
*/
-#include <rpmiotypes.h>
-#include <rpmio.h>
-
-#include <rpmtypes.h>
-#include <rpmtag.h>
+#include "system.h"
-#pragma GCC diagnostic ignored "-Wstrict-prototypes"
-#include <ruby.h>
-#pragma GCC diagnostic warning "-Wstrict-prototypes"
+#include <rpmiotypes.h>
/**
@@ .
patch -p0 <<'@@ .'
Index: rpm/ruby/rpmds-rb.c
============================================================================
$ cvs diff -u -r1.6 -r1.7 rpmds-rb.c
--- rpm/ruby/rpmds-rb.c 5 Nov 2010 19:04:51 -0000 1.6
+++ rpm/ruby/rpmds-rb.c 13 Nov 2010 21:42:47 -0000 1.7
@@ -4,8 +4,8 @@
*/
#include "system.h"
-
#include "rpm-rb.h"
+
#include "rpmds-rb.h"
#ifdef NOTYET
@@ -13,12 +13,19 @@
#include <mire.h>
#endif
+#define _RPMDS_INTERNAL
+#include <rpmtag.h>
+#include <rpmtypes.h>
+#include <rpmtag.h>
+#include <rpmio.h>
#include <rpmds.h>
#include "../debug.h"
+
VALUE rpmdsClass;
+
/*...@unchecked@*/
static int _debug = 0;
@@ .
patch -p0 <<'@@ .'
Index: rpm/ruby/rpmfi-rb.c
============================================================================
$ cvs diff -u -r1.3 -r1.4 rpmfi-rb.c
--- rpm/ruby/rpmfi-rb.c 2 May 2009 17:16:25 -0000 1.3
+++ rpm/ruby/rpmfi-rb.c 13 Nov 2010 21:42:47 -0000 1.4
@@ -12,16 +12,24 @@
#include <mire.h>
#endif
+#define _RPMFI_INTERNAL
+#include <rpmtag.h>
+#include <rpmtypes.h>
+#include <rpmio.h>
#include <rpmfi.h>
#include <rpmts.h>
+
#include "../debug.h"
+
VALUE rpmfiClass;
+
/*...@unchecked@*/
static int _debug = 0;
+
/* --- helpers */
static void *
rpmfi_ptr(VALUE s)
@@ .
patch -p0 <<'@@ .'
Index: rpm/ruby/rpmfi-rb.h
============================================================================
$ cvs diff -u -r1.2 -r1.3 rpmfi-rb.h
--- rpm/ruby/rpmfi-rb.h 2 May 2009 09:55:01 -0000 1.2
+++ rpm/ruby/rpmfi-rb.h 13 Nov 2010 21:42:47 -0000 1.3
@@ -2,23 +2,30 @@
#define H_RPMFI_RB
/**
- * \file ruby/rpmfi-rb.h
+ * @file ruby/rpmfi-rb.h
+ * @ingroup rb_c
*/
-#include "rpm-rb.h"
+
+#include "system.h"
+
extern VALUE rpmfiClass;
+
#ifdef __cplusplus
extern "C" {
#endif
+
extern void
Init_rpmfi(void);
+
extern VALUE
rpmrb_NewFi(void *_fi);
+
#ifdef __cplusplus
}
#endif
@@ .
patch -p0 <<'@@ .'
Index: rpm/ruby/rpmhdr-rb.c
============================================================================
$ cvs diff -u -r1.4 -r1.5 rpmhdr-rb.c
--- rpm/ruby/rpmhdr-rb.c 2 May 2009 17:16:25 -0000 1.4
+++ rpm/ruby/rpmhdr-rb.c 13 Nov 2010 21:42:47 -0000 1.5
@@ -14,8 +14,12 @@
#include <mire.h>
#endif
+#define _RPMDS_INTERNAL
+#include <rpmtag.h>
+#include <rpmtypes.h>
#include <rpmds.h>
#include <rpmfi.h>
+#include <rpmio.h>
#include <rpmcli.h> /* XXX rpmHeaderFormats */
@@ .
patch -p0 <<'@@ .'
Index: rpm/ruby/rpmmi-rb.c
============================================================================
$ cvs diff -u -r1.7 -r1.8 rpmmi-rb.c
--- rpm/ruby/rpmmi-rb.c 15 May 2009 13:41:00 -0000 1.7
+++ rpm/ruby/rpmmi-rb.c 13 Nov 2010 21:42:47 -0000 1.8
@@ -16,6 +16,7 @@
#include <rpmdb.h>
#include <rpmts.h>
+#include <rpmio.h>
#include "../debug.h"
@@ .
patch -p0 <<'@@ .'
Index: rpm/ruby/rpmps-rb.c
============================================================================
$ cvs diff -u -r1.3 -r1.4 rpmps-rb.c
--- rpm/ruby/rpmps-rb.c 2 May 2009 17:16:25 -0000 1.3
+++ rpm/ruby/rpmps-rb.c 13 Nov 2010 21:42:47 -0000 1.4
@@ -1,7 +1,9 @@
-/** \ingroup rb_c
- * \file ruby/rpmps-rb.c
+/**
+ * @ingroup rb_c
+ * @file ruby/rpmps-rb.c
*/
+
#include "system.h"
#include "rpm-rb.h"
@@ -12,15 +14,22 @@
#include <mire.h>
#endif
+#define _RPMFI_INTERNAL
+#include <rpmtag.h>
+#include <rpmtypes.h>
+#include <rpmio.h>
+#include <rpmfi.h>
#include <rpmps.h>
#include "../debug.h"
+
VALUE rpmpsClass;
/*...@unchecked@*/
static int _debug = 0;
+
/* --- helpers */
static void *
rpmps_ptr(VALUE s)
@@ .
patch -p0 <<'@@ .'
Index: rpm/ruby/rpmps-rb.h
============================================================================
$ cvs diff -u -r1.1 -r1.2 rpmps-rb.h
--- rpm/ruby/rpmps-rb.h 1 May 2009 16:57:39 -0000 1.1
+++ rpm/ruby/rpmps-rb.h 13 Nov 2010 21:42:47 -0000 1.2
@@ -2,20 +2,26 @@
#define H_RPMPS_RB
/**
- * \file ruby/rpmps-rb.h
+ * @file ruby/rpmps-rb.h
+ * @ingroup rb_c
*/
+
#include "rpm-rb.h"
+
extern VALUE rpmpsClass;
+
#ifdef __cplusplus
extern "C" {
#endif
+
void
Init_rpmps(void);
+
#ifdef __cplusplus
}
#endif
@@ .
patch -p0 <<'@@ .'
Index: rpm/ruby/rpmte-rb.c
============================================================================
$ cvs diff -u -r1.2 -r1.3 rpmte-rb.c
--- rpm/ruby/rpmte-rb.c 2 May 2009 17:16:25 -0000 1.2
+++ rpm/ruby/rpmte-rb.c 13 Nov 2010 21:42:48 -0000 1.3
@@ -12,6 +12,11 @@
#include <mire.h>
#endif
+#define _RPMFI_INTERNAL
+#include <rpmtag.h>
+#include <rpmtypes.h>
+#include <rpmio.h>
+#include <rpmfi.h>
#include <rpmte.h>
#include "../debug.h"
@@ .
patch -p0 <<'@@ .'
Index: rpm/ruby/rpmte-rb.h
============================================================================
$ cvs diff -u -r1.1 -r1.2 rpmte-rb.h
--- rpm/ruby/rpmte-rb.h 1 May 2009 16:57:39 -0000 1.1
+++ rpm/ruby/rpmte-rb.h 13 Nov 2010 21:42:48 -0000 1.2
@@ -2,20 +2,26 @@
#define H_RPMTE_RB
/**
- * \file ruby/rpmte-rb.h
+ * @file ruby/rpmte-rb.h
+ * @ingroup rb_c
*/
-#include "rpm-rb.h"
+
+#include "system.h"
+
extern VALUE rpmteClass;
+
#ifdef __cplusplus
extern "C" {
#endif
+
void
Init_rpmte(void);
+
#ifdef __cplusplus
}
#endif
@@ .
patch -p0 <<'@@ .'
Index: rpm/ruby/rpmts-rb.c
============================================================================
$ cvs diff -u -r1.11 -r1.12 rpmts-rb.c
--- rpm/ruby/rpmts-rb.c 5 Nov 2010 19:04:51 -0000 1.11
+++ rpm/ruby/rpmts-rb.c 13 Nov 2010 21:42:48 -0000 1.12
@@ -17,6 +17,7 @@
#define _RPMTS_INTERNAL
#include <rpmts.h>
#include <rpmbuild.h>
+#include <rpmrc.h>
#include "../debug.h"
@@ -149,7 +150,7 @@
passphrase = RSTRING_PTR(passphrase_v);
}
if(TYPE(cookie_v) != T_NIL) {
- Check_Type(passphrase_v, T_STRING);
+ Check_Type(cookie_v, T_STRING);
cookie = RSTRING_PTR(cookie_v);
}
if(TYPE(recursing_v) == T_TRUE) recursing = 1;
@@ -159,7 +160,7 @@
rpmts ts = rpmts_ptr(obj);
if(parseSpec(ts, RSTRING_PTR(specfile_v), rootURL,
- recursing, passphrase, cookie, anyarch, verify, force) != 0)
+ recursing, passphrase, cookie, anyarch, force, verify) != 0)
return Qnil;
/* Wrap spec struct and set a reference to this ts class */
@@ .
patch -p0 <<'@@ .'
Index: rpm/ruby/rpmts-rb.h
============================================================================
$ cvs diff -u -r1.3 -r1.4 rpmts-rb.h
--- rpm/ruby/rpmts-rb.h 27 Oct 2010 01:01:16 -0000 1.3
+++ rpm/ruby/rpmts-rb.h 13 Nov 2010 21:42:48 -0000 1.4
@@ -2,13 +2,18 @@
#define H_RPMTS_RB
/**
- * \file ruby/rpmts-rb.h
+ * @file ruby/rpmts-rb.h
+ * @ingroup rb_c
+ *
+ * Ruby bindings to the RPM Transaction Set API
*/
-#include "rpm-rb.h"
-/*!
- * \summary TransactionSet class reference variable
+#include "system.h"
+
+
+/**
+ * Consitutes the RPM::Ts class, binding to RPM's TransactionSet API.
*/
extern VALUE rpmtsClass;
@@ -17,11 +22,9 @@
#endif
-/**
- * Interface to RPM's TransactionSet function set.
- */
void Init_rpmts(void);
+
#ifdef __cplusplus
}
#endif
@@ .
patch -p0 <<'@@ .'
Index: rpm/ruby/spec-rb.c
============================================================================
$ cvs diff -u -r1.3 -r1.4 spec-rb.c
--- rpm/ruby/spec-rb.c 8 Nov 2010 01:17:26 -0000 1.3
+++ rpm/ruby/spec-rb.c 13 Nov 2010 21:42:48 -0000 1.4
@@ -18,7 +18,11 @@
#endif
#include <stdio.h>
-#include <rpmdb.h>
+#define _RPMTS_INTERNAL
+#define _RPMFI_INTERNAL
+#include <rpmtag.h>
+#include <rpmtypes.h>
+#include <rpmio.h>
#include <rpmbuild.h>
#include <rpmspec.h>
#include <rpmmacro.h>
@@ -175,7 +179,7 @@
spec_prep(VALUE argc, VALUE *argv, VALUE self)
{
rpmRC error = _spec_build(argc, argv, self, RPMBUILD_PREP);
- if(error) rpm_rb_raise(error, "%%prep failed");
+ if(error) rpm_rb_raise(error, "%prep failed");
return self;
}
@@ -193,7 +197,7 @@
spec_build(VALUE argc, VALUE *argv, VALUE self)
{
rpmRC error = _spec_build(argc, argv, self, RPMBUILD_BUILD);
- if(error) rpm_rb_raise(error, "%%build failed");
+ if(error) rpm_rb_raise(error, "%build failed");
return self;
}
@@ -211,7 +215,7 @@
spec_install(VALUE argc, VALUE *argv, VALUE self)
{
rpmRC error = _spec_build(argc, argv, self, RPMBUILD_INSTALL);
- if(error) rpm_rb_raise(error, "%%install failed");
+ if(error) rpm_rb_raise(error, "%install failed");
return self;
}
@@ -229,7 +233,7 @@
spec_check(VALUE argc, VALUE *argv, VALUE self)
{
rpmRC error = _spec_build(argc, argv, self, RPMBUILD_CHECK);
- if(error) rpm_rb_raise(error, "%%check failed");
+ if(error) rpm_rb_raise(error, "%check failed");
return self;
}
@@ -247,7 +251,7 @@
spec_clean(VALUE argc, VALUE *argv, VALUE self)
{
rpmRC error = _spec_build(argc, argv, self, RPMBUILD_CLEAN);
- if(error) rpm_rb_raise(error, "%%clean failed");
+ if(error) rpm_rb_raise(error, "%clean failed");
return self;
}
@@ .
patch -p0 <<'@@ .'
Index: rpm/ruby/spec-rb.h
============================================================================
$ cvs diff -u -r1.2 -r1.3 spec-rb.h
--- rpm/ruby/spec-rb.h 5 Nov 2010 19:00:46 -0000 1.2
+++ rpm/ruby/spec-rb.h 13 Nov 2010 21:42:48 -0000 1.3
@@ -10,9 +10,12 @@
#include "system.h"
-#include "rpm-rb.h"
#define _RPMTS_INTERNAL
+#define _RPMFI_INTERNAL
+#include <rpmtag.h>
+#include <rpmtypes.h>
+#include <rpmio.h>
#include <rpmspec.h>
@@ .
patch -p0 <<'@@ .'
Index: rpm/ruby/test/unit/test_spec.rb
============================================================================
$ cvs diff -u -r1.1 -r1.2 test_spec.rb
--- rpm/ruby/test/unit/test_spec.rb 9 Nov 2010 18:21:21 -0000 1.1
+++ rpm/ruby/test/unit/test_spec.rb 13 Nov 2010 21:42:48 -0000 1.2
@@ -13,11 +13,6 @@
@spec = @ts.parse_spec(File.expand_path @fixture_path + '/mock.spec')
end
- def test_parse_spec
- s = @ts.parse_spec @fixture_path
- assert s, 'Must return a valid RPM::Spec object'
- end
-
def test_get_sources
src = @spec.sources
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
