RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 13-Apr-2009 18:32:43
Branch: HEAD Handle: 2009041316324201
Modified files:
rpm CHANGES configure.ac devtool.conf
rpm/rpmio macro.c poptIO.c rpmio.c rpmruby.c
Log:
save --with-ruby for bindings, use rubyembed for embedded
Summary:
Revision Changes Path
1.2920 +1 -0 rpm/CHANGES
2.359 +1 -1 rpm/configure.ac
2.285 +1 -1 rpm/devtool.conf
2.222 +2 -2 rpm/rpmio/macro.c
1.42 +1 -1 rpm/rpmio/poptIO.c
1.187 +2 -2 rpm/rpmio/rpmio.c
2.5 +5 -5 rpm/rpmio/rpmruby.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2919 -r1.2920 CHANGES
--- rpm/CHANGES 12 Apr 2009 22:28:48 -0000 1.2919
+++ rpm/CHANGES 13 Apr 2009 16:32:42 -0000 1.2920
@@ -1,5 +1,6 @@
5.2a3 -> 5.2a4:
+ - afb: rename --with-ruby to --with-rubyembed, to match Perl/Python.
- jbj: perl: attach stdout to macro expansion buffer with IO::String.
- rse: use new POPT 1.15 from devtool environment
- jbj: tcl: attach rpmtclIO to macro expansion buffer with
Tcl_StackChannel.
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
============================================================================
$ cvs diff -u -r2.358 -r2.359 configure.ac
--- rpm/configure.ac 8 Apr 2009 17:31:55 -0000 2.358
+++ rpm/configure.ac 13 Apr 2009 16:32:42 -0000 2.359
@@ -1258,7 +1258,7 @@
dnl # Ruby embedding
RPM_CHECK_LIB(
- [Ruby embedding], [ruby],
+ [Ruby embedding], [rubyembed],
[ruby], [ruby_init], [ruby.h],
[no,external:none], [],
[
@@ .
patch -p0 <<'@@ .'
Index: rpm/devtool.conf
============================================================================
$ cvs diff -u -r2.284 -r2.285 devtool.conf
--- rpm/devtool.conf 13 Apr 2009 16:05:55 -0000 2.284
+++ rpm/devtool.conf 13 Apr 2009 16:32:42 -0000 2.285
@@ -96,7 +96,7 @@
--with-pythonembed=/usr/lib:/usr/include/python \
--with-perl \
--with-perlembed=/usr/lib/perl5/5.10.0/i386-linux-thread-multi/CORE \
- --with-ruby=/usr/lib:/usr/lib/ruby/1.8/1386-linux \
+ --with-rubyembed=/usr/lib:/usr/lib/ruby/1.8/1386-linux \
--with-build-extlibdep \
--with-build-maxextlibdep \
--enable-build-pic \
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/macro.c
============================================================================
$ cvs diff -u -r2.221 -r2.222 macro.c
--- rpm/rpmio/macro.c 12 Apr 2009 02:24:40 -0000 2.221
+++ rpm/rpmio/macro.c 13 Apr 2009 16:32:43 -0000 2.222
@@ -78,7 +78,7 @@
#include <rpmpython.h>
#endif
-#ifdef WITH_RUBY
+#ifdef WITH_RUBYEMBED
#include <rpmruby.h>
#endif
@@ -1787,7 +1787,7 @@
}
#endif
-#ifdef WITH_RUBY
+#ifdef WITH_RUBYEMBED
if (STREQ("ruby", f, fn)) {
rpmruby ruby = rpmrubyNew(NULL, 0);
const char *ls = s+sizeof("{ruby:")-1;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/poptIO.c
============================================================================
$ cvs diff -u -r1.41 -r1.42 poptIO.c
--- rpm/rpmio/poptIO.c 8 Apr 2009 17:31:56 -0000 1.41
+++ rpm/rpmio/poptIO.c 13 Apr 2009 16:32:43 -0000 1.42
@@ -429,7 +429,7 @@
{ "rpmpythondebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN,
&_rpmpython_debug, -1,
N_("Debug embedded Python interpreter"), NULL},
#endif
-#ifdef WITH_RUBY
+#ifdef WITH_RUBYEMBED
{ "rpmrubydebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN,
&_rpmruby_debug, -1,
N_("Debug embedded Ruby interpreter"), NULL},
#endif
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmio.c
============================================================================
$ cvs diff -u -r1.186 -r1.187 rpmio.c
--- rpm/rpmio/rpmio.c 10 Apr 2009 13:17:01 -0000 1.186
+++ rpm/rpmio/rpmio.c 13 Apr 2009 16:32:43 -0000 1.187
@@ -3140,7 +3140,7 @@
#if defined(WITH_PYTHONEMBED)
extern rpmioPool _rpmpythonPool;
#endif
-#if defined(WITH_RUBY)
+#if defined(WITH_RUBYEMBED)
extern rpmioPool _rpmrubyPool;
#endif
/*...@=nestedextern@*/
@@ -3159,7 +3159,7 @@
#endif
urlFreeCache();
-#if defined(WITH_RUBY)
+#if defined(WITH_RUBYEMBED)
_rpmrubyPool = rpmioFreePool(_rpmrubyPool);
#endif
#if defined(WITH_PYTHONEMBED)
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmruby.c
============================================================================
$ cvs diff -u -r2.4 -r2.5 rpmruby.c
--- rpm/rpmio/rpmruby.c 12 Apr 2009 22:28:49 -0000 2.4
+++ rpm/rpmio/rpmruby.c 13 Apr 2009 16:32:43 -0000 2.5
@@ -10,7 +10,7 @@
#undef PACKAGE_STRING
#undef PACKAGE_BUGREPORT
-#if defined(WITH_RUBY)
+#if defined(WITH_RUBYEMBED)
#include <ruby.h>
#endif
@@ -30,7 +30,7 @@
ruby->fn = _free(ruby->fn);
ruby->flags = 0;
-#if defined(WITH_RUBY)
+#if defined(WITH_RUBYEMBED)
ruby_finalize();
ruby_cleanup(0);
#endif
@@ -68,7 +68,7 @@
ruby->fn = strdup(fn);
ruby->flags = flags;
-#if defined(WITH_RUBY)
+#if defined(WITH_RUBYEMBED)
ruby_init();
ruby_init_loadpath();
ruby_script("rpmruby");
@@ -87,7 +87,7 @@
fprintf(stderr, "==> %s(%p,%s)\n", __FUNCTION__, ruby, fn);
if (fn != NULL) {
-#if defined(WITH_RUBY)
+#if defined(WITH_RUBYEMBED)
rb_load_file(fn);
ruby->state = ruby_exec();
if (resultp != NULL)
@@ -106,7 +106,7 @@
fprintf(stderr, "==> %s(%p,%s,%p)\n", __FUNCTION__, ruby, str, resultp);
if (str != NULL) {
-#if defined(WITH_RUBY)
+#if defined(WITH_RUBYEMBED)
ruby->state = rb_eval_string(str);
if (resultp != NULL)
*resultp = RSTRING_PTR(rb_gv_get("$result"));
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
