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:
    Revision    Changes     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 -0000      1.293.2.95
  +++ rpm/rpmio/Makefile.am     22 Jun 2017 17:35:24 -0000      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 -0000      1.10.2.3
  +++ rpm/rpmio/rpmjs.h 22 Jun 2017 17:35:24 -0000      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 -0000      1.1.2.2
  +++ rpm/rpmio/rpmjs17.cpp     22 Jun 2017 17:35:24 -0000      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.cpp    22 Jun 2017 17:25:47 -0000      1.1.2.2
  +++ rpm/rpmio/rpmjs185.cpp    22 Jun 2017 17:35:24 -0000      1.1.2.3
  @@ -146,6 +146,7 @@
   static struct JSIO_s _mozjs185 = { mozFini, mozInit, mozRun };
   JSIO_t mozjs185 = &_mozjs185;
   
  +#if defined(RPMJS_SELF_TEST)
   /*==============================================================*/
   int main(int argc, const char *argv[])
   {
  @@ -165,3 +166,4 @@
   
       return rc;
   }
  +#endif       /* RPMJS_SELF_TEST */
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmjs24.cpp
  ============================================================================
  $ cvs diff -u -r1.1.2.3 -r1.1.2.4 rpmjs24.cpp
  --- rpm/rpmio/rpmjs24.cpp     22 Jun 2017 17:25:47 -0000      1.1.2.3
  +++ rpm/rpmio/rpmjs24.cpp     22 Jun 2017 17:35:24 -0000      1.1.2.4
  @@ -138,6 +138,7 @@
   static struct JSIO_s _mozjs24 = { mozFini, mozInit, mozRun };
   JSIO_t mozjs24 = &_mozjs24;
   
  +#if defined(RPMJS_SELF_TEST)
   /*==============================================================*/
   int main(int argc, const char *argv[])
   {
  @@ -157,3 +158,4 @@
   
       return rc;
   }
  +#endif       /* RPMJS_SELF_TEST */
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmjs31.cpp
  ============================================================================
  $ cvs diff -u -r1.1.2.3 -r1.1.2.4 rpmjs31.cpp
  --- rpm/rpmio/rpmjs31.cpp     22 Jun 2017 17:25:47 -0000      1.1.2.3
  +++ rpm/rpmio/rpmjs31.cpp     22 Jun 2017 17:35:24 -0000      1.1.2.4
  @@ -140,6 +140,7 @@
   static struct JSIO_s _mozjs31 = { mozFini, mozInit, mozRun };
   JSIO_t mozjs31 = &_mozjs31;
   
  +#if defined(RPMJS_SELF_TEST)
   /*==============================================================*/
   int main(int argc, const char *argv[])
   {
  @@ -159,3 +160,4 @@
   
       return rc;
   }
  +#endif       /* RPMJS_SELF_TEST */
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmjs38.cpp
  ============================================================================
  $ cvs diff -u -r1.1.2.3 -r1.1.2.4 rpmjs38.cpp
  --- rpm/rpmio/rpmjs38.cpp     22 Jun 2017 17:25:47 -0000      1.1.2.3
  +++ rpm/rpmio/rpmjs38.cpp     22 Jun 2017 17:35:24 -0000      1.1.2.4
  @@ -140,6 +140,7 @@
   static struct JSIO_s _mozjs38 = { mozFini, mozInit, mozRun };
   JSIO_t mozjs38 = &_mozjs38;
   
  +#if defined(RPMJS_SELF_TEST)
   /*==============================================================*/
   int main(int argc, const char *argv[])
   {
  @@ -159,3 +160,4 @@
   
       return rc;
   }
  +#endif       /* RPMJS_SELF_TEST */
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmjs45.cpp
  ============================================================================
  $ cvs diff -u -r1.1.2.3 -r1.1.2.4 rpmjs45.cpp
  --- rpm/rpmio/rpmjs45.cpp     22 Jun 2017 17:25:47 -0000      1.1.2.3
  +++ rpm/rpmio/rpmjs45.cpp     22 Jun 2017 17:35:24 -0000      1.1.2.4
  @@ -144,6 +144,7 @@
   static struct JSIO_s _mozjs45 = { mozFini, mozInit, mozRun };
   JSIO_t mozjs45 = &_mozjs45;
   
  +#if defined(RPMJS_SELF_TEST)
   /*==============================================================*/
   int main(int argc, const char *argv[])
   {
  @@ -163,3 +164,4 @@
   
       return rc;
   }
  +#endif       /* RPMJS_SELF_TEST */
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                rpm-cvs@rpm5.org

Reply via email to