From 2caee65f69c7bf83527a04abb18088b9d50f7e88 Mon Sep 17 00:00:00 2001 From: Andrei Rebegea Date: Thu, 15 Jun 2017 11:20:33 +0000 Subject: [PATCH] Merged 5.2.N (5.2.2) to HEAD (5.2) 137096 skopf: Merged REPO-2054 (5.2.1) to 5.2.N (5.2.1) 136870 anechifor: changes pdfium->alfresco-pdf-renderer git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137611 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../bitrock/alfresco-build-settings.xml | 2 +- .../alfresco-customstack-build-settings.xml | 2 +- .../bitrock/alfresco-pdf-renderer.xml | 82 +++++++++++++++++++ src/main/resources/bitrock/project.xml | 2 +- src/main/resources/extract-binaries.xml | 2 +- 5 files changed, 86 insertions(+), 4 deletions(-) create mode 100644 src/main/resources/bitrock/alfresco-pdf-renderer.xml diff --git a/src/main/resources/bitrock/alfresco-build-settings.xml b/src/main/resources/bitrock/alfresco-build-settings.xml index b4ddb3e75b..ea36b4911f 100644 --- a/src/main/resources/bitrock/alfresco-build-settings.xml +++ b/src/main/resources/bitrock/alfresco-build-settings.xml @@ -57,7 +57,7 @@ - + diff --git a/src/main/resources/bitrock/alfresco-customstack-build-settings.xml b/src/main/resources/bitrock/alfresco-customstack-build-settings.xml index d1d1dc5ffe..510d35a390 100644 --- a/src/main/resources/bitrock/alfresco-customstack-build-settings.xml +++ b/src/main/resources/bitrock/alfresco-customstack-build-settings.xml @@ -37,7 +37,7 @@ - + diff --git a/src/main/resources/bitrock/alfresco-pdf-renderer.xml b/src/main/resources/bitrock/alfresco-pdf-renderer.xml new file mode 100644 index 0000000000..493f96eb54 --- /dev/null +++ b/src/main/resources/bitrock/alfresco-pdf-renderer.xml @@ -0,0 +1,82 @@ + + alfresco_pdf_renderer + alfresco_pdf_renderer + 0 + 0 + 1 + + + + 0 + alfresco_pdf_renderer_root_directory + alfresco_pdf_renderer_root_directory + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ##### ALFRESCO_PDF_RENDERER ENV ##### +ALFRESCO_PDF_RENDERER_VAR="${alfresco_pdf_renderer_root_directory}" +export ALFRESCO_PDF_RENDERER_VAR + + + + + + + + rem ##### ALFRESCO_PDF_RENDERER ENV ##### +set ALFRESCO_PDF_RENDERER_VAR=${alfresco_pdf_renderer_root_directory} + + + + + + + ${ALFRESCO_PDF_RENDERER_VAR}${ENV_VAR} + + + + + + alfresco_pdf_renderer + ${alfresco_pdf_renderer_root_directory} + + + + + + + + + diff --git a/src/main/resources/bitrock/project.xml b/src/main/resources/bitrock/project.xml index 9199403698..e9d0b27ca0 100644 --- a/src/main/resources/bitrock/project.xml +++ b/src/main/resources/bitrock/project.xml @@ -191,7 +191,7 @@ - + diff --git a/src/main/resources/extract-binaries.xml b/src/main/resources/extract-binaries.xml index 44cce608f9..1c5bd145cb 100644 --- a/src/main/resources/extract-binaries.xml +++ b/src/main/resources/extract-binaries.xml @@ -149,7 +149,7 @@ Extracting Alfresco Pdf Renderer... - +