Re: [CVS] RPM: popt/po/ de.po
The popt po/de.po will get killed repeatedly because I'm obligated to take popt translations *only* from the Translation Project. The best answer (annoying for you I know ;-) is to submit the popt de.po file through the Translation Project. 73 de Jeff On Apr 17, 2009, at 8:07 AM, Robert Scheck wrote: RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Robert Scheck Root: /v/rpm/cvs Email: rob...@rpm5.org Module: popt Date: 17-Apr-2009 14:07:31 Branch: HEAD Handle: 2009041712073000 Modified files: popt/po de.po Log: Updated German popt translation (re-apply of http://rpm5.org/cvs/chngview?cn=10394 after it got killed somehow) Summary: RevisionChanges Path 1.71+8 -10 popt/po/de.po patch -p0 '@@ .' Index: popt/po/de.po = = = = = = == $ cvs diff -u -r1.70 -r1.71 de.po --- popt/po/de.po 12 Apr 2009 18:15:34 - 1.70 +++ popt/po/de.po 17 Apr 2009 12:07:30 - 1.71 @@ -1,14 +1,14 @@ # Translation of popt to German (Deutsch) # This file is distributed under the same license as the popt package. -# Robert Scheck r...@robert-scheck.de, 2004-2007. +# Robert Scheck rob...@rpm5.org, 2004-2009. # msgid msgstr -Project-Id-Version: popt 1.11\n +Project-Id-Version: popt 1.15\n Report-Msgid-Bugs-To: popt-de...@rpm5.org\n POT-Creation-Date: 2009-04-12 20:14+0200\n -PO-Revision-Date: 2007-02-17 21:00+0100\n -Last-Translator: Robert Scheck r...@robert-scheck.de\n +PO-Revision-Date: 2009-04-17 14:05+0200\n +Last-Translator: Robert Scheck rob...@rpm5.org\n Language-Team: German d...@li.org\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n @@ -19,9 +19,9 @@ msgstr Unbekannte Fehler-Nummer #: popt.c:1031 -#, fuzzy, c-format +#, c-format msgid option type (%u) not implemented in popt\n -msgstr Optionstyp (%d) ist in popt nicht vorhanden\n +msgstr Optionstyp (%u) ist nicht in popt implementiert\n #: popt.c:1452 msgid missing argument @@ -80,9 +80,8 @@ msgstr Zeigt die Standardeinstellungen an #: popthelp.c:92 -#, fuzzy msgid Terminate options -msgstr Hilfe-Optionen: +msgstr SchlieÃt die Optionen ab #: popthelp.c:191 msgid Help options: @@ -109,9 +108,8 @@ msgstr LONG #: popthelp.c:208 -#, fuzzy msgid LONGLONG -msgstr LONG +msgstr LONGLONG #: popthelp.c:209 msgid STRING @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-...@rpm5.org __ RPM Package Managerhttp://rpm5.org Developer Communication Listrpm-devel@rpm5.org
Re: [CVS] RPM: rpm/ CHANGES rpm/build/ parseScript.c rpm/ configure.ac dev...
This is one helluva way to learn how to program
using JavaScript. I learned python and ruby exactly
the same way ...)
Judging from my brief drive-by browsing of js/src/js.c,
the idea of JavaScript embedded into RPM doesn't seem
quite as crazy as it originally sounded. But its way too early
to tell ...
Off to do FICL for the fun of it, then I'll dig more
seriously into JavaScript bindings and programming
this weekend.
73 de Jeff
On Apr 17, 2009, at 8:41 AM, Jeff Johnson wrote:
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: 17-Apr-2009 14:41:57
Branch: HEAD Handle: 2009041712415501
Modified files:
rpm CHANGES configure.ac devtool.conf
rpm/build parseScript.c
rpm/lib psm.c rpmds.c
rpm/miscMakefile.am
rpm/rpmio Makefile.am librpmio.vers macro.c
poptIO.c rpmio.c
rpmjs.c rpmjs.h
Log:
- js: wire-up %post -p js. much more todo++.
- js: wire-up %{js:...}. much more todo++.
Summary:
RevisionChanges Path
1.2941 +2 -0 rpm/CHANGES
2.72+6 -0 rpm/build/parseScript.c
2.365 +2 -2 rpm/configure.ac
2.289 +1 -1 rpm/devtool.conf
2.364 +13 -2 rpm/lib/psm.c
2.151 +5 -0 rpm/lib/rpmds.c
1.46+10 -8 rpm/misc/Makefile.am
1.225 +5 -4 rpm/rpmio/Makefile.am
2.108 +3 -0 rpm/rpmio/librpmio.vers
2.226 +29 -0 rpm/rpmio/macro.c
1.47+3 -0 rpm/rpmio/poptIO.c
1.191 +7 -3 rpm/rpmio/rpmio.c
1.2 +324 -3 rpm/rpmio/rpmjs.c
1.2 +3 -1 rpm/rpmio/rpmjs.h
patch -p0 '@@ .'
Index: rpm/CHANGES
=
=
=
=
=
=
==
$ cvs diff -u -r1.2940 -r1.2941 CHANGES
--- rpm/CHANGES16 Apr 2009 20:26:42 - 1.2940
+++ rpm/CHANGES17 Apr 2009 12:41:55 - 1.2941
@@ -1,5 +1,7 @@
5.2a4 - 5.2b1:
+- jbj: js: wire-up %post -p js. much more todo++.
+- jbj: js: wire-up %{js:...}. much more todo++.
- jbj: js: stub-in a javascript interpreter wrapper.
- jbj: tcl: load and use $argv and $argc.
- jbj: tcl: fix: don't append multiple newlines.
@@ .
patch -p0 '@@ .'
Index: rpm/build/parseScript.c
=
=
=
=
=
=
==
$ cvs diff -u -r2.71 -r2.72 parseScript.c
--- rpm/build/parseScript.c16 Apr 2009 04:04:45 - 2.71
+++ rpm/build/parseScript.c17 Apr 2009 12:41:55 - 2.72
@@ -313,6 +313,12 @@
BuiltinLuaScripts, 4.2.2-1);
} else
#endif
+#ifdef WITH_JS
+if (!strcmp(progArgv[0], js)) {
+ (void) rpmlibNeedsFeature(pkg-header,
+BuiltinJavaScript, 5.2-1);
+} else
+#endif
#ifdef WITH_PERLEMBED
if (!strcmp(progArgv[0], perl)) {
(void) rpmlibNeedsFeature(pkg-header,
@@ .
patch -p0 '@@ .'
Index: rpm/configure.ac
=
=
=
=
=
=
==
$ cvs diff -u -r2.364 -r2.365 configure.ac
--- rpm/configure.ac 16 Apr 2009 20:26:42 - 2.364
+++ rpm/configure.ac 17 Apr 2009 12:41:55 - 2.365
@@ -1274,9 +1274,9 @@
dnl # JavaScript
RPM_CHECK_LIB(
-[JavaScript], [javascript],
+[JavaScript], [js],
[js], [JS_NewContext], [jsstddef.h],
-[no,internal:none], [js:src/Linux_All_DBG.OBJ],
+[no,internal:none], [js/src:Linux_All_DBG.OBJ],
[ if test .$RPM_CHECK_LIB_LOCATION = .internal; then
AC_DEFINE(HAVE_JSSTDDEF_H, 1, [Define to 1 if you have
jsstddef.h])
AC_DEFINE(HAVE_LIBJS, 1, [Define to 1 if you have the 'js'
library (-ljs).])
@@ .
patch -p0 '@@ .'
Index: rpm/devtool.conf
=
=
=
=
=
=
==
$ cvs diff -u -r2.288 -r2.289 devtool.conf
--- rpm/devtool.conf 16 Apr 2009 20:26:42 - 2.288
+++ rpm/devtool.conf 17 Apr 2009 12:41:55 - 2.289
@@ -97,7 +97,7 @@
--with-perl \
--with-perlembed=/usr/lib/perl5/5.10.0/i386-linux-thread-
multi/CORE \
--with-rubyembed=/usr/lib/ruby/1.8/i386-linux \
- --with-javascript=internal \
+ --with-js=internal \
--with-build-extlibdep \
--with-build-maxextlibdep \
--enable-build-pic \
@@ .
patch -p0 '@@ .'
Index: rpm/lib/psm.c
=
=
=
=
=
=
Re: [CVS] RPM: rpm/ CHANGES rpm/build/ parseScript.c rpm/ configure.ac dev...
Hehehehe:
$ rpm -E '%{ficl:.( Hello World!) cr}'
loading CORE EXT words
loading SEARCH SEARCH-EXT words
loading Johns-Hopkins locals
loading MARKER
loading ficl O-O extensions
loading ficl utility classes
loading ficl string class
Ficl version 4.0.31
Apr 16 2009
-- ficl 0x8d49de0 ++ 1 rpmficlNew at rpmficl.c:81
== rpmficlRun(0x8d49de0,.( Hello World!) cr)
Hello World!
-- ficl 0x8d49de0 -- 1 expandMacro at macro.c:1903
FIXME
$
See http://ficl.sourceforge.net/pdf/Forth_Primer.pdf for details.
73 de Jeff
On Apr 17, 2009, at 12:10 PM, Jeff Johnson wrote:
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: 17-Apr-2009 18:10:23
Branch: HEAD Handle: 2009041716102102
Added files:
rpm/rpmio rpmficl.c rpmficl.h
Modified files:
rpm CHANGES configure.ac devtool.conf
rpm/build parseScript.c
rpm/lib psm.c rpmds.c
rpm/miscMakefile.am librpmmisc.vers
rpm/rpmio Makefile.am librpmio.vers macro.c
poptIO.c rpmio.c
Log:
- ficl: wire-up %post -p ficl.
- ficl: wire-up %{ficl:...}. capturing stdout todo++ ...
- ficl: add a FICL interpreter wrapper.
Summary:
RevisionChanges Path
1.2942 +3 -0 rpm/CHANGES
2.73+6 -0 rpm/build/parseScript.c
2.366 +11 -0 rpm/configure.ac
2.290 +2 -1 rpm/devtool.conf
2.365 +15 -4 rpm/lib/psm.c
2.152 +5 -0 rpm/lib/rpmds.c
1.47+2 -0 rpm/misc/Makefile.am
1.18+5 -0 rpm/misc/librpmmisc.vers
1.226 +5 -3 rpm/rpmio/Makefile.am
2.109 +3 -0 rpm/rpmio/librpmio.vers
2.227 +29 -0 rpm/rpmio/macro.c
1.48+3 -0 rpm/rpmio/poptIO.c
2.1 +127 -0 rpm/rpmio/rpmficl.c
2.1 +104 -0 rpm/rpmio/rpmficl.h
1.192 +7 -2 rpm/rpmio/rpmio.c
patch -p0 '@@ .'
Index: rpm/CHANGES
=
=
=
=
=
=
==
$ cvs diff -u -r1.2941 -r1.2942 CHANGES
--- rpm/CHANGES17 Apr 2009 12:41:55 - 1.2941
+++ rpm/CHANGES17 Apr 2009 16:10:21 - 1.2942
@@ -1,5 +1,8 @@
5.2a4 - 5.2b1:
+- jbj: ficl: wire-up %post -p ficl.
+- jbj: ficl: wire-up %{ficl:...}. capturing stdout todo++ ...
+- jbj: ficl: add a FICL interpreter wrapper.
- jbj: js: wire-up %post -p js. much more todo++.
- jbj: js: wire-up %{js:...}. much more todo++.
- jbj: js: stub-in a javascript interpreter wrapper.
@@ .
patch -p0 '@@ .'
Index: rpm/build/parseScript.c
=
=
=
=
=
=
==
$ cvs diff -u -r2.72 -r2.73 parseScript.c
--- rpm/build/parseScript.c17 Apr 2009 12:41:55 - 2.72
+++ rpm/build/parseScript.c17 Apr 2009 16:10:22 - 2.73
@@ -313,6 +313,12 @@
BuiltinLuaScripts, 4.2.2-1);
} else
#endif
+#ifdef WITH_FICL
+if (!strcmp(progArgv[0], ficl)) {
+ (void) rpmlibNeedsFeature(pkg-header,
+BuiltinFiclScripts, 5.2-1);
+} else
+#endif
#ifdef WITH_JS
if (!strcmp(progArgv[0], js)) {
(void) rpmlibNeedsFeature(pkg-header,
@@ .
patch -p0 '@@ .'
Index: rpm/configure.ac
=
=
=
=
=
=
==
$ cvs diff -u -r2.365 -r2.366 configure.ac
--- rpm/configure.ac 17 Apr 2009 12:41:55 - 2.365
+++ rpm/configure.ac 17 Apr 2009 16:10:22 - 2.366
@@ -1272,6 +1272,17 @@
[
], [])
+dnl # FICL
+RPM_CHECK_LIB(
+[FICL], [ficl],
+[ficl], [ficlSystemCreate], [ficl.h],
+[no,internal:none], [ficl],
+[ if test .$RPM_CHECK_LIB_LOCATION = .internal; then
+ AC_DEFINE(HAVE_FICL_H, 1, [Define to 1 if you have
ficl.h])
+ AC_DEFINE(HAVE_LIBFICL, 1, [Define to 1 if you have the 'ficl'
library (-lficl).])
+ fi
+], [])
+
dnl # JavaScript
RPM_CHECK_LIB(
[JavaScript], [js],
@@ .
patch -p0 '@@ .'
Index: rpm/devtool.conf
=
=
=
=
=
=
==
$ cvs diff -u -r2.289 -r2.290 devtool.conf
--- rpm/devtool.conf 17 Apr 2009 12:41:55 - 2.289
+++ rpm/devtool.conf 17 Apr 2009 16:10:22 - 2.290
@@ -92,12 +92,13 @@
--with-pthreads \
--with-libelf \
--with-selinux \
+ --with-ficl=internal \
+ --with-js=internal \
--with-python \
Re: [CVS] RPM: rpm/ CHANGES configure.ac devtool.conf rpm/rpmio/ rpmjs.c
Took a bit to figger (and I still haven't a clue ;-),
but javascript is now embedded:
[...@fedora10 wdj]$ rpm -E '%{js:Hello World!}'
-- js 0xa07fe10 ++ 1 rpmjsNew at rpmjs.c:115
== rpmjsRun(0xa07fe10,Hello World!)
-- js 0xa07fe10 -- 1 expandMacro at macro.c:1931
Hello World!
[...@fedora10 wdj]$ rpm -E '%{js: 1 + 1}'
-- js 0x9c9b460 ++ 1 rpmjsNew at rpmjs.c:115
== rpmjsRun(0x9c9b460, 1 + 1)
-- js 0x9c9b460 -- 1 expandMacro at macro.c:1931
2
73 de Jeff
On Apr 17, 2009, at 6:42 PM, Jeff Johnson wrote:
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: 18-Apr-2009 00:42:14
Branch: HEAD Handle: 2009041722421101
Modified files:
rpm CHANGES configure.ac devtool.conf
rpm/rpmio rpmjs.c
Log:
- ficl: permit external ficl too.
- js: simplify the embedding to the JSAPI examples, not the js
shell.
Summary:
RevisionChanges Path
1.2944 +1 -0 rpm/CHANGES
2.367 +1 -1 rpm/configure.ac
2.291 +1 -1 rpm/devtool.conf
1.3 +34 -286rpm/rpmio/rpmjs.c
patch -p0 '@@ .'
Index: rpm/CHANGES
=
=
=
=
=
=
==
$ cvs diff -u -r1.2943 -r1.2944 CHANGES
--- rpm/CHANGES17 Apr 2009 18:42:32 - 1.2943
+++ rpm/CHANGES17 Apr 2009 22:42:11 - 1.2944
@@ -1,5 +1,6 @@
5.2a4 - 5.2b1:
+- jbj: js: simplify the embedding to the JSAPI examples, not
the js shell.
- jbj: ficl: capture stdout from ficl vm.
- jbj: ficl: wire-up %post -p ficl.
- jbj: ficl: wire-up %{ficl:...}. capturing stdout todo++ ...
@@ .
patch -p0 '@@ .'
Index: rpm/configure.ac
=
=
=
=
=
=
==
$ cvs diff -u -r2.366 -r2.367 configure.ac
--- rpm/configure.ac 17 Apr 2009 16:10:22 - 2.366
+++ rpm/configure.ac 17 Apr 2009 22:42:11 - 2.367
@@ -1276,7 +1276,7 @@
RPM_CHECK_LIB(
[FICL], [ficl],
[ficl], [ficlSystemCreate], [ficl.h],
-[no,internal:none], [ficl],
+[no,external:internal:none], [ficl],
[ if test .$RPM_CHECK_LIB_LOCATION = .internal; then
AC_DEFINE(HAVE_FICL_H, 1, [Define to 1 if you have
ficl.h])
AC_DEFINE(HAVE_LIBFICL, 1, [Define to 1 if you have the 'ficl'
library (-lficl).])
@@ .
patch -p0 '@@ .'
Index: rpm/devtool.conf
=
=
=
=
=
=
==
$ cvs diff -u -r2.290 -r2.291 devtool.conf
--- rpm/devtool.conf 17 Apr 2009 16:10:22 - 2.290
+++ rpm/devtool.conf 17 Apr 2009 22:42:11 - 2.291
@@ -92,7 +92,7 @@
--with-pthreads \
--with-libelf \
--with-selinux \
- --with-ficl=internal \
+ --with-ficl=/usr/lib:/usr/include/ficl \
--with-js=internal \
--with-python \
--with-pythonembed=/usr/lib:/usr/include/python2.5 \
@@ .
patch -p0 '@@ .'
Index: rpm/rpmio/rpmjs.c
=
=
=
=
=
=
==
$ cvs diff -u -r1.2 -r1.3 rpmjs.c
--- rpm/rpmio/rpmjs.c 17 Apr 2009 12:41:56 - 1.2
+++ rpm/rpmio/rpmjs.c 17 Apr 2009 22:42:12 - 1.3
@@ -30,270 +30,27 @@
#include debug.h
/*...@unchecked@*/
-int _rpmjs_debug = 1;
+int _rpmjs_debug = 0;
/*...@unchecked@*/ /*...@relnull@*/
rpmjs _rpmjsI = NULL;
#if defined(WITH_JS)
-
-typedef enum JSShellExitCode {
-EXITCODE_RUNTIME_ERROR = 3,
-EXITCODE_FILE_NOT_FOUND = 4,
-EXITCODE_OUT_OF_MEMORY = 5
-} JSShellExitCode;
-
-static size_t gStackChunkSize = 8192;
-static size_t gMaxStackSize = 50;
-static jsuword gStackBase;
-static size_t gScriptStackQuota = JS_DEFAULT_SCRIPT_STACK_QUOTA;
-static JSBool gEnableBranchCallback = JS_FALSE;
-static uint32 gBranchCount;
-static uint32 gBranchLimit;
-static int gExitCode = 0;
-
-static FILE *gErrFile = NULL;
-static FILE *gOutFile = NULL;
-
-static JSBool reportWarnings = JS_TRUE;
-
-/* We use a mix of JS_FS and JS_FN to test both kinds of natives. */
-static JSFunctionSpec shell_functions[] = {
-JS_FS_END
-};
-
-static JSBool
-global_enumerate(JSContext *cx, JSObject *obj)
-{
-#ifdef LAZY_STANDARD_CLASSES
-return JS_EnumerateStandardClasses(cx, obj);
-#else
-return JS_TRUE;
-#endif
-}
-
-static JSBool
-global_resolve(JSContext *cx, JSObject *obj, jsval id, uintN flags,
- JSObject **objp)
-{
-#ifdef LAZY_STANDARD_CLASSES
-if ((flags JSRESOLVE_ASSIGNING) == 0) {
-
