[CVS] RPM: rpm/ CHANGES configure.ac devtool.conf rpm/rpmio/ .cvsignor...
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 08-Apr-2009 19:31:56 Branch: HEAD Handle: 2009040817315501 Added files: rpm/rpmio rpmruby.c rpmruby.h truby.c Modified files: rpm CHANGES configure.ac devtool.conf rpm/rpmio .cvsignore Makefile.am librpmio.vers poptIO.c rpmio.c Log: - ruby: add --with-ruby for embedding ruby. Summary: RevisionChanges Path 1.2910 +1 -0 rpm/CHANGES 2.358 +8 -0 rpm/configure.ac 2.278 +1 -0 rpm/devtool.conf 1.37+1 -0 rpm/rpmio/.cvsignore 1.222 +9 -6 rpm/rpmio/Makefile.am 2.107 +4 -0 rpm/rpmio/librpmio.vers 1.41+6 -0 rpm/rpmio/poptIO.c 1.185 +4 -0 rpm/rpmio/rpmio.c 2.1 +108 -0 rpm/rpmio/rpmruby.c 2.1 +103 -0 rpm/rpmio/rpmruby.h 2.1 +54 -0 rpm/rpmio/truby.c patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.2909 -r1.2910 CHANGES --- rpm/CHANGES 8 Apr 2009 06:09:58 - 1.2909 +++ rpm/CHANGES 8 Apr 2009 17:31:55 - 1.2910 @@ -1,5 +1,6 @@ 5.2a3 -> 5.2a4: +- jbj: ruby: add --with-ruby for embedding ruby. - jbj: yarn: convert rpmluav to usage mutex with refcounts - jbj: yarn: convert rpmlua to usage mutex with refcounts - jbj: python: wire-up %post -p . arg1/arg2, persistent interp, todo++. @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.357 -r2.358 configure.ac --- rpm/configure.ac 7 Apr 2009 22:57:47 - 2.357 +++ rpm/configure.ac 8 Apr 2009 17:31:55 - 2.358 @@ -1256,6 +1256,14 @@ [ ], []) +dnl # Ruby embedding +RPM_CHECK_LIB( +[Ruby embedding], [ruby], +[ruby], [ruby_init], [ruby.h], +[no,external:none], [], +[ +], []) + dnl # Tcl RPM_CHECK_LIB( [Tcl], [tcl], @@ . patch -p0 <<'@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.277 -r2.278 devtool.conf --- rpm/devtool.conf 7 Apr 2009 22:57:47 - 2.277 +++ rpm/devtool.conf 8 Apr 2009 17:31:55 - 2.278 @@ -96,6 +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-build-extlibdep \ --with-build-maxextlibdep \ --enable-build-pic \ @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/.cvsignore $ cvs diff -u -r1.36 -r1.37 .cvsignore --- rpm/rpmio/.cvsignore 7 Apr 2009 22:57:48 - 1.36 +++ rpm/rpmio/.cvsignore 8 Apr 2009 17:31:56 - 1.37 @@ -48,5 +48,6 @@ tpython tring trpmio +truby tsw ttcl @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/Makefile.am $ cvs diff -u -r1.221 -r1.222 Makefile.am --- rpm/rpmio/Makefile.am 7 Apr 2009 22:57:48 - 1.221 +++ rpm/rpmio/Makefile.am 8 Apr 2009 17:31:56 - 1.222 @@ -18,7 +18,7 @@ rpmgenbasedir rpmgenpkglist rpmgensrclist rpmgpg \ rpmpbzip2 rpmpigz rpmtar rpmz \ tdir tfts tget tglob thkp thtml tinv tkey tmacro tmagic tmire \ - tperl tpython tput tpw trpmio tsw ttcl dumpasn1 lookup3 + tperl tpython tput tpw trpmio truby tsw ttcl dumpasn1 lookup3 bin_PROGRAMS = man_MANS = @@ -66,9 +66,9 @@ salsa10.h salsa20.h tiger.h \ poptIO.h rpmbc.h rpmbz.h rpmdav.h \ rpmgc.h rpmhash.h rpmhook.h rpmio_internal.h rpmkeyring.h rpmku.h \ - rpmlua.h rpmmg.h rpmnss.h rpmperl.h rpmpython.h rpmsq.h rpmssl.h \ - rpmio-stub.h rpmtcl.h rpmurl.h rpmuuid.h rpmxar.h rpmz.h rpmzq.h \ - tar.h ugid.h + rpmlua.h rpmmg.h rpmnss.h rpmperl.h rpmpython.h rpmruby.h rpmsq.h \ + rpmssl.h rpmtcl.h rpmurl.h rpmuuid.h rpmxar.h rpmz.h rpmzq.h \ + tar.h ugid.h rpmio-stub.h usrlibdir = $(libdir) usrlib_LTLIBRARIES = librpmio.la @@ -80,8 +80,8 @@ salsa10.c salsa20.c tiger.c \ rpmbc.c rpmdav.c rpmgc.c rpmhash.c rpmhook.c rpmio.c rpmiob.c
[CVS] RPM: rpm/ CHANGES rpm/build/ parseScript.c rpm/lib/ psm.c rpmds....
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 08-Apr-2009 20:13:05 Branch: HEAD Handle: 2009040818130401 Modified files: rpm CHANGES rpm/build parseScript.c rpm/lib psm.c rpmds.c rpm/rpmio macro.c Log: - ruby: wire-up %post -p . arg1/arg2, persistent interp, todo++. - ruby: wire-up %{ruby:...}. the string result is bogus, todo++. Summary: RevisionChanges Path 1.2911 +2 -0 rpm/CHANGES 2.70+6 -0 rpm/build/parseScript.c 2.358 +16 -3 rpm/lib/psm.c 2.147 +5 -0 rpm/lib/rpmds.c 2.220 +38 -1 rpm/rpmio/macro.c patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.2910 -r1.2911 CHANGES --- rpm/CHANGES 8 Apr 2009 17:31:55 - 1.2910 +++ rpm/CHANGES 8 Apr 2009 18:13:04 - 1.2911 @@ -1,5 +1,7 @@ 5.2a3 -> 5.2a4: +- jbj: ruby: wire-up %post -p . arg1/arg2, persistent interp, todo++. +- jbj: ruby: wire-up %{ruby:...}. the string result is bogus, todo++. - jbj: ruby: add --with-ruby for embedding ruby. - jbj: yarn: convert rpmluav to usage mutex with refcounts - jbj: yarn: convert rpmlua to usage mutex with refcounts @@ . patch -p0 <<'@@ .' Index: rpm/build/parseScript.c $ cvs diff -u -r2.69 -r2.70 parseScript.c --- rpm/build/parseScript.c 7 Apr 2009 23:32:59 - 2.69 +++ rpm/build/parseScript.c 8 Apr 2009 18:13:04 - 2.70 @@ -325,6 +325,12 @@ "BuiltinPythonScripts", "5.2-1"); } else #endif +#ifdef WITH_RUBY +if (!strcmp(progArgv[0], "")) { + (void) rpmlibNeedsFeature(pkg->header, + "BuiltinRubyScripts", "5.2-1"); +} else +#endif #ifdef WITH_TCL if (!strcmp(progArgv[0], "")) { (void) rpmlibNeedsFeature(pkg->header, @@ . patch -p0 <<'@@ .' Index: rpm/lib/psm.c $ cvs diff -u -r2.357 -r2.358 psm.c --- rpm/lib/psm.c 7 Apr 2009 23:32:59 - 2.357 +++ rpm/lib/psm.c 8 Apr 2009 18:13:05 - 2.358 @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -557,7 +558,7 @@ } #endif /* WITH_LUA */ -#if defined(WITH_LUA) || defined(WITH_TCL) || defined(WITH_PERL) +#if defined(WITH_LUA) || defined(WITH_TCL) || defined(WITH_PERLEMBED) || defined(WITH_PYTHONEMBED) || defined(WITH_RUBY) static int enterChroot(rpmpsm psm, int * fdnop) /*...@globals fileSystem, internalState @*/ /*...@modifies *fdnop, fileSystem, internalState @*/ @@ -667,6 +668,17 @@ python = rpmpythonFree(python); } else #endif +#if defined(WITH_RUBY) +if (!strcmp(Phe->p.argv[0], "")) { + rpmruby ruby = rpmrubyNew(NULL, 0); + /* XXX TODO: wire up arg1 and arg2, handle other args too. */ + if (rpmrubyRun(ruby, script, NULL) == RPMRC_OK) + rc = RPMRC_OK; + else + rc = RPMRC_FAIL; + ruby = rpmrubyFree(ruby); +} else +#endif #if defined(WITH_TCL) if (!strcmp(Phe->p.argv[0], "")) { rpmtcl tcl = rpmtclNew(NULL, 0); @@ -690,7 +702,7 @@ return rc; } -#endif /* defined(WITH_LUA) || defined(WITH_TCL) */ +#endif /** */ @@ -767,9 +779,10 @@ if (!strcmp(Phe->p.argv[0], "") || !strcmp(Phe->p.argv[0], "") || !strcmp(Phe->p.argv[0], "") + || !strcmp(Phe->p.argv[0], "") || !strcmp(Phe->p.argv[0], "")) { -#if defined(WITH_LUA) || defined(WITH_TCL) || defined(WITH_PERLEMBED) || defined(WITH_PYTHONEMBED) +#if defined(WITH_LUA) || defined(WITH_TCL) || defined(WITH_PERLEMBED) || defined(WITH_PYTHONEMBED) || defined(WITH_RUBY) rpmlog(RPMLOG_DEBUG, D_("%s: %s(%s) running %s scriptlet.\n"), psm->stepName, tag2sln(psm->scriptTag), NVRA, Phe->p.argv[0]); @@ . patch -p0 <<'@@ .' Index: rpm/lib/rpmds.c $ cvs diff -u -r2.146 -r2.147 rpmds.c --- rpm/lib/rpmds.c 7 Apr 2009 23:32:59 - 2.146 +++ rpm/lib/rpmds.c 8 Apr 2009 18:13:05 - 2.147 @@ -1484,6 +1484,11 @@ (RPMSENSE_EQUAL),
[CVS] RPM: rpm/rpmio/ rpmperl.c rpmperl.h rpmpython.h rpmruby.c
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: 08-Apr-2009 21:55:57 Branch: HEAD Handle: 2009040819555700 Modified files: rpm/rpmio rpmperl.c rpmperl.h rpmpython.h rpmruby.c Log: fix build without embedded perl/python/ruby Summary: RevisionChanges Path 2.2 +2 -2 rpm/rpmio/rpmperl.c 2.2 +3 -1 rpm/rpmio/rpmperl.h 2.2 +2 -0 rpm/rpmio/rpmpython.h 2.2 +4 -0 rpm/rpmio/rpmruby.c patch -p0 <<'@@ .' Index: rpm/rpmio/rpmperl.c $ cvs diff -u -r2.1 -r2.2 rpmperl.c --- rpm/rpmio/rpmperl.c 7 Apr 2009 17:17:21 - 2.1 +++ rpm/rpmio/rpmperl.c 8 Apr 2009 19:55:57 - 2.2 @@ -7,7 +7,7 @@ #include "debug.h" -#define my_perl (perl->I) +#define my_perl ((PerlInterpreter *)perl->I) /*...@unchecked@*/ int _rpmperl_debug = 0; @@ -26,7 +26,7 @@ perl_destruct(my_perl); perl_free(my_perl); #endif -my_perl = NULL; +perl->I = NULL; } /*...@unchecked@*/ /*...@only@*/ /*...@null@*/ @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmperl.h $ cvs diff -u -r2.1 -r2.2 rpmperl.h --- rpm/rpmio/rpmperl.h 7 Apr 2009 17:17:21 - 2.1 +++ rpm/rpmio/rpmperl.h 8 Apr 2009 19:55:57 - 2.2 @@ -14,14 +14,16 @@ extern int _rpmperl_debug; #if defined(_RPMPERL_INTERNAL) +#if defined(WITH_PERLEMBED) #include #include +#endif struct rpmperl_s { struct rpmioItem_s _item;/*!< usage mutex and pool identifier. */ const char * fn; int flags; -PerlInterpreter * I; +void * I; }; #endif /* _RPMPERL_INTERNAL */ @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmpython.h $ cvs diff -u -r2.1 -r2.2 rpmpython.h --- rpm/rpmio/rpmpython.h 7 Apr 2009 22:57:48 - 2.1 +++ rpm/rpmio/rpmpython.h 8 Apr 2009 19:55:57 - 2.2 @@ -14,7 +14,9 @@ extern int _rpmpython_debug; #if defined(_RPMPYTHON_INTERNAL) +#if defined(WITH_PYTHONEMBED) #include +#endif struct rpmpython_s { struct rpmioItem_s _item;/*!< usage mutex and pool identifier. */ @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmruby.c $ cvs diff -u -r2.1 -r2.2 rpmruby.c --- rpm/rpmio/rpmruby.c 8 Apr 2009 17:31:56 - 2.1 +++ rpm/rpmio/rpmruby.c 8 Apr 2009 19:55:57 - 2.2 @@ -1,3 +1,5 @@ +#include "system.h" + /* XXX grrr, ruby.h includes its own config.h too. */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -8,7 +10,9 @@ #undef PACKAGE_STRING #undef PACKAGE_BUGREPORT +#if defined(WITH_RUBY) #include +#endif #define _RPMRUBY_INTERNAL #include "rpmruby.h" @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
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: 08-Apr-2009 21:56:55 Branch: HEAD Handle: 2009040819565500 Modified files: rpm devtool.conf Log: macosx: enable embedded tcl scriptlets Summary: RevisionChanges Path 2.279 +1 -0 rpm/devtool.conf patch -p0 <<'@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.278 -r2.279 devtool.conf --- rpm/devtool.conf 8 Apr 2009 17:31:55 - 2.278 +++ rpm/devtool.conf 8 Apr 2009 19:56:55 - 2.279 @@ -1686,6 +1686,7 @@ --with-dbapi=db \ --with-bugreport="a...@rpm5.org" \ --with-db=internal \ +--with-tcl=external \ --with-lua=internal \ --with-syck=internal \ --with-zlib=external \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org