RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: [email protected] Module: rpm Date: 30-Sep-2011 22:19:38 Branch: rpm-5_4 Handle: 2011093020193701 Modified files: (Branch: rpm-5_4) rpm CHANGES configure.ac devtool.conf rpm/rpmio rpmjs.c rpm/tests/ref showrc Log: - gpsee: snapshot RPM+JS resurrection work-in-progress for release. Summary: Revision Changes Path 1.3501.2.178+1 -0 rpm/CHANGES 2.472.2.31 +1 -1 rpm/configure.ac 2.365.2.15 +1 -1 rpm/devtool.conf 1.36.2.2 +14 -0 rpm/rpmio/rpmjs.c 1.37.2.5 +3 -1 rpm/tests/ref/showrc ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/CHANGES ============================================================================ $ cvs diff -u -r1.3501.2.177 -r1.3501.2.178 CHANGES --- rpm/CHANGES 30 Sep 2011 19:54:28 -0000 1.3501.2.177 +++ rpm/CHANGES 30 Sep 2011 20:19:37 -0000 1.3501.2.178 @@ -1,4 +1,5 @@ 5.4.2 -> 5.4.3: + - jbj: gpsee: snapshot RPM+JS resurrection work-in-progress for release. - jbj: leg: stub-in a fictional architecture to restructure the ARM namespace based on "attributes". - jbj: arm: add the next 6 armv7* permutations to demonstrate the futility @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac ============================================================================ $ cvs diff -u -r2.472.2.30 -r2.472.2.31 configure.ac --- rpm/configure.ac 13 Sep 2011 01:12:51 -0000 2.472.2.30 +++ rpm/configure.ac 30 Sep 2011 20:19:37 -0000 2.472.2.31 @@ -1713,7 +1713,7 @@ AC_DEFINE(HAVE_GPSEE_H, 1, [Define to 1 if you have <gpsee.h>]) AC_DEFINE(HAVE_LIBGPSEE, 1, [Define to 1 if you have the 'gpsee' library (-ljs).]) else - GPSEE_MODULES_PATH="$withval/libexec" + GPSEE_MODULES_PATH="$prefix/libexec/gpsee" AC_SUBST(GPSEE_MODULES_PATH) fi ], []) @@ . patch -p0 <<'@@ .' Index: rpm/devtool.conf ============================================================================ $ cvs diff -u -r2.365.2.14 -r2.365.2.15 devtool.conf --- rpm/devtool.conf 13 Sep 2011 01:12:51 -0000 2.365.2.14 +++ rpm/devtool.conf 30 Sep 2011 20:19:37 -0000 2.365.2.15 @@ -446,7 +446,7 @@ --without-bash \ --without-rc \ --without-js \ - --without-gpsee \ + --with-gpsee \ --with-python \ --with-pythonembed=/usr/lib:/usr/include/python2.6 \ --with-perl \ @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmjs.c ============================================================================ $ cvs diff -u -r1.36.2.1 -r1.36.2.2 rpmjs.c --- rpm/rpmio/rpmjs.c 23 Sep 2011 21:11:12 -0000 1.36.2.1 +++ rpm/rpmio/rpmjs.c 30 Sep 2011 20:19:38 -0000 1.36.2.2 @@ -121,6 +121,11 @@ fprintf(stderr, "==> %s(%p) I %p\n", __FUNCTION__, js, js->I); #if defined(WITH_GPSEE) +#if defined(XXX_GPSEE_DEBUGGER) + gpsee_finiDebugger(js->jsdc); + js->jsdc = NULL; +#endif + (void) gpsee_destroyInterpreter(js->I); #endif js->I = NULL; @@ -169,6 +174,11 @@ JSI_t I = NULL; #if defined(WITH_GPSEE) + +#if defined(XXX_GPSEE_DEBUGGER) /* XXX js->jsdc? */ + JSDContext *jsdc; +#endif + if (flags == 0) flags = _rpmjs_options; @@ -179,6 +189,10 @@ /* XXX FIXME: js->Iargv/js->Ienviron for use by rpmjsRunFile() */ I = gpsee_createInterpreter(); +#if defined(XXX_GPSEE_DEBUGGER) + js->jsdc = gpsee_initDebugger(I->cx, I->realm, DEBUGGER_JS); +#endif + #ifdef NOTYET /* FIXME: dig out where NOCACHE has moved. */ if (F_ISSET(flags, NOCACHE)) I->useCompilerCache = 0; @@ . patch -p0 <<'@@ .' Index: rpm/tests/ref/showrc ============================================================================ $ cvs diff -u -r1.37.2.4 -r1.37.2.5 showrc --- rpm/tests/ref/showrc 13 Sep 2011 01:12:53 -0000 1.37.2.4 +++ rpm/tests/ref/showrc 30 Sep 2011 20:19:38 -0000 1.37.2.5 @@ -17,8 +17,10 @@ macrofiles : ../macros/macros:../tests/macros Features provided by rpmlib installer: rpmlib(BuiltinAugeasScripts) = 5.3-1 + rpmlib(BuiltinJavaScript) = 5.2-1 rpmlib(BuiltinLuaScripts) = 4.2.2-1 rpmlib(BuiltinPythonScripts) = 5.2-1 + rpmlib(BuiltinRubyScripts) = 5.2-1 rpmlib(BuiltinTclScripts) = 5.2-1 rpmlib(CompressedFileNames) = 3.0.4-1 rpmlib(ConcurrentAccess) = 4.1-1 @@ -268,7 +270,7 @@ --homedir %{_testdir}/tmp/.gnupg -u "%{_gpg_name}" -sbo %{__signature_filename} %{__plaintext_filename} -14: __grep %{_usrlibrpmbin}/grep --14: __gsr %{_bindir}/gsr +-14: __gsr /usr/bin/gsr -14: __gzip /bin/gzip -14: __hg /usr/bin/hg -14: __id /usr/bin/id @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository [email protected]
