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:   20-Apr-2009 18:43:45
  Branch: HEAD                             Handle: 2009042016434500

  Added files:
    rpm/js                  tjs.c
  Modified files:
    rpm/js                  .cvsignore Makefile.am

  Log:
    - js: stub in an executable that can do -E '%{js:yadda}'.

  Summary:
    Revision    Changes     Path
    1.2         +4  -0      rpm/js/.cvsignore
    1.2         +28 -2      rpm/js/Makefile.am
    1.1         +40 -0      rpm/js/tjs.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/js/.cvsignore
  ============================================================================
  $ cvs diff -u -r1.1 -r1.2 .cvsignore
  --- rpm/js/.cvsignore 20 Apr 2009 15:45:43 -0000      1.1
  +++ rpm/js/.cvsignore 20 Apr 2009 16:43:45 -0000      1.2
  @@ -6,3 +6,7 @@
   *.gcno
   *.la
   *.lo
  +README
  +jsd
  +src
  +tjs
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/js/Makefile.am
  ============================================================================
  $ cvs diff -u -r1.1 -r1.2 Makefile.am
  --- rpm/js/Makefile.am        20 Apr 2009 15:45:43 -0000      1.1
  +++ rpm/js/Makefile.am        20 Apr 2009 16:43:45 -0000      1.2
  @@ -4,8 +4,6 @@
   
   LINT = splint
   
  -EXTRA_DIST =
  -
   AM_CPPFLAGS = -I. \
        -I$(top_srcdir) \
        -I$(top_srcdir)/build \
  @@ -21,6 +19,30 @@
        @WITH_XAR_CPPFLAGS@ \
        @WITH_ZLIB_CPPFLAGS@
   
  +EXTRA_DIST =
  +
  +EXTRA_PROGRAMS = tjs
  +
  +RPMMISC_LDADD_COMMON = \
  +     $(top_builddir)/misc/librpmmisc.la \
  +     @LTLIBINTL@
  +
  +RPMIO_LDADD_COMMON = \
  +     $(top_builddir)/rpmio/librpmio.la \
  +     $(RPMMISC_LDADD_COMMON)
  +
  +RPMDB_LDADD_COMMON = \
  +     $(top_builddir)/rpmdb/librpmdb.la \
  +     $(RPMIO_LDADD_COMMON)
  +
  +RPM_LDADD_COMMON = \
  +     $(top_builddir)/lib/librpm.la \
  +     $(RPMDB_LDADD_COMMON)
  +
  +RPMBUILD_LDADD_COMMON = \
  +     $(top_builddir)/build/librpmbuild.la \
  +     $(RPM_LDADD_COMMON)
  +
   noinst_HEADERS =
   
   noinst_LTLIBRARIES = rpmjsm.la
  @@ -42,3 +64,7 @@
   .PHONY:      lint
   lint:
        $(LINT) $(DEFS) $(INCLUDES) $(rpmjs_la_sources)
  +
  +tjs_SOURCES = tjs.c
  +tjs_LDADD = rpmjsm.la $(RPM_LDADD_COMMON)
  +
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/js/tjs.c
  ============================================================================
  $ cvs diff -u -r0 -r1.1 tjs.c
  --- /dev/null 2009-04-20 18:43:00 +0200
  +++ tjs.c     2009-04-20 18:43:45 +0200
  @@ -0,0 +1,40 @@
  +#include "system.h"
  +
  +#include <rpmio.h>
  +#include <argv.h>
  +
  +#include <rpmcli.h>
  +
  +#include "debug.h"
  +
  +static struct poptOption optionsTable[] = {
  +
  + { NULL, '\0', POPT_ARG_INCLUDE_TABLE, rpmcliAllPoptTable, 0,
  +     N_("Common options for all rpm executables:"),
  +     NULL },
  +
  +  POPT_AUTOHELP
  +  POPT_TABLEEND
  +};
  +
  +int
  +main(int argc, char *argv[])
  +{
  +    poptContext optCon = rpmcliInit(argc, argv, optionsTable);
  +    ARGV_t av = poptGetArgs(optCon);
  +    int ac = argvCount(av);
  +    const char * fn;
  +    int rc = 1;              /* assume failure */
  +
  +    if (ac < 1) {
  +     poptPrintUsage(optCon, stderr, 0);
  +     goto exit;
  +    }
  +
  +    rc = 0;
  +
  +exit:
  +    optCon = rpmcliFini(optCon);
  +
  +    return rc;
  +}
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                rpm-cvs@rpm5.org

Reply via email to