diff --git a/src/main/resources/bitrock/alfresco-customstack-build-settings.xml b/src/main/resources/bitrock/alfresco-customstack-build-settings.xml
index 7988be7927..5ff497fc5c 100644
--- a/src/main/resources/bitrock/alfresco-customstack-build-settings.xml
+++ b/src/main/resources/bitrock/alfresco-customstack-build-settings.xml
@@ -37,7 +37,6 @@
-
diff --git a/src/main/resources/bitrock/ghostscript.xml b/src/main/resources/bitrock/ghostscript.xml
index 3cf9068178..9d331fea87 100644
--- a/src/main/resources/bitrock/ghostscript.xml
+++ b/src/main/resources/bitrock/ghostscript.xml
@@ -1,4 +1,4 @@
-
+
diff --git a/src/main/resources/bitrock/imagemagick.xml b/src/main/resources/bitrock/imagemagick.xml
index ae3d4a081a..2f1b884f1e 100644
--- a/src/main/resources/bitrock/imagemagick.xml
+++ b/src/main/resources/bitrock/imagemagick.xml
@@ -23,11 +23,6 @@ System variables provided by this component:
-
-
-
-
-
@@ -93,7 +88,6 @@ System variables provided by this component:
7.0.5
7.0.5
-
@@ -132,51 +126,35 @@ System variables provided by this component:
##### IMAGEMAGICK ENV #####
-MAGICK_HOME="${imagemagick_root_directory}"
-export MAGICK_HOME
-MAGICK_CONFIGURE_PATH="${imagemagick_root_directory}/lib/ImageMagick-${imagemagick_version}/config-Q16HDRI"
-export MAGICK_CONFIGURE_PATH
-MAGICK_CODER_MODULE_PATH="${imagemagick_root_directory}/lib/ImageMagick-${imagemagick_version}/modules-Q16HDRI/coders"
-export MAGICK_CODER_MODULE_PATH
-
-
+ MAGICK_HOME="${imagemagick_root_directory}"
+ export MAGICK_HOME
+ MAGICK_CONFIGURE_PATH="${imagemagick_root_directory}/lib/ImageMagick-${imagemagick_version}/config-Q16HDRI"
+ export MAGICK_CONFIGURE_PATH
+ MAGICK_CODER_MODULE_PATH="${imagemagick_root_directory}/lib/ImageMagick-${imagemagick_version}/modules-Q16HDRI/coders"
+ export MAGICK_CODER_MODULE_PATH
+
rem ##### IMAGEMAGICK ENV #####
-set MAGICK_HOME=${imagemagick_root_directory.dos}
-set MAGICK_CODER_MODULE_PATH=${imagemagick_root_directory.dos}\modules\coders
-set MAGICK_CONFIGURE_PATH=${imagemagick_root_directory.dos}
-
+ set MAGICK_HOME=${imagemagick_root_directory.dos}
+ set MAGICK_CODER_MODULE_PATH=${imagemagick_root_directory.dos}\modules\coders
+ set MAGICK_CONFIGURE_PATH=${imagemagick_root_directory.dos}
+
-
- ${IMAGEMAGICK_ENV_VAR}
-set GS_LIB=${imagemagick_root_directory.dos}\lib
-
-
-
-
-
-
-
- ${IMAGEMAGICK_ENV_VAR}
-GS_LIB="${imagemagick_root_directory}/share/ghostscript/fonts"
-export GS_LIB
-
-
-
-
-
+
+
${IMAGEMAGICK_ENV_VAR}${ENV_VAR}
- ${imagemagick_root_directory}/bin/animate
+
+ ${imagemagick_root_directory}/bin/animate
${imagemagick_root_directory}/bin/compare
${imagemagick_root_directory}/bin/composite
${imagemagick_root_directory}/bin/conjure
@@ -228,33 +206,16 @@ export GS_LIB
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ${imagemagick_root_directory}/lib/ImageMagick-${imagemagick_version}/config-Q16HDRI/type-ghostscript.xml
-
-
- /usr/share/fonts/default/Type1
- ${common_root_directory}/share/ghostscript/fonts
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
exact
diff --git a/src/main/resources/bitrock/project.xml b/src/main/resources/bitrock/project.xml
index 996ff821da..d10d682c38 100644
--- a/src/main/resources/bitrock/project.xml
+++ b/src/main/resources/bitrock/project.xml
@@ -191,7 +191,6 @@
-
diff --git a/src/main/resources/extract-binaries.xml b/src/main/resources/extract-binaries.xml
index 496ede1b46..cada99dfee 100644
--- a/src/main/resources/extract-binaries.xml
+++ b/src/main/resources/extract-binaries.xml
@@ -148,12 +148,6 @@
- Extracting GhostScript...
-
-
-
-
-
Extracting ImageMagick...