From d3088829af87192719077f93abc80c98374bab17 Mon Sep 17 00:00:00 2001 From: "James R. Barlow" Date: Sun, 26 Jul 2015 01:52:08 -0700 Subject: [PATCH] More packaging changes: move jhove, fix console script --- MANIFEST.in | 4 +++- {jhove => ocrmypdf/jhove}/COPYING | 0 {jhove => ocrmypdf/jhove}/LICENSE | 0 {jhove => ocrmypdf/jhove}/README | 0 {jhove => ocrmypdf/jhove}/RELEASENOTES | 0 {jhove => ocrmypdf/jhove}/bin/JhoveApp.jar | Bin {jhove => ocrmypdf/jhove}/bin/JhoveView.jar | Bin {jhove => ocrmypdf/jhove}/bin/README | 0 {jhove => ocrmypdf/jhove}/bin/jhove-handler.jar | Bin {jhove => ocrmypdf/jhove}/bin/jhove-module.jar | Bin {jhove => ocrmypdf/jhove}/bin/jhove.jar | Bin {jhove => ocrmypdf/jhove}/build.xml | 0 {jhove => ocrmypdf/jhove}/conf/README | 0 .../jhove}/conf/jhove-byteoffset=true.conf | 0 .../jhove}/conf/jhove-withTextMD.conf | 0 {jhove => ocrmypdf/jhove}/conf/jhove.conf | 0 {jhove => ocrmypdf/jhove}/configure.pl | 0 {jhove => ocrmypdf/jhove}/gdump | 0 {jhove => ocrmypdf/jhove}/j2dump | 0 {jhove => ocrmypdf/jhove}/jdump | 0 {jhove => ocrmypdf/jhove}/jhove | 0 {jhove => ocrmypdf/jhove}/jhove.tmpl | 0 {jhove => ocrmypdf/jhove}/jhove_bat.tmpl | 0 {jhove => ocrmypdf/jhove}/lib/OdfModule.jar | Bin {jhove => ocrmypdf/jhove}/lib/PngModule.jar | Bin {jhove => ocrmypdf/jhove}/md5.pl | 0 {jhove => ocrmypdf/jhove}/packagejhove.sh | 0 {jhove => ocrmypdf/jhove}/pdump | 0 {jhove => ocrmypdf/jhove}/userhome | 0 ocrmypdf/main.py | 8 ++++++-- setup.py | 7 ++++++- 31 files changed, 15 insertions(+), 4 deletions(-) rename {jhove => ocrmypdf/jhove}/COPYING (100%) rename {jhove => ocrmypdf/jhove}/LICENSE (100%) rename {jhove => ocrmypdf/jhove}/README (100%) rename {jhove => ocrmypdf/jhove}/RELEASENOTES (100%) rename {jhove => ocrmypdf/jhove}/bin/JhoveApp.jar (100%) rename {jhove => ocrmypdf/jhove}/bin/JhoveView.jar (100%) rename {jhove => ocrmypdf/jhove}/bin/README (100%) rename {jhove => ocrmypdf/jhove}/bin/jhove-handler.jar (100%) rename {jhove => ocrmypdf/jhove}/bin/jhove-module.jar (100%) rename {jhove => ocrmypdf/jhove}/bin/jhove.jar (100%) rename {jhove => ocrmypdf/jhove}/build.xml (100%) rename {jhove => ocrmypdf/jhove}/conf/README (100%) rename {jhove => ocrmypdf/jhove}/conf/jhove-byteoffset=true.conf (100%) rename {jhove => ocrmypdf/jhove}/conf/jhove-withTextMD.conf (100%) rename {jhove => ocrmypdf/jhove}/conf/jhove.conf (100%) rename {jhove => ocrmypdf/jhove}/configure.pl (100%) rename {jhove => ocrmypdf/jhove}/gdump (100%) rename {jhove => ocrmypdf/jhove}/j2dump (100%) rename {jhove => ocrmypdf/jhove}/jdump (100%) rename {jhove => ocrmypdf/jhove}/jhove (100%) rename {jhove => ocrmypdf/jhove}/jhove.tmpl (100%) rename {jhove => ocrmypdf/jhove}/jhove_bat.tmpl (100%) rename {jhove => ocrmypdf/jhove}/lib/OdfModule.jar (100%) rename {jhove => ocrmypdf/jhove}/lib/PngModule.jar (100%) rename {jhove => ocrmypdf/jhove}/md5.pl (100%) rename {jhove => ocrmypdf/jhove}/packagejhove.sh (100%) rename {jhove => ocrmypdf/jhove}/pdump (100%) rename {jhove => ocrmypdf/jhove}/userhome (100%) diff --git a/MANIFEST.in b/MANIFEST.in index 2f42ed63..9d6a9042 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,2 +1,4 @@ -recursive-include jhove * +recursive-include ocrmypdf/jhove/bin *.jar +recursive-include ocrmypdf/jhove/lib *.jar +recursive-include ocrmypdf/jhove/conf *.conf recursive-exclude tests/output * diff --git a/jhove/COPYING b/ocrmypdf/jhove/COPYING similarity index 100% rename from jhove/COPYING rename to ocrmypdf/jhove/COPYING diff --git a/jhove/LICENSE b/ocrmypdf/jhove/LICENSE similarity index 100% rename from jhove/LICENSE rename to ocrmypdf/jhove/LICENSE diff --git a/jhove/README b/ocrmypdf/jhove/README similarity index 100% rename from jhove/README rename to ocrmypdf/jhove/README diff --git a/jhove/RELEASENOTES b/ocrmypdf/jhove/RELEASENOTES similarity index 100% rename from jhove/RELEASENOTES rename to ocrmypdf/jhove/RELEASENOTES diff --git a/jhove/bin/JhoveApp.jar b/ocrmypdf/jhove/bin/JhoveApp.jar similarity index 100% rename from jhove/bin/JhoveApp.jar rename to ocrmypdf/jhove/bin/JhoveApp.jar diff --git a/jhove/bin/JhoveView.jar b/ocrmypdf/jhove/bin/JhoveView.jar similarity index 100% rename from jhove/bin/JhoveView.jar rename to ocrmypdf/jhove/bin/JhoveView.jar diff --git a/jhove/bin/README b/ocrmypdf/jhove/bin/README similarity index 100% rename from jhove/bin/README rename to ocrmypdf/jhove/bin/README diff --git a/jhove/bin/jhove-handler.jar b/ocrmypdf/jhove/bin/jhove-handler.jar similarity index 100% rename from jhove/bin/jhove-handler.jar rename to ocrmypdf/jhove/bin/jhove-handler.jar diff --git a/jhove/bin/jhove-module.jar b/ocrmypdf/jhove/bin/jhove-module.jar similarity index 100% rename from jhove/bin/jhove-module.jar rename to ocrmypdf/jhove/bin/jhove-module.jar diff --git a/jhove/bin/jhove.jar b/ocrmypdf/jhove/bin/jhove.jar similarity index 100% rename from jhove/bin/jhove.jar rename to ocrmypdf/jhove/bin/jhove.jar diff --git a/jhove/build.xml b/ocrmypdf/jhove/build.xml similarity index 100% rename from jhove/build.xml rename to ocrmypdf/jhove/build.xml diff --git a/jhove/conf/README b/ocrmypdf/jhove/conf/README similarity index 100% rename from jhove/conf/README rename to ocrmypdf/jhove/conf/README diff --git a/jhove/conf/jhove-byteoffset=true.conf b/ocrmypdf/jhove/conf/jhove-byteoffset=true.conf similarity index 100% rename from jhove/conf/jhove-byteoffset=true.conf rename to ocrmypdf/jhove/conf/jhove-byteoffset=true.conf diff --git a/jhove/conf/jhove-withTextMD.conf b/ocrmypdf/jhove/conf/jhove-withTextMD.conf similarity index 100% rename from jhove/conf/jhove-withTextMD.conf rename to ocrmypdf/jhove/conf/jhove-withTextMD.conf diff --git a/jhove/conf/jhove.conf b/ocrmypdf/jhove/conf/jhove.conf similarity index 100% rename from jhove/conf/jhove.conf rename to ocrmypdf/jhove/conf/jhove.conf diff --git a/jhove/configure.pl b/ocrmypdf/jhove/configure.pl similarity index 100% rename from jhove/configure.pl rename to ocrmypdf/jhove/configure.pl diff --git a/jhove/gdump b/ocrmypdf/jhove/gdump similarity index 100% rename from jhove/gdump rename to ocrmypdf/jhove/gdump diff --git a/jhove/j2dump b/ocrmypdf/jhove/j2dump similarity index 100% rename from jhove/j2dump rename to ocrmypdf/jhove/j2dump diff --git a/jhove/jdump b/ocrmypdf/jhove/jdump similarity index 100% rename from jhove/jdump rename to ocrmypdf/jhove/jdump diff --git a/jhove/jhove b/ocrmypdf/jhove/jhove similarity index 100% rename from jhove/jhove rename to ocrmypdf/jhove/jhove diff --git a/jhove/jhove.tmpl b/ocrmypdf/jhove/jhove.tmpl similarity index 100% rename from jhove/jhove.tmpl rename to ocrmypdf/jhove/jhove.tmpl diff --git a/jhove/jhove_bat.tmpl b/ocrmypdf/jhove/jhove_bat.tmpl similarity index 100% rename from jhove/jhove_bat.tmpl rename to ocrmypdf/jhove/jhove_bat.tmpl diff --git a/jhove/lib/OdfModule.jar b/ocrmypdf/jhove/lib/OdfModule.jar similarity index 100% rename from jhove/lib/OdfModule.jar rename to ocrmypdf/jhove/lib/OdfModule.jar diff --git a/jhove/lib/PngModule.jar b/ocrmypdf/jhove/lib/PngModule.jar similarity index 100% rename from jhove/lib/PngModule.jar rename to ocrmypdf/jhove/lib/PngModule.jar diff --git a/jhove/md5.pl b/ocrmypdf/jhove/md5.pl similarity index 100% rename from jhove/md5.pl rename to ocrmypdf/jhove/md5.pl diff --git a/jhove/packagejhove.sh b/ocrmypdf/jhove/packagejhove.sh similarity index 100% rename from jhove/packagejhove.sh rename to ocrmypdf/jhove/packagejhove.sh diff --git a/jhove/pdump b/ocrmypdf/jhove/pdump similarity index 100% rename from jhove/pdump rename to ocrmypdf/jhove/pdump diff --git a/jhove/userhome b/ocrmypdf/jhove/userhome similarity index 100% rename from jhove/userhome rename to ocrmypdf/jhove/userhome diff --git a/ocrmypdf/main.py b/ocrmypdf/main.py index 1d707f99..1cc16fc8 100755 --- a/ocrmypdf/main.py +++ b/ocrmypdf/main.py @@ -36,7 +36,7 @@ warnings.simplefilter('ignore', pypdf.utils.PdfReadWarning) BASEDIR = os.path.dirname(os.path.realpath(__file__)) -JHOVE_PATH = os.path.realpath(os.path.join(BASEDIR, '..', 'jhove')) +JHOVE_PATH = os.path.realpath(os.path.join(BASEDIR, 'jhove')) JHOVE_JAR = os.path.join(JHOVE_PATH, 'bin', 'JhoveApp.jar') JHOVE_CFG = os.path.join(JHOVE_PATH, 'conf', 'jhove.conf') @@ -791,5 +791,9 @@ def available_cpu_count(): return 1 -if __name__ == '__main__': +def run_pipeline(): cmdline.run(options, multiprocess=available_cpu_count()) + + +if __name__ == '__main__': + run_pipeline() diff --git a/setup.py b/setup.py index e8fa5d4d..ed69adc4 100644 --- a/setup.py +++ b/setup.py @@ -37,8 +37,13 @@ setup( ], entry_points={ 'console_scripts': [ - 'ocrmypdf = ocrmypdf.main:main' + 'ocrmypdf = ocrmypdf.main:run_pipeline' ], }, + eager_resources=[ + 'ocrmypdf/jhove/bin/*.jar', + 'ocrmypdf/jhove/conf/*.conf', + 'ocrmypdf/jhove/lib/*.jar' + ], include_package_data=True, zip_safe=False)