More packaging changes: move jhove, fix console script

This commit is contained in:
James R. Barlow
2015-07-26 01:52:08 -07:00
parent 9aaaba1714
commit d3088829af
31 changed files with 15 additions and 4 deletions
+3 -1
View File
@@ -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 *
+6 -2
View File
@@ -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()
+6 -1
View File
@@ -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)