From 52658259bafa3a2de68107a024a4bc669f0dd3f4 Mon Sep 17 00:00:00 2001 From: frankmorgner Date: Tue, 8 Nov 2011 17:09:41 +0000 Subject: [PATCH] not using static path for program-output. instead setting the correct envirnment in conf.py. git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@635 96b47cad-a561-4643-ad3b-153ac7d7599c --- ccid/doc/README.rst | 4 ++-- ccid/doc/README.rst.in | 4 ++-- doc/conf.py | 4 ++++ npa/doc/README.rst | 2 +- npa/doc/README.rst.in | 2 +- pcsc-relay/doc/README.rst | 2 +- pcsc-relay/doc/README.rst.in | 2 +- virtualsmartcard/doc/README.rst | 2 +- virtualsmartcard/doc/README.rst.in | 2 +- 9 files changed, 14 insertions(+), 10 deletions(-) diff --git a/ccid/doc/README.rst b/ccid/doc/README.rst index c0bd129..301a72c 100644 --- a/ccid/doc/README.rst +++ b/ccid/doc/README.rst @@ -109,13 +109,13 @@ mounted. The CCID Emulator is compatible with the unix driver libccid_ and the windows smart card driver. To initialize PACE using the PC/SC API you need to patch libccid and pcsc-lite (see directory patches). -.. program-output:: sh -c 'cd /home/fm/work/vsmartcard/ccid/src && ./ccid-emulator --help' +.. program-output:: ccid-emulator --help cats-test can be used to test the PACE capabilities of a smart card reader with PACE support (such as the CCID Emulator or any other "Standardleser" CAT-S or "Komfortleser" CAT-C) via PC/SC. -.. program-output:: sh -c 'cd /home/fm/work/vsmartcard/ccid/src && ./cats-test' +.. program-output:: cats-test .. include:: questions.rst diff --git a/ccid/doc/README.rst.in b/ccid/doc/README.rst.in index e88b8cf..8837490 100644 --- a/ccid/doc/README.rst.in +++ b/ccid/doc/README.rst.in @@ -109,13 +109,13 @@ mounted. The @PACKAGE_NAME@ is compatible with the unix driver libccid_ and the windows smart card driver. To initialize PACE using the PC/SC API you need to patch libccid and pcsc-lite (see directory patches). -.. program-output:: sh -c 'cd @abs_top_srcdir@/src && ./ccid-emulator --help' +.. program-output:: ccid-emulator --help cats-test can be used to test the PACE capabilities of a smart card reader with PACE support (such as the @PACKAGE_NAME@ or any other "Standardleser" CAT-S or "Komfortleser" CAT-C) via PC/SC. -.. program-output:: sh -c 'cd @abs_top_srcdir@/src && ./cats-test' +.. program-output:: cats-test .. include:: questions.rst diff --git a/doc/conf.py b/doc/conf.py index d3dd27c..c60e69b 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -19,6 +19,10 @@ os.system("make doc -C virtualsmartcard") os.system("make doc -C ccid") os.system("make doc -C pcsc-relay") +os.environ['PATH'] += os.pathsep + os.path.abspath('../npa/src') +os.environ['PATH'] += os.pathsep + os.path.abspath('../pcsc-relay/src') +os.environ['PATH'] += os.pathsep + os.path.abspath('../virtualsmartcard/src/vpicc') + # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the # documentation root, use os.path.abspath to make it absolute, like shown here. diff --git a/npa/doc/README.rst b/npa/doc/README.rst index e5ba8a1..0c541bc 100644 --- a/npa/doc/README.rst +++ b/npa/doc/README.rst @@ -109,7 +109,7 @@ To pass a secret to npa-tool, the command line parameters or the environment variables PIN/CAN/MRZ/PUK/NEWPIN can be used. If none of these options is used, npa-tool will show a password prompt. -.. program-output:: sh -c 'cd /home/fm/work/vsmartcard/npa/src && ./npa-tool --help' +.. program-output:: npa-tool --help ---------------------- Linking against libnpa diff --git a/npa/doc/README.rst.in b/npa/doc/README.rst.in index 7998bd7..0c5243b 100644 --- a/npa/doc/README.rst.in +++ b/npa/doc/README.rst.in @@ -109,7 +109,7 @@ To pass a secret to npa-tool, the command line parameters or the environment variables PIN/CAN/MRZ/PUK/NEWPIN can be used. If none of these options is used, npa-tool will show a password prompt. -.. program-output:: sh -c 'cd @abs_top_srcdir@/src && ./npa-tool --help' +.. program-output:: npa-tool --help ---------------------- Linking against libnpa diff --git a/pcsc-relay/doc/README.rst b/pcsc-relay/doc/README.rst index 45a66ff..de5d0e9 100644 --- a/pcsc-relay/doc/README.rst +++ b/pcsc-relay/doc/README.rst @@ -32,7 +32,7 @@ pcsc-relay has the following dependencies: - PC/SC middleware - libnfc_ -.. program-output:: sh -c 'cd /home/fm/work/vsmartcard/pcsc-relay/src && ./pcsc-relay --help' +.. program-output:: pcsc-relay --help --------------- diff --git a/pcsc-relay/doc/README.rst.in b/pcsc-relay/doc/README.rst.in index bfb0328..bf93b31 100644 --- a/pcsc-relay/doc/README.rst.in +++ b/pcsc-relay/doc/README.rst.in @@ -32,7 +32,7 @@ pcsc-relay has the following dependencies: - PC/SC middleware - libnfc_ -.. program-output:: sh -c 'cd @abs_top_srcdir@/src && ./pcsc-relay --help' +.. program-output:: pcsc-relay --help --------------- diff --git a/virtualsmartcard/doc/README.rst b/virtualsmartcard/doc/README.rst index 6119258..26c34e9 100644 --- a/virtualsmartcard/doc/README.rst +++ b/virtualsmartcard/doc/README.rst @@ -73,7 +73,7 @@ You should now be able to access the |vpicc| through the system's PC/SC API via |vpcd|/pcscd. You can use the opensc-explorer or pcsc_scan to test that. -.. program-output:: /home/fm/work/vsmartcard/virtualsmartcard/src/vpicc/vicc --help +.. program-output:: vicc --help .. include:: questions.rst diff --git a/virtualsmartcard/doc/README.rst.in b/virtualsmartcard/doc/README.rst.in index 2fb94a5..d3493da 100644 --- a/virtualsmartcard/doc/README.rst.in +++ b/virtualsmartcard/doc/README.rst.in @@ -73,7 +73,7 @@ You should now be able to access the |vpicc| through the system's PC/SC API via |vpcd|/pcscd. You can use the opensc-explorer or pcsc_scan to test that. -.. program-output:: @abs_top_srcdir@/src/vpicc/vicc --help +.. program-output:: vicc --help .. include:: questions.rst