date:20090502

[CVS] RPM: rpm/ruby/ rpmds-rb.c rpmds-rb.h rpmfi-rb.c rpmfi-rb.h rpmhd...

2009-05-02 Thread Jeff Johnson

  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:   02-May-2009 11:55:02
  Branch: HEAD Handle: 2009050209550100

  Modified files:
rpm/rubyrpmds-rb.c rpmds-rb.h rpmfi-rb.c rpmfi-rb.h
rpmhdr-rb.c rpmhdr-rb.h rpmmi-rb.c trb.c
rpm/ruby/tscripts   Ds.rb Fi.rb Hdr.rb Mi.rb

  Log:
- ruby: Hdr: add methods to populate Ds/Fi classes.

  Summary:
RevisionChanges Path
1.3 +30 -7  rpm/ruby/rpmds-rb.c
1.2 +4  -1  rpm/ruby/rpmds-rb.h
1.2 +32 -64 rpm/ruby/rpmfi-rb.c
1.2 +4  -1  rpm/ruby/rpmfi-rb.h
1.3 +75 -79 rpm/ruby/rpmhdr-rb.c
1.2 +4  -1  rpm/ruby/rpmhdr-rb.h
1.4 +4  -19 rpm/ruby/rpmmi-rb.c
1.7 +3  -3  rpm/ruby/trb.c
1.3 +1  -1  rpm/ruby/tscripts/Ds.rb
1.2 +1  -1  rpm/ruby/tscripts/Fi.rb
1.3 +41 -37 rpm/ruby/tscripts/Hdr.rb
1.3 +4  -1  rpm/ruby/tscripts/Mi.rb
  

  patch -p0 <<'@@ .'
  Index: rpm/ruby/rpmds-rb.c
  
  $ cvs diff -u -r1.2 -r1.3 rpmds-rb.c
  --- rpm/ruby/rpmds-rb.c   1 May 2009 18:27:10 -   1.2
  +++ rpm/ruby/rpmds-rb.c   2 May 2009 09:55:01 -   1.3
  @@ -238,14 +238,27 @@
   }
   
   static VALUE
  -rpmds_alloc(VALUE klass)
  +rpmds_new(int argc, VALUE *argv, VALUE s)
   {
  -rpmds ds = NULL;
  -int xx = rpmdsRpmlib(&ds, NULL);
  -VALUE obj = Data_Wrap_Struct(klass, 0, rpmds_free, ds);
  +VALUE v_hdr, v_tag;
  +rpmTag tag = RPMTAG_NAME;
  +int flags = 0;
  +rpmds ds;
  +
  +rb_scan_args(argc, argv, "02", &v_hdr, &v_tag);
  +
  +if (!NIL_P(v_tag))
  + tag = FIX2INT(v_tag);
  +
  +if (!NIL_P(v_hdr)) {
  + Header h = rpmds_ptr(v_hdr);
  + ds = rpmdsNew(h, tag, flags);
  +} else
  + (void) rpmdsRpmlib(&ds, NULL);
  +
   if (_debug)
  -fprintf(stderr, "==> %s(0x%lx) obj 0x%lx ds %p\n", __FUNCTION__, klass, obj, 
ds);
  -return obj;
  +fprintf(stderr, "==> %s(%p[%d], 0x%lx) mi %p\n", __FUNCTION__, argv, argc, 
s, ds);
  +return Data_Wrap_Struct(s, 0, rpmds_free, ds);
   }
   
   /* --- Class initialization */
  @@ -256,7 +269,17 @@
   rpmdsClass = rb_define_class("Ds", rb_cObject);
   if (_debug)
   fprintf(stderr, "==> %s() rpmdsClass 0x%lx\n", __FUNCTION__, rpmdsClass);
  -rb_define_alloc_func(rpmdsClass, rpmds_alloc);
  +#ifdef  NOTYET
  +rb_include_module(rpmdsClass, rb_mEnumerable);
  +#endif
  +rb_define_singleton_method(rpmdsClass, "new", rpmds_new, -1);
   initProperties(rpmdsClass);
   initMethods(rpmdsClass);
   }
  +
  +VALUE
  +rpmrb_NewDs(void *_ds)
  +{
  +return Data_Wrap_Struct(rpmdsClass, 0, rpmds_free, _ds);
  +}
  +
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/ruby/rpmds-rb.h
  
  $ cvs diff -u -r1.1 -r1.2 rpmds-rb.h
  --- rpm/ruby/rpmds-rb.h   1 May 2009 16:57:39 -   1.1
  +++ rpm/ruby/rpmds-rb.h   2 May 2009 09:55:01 -   1.2
  @@ -13,9 +13,12 @@
   extern "C" {
   #endif
   
  -void
  +extern void
   Init_rpmds(void);
   
  +extern VALUE
  +rpmrb_NewDs(void *_ds);
  +
   #ifdef __cplusplus  
   }
   #endif
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/ruby/rpmfi-rb.c
  
  $ cvs diff -u -r1.1 -r1.2 rpmfi-rb.c
  --- rpm/ruby/rpmfi-rb.c   1 May 2009 16:57:39 -   1.1
  +++ rpm/ruby/rpmfi-rb.c   2 May 2009 09:55:01 -   1.2
  @@ -13,6 +13,7 @@
   #endif
   
   #include 
  +#include 
   
   #include "../debug.h"
   
  @@ -54,61 +55,11 @@
   return INT2FIX(_debug = FIX2INT(v));
   }
   
  -#ifdef   NOTYET
  -static VALUE
  -rpmfi_rootdir_get(VALUE s)
  -{
  -void *ptr = rpmfi_ptr(s);
  -rpmfi fi = ptr;
  -if (_debug)
  -fprintf(stderr, "==> %s(0x%lx) ptr %p\n", __FUNCTION__, s, ptr);
  -return rb_str_new2(rpmfiRootDir(fi));
  -}
  -
  -static VALUE
  -rpmfi_rootdir_set(VALUE s, VALUE v)
  -{
  -void *ptr = rpmfi_ptr(s);
  -rpmfi fi = ptr;
  -if (_debug)
  -fprintf(stderr, "==> %s(0x%lx, 0x%lx) ptr %p\n", __FUNCTION__, s, v, ptr);
  -rpmfiSetRootDir(fi, StringValueCStr(v));
  -return rb_str_new2(rpmfiRootDir(fi));
  -}
  -
  -static VALUE
  -rpmfi_vsflags_get(VALUE s)
  -{
  -void *ptr = rpmfi_ptr(s);
  -rpmfi fi = ptr;
  -if (_debug)
  -fprintf(stderr, "==> %s(0x%lx) ptr %p\n", __FUNCTION__, s, ptr);
  -return INT2FIX(_debug);
  -}
  -

[CVS] RPM: rpm/ CHANGES configure.ac rpm/lib/ rpmds.c rpmrc.c rpm/ sys...

2009-05-02 Thread Per ï¿½yvind Karlsen

  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Per Ãyvind Karlsen
  Root:   /v/rpm/cvs   Email:  pkarl...@rpm5.org
  Module: rpm  Date:   02-May-2009 15:29:34
  Branch: HEAD Handle: 2009050213293301

  Modified files:
rpm CHANGES configure.ac system.h
rpm/lib rpmds.c rpmrc.c

  Log:
cpuinfo: allow to enable from configure again since it's usable now.
(although still room for improvements...)

  Summary:
RevisionChanges Path
1.2961  +2  -0  rpm/CHANGES
2.371   +5  -5  rpm/configure.ac
2.153   +2  -2  rpm/lib/rpmds.c
2.273   +4  -4  rpm/lib/rpmrc.c
2.116   +0  -9  rpm/system.h
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.2960 -r1.2961 CHANGES
  --- rpm/CHANGES   29 Apr 2009 23:53:32 -  1.2960
  +++ rpm/CHANGES   2 May 2009 13:29:33 -   1.2961
  @@ -1,5 +1,7 @@
   
   5.2a4 -> 5.2b1:
  +- proyvind: cpuinfo: allow to enable from configure again since it's 
usable
  + now. (although still room for improvements...)
   - jbj: ruby: stub-in the minimal necessary AutoFu to attempt ruby 
bindings.
   - jbj: add AutoFu to detect fallocate(2) and posix_fallocate(3).
   - jbj: js: add rpmMCExpand() for per-context macro expansion.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  
  $ cvs diff -u -r2.370 -r2.371 configure.ac
  --- rpm/configure.ac  29 Apr 2009 23:53:32 -  2.370
  +++ rpm/configure.ac  2 May 2009 13:29:33 -   2.371
  @@ -1431,11 +1431,11 @@
   
   # later..
   dnl # CPUInfo
  -#RPM_CHECK_LIB(
  -#[CPUInfo], [cpuinfo],
  -#[cpuinfo], [cpuinfo_new], [cpuinfo.h],
  -#[no,external:none], [],
  -#[AC_MSG_WARN([CPUInfo support is under development])], [])
  +RPM_CHECK_LIB(
  +[CPUInfo], [cpuinfo],
  +[cpuinfo], [cpuinfo_new], [cpuinfo.h],
  +[no,external:none], [],
  +[AC_MSG_WARN([CPUInfo support is under development])], [])
   
   dnl ##
   dnl ##  INSTALLATION PARAMETERS 
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmds.c
  
  $ cvs diff -u -r2.152 -r2.153 rpmds.c
  --- rpm/lib/rpmds.c   17 Apr 2009 16:10:22 -  2.152
  +++ rpm/lib/rpmds.c   2 May 2009 13:29:34 -   2.153
  @@ -3,7 +3,7 @@
*/
   #include "system.h"
   
  -#if defined(SUPPORT_LIBCPUINFO)
  +#if defined(WITH_CPUINFO)
   #include 
   #endif
   
  @@ -1192,7 +1192,7 @@
   ds = NULL;
   }
   
  -#if defined(SUPPORT_LIBCPUINFO)
  +#if defined(WITH_CPUINFO)
   int rpmdsCpuinfo(rpmds *dsp, const char * fn)
   {
   const char * NS = "cpuinfo";
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmrc.c
  
  $ cvs diff -u -r2.272 -r2.273 rpmrc.c
  --- rpm/lib/rpmrc.c   6 Apr 2009 15:26:28 -   2.272
  +++ rpm/lib/rpmrc.c   2 May 2009 13:29:34 -   2.273
  @@ -502,7 +502,7 @@
   }
   /*...@=onlytrans@*/
   
  -#if defined(SUPPORT_LIBCPUINFO)
  +#if defined(WITH_CPUINFO)
   static inline int rpmCpuinfoMatch(const char * feature, const char * EVR, 
rpmds cpuinfo)
   {
   rpmds cpufeature = rpmdsSingle(RPMTAG_REQUIRENAME, feature, EVR, 
RPMSENSE_PROBE);
  @@ -712,7 +712,7 @@
if (cp == NULL || cp[0] == '\0')
cp = _platform;
if (rpmPlatform(cp) == RPMRC_OK) {
  -#elif defined(SUPPORT_LIBCPUINFO)
  +#elif defined(WITH_CPUINFO)
if (rpmPlatform(_platform) == RPMRC_OK || rpmCpuinfo() == RPMRC_OK) {
   #else
if (rpmPlatform(_platform) == RPMRC_OK) {
  @@ -853,7 +853,7 @@
if (name) *name = canon->short_name;
   } else {
if (num) *num = 255;
  -#if defined(SUPPORT_LIBCPUINFO)
  +#if defined(WITH_CPUINFO)
if (name)
{
if(type == ARCH)
  @@ -1202,7 +1202,7 @@
   
xx = rpmdsCpuinfo(&ds, NULL);
if (ds != NULL) {
  -#if defined(SUPPORT_LIBCPUINFO)
  +#if defined(WITH_CPUINFO)
const char * fn = "libcpuinfo";
   #else
const char * fn = (_cpuinfo_path ? _cpuinfo_path : "/proc/cpuinfo");
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/system.h
  
  $ cvs diff -u -r2.115 -r2.116 system.h
  --- rpm/system.h  7 Mar 2009 13:38:09 -   2.115
  +++ rpm/system.h  2 May 2009 13:29:33 -   2.116
  @@ -753,13 +753,4 @@
*/
   #undef   SUPPORT_AR_PAYLOADS
   
  -/**
  - * Permit

[CVS] RPM: rpm/ruby/ rpmds-rb.c rpmfi-rb.c rpmhdr-rb.c rpmmc-rb.c rpmm...

2009-05-02 Thread Jeff Johnson

  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:   02-May-2009 19:16:25
  Branch: HEAD Handle: 2009050217162500

  Modified files:
rpm/rubyrpmds-rb.c rpmfi-rb.c rpmhdr-rb.c rpmmc-rb.c
rpmmi-rb.c rpmps-rb.c rpmte-rb.c rpmts-rb.c trb.c
rpm/ruby/tscripts   Ds.rb Fi.rb Hdr.rb

  Log:
- ruby: Fi: add methods.

  Summary:
RevisionChanges Path
1.4 +29 -43 rpm/ruby/rpmds-rb.c
1.3 +261 -1 rpm/ruby/rpmfi-rb.c
1.4 +1  -1  rpm/ruby/rpmhdr-rb.c
1.3 +1  -1  rpm/ruby/rpmmc-rb.c
1.5 +1  -1  rpm/ruby/rpmmi-rb.c
1.3 +1  -1  rpm/ruby/rpmps-rb.c
1.2 +1  -1  rpm/ruby/rpmte-rb.c
1.9 +1  -1  rpm/ruby/rpmts-rb.c
1.8 +5  -5  rpm/ruby/trb.c
1.4 +2  -2  rpm/ruby/tscripts/Ds.rb
1.3 +48 -0  rpm/ruby/tscripts/Fi.rb
1.4 +3  -1  rpm/ruby/tscripts/Hdr.rb
  

  patch -p0 <<'@@ .'
  Index: rpm/ruby/rpmds-rb.c
  
  $ cvs diff -u -r1.3 -r1.4 rpmds-rb.c
  --- rpm/ruby/rpmds-rb.c   2 May 2009 09:55:01 -   1.3
  +++ rpm/ruby/rpmds-rb.c   2 May 2009 17:16:25 -   1.4
  @@ -19,7 +19,7 @@
   VALUE rpmdsClass;
   
   /*...@unchecked@*/
  -static int _debug = -1;
  +static int _debug = 0;
   
   /* --- helpers */
   static void *
  @@ -57,10 +57,9 @@
   static VALUE
   rpmds_Count_get(VALUE s)
   {
  -void *ptr = rpmds_ptr(s);
  -rpmds ds = ptr;
  +rpmds ds = rpmds_ptr(s);
   if (_debug)
  -fprintf(stderr, "==> %s(0x%lx) ptr %p\n", __FUNCTION__, s, ptr);
  +fprintf(stderr, "==> %s(0x%lx) ptr %p\n", __FUNCTION__, s, ds);
   return INT2FIX(rpmdsCount(ds));
   }
   
  @@ -68,31 +67,28 @@
   static VALUE
   rpmds_Type_get(VALUE s)
   {
  -void *ptr = rpmds_ptr(s);
  -rpmds ds = ptr;
  +rpmds ds = rpmds_ptr(s);
   if (_debug)
  -fprintf(stderr, "==> %s(0x%lx) ptr %p\n", __FUNCTION__, s, ptr);
  +fprintf(stderr, "==> %s(0x%lx) ptr %p\n", __FUNCTION__, s, ds);
   return rb_str_new2(rpmdsType(ds));
   }
   
   static VALUE
   rpmds_Ix_get(VALUE s)
   {
  -void *ptr = rpmds_ptr(s);
  -rpmds ds = ptr;
  +rpmds ds = rpmds_ptr(s);
   if (_debug)
  -fprintf(stderr, "==> %s(0x%lx) ptr %p\n", __FUNCTION__, s, ptr);
  +fprintf(stderr, "==> %s(0x%lx) ptr %p\n", __FUNCTION__, s, ds);
   return INT2FIX(rpmdsIx(ds));
   }
   
   static VALUE
   rpmds_Ix_set(VALUE s, VALUE v)
   {
  -void *ptr = rpmds_ptr(s);
  -rpmds ds = ptr;
  +rpmds ds = rpmds_ptr(s);
   int ix = FIX2INT(v);
   if (_debug)
  -fprintf(stderr, "==> %s(0x%lx) ptr %p\n", __FUNCTION__, s, ptr);
  +fprintf(stderr, "==> %s(0x%lx) ptr %p\n", __FUNCTION__, s, ds);
   if (ix != rpmdsIx(ds)) {
(void) rpmdsSetIx(ds, ix-1);
/* XXX flush and recreate N and DNEVR with a rpmdsNext() step */
  @@ -104,21 +100,19 @@
   static VALUE
   rpmds_BT_get(VALUE s)
   {
  -void *ptr = rpmds_ptr(s);
  -rpmds ds = ptr;
  +rpmds ds = rpmds_ptr(s);
   if (_debug)
  -fprintf(stderr, "==> %s(0x%lx) ptr %p\n", __FUNCTION__, s, ptr);
  +fprintf(stderr, "==> %s(0x%lx) ptr %p\n", __FUNCTION__, s, ds);
   return INT2FIX(rpmdsBT(ds));
   }
   
   static VALUE
   rpmds_BT_set(VALUE s, VALUE v)
   {
  -void *ptr = rpmds_ptr(s);
  -rpmds ds = ptr;
  +rpmds ds = rpmds_ptr(s);
   int BT = FIX2INT(v);
   if (_debug)
  -fprintf(stderr, "==> %s(0x%lx) ptr %p\n", __FUNCTION__, s, ptr);
  +fprintf(stderr, "==> %s(0x%lx) ptr %p\n", __FUNCTION__, s, ds);
   (void) rpmdsSetBT(ds, BT);
   return INT2FIX(rpmdsBT(ds));
   }
  @@ -126,21 +120,19 @@
   static VALUE
   rpmds_Color_get(VALUE s)
   {
  -void *ptr = rpmds_ptr(s);
  -rpmds ds = ptr;
  +rpmds ds = rpmds_ptr(s);
   if (_debug)
  -fprintf(stderr, "==> %s(0x%lx) ptr %p\n", __FUNCTION__, s, ptr);
  +fprintf(stderr, "==> %s(0x%lx) ptr %p\n", __FUNCTION__, s, ds);
   return INT2FIX(rpmdsColor(ds));
   }
   
   static VALUE
   rpmds_Color_set(VALUE s, VALUE v)
   {
  -void *ptr = rpmds_ptr(s);
  -rpmds ds = ptr;
  +rpmds ds = rpmds_ptr(s);
   int color = FIX2INT(v);
   if (_debug)
  -fprintf(stderr, "==> %s(0x%lx) ptr %p\n", __FUNCTION__, s, ptr);
  +fprintf(stderr, "==> %s(0x%lx) ptr %p\n", __FUNCTION__, s, ds);
   (void) rpmdsSetColor(ds, color);
   return INT2FIX(rpmdsColor(ds));
   }
  @@ -148,21 +140,19 @@
   static VALUE
   rpmds_NoPromote_get(VALUE s)
   {
  -void *ptr = rpmds_ptr(s);
  -rpmds ds = ptr;

[CVS] RPM: rpm/js/ rpmfi-js.c rpmhdr-js.c rpmps-js.c rpm/js/tscripts/ ...

2009-05-02 Thread Jeff Johnson

  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:   02-May-2009 20:09:03
  Branch: HEAD Handle: 2009050218090300

  Modified files:
rpm/js  rpmfi-js.c rpmhdr-js.c rpmps-js.c
rpm/js/tscripts Ps.js

  Log:
- js: sanity.

  Summary:
RevisionChanges Path
1.8 +2  -2  rpm/js/rpmfi-js.c
1.12+0  -10 rpm/js/rpmhdr-js.c
1.8 +1  -11 rpm/js/rpmps-js.c
1.5 +2  -2  rpm/js/tscripts/Ps.js
  

  patch -p0 <<'@@ .'
  Index: rpm/js/rpmfi-js.c
  
  $ cvs diff -u -r1.7 -r1.8 rpmfi-js.c
  --- rpm/js/rpmfi-js.c 27 Apr 2009 20:20:11 -  1.7
  +++ rpm/js/rpmfi-js.c 2 May 2009 18:09:03 -   1.8
  @@ -244,7 +244,7 @@
break;
if (myint != rpmfiFX(fi)) {
(void) rpmfiSetFX(fi, myint-1);
  - /* XXX flush and recreate a {BN,DN,FN} with a rpmfiNext() step */
  + /* XXX flush and recreate {BN,DN,FN} with a rpmfiNext() step */
(void) rpmfiNext(fi);
}
ok = JS_TRUE;
  @@ -254,7 +254,7 @@
break;
if (myint != rpmfiDX(fi)) {
(void) rpmfiSetDX(fi, myint-1);
  - /* XXX flush and recreate a {BN,DN,FN} with a rpmfiNext() step */
  + /* XXX flush and recreate {BN,DN,FN} with a rpmfiNextD() step */
(void) rpmfiNextD(fi);
}
ok = JS_TRUE;
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/js/rpmhdr-js.c
  
  $ cvs diff -u -r1.11 -r1.12 rpmhdr-js.c
  --- rpm/js/rpmhdr-js.c29 Apr 2009 20:03:28 -  1.11
  +++ rpm/js/rpmhdr-js.c2 May 2009 18:09:03 -   1.12
  @@ -441,15 +441,6 @@
   }
   
   /* --- Class initialization */
  -#ifdef   HACKERY
  -JSClass rpmhdrClass = {
  -"Hdr", JSCLASS_NEW_RESOLVE | JSCLASS_NEW_ENUMERATE | JSCLASS_HAS_PRIVATE,
  -rpmhdr_addprop,   rpmhdr_delprop, rpmhdr_getprop, rpmhdr_setprop,
  -(JSEnumerateOp)rpmhdr_enumerate, (JSResolveOp)rpmhdr_resolve,
  -rpmhdr_convert,  rpmhdr_dtor,
  -JSCLASS_NO_OPTIONAL_MEMBERS
  -};
  -#else
   JSClass rpmhdrClass = {
   "Hdr", JSCLASS_NEW_RESOLVE | JSCLASS_HAS_PRIVATE,
   rpmhdr_addprop, rpmhdr_delprop, rpmhdr_getprop, rpmhdr_setprop,
  @@ -457,7 +448,6 @@
   rpmhdr_convert,  rpmhdr_dtor,
   JSCLASS_NO_OPTIONAL_MEMBERS
   };
  -#endif
   
   JSObject *
   rpmjs_InitHdrClass(JSContext *cx, JSObject* obj)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/js/rpmps-js.c
  
  $ cvs diff -u -r1.7 -r1.8 rpmps-js.c
  --- rpm/js/rpmps-js.c 28 Apr 2009 15:13:36 -  1.7
  +++ rpm/js/rpmps-js.c 2 May 2009 18:09:03 -   1.8
  @@ -259,7 +259,7 @@
   if (_debug)
   fprintf(stderr, "==> %s(%p,%p) ptr %p\n", __FUNCTION__, cx, obj, ptr);
   
  -(void) rpmpsFree(ps);
  +ps = rpmpsFree(ps);
   }
   
   static JSBool
  @@ -285,15 +285,6 @@
   }
   
   /* --- Class initialization */
  -#ifdef   HACKERY
  -JSClass rpmpsClass = {
  -"Ps", JSCLASS_NEW_RESOLVE | JSCLASS_NEW_ENUMERATE | JSCLASS_HAS_PRIVATE 
| JSCLASS_HAS_CACHED_PROTO(JSProto_Object),
  -rpmps_addprop,   rpmps_delprop, rpmps_getprop, rpmps_setprop,
  -(JSEnumerateOp)rpmps_enumerate, (JSResolveOp)rpmps_resolve,
  -rpmps_convert,   rpmps_dtor,
  -JSCLASS_NO_OPTIONAL_MEMBERS
  -};
  -#else
   JSClass rpmpsClass = {
   "Ps", JSCLASS_NEW_RESOLVE | JSCLASS_HAS_PRIVATE,
   rpmps_addprop,   rpmps_delprop, rpmps_getprop, rpmps_setprop,
  @@ -301,7 +292,6 @@
   rpmps_convert,   rpmps_dtor,
   JSCLASS_NO_OPTIONAL_MEMBERS
   };
  -#endif
   
   JSObject *
   rpmjs_InitPsClass(JSContext *cx, JSObject* obj)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/js/tscripts/Ps.js
  
  $ cvs diff -u -r1.4 -r1.5 Ps.js
  --- rpm/js/tscripts/Ps.js 28 Apr 2009 05:29:54 -  1.4
  +++ rpm/js/tscripts/Ps.js 2 May 2009 18:09:03 -   1.5
  @@ -34,8 +34,8 @@
   var O = "OS";
   
   ack("ps.length", 0);
  -// ack("ps.push(PKG, ALT', KEY, RPMPROB_BADARCH, dn, bn, ui)", undefined);
  -// ack("ps.push(PKG, ALT', KEY, RPMPROB_BADOS, dn, bn, ui)", undefined);
  +// ack("ps.push(PKG, ALT, KEY, RPMPROB_BADARCH, dn, bn, ui)", undefined);
  +// ack("ps.push(PKG, ALT, KEY, RPMPROB_BADOS, dn, bn, ui)", undefined);
   ack("ps.push(PKG, ALT, KEY, RPMPROB_PKG_INSTALLED, dn, bn, ui)", undefined);
   ack("ps.push(PKG, ALT, KEY, RPMPROB_BADRELOC

[CVS] RPM: js/src/ Makefile.in

2009-05-02 Thread Jeff Johnson

  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: js   Date:   02-May-2009 22:01:20
  Branch: HEAD Handle: 2009050220012000

  Removed files:
js/src  Makefile.in

  Log:
- js: get rid of (now generated) Makefile.in.

  Summary:
RevisionChanges Path
1.2 +0  -449js/src/Makefile.in
  

  rm -f js/src/Makefile.in <<'@@ .'
  Index: js/src/Makefile.in
  
  [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: js/src/ .cvsignore Makefile.am rpm/ CHANGES Makefile.am con...

2009-05-02 Thread Jeff Johnson

  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 js   Date:   02-May-2009 22:06:29
  Branch: HEAD Handle: 2009050220062702

  Added files:
js/src  Makefile.am
  Modified files:
js/src  .cvsignore
rpm CHANGES Makefile.am configure.ac
rpm/lib poptALL.c
rpm/miscMakefile.am
rpm/rpmio   librpmio.vers

  Log:
- js: add AutoFu to build --with-js=internal.
- ruby: fix: global interpreter with contained object refcnts needs
early cleanup in rpmcliFini(), not in rpmioClean().

  Summary:
RevisionChanges Path
1.3 +10 -0  js/src/.cvsignore
1.1 +58 -0  js/src/Makefile.am
1.2962  +3  -0  rpm/CHANGES
2.234   +1  -0  rpm/Makefile.am
2.372   +6  -2  rpm/configure.ac
2.129   +5  -1  rpm/lib/poptALL.c
1.48+1  -1  rpm/misc/Makefile.am
2.113   +1  -0  rpm/rpmio/librpmio.vers
  

  patch -p0 <<'@@ .'
  Index: js/src/.cvsignore
  
  $ cvs diff -u -r1.2 -r1.3 .cvsignore
  --- js/src/.cvsignore 22 Apr 2009 20:24:04 -  1.2
  +++ js/src/.cvsignore 2 May 2009 20:06:29 -   1.3
  @@ -1,10 +1,20 @@
  +.deps
  +.libs
  +*.o
  +*.la
  +*.lo
  +*.loT
   *.pdb
   *.ncb
   *.opt
   *.plg
   Debug
   Release
  +Makefile.in
   Makefile
   jscpucfg
   jsautocfg.h
  +jskwgen
  +jsautokw.h
  +js
   Linux_All_DBG.OBJ
  @@ .
  patch -p0 <<'@@ .'
  Index: js/src/Makefile.am
  
  $ cvs diff -u -r0 -r1.1 Makefile.am
  --- /dev/null 2009-05-02 22:04:30 +0200
  +++ Makefile.am   2009-05-02 22:06:29 +0200
  @@ -0,0 +1,58 @@
  +# Makefile for rpm/js/src
  +
  +AUTOMAKE_OPTIONS = 1.4 foreign
  +
  +LINT = splint
  +
  +AM_CPPFLAGS = -I.  -I$(top_srcdir) 
  +
  +EXTRA_DIST = \
  +jsopcode.tbl jsproto.tbl \
  +js.msg jsshell.msg
  +
  +EXTRA_PROGRAMS =
  +
  +noinst_PROGRAMS =jscpucfg jskwgen js
  +noinst_LTLIBRARIES = libjs.la
  +noinst_HEADERS = \
  + jsapi.h jsdbgapi.h \
  + jsarray.h jsatom.h jsbool.h jsconfig.h jscntxt.h jsdate.h \
  + jsemit.h jsexn.h jsfun.h jsgc.h jsinterp.h jsiter.h \
  + jslibmath.h jslock.h jsmath.h jsnum.h jsobj.h json.h \
  + jsopcode.h jsparse.h jsarena.h jsclist.h jsdhash.h jsdtoa.h \
  + jshash.h jslong.h jstypes.h jsprvtd.h jspubtd.h jsregexp.h \
  + jsscan.h jsscope.h jsscript.h jsstr.h jsutil.h jsxdrapi.h \
  + jsxml.h \
  +jsbit.h jscompat.h jscpucfg.h jsotypes.h jsstddef.h \
  +prmjtime.h resource.h jsautocfg.h jsautokw.h \
  + jsfile.h
  +
  +libjs_la_SOURCES = \
  + jsapi.c jsarena.c jsarray.c jsatom.c jsbool.c jscntxt.c \
  + jsdate.c jsdbgapi.c jsdhash.c jsdtoa.c jsemit.c jsexn.c \
  + jsfun.c jsgc.c jshash.c jsinterp.c jsinvoke.c jsiter.c \
  + jslock.c jslog2.c jslong.c jsmath.c jsnum.c jsobj.c json.c \
  + jsopcode.c jsparse.c jsprf.c jsregexp.c jsscan.c jsscope.c \
  + jsscript.c jsstr.c jsutil.c jsxdrapi.c jsxml.c \
  + prmjtime.c \
  + jsfile.c
  +libjs_la_CFLAGS = -DXP_UNIX
  +
  +jscpucfg_SOURCES = jscpucfg.c
  +
  +jskwgen_SOURCES  = jskwgen.c jskeyword.tbl
  +
  +jsautocfg.h: ./jscpucfg
  + rm -f $@
  + ./jscpucfg > $@
  +
  +jsautokw.h: ./jskwgen
  + ./jskwgen $@
  +
  +js_SOURCES = js.c
  +js_CFLAGS =  -DXP_UNIX
  +js_LDADD =   libjs.la
  +
  +.PHONY:  lint
  +lint:
  + $(LINT) $(DEFS) $(INCLUDES) $(libjs_la_SOURCES)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.2961 -r1.2962 CHANGES
  --- rpm/CHANGES   2 May 2009 13:29:33 -   1.2961
  +++ rpm/CHANGES   2 May 2009 20:06:27 -   1.2962
  @@ -1,5 +1,8 @@
   
   5.2a4 -> 5.2b1:
  +- jbj: js: add AutoFu to build --with-js=internal.
  +- jbj: ruby: fix: global interpreter with contained object refcnts needs
  + early cleanup in rpmcliFini(), not in rpmioClean().
   - proyvind: cpuinfo: allow to enable from configure again since it's 
usable
now. (although still room for improvements...)
   - jbj: ruby: stub-in the minimal necessary AutoFu to attempt ruby 
bindings.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/Makefile.am
  
  $ cvs diff -u -r2.233 -r2.234 Makefile.am
  --- rpm/Makefile.am   29 Apr 2009 23:53:32 -  2.233
  +++ rpm/

[CVS] RPM: rpm/ devtool.conf

2009-05-02 Thread Jeff Johnson

  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:   02-May-2009 22:46:26
  Branch: HEAD Handle: 2009050220462600

  Modified files:
rpm devtool.conf

  Log:
- devtool: automate checking out spidermonkey into js/src.

  Summary:
RevisionChanges Path
2.293   +3  -2  rpm/devtool.conf
  

  patch -p0 <<'@@ .'
  Index: rpm/devtool.conf
  
  $ cvs diff -u -r2.292 -r2.293 devtool.conf
  --- rpm/devtool.conf  29 Apr 2009 23:53:32 -  2.292
  +++ rpm/devtool.conf  2 May 2009 20:46:26 -   2.293
  @@ -3,7 +3,7 @@
   ##
   
   %common
  -MODULE_NAMES="db lua file xar xz pcre syck"
  +MODULE_NAMES="db lua file xar xz pcre syck js/src"
   MODULE_TAG_DB=""
   MODULE_TAG_LUA=""
   MODULE_TAG_FILE=""
  @@ -11,10 +11,11 @@
   MODULE_TAG_XZ=""
   MODULE_TAG_PCRE=""
   MODULE_TAG_SYCK=""
  +MODULE_TAG_JS_SRC=""
   
   %checkout
   for name in $MODULE_NAMES "$@"; do
  -release=MODULE_TAG_`echo ${name} | tr '[a-z]' '[A-Z]'`
  +release=MODULE_TAG_`echo ${name} | tr '[a-z/]' '[A-Z_]'`
   release=`eval echo \\$${release}`
   if [ ".${release}" = . ]; then
   if [ -d ${DEVTOOL_SRCDIR}/${name}/CVS ]; then
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ CHANGES rpm/build/ files.c

2009-05-02 Thread Per ï¿½yvind Karlsen

  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Per Ãyvind Karlsen
  Root:   /v/rpm/cvs   Email:  pkarl...@rpm5.org
  Module: rpm  Date:   03-May-2009 00:56:33
  Branch: HEAD Handle: 2009050222563201

  Modified files:
rpm CHANGES
rpm/build   files.c

  Log:
add %{disttag} to source package header.

  Summary:
RevisionChanges Path
1.2963  +1  -0  rpm/CHANGES
1.355   +1  -0  rpm/build/files.c
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.2962 -r1.2963 CHANGES
  --- rpm/CHANGES   2 May 2009 20:06:27 -   1.2962
  +++ rpm/CHANGES   2 May 2009 22:56:32 -   1.2963
  @@ -1,5 +1,6 @@
   
   5.2a4 -> 5.2b1:
  +- proyvind: add %{disttag} to source package header.
   - jbj: js: add AutoFu to build --with-js=internal.
   - jbj: ruby: fix: global interpreter with contained object refcnts needs
early cleanup in rpmcliFini(), not in rpmioClean().
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/build/files.c
  
  $ cvs diff -u -r1.354 -r1.355 files.c
  --- rpm/build/files.c 18 Mar 2009 15:25:45 -  1.354
  +++ rpm/build/files.c 2 May 2009 22:56:33 -   1.355
  @@ -2543,6 +2543,7 @@
case RPMTAG_DESCRIPTION:
case RPMTAG_PACKAGER:
case RPMTAG_DISTRIBUTION:
  + case RPMTAG_DISTTAG:
case RPMTAG_DISTURL:
case RPMTAG_VENDOR:
case RPMTAG_LICENSE:
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ruby/ rpmds-rb.c rpmds-rb.h rpmfi-rb.c rpmfi-rb.h rpmhd...

[CVS] RPM: rpm/ CHANGES configure.ac rpm/lib/ rpmds.c rpmrc.c rpm/ sys...

[CVS] RPM: rpm/ruby/ rpmds-rb.c rpmfi-rb.c rpmhdr-rb.c rpmmc-rb.c rpmm...

[CVS] RPM: rpm/js/ rpmfi-js.c rpmhdr-js.c rpmps-js.c rpm/js/tscripts/ ...

[CVS] RPM: js/src/ Makefile.in

[CVS] RPM: js/src/ .cvsignore Makefile.am rpm/ CHANGES Makefile.am con...

[CVS] RPM: rpm/ devtool.conf

[CVS] RPM: rpm/ CHANGES rpm/build/ files.c

8 matches

Site Navigation

Mail list logo

Footer information