RPM Package Manager, CVS Repository
  /cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
  Module: rpm                              Date:   13-Sep-2010 00:19:57
  Branch: HEAD                             Handle: 2010091222195502

  Modified files:
    rpm                     CHANGES
    rpm/build               parseScript.c
    rpm/lib                 psm.c rpmds.c
    rpm/rpmio               macro.c rpmjs.c

  Log:
    - gpsee: replace WITH_JS everwhere with WITH_GPSEE. GPSEE->JS always.

  Summary:
    Revision    Changes     Path
    1.3442      +1  -0      rpm/CHANGES
    2.80        +1  -1      rpm/build/parseScript.c
    2.398       +2  -2      rpm/lib/psm.c
    2.169       +1  -1      rpm/lib/rpmds.c
    2.249       +3  -3      rpm/rpmio/macro.c
    1.36        +3  -14     rpm/rpmio/rpmjs.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.3441 -r1.3442 CHANGES
  --- rpm/CHANGES	12 Sep 2010 21:26:47 -0000	1.3441
  +++ rpm/CHANGES	12 Sep 2010 22:19:55 -0000	1.3442
  @@ -1,4 +1,5 @@
   5.3.3 -> 5.4a1:
  +    - jbj: gpsee: replace WITH_JS everwhere with WITH_GPSEE. GPSEE->JS always.
       - jbj: rpmjs: resecusitate sufficiently to use with jx/ngsr.c. more todo++.
       - eveith: Fix ruby include paths
       - rpm.org: git-v1:339f31face44d877c3a6e2fc780e740e7e236eae.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/build/parseScript.c
  ============================================================================
  $ cvs diff -u -r2.79 -r2.80 parseScript.c
  --- rpm/build/parseScript.c	12 Apr 2010 21:22:24 -0000	2.79
  +++ rpm/build/parseScript.c	12 Sep 2010 22:19:56 -0000	2.80
  @@ -328,7 +328,7 @@
   				  "BuiltinFiclScripts", "5.2-1");
       } else
   #endif
  -#ifdef WITH_JS
  +#ifdef WITH_GPSEE
       if (!strcmp(progArgv[0], "<js>")) {
   	(void) rpmlibNeedsFeature(pkg->header,
   				  "BuiltinJavaScript", "5.2-1");
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/psm.c
  ============================================================================
  $ cvs diff -u -r2.397 -r2.398 psm.c
  --- rpm/lib/psm.c	8 May 2010 14:58:22 -0000	2.397
  +++ rpm/lib/psm.c	12 Sep 2010 22:19:56 -0000	2.398
  @@ -25,7 +25,7 @@
   #include <rpmsquirrel.h>
   #include <rpmtcl.h>
   
  -#if defined(WITH_LUA) || defined(WITH_AUGEAS) || defined(WITH_FICL) || defined(WITH_JS) || defined(WITH_PERLEMBED) || defined(WITH_PYTHONEMBED) || defined(WITH_RUBYEMBED) || defined(WITH_SEMANAGE) || defined(WITH_SQLITE) || defined(WITH_SQUIRREL) || defined(WITH_TCL)
  +#if defined(WITH_LUA) || defined(WITH_AUGEAS) || defined(WITH_FICL) || defined(WITH_GPSEE) || defined(WITH_PERLEMBED) || defined(WITH_PYTHONEMBED) || defined(WITH_RUBYEMBED) || defined(WITH_SEMANAGE) || defined(WITH_SQLITE) || defined(WITH_SQUIRREL) || defined(WITH_TCL)
   #define	_WITH_EMBEDDED
   #else
   #undef _WITH_ENBEDDED
  @@ -641,7 +641,7 @@
   	ficl = rpmficlFree(ficl);
       } else
   #endif
  -#if defined(WITH_JS)
  +#if defined(WITH_GPSEE)
       if (!strcmp(Phe->p.argv[0], "<js>")) {
   	rpmjs js = rpmjsNew((char **)av, 0);
   	rc = rpmjsRun(js, script, NULL) == RPMRC_OK
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmds.c
  ============================================================================
  $ cvs diff -u -r2.168 -r2.169 rpmds.c
  --- rpm/lib/rpmds.c	11 Apr 2010 17:47:30 -0000	2.168
  +++ rpm/lib/rpmds.c	12 Sep 2010 22:19:56 -0000	2.169
  @@ -1476,7 +1476,7 @@
   	(RPMSENSE_RPMLIB|RPMSENSE_EQUAL),
       N_("internal embedded FICL.") },
   #endif
  -#if defined(WITH_JS)
  +#if defined(WITH_GPSEE)
       { "rpmlib(BuiltinJavaScript)",	"5.2-1",
   	(RPMSENSE_RPMLIB|RPMSENSE_EQUAL),
       N_("internal embedded JavaScript.") },
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/macro.c
  ============================================================================
  $ cvs diff -u -r2.248 -r2.249 macro.c
  --- rpm/rpmio/macro.c	20 Apr 2010 13:22:27 -0000	2.248
  +++ rpm/rpmio/macro.c	12 Sep 2010 22:19:57 -0000	2.249
  @@ -99,7 +99,7 @@
   #include "debug.h"
   
   /*@unchecked@*/
  -#if defined(WITH_AUGEAS) || defined(WITH_FICL) || defined(WITH_JS) || defined(WITH_NIX) || defined(WITH_PERLEMBED) || defined(WITH_PYTHONEMBED) || defined(WITH_RUBYEMBED) || defined(WITH_SQLITE) || defined(WITH_SQUIRREL) || defined(WITH_TCL)
  +#if defined(WITH_AUGEAS) || defined(WITH_FICL) || defined(WITH_GPSEE) || defined(WITH_NIX) || defined(WITH_PERLEMBED) || defined(WITH_PYTHONEMBED) || defined(WITH_RUBYEMBED) || defined(WITH_SQLITE) || defined(WITH_SQUIRREL) || defined(WITH_TCL)
   static int _globalI = 0x80000000;
   #endif
   
  @@ -1587,7 +1587,7 @@
    * @retval *avp		invocation args
    * @return		script string
    */
  -#if defined(WITH_AUGEAS) || defined(WITH_FICL) || defined(WITH_JS) || defined(WITH_PERLEMBED) || defined(WITH_PYTHONEMBED) || defined(WITH_RUBYEMBED) || defined(WITH_SQLITE) || defined(WITH_SQUIRREL) || defined(WITH_TCL)
  +#if defined(WITH_AUGEAS) || defined(WITH_FICL) || defined(WITH_GPSEE) || defined(WITH_PERLEMBED) || defined(WITH_PYTHONEMBED) || defined(WITH_RUBYEMBED) || defined(WITH_SQLITE) || defined(WITH_SQUIRREL) || defined(WITH_TCL)
   static char * parseEmbedded(const char * s, size_t nb, char *** avp)
   	/*@*/
   {
  @@ -1964,7 +1964,7 @@
   	}
   #endif
   
  -#ifdef	WITH_JS
  +#ifdef	WITH_GPSEE
   	if (STREQ("js", f, fn)) {
   		char ** av = NULL;
   		char * script = parseEmbedded(s, (size_t)(se-s), &av);
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmjs.c
  ============================================================================
  $ cvs diff -u -r1.35 -r1.36 rpmjs.c
  --- rpm/rpmio/rpmjs.c	12 Sep 2010 21:26:48 -0000	1.35
  +++ rpm/rpmio/rpmjs.c	12 Sep 2010 22:19:57 -0000	1.36
  @@ -158,6 +158,7 @@
       return _rpmjsI;
   }
   
  +/* XXX FIXME: Iargv/Ienviron are now associated with running. */
   rpmjs rpmjsNew(char ** av, uint32_t flags)
   {
       rpmjs js =
  @@ -168,10 +169,6 @@
       JSI_t I = NULL;
   
   #if defined(WITH_GPSEE)
  -    static char *const _empty[] = { NULL };
  -    char *const * Iargv = (av ? (char *const *)av : _empty);
  -    char *const * Ienviron = NULL;
  -
       if (flags == 0)
   	flags = _rpmjs_options;
   
  @@ -180,14 +177,6 @@
   	putenv((char *) "GPSEE_NO_UTF8_C_STRINGS=1");
       }
   
  -    if (F_ISSET(flags, ALLOW)) {
  -#if defined(__APPLE__)
  -        Ienviron = (char *const *) _NSGetEnviron();
  -#else
  -        Ienviron = environ;
  -#endif
  -    }
  -
       /* XXX FIXME: js->Iargv/js->Ienviron for use by rpmjsRunFile() */
       I = gpsee_createInterpreter();
   #ifdef	NOTYET	/* FIXME: dig out where NOCACHE has moved. */
  @@ -216,7 +205,6 @@
   	/*@modifies js @*/
   {
       FILE * fp = NULL;
  -    gpsee_interpreter_t * I = js->I;
   
       fp = fopen(fn, "r");
       if (fp == NULL || ferror(fp)) {
  @@ -245,6 +233,7 @@
   		rewind(fp);
   	    } else {
   #ifdef	NOTYET	/* XXX FIXME */
  +gpsee_interpreter_t * I = js->I;
   		I->linenoOffset += 1;
   #endif	/* NOTYET */
   		do {	/* consume entire first line, regardless of length */
  @@ -348,7 +337,7 @@
   	    } else
   		rc = RPMRC_OK;
   	} else {
  -	    char *const * Ienviron;
  +	    char *const * Ienviron = NULL;
   
   	    if (F_ISSET(js->flags, ALLOW)) {
   #if defined(__APPLE__)
  @@ .