[CVS] RPM: rpm-5_4: rpm/rpmio/ Makefile.am rpmjs.h rpmjs17.cpp rpmjs18...
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: 22-Jun-2017 19:35:24
Branch: rpm-5_4 Handle: 2017062217352400
Modified files: (Branch: rpm-5_4)
rpm/rpmio Makefile.am rpmjs.h rpmjs17.cpp rpmjs185.cpp
rpmjs24.cpp rpmjs31.cpp rpmjs38.cpp rpmjs45.cpp
Log:
- rpmjs: prepare for modularization.
Summary:
RevisionChanges Path
1.293.2.96 +6 -6 rpm/rpmio/Makefile.am
1.10.2.4+2 -0 rpm/rpmio/rpmjs.h
1.1.2.3 +2 -0 rpm/rpmio/rpmjs17.cpp
1.1.2.3 +2 -0 rpm/rpmio/rpmjs185.cpp
1.1.2.4 +2 -0 rpm/rpmio/rpmjs24.cpp
1.1.2.4 +2 -0 rpm/rpmio/rpmjs31.cpp
1.1.2.4 +2 -0 rpm/rpmio/rpmjs38.cpp
1.1.2.4 +2 -0 rpm/rpmio/rpmjs45.cpp
patch -p0 <<'@@ .'
Index: rpm/rpmio/Makefile.am
$ cvs diff -u -r1.293.2.95 -r1.293.2.96 Makefile.am
--- rpm/rpmio/Makefile.am 22 Jun 2017 17:25:47 - 1.293.2.95
+++ rpm/rpmio/Makefile.am 22 Jun 2017 17:35:24 - 1.293.2.96
@@ -551,27 +551,27 @@
rpmgpg_LDADD = $(RPMIO_LDADD_COMMON)
rpmjs185_SOURCES = rpmjs185.cpp
-rpmjs185_CPPFLAGS = -DXP_UNIX=1 -DJS_THREADSAFE=1 -I/usr/include/js -fPIC
+rpmjs185_CPPFLAGS = -DXP_UNIX=1 -DJS_THREADSAFE=1 -I/usr/include/js -fPIC
-DRPMJS_SELF_TEST
rpmjs185_LDADD = -L/usr/lib64 -ljs
rpmjs17_SOURCES = rpmjs17.cpp
-rpmjs17_CPPFLAGS = -include /usr/include/js-17.0/js/RequiredDefines.h
-I/usr/include/js-17.0 -fPIC
+rpmjs17_CPPFLAGS = -include /usr/include/js-17.0/js/RequiredDefines.h
-I/usr/include/js-17.0 -fPIC -DRPMJS_SELF_TEST
rpmjs17_LDADD = -L/usr/lib64 -lmozjs-17.0
rpmjs24_SOURCES = rpmjs24.cpp
-rpmjs24_CPPFLAGS = -include /usr/include/mozjs-24/js/RequiredDefines.h
-I/usr/include/mozjs-24 -fPIC
+rpmjs24_CPPFLAGS = -include /usr/include/mozjs-24/js/RequiredDefines.h
-I/usr/include/mozjs-24 -fPIC -DRPMJS_SELF_TEST
rpmjs24_LDADD = -L/usr/lib64 -lmozjs-24
rpmjs31_SOURCES = rpmjs31.cpp
-rpmjs31_CPPFLAGS = -include /usr/include/mozjs-31/js/RequiredDefines.h
-I/usr/include/mozjs-31 -fPIC
+rpmjs31_CPPFLAGS = -include /usr/include/mozjs-31/js/RequiredDefines.h
-I/usr/include/mozjs-31 -fPIC -DRPMJS_SELF_TEST
rpmjs31_LDADD = -L/usr/lib64 -lmozjs-31
rpmjs38_SOURCES = rpmjs38.cpp
-rpmjs38_CPPFLAGS = -include /usr/include/mozjs-38/js/RequiredDefines.h
-I/usr/include/mozjs-38 -fPIC
+rpmjs38_CPPFLAGS = -include /usr/include/mozjs-38/js/RequiredDefines.h
-I/usr/include/mozjs-38 -fPIC -DRPMJS_SELF_TEST
rpmjs38_LDADD = -L/usr/lib64 -lmozjs-38
rpmjs45_SOURCES = rpmjs45.cpp
-rpmjs45_CPPFLAGS = -include /usr/include/mozjs-45/js/RequiredDefines.h
-I/usr/include/mozjs-45 -fPIC
+rpmjs45_CPPFLAGS = -include /usr/include/mozjs-45/js/RequiredDefines.h
-I/usr/include/mozjs-45 -fPIC -DRPMJS_SELF_TEST
rpmjs45_LDADD = -L/usr/lib64 -lmozjs-45
mozjs: rpmjs185 rpmjs17 rpmjs24 rpmjs31 rpmjs38 rpmjs45
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmjs.h
$ cvs diff -u -r1.10.2.3 -r1.10.2.4 rpmjs.h
--- rpm/rpmio/rpmjs.h 22 Jun 2017 17:25:47 - 1.10.2.3
+++ rpm/rpmio/rpmjs.h 22 Jun 2017 17:35:24 - 1.10.2.4
@@ -57,6 +57,8 @@
int (*mozRun) (rpmjs js, const char * script, const char * filename,
int lineno);
};
+extern JSIO_t mozjs185;
+extern JSIO_t mozjs17;
extern JSIO_t mozjs24;
extern JSIO_t mozjs31;
extern JSIO_t mozjs38;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmjs17.cpp
$ cvs diff -u -r1.1.2.2 -r1.1.2.3 rpmjs17.cpp
--- rpm/rpmio/rpmjs17.cpp 22 Jun 2017 17:25:47 - 1.1.2.2
+++ rpm/rpmio/rpmjs17.cpp 22 Jun 2017 17:35:24 - 1.1.2.3
@@ -139,6 +139,7 @@
static struct JSIO_s _mozjs17 = { mozFini, mozInit, mozRun };
JSIO_t mozjs17 = &_mozjs17;
+#if defined(RPMJS_SELF_TEST)
/*==*/
int main(int argc, const char *argv[])
{
@@ -158,3 +159,4 @@
return rc;
}
+#endif /* RPMJS_SELF_TEST */
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmjs185.cpp
$ cvs diff -u -r1.1.2.2 -r1.1.2.3 rpmjs185.cpp
--- rpm/rpmio/rpmjs185.cpp22 Jun 2017 17:25:47 - 1.1.2.2
+++ rpm/rpmio/rpmjs185.cpp22 Jun 2017 17:35:24
[CVS] RPM: rpm-5_4: rpm/rpmio/ Makefile.am rpmjs.h rpmjs17.cpp rpmjs18...
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: 22-Jun-2017 19:25:47
Branch: rpm-5_4 Handle: 2017062217254700
Modified files: (Branch: rpm-5_4)
rpm/rpmio Makefile.am rpmjs.h rpmjs17.cpp rpmjs185.cpp
rpmjs24.cpp rpmjs31.cpp rpmjs38.cpp rpmjs45.cpp
Log:
- rpmjs: collect the whole set.
Summary:
RevisionChanges Path
1.293.2.95 +13 -3 rpm/rpmio/Makefile.am
1.10.2.3+13 -0 rpm/rpmio/rpmjs.h
1.1.2.2 +156 -90rpm/rpmio/rpmjs17.cpp
1.1.2.2 +166 -94rpm/rpmio/rpmjs185.cpp
1.1.2.3 +52 -38 rpm/rpmio/rpmjs24.cpp
1.1.2.3 +55 -42 rpm/rpmio/rpmjs31.cpp
1.1.2.3 +51 -40 rpm/rpmio/rpmjs38.cpp
1.1.2.3 +54 -40 rpm/rpmio/rpmjs45.cpp
patch -p0 <<'@@ .'
Index: rpm/rpmio/Makefile.am
$ cvs diff -u -r1.293.2.94 -r1.293.2.95 Makefile.am
--- rpm/rpmio/Makefile.am 21 Jun 2017 17:26:24 - 1.293.2.94
+++ rpm/rpmio/Makefile.am 22 Jun 2017 17:25:47 - 1.293.2.95
@@ -18,7 +18,7 @@
getdate.y html-parse.c html-parse.h libsqlio.c \
rpmcpio.c rpmcpio.h rpmgenbasedir.c rpmgenpkglist.c rpmgensrclist.c \
rpmjsio.msg rpmtar.c rpmtar.h \
- rpmjs24.cpp rpmjs31.cpp rpmjs38.cpp rpmjs45.cpp \
+ rpmjs185.cpp rpmjs17.cpp rpmjs24.cpp rpmjs31.cpp rpmjs38.cpp
rpmjs45.cpp \
tdir.c teio.c tfts.c tget.c tgfs.c tgit.c tglob.c thkp.c thtml.c \
tinv.c tkey.c tmire.c tmq.c tmqtt.c todbc.c tput.c tpython.c trpmio.c \
tsexp.c tsvn.c tsw.c lookup3.c duktape.c tjsmn.c tjson.c yajl.c \
@@ -32,7 +32,7 @@
EXTRA_PROGRAMS += bsdiff bspatch fanotify pcrsed rpmborg rpmcurl \
rpmgenbasedir rpmgenpkglist rpmgensrclist rpmgpg \
rpmpbzip2 rpmpigz rpmzstd \
- rpmjs24 rpmjs31 rpmjs38 rpmjs45 \
+ rpmjs185 rpmjs17 rpmjs24 rpmjs31 rpmjs38 rpmjs45 \
tasn tbf tcap tder tdir teio tfts tget tglob thkp tmagic tmire \
tmount todbc toid tperl tpython tput trpmio tsexp tsvn tsw ttcl \
dumpasn1 lookup3 trel twitter github tmicrojson
@@ -550,6 +550,14 @@
rpmgpg_SOURCES = rpmgpg.c
rpmgpg_LDADD = $(RPMIO_LDADD_COMMON)
+rpmjs185_SOURCES = rpmjs185.cpp
+rpmjs185_CPPFLAGS = -DXP_UNIX=1 -DJS_THREADSAFE=1 -I/usr/include/js -fPIC
+rpmjs185_LDADD = -L/usr/lib64 -ljs
+
+rpmjs17_SOURCES = rpmjs17.cpp
+rpmjs17_CPPFLAGS = -include /usr/include/js-17.0/js/RequiredDefines.h
-I/usr/include/js-17.0 -fPIC
+rpmjs17_LDADD = -L/usr/lib64 -lmozjs-17.0
+
rpmjs24_SOURCES = rpmjs24.cpp
rpmjs24_CPPFLAGS = -include /usr/include/mozjs-24/js/RequiredDefines.h
-I/usr/include/mozjs-24 -fPIC
rpmjs24_LDADD = -L/usr/lib64 -lmozjs-24
@@ -566,7 +574,9 @@
rpmjs45_CPPFLAGS = -include /usr/include/mozjs-45/js/RequiredDefines.h
-I/usr/include/mozjs-45 -fPIC
rpmjs45_LDADD = -L/usr/lib64 -lmozjs-45
-mozjs: rpmjs24 rpmjs31 rpmjs38 rpmjs45
+mozjs: rpmjs185 rpmjs17 rpmjs24 rpmjs31 rpmjs38 rpmjs45
+ -./rpmjs185
+ -./rpmjs17
-./rpmjs24
-./rpmjs31
-./rpmjs38
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmjs.h
$ cvs diff -u -r1.10.2.2 -r1.10.2.3 rpmjs.h
--- rpm/rpmio/rpmjs.h 17 May 2017 12:34:40 - 1.10.2.2
+++ rpm/rpmio/rpmjs.h 22 Jun 2017 17:25:47 - 1.10.2.3
@@ -50,9 +50,22 @@
RPMJS_FLAGS_GLOBAL = (1<<31),
};
+typedef struct JSIO_s * JSIO_t;
+struct JSIO_s {
+void (*mozFini) (rpmjs js);
+void * (*mozInit)(rpmjs js);
+int (*mozRun) (rpmjs js, const char * script, const char * filename,
int lineno);
+};
+
+extern JSIO_t mozjs24;
+extern JSIO_t mozjs31;
+extern JSIO_t mozjs38;
+extern JSIO_t mozjs45;
+
struct rpmjs_s {
struct rpmioItem_s _item;/*!< usage mutex and pool identifier. */
uint32_t flags; /*!< JSOPTION_FOO in 0x bits */
+JSIO_t jsio;
void * I;/*!< JS interpreter {rt, cx, globalObj}
*/
};
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmjs17.cpp
$ cvs diff -u -r1.1.2.1 -r1.1.2.2 rpmjs17.cpp
--- rpm/rpmio/rpmjs17.cpp 22 Jun 2017 17:03:52 - 1.1.2.1
+++ rpm/rpmio/rpmjs17.cpp 22 Jun 2017 17:25:47 - 1.1.2.2
@@ -1,94 +1,160 @@
-/*
- * This define is for Windows only, it is a
