Add dependency of ParaView on freetype and libxml2

diff --git a/config_CentOS_5.5_64bit.xml b/config_CentOS_5.5_64bit.xml
index 329735a4396a9d9c12b743176754b479133c848c..58f7c9afdbcc12728a728b177848f5f0b6a09807 100755 (executable)
--- a/config_CentOS_5.5_64bit.xml
+++ b/config_CentOS_5.5_64bit.xml
@@ -590,6 +590,15 @@
                    installdiskspace="2970,9509,19100"
                    script="scotch.sh"/>
     </product>
+    <product name="libxml2" 
+            type="prerequisite"
+             description="XML C parser">
+      <installation os="CentOS 5.5 64bit"
+                    version="2.9.0" 
+                   disable="false"
+                   installdiskspace="17681,45113,95387"
+                   script="libxml2.sh"/>
+    </product>
     <product name="ParaView"
             type="prerequisite"
             description="Scalable, open-source visualization application">
@@ -689,15 +698,6 @@
                    installdiskspace="18030,0,18030"
                    script="homard.sh"/>
     </product>
-    <product name="libxml2" 
-            type="prerequisite"
-             description="XML C parser">
-      <installation os="CentOS 5.5 64bit"
-                    version="2.9.0" 
-                   disable="false"
-                   installdiskspace="17681,45113,95387"
-                   script="libxml2.sh"/>
-    </product>
     <product name="wso2" 
             type="prerequisite"
              description="WSO2 Web Services Framework for C++ (WSF/C++) is an extension to WSO2 Web Services Framework for C (WSF/C) wrapping the existing API.">
@@ -1146,6 +1146,10 @@
     <product name="Qt">
       <dep>gcc</dep>
     </product>
+    <product name="libxml2">
+      <dep>gcc</dep>
+      <dep>Python</dep>
+    </product>    
     <product name="Sip">
       <dep>gcc</dep>
       <dep>Python</dep>
@@ -1244,6 +1248,8 @@
       <dep>Qt</dep>
       <dep>boost</dep>
       <dep>gl2ps</dep>
+      <dep>freetype</dep>
+      <dep>libxml2</dep>
     </product>
     <product name="numpy">
       <dep>gcc</dep>
@@ -1266,10 +1272,6 @@
       <dep>gcc</dep>
       <dep>Python</dep>
     </product>
-    <product name="libxml2">
-      <dep>gcc</dep>
-      <dep>Python</dep>
-    </product>    
     <product name="netgen">
       <dep>gcc</dep>
       <dep>tcltk</dep>

diff --git a/config_CentOS_6.3_64bit.xml b/config_CentOS_6.3_64bit.xml
index 08a46c60853c4bc7922b3afe7b0512c3e2ea6193..a6242553df5250125587979981b370f82dbe70c4 100755 (executable)
--- a/config_CentOS_6.3_64bit.xml
+++ b/config_CentOS_6.3_64bit.xml
@@ -581,6 +581,15 @@
                    installdiskspace="2970,9509,19100"
                    script="scotch.sh"/>
     </product>
+    <product name="libxml2" 
+            type="prerequisite"
+             description="XML C parser">
+      <installation os="CentOS 6.3 64bit"
+                    version="2.9.0" 
+                   disable="false"
+                   installdiskspace="17681,45113,95387"
+                   script="libxml2.sh"/>
+    </product>
     <product name="ParaView"
             type="prerequisite"
             description="Scalable, open-source visualization application">
@@ -680,15 +689,6 @@
                    installdiskspace="18030,0,18030"
                    script="homard.sh"/>
     </product>
-    <product name="libxml2" 
-            type="prerequisite"
-             description="XML C parser">
-      <installation os="CentOS 6.3 64bit"
-                    version="2.9.0" 
-                   disable="false"
-                   installdiskspace="17681,45113,95387"
-                   script="libxml2.sh"/>
-    </product>
     <product name="wso2" 
             type="prerequisite"
              description="WSO2 Web Services Framework for C++ (WSF/C++) is an extension to WSO2 Web Services Framework for C (WSF/C) wrapping the existing API.">
@@ -1103,6 +1103,9 @@
     <product name="Python">
       <dep>tcltk</dep>
     </product>
+    <product name="libxml2">
+      <dep>Python</dep>
+    </product>    
     <product name="Sip">
       <dep>Python</dep>
       <dep>Qt</dep>
@@ -1170,6 +1173,8 @@
       <dep>Qt</dep>
       <dep>boost</dep>
       <dep>gl2ps</dep>
+      <dep>freetype</dep>
+      <dep>libxml2</dep>
     </product>
     <product name="numpy">
       <dep>Python</dep>
@@ -1185,9 +1190,6 @@
     <product name="docutils">
       <dep>Python</dep>
     </product>
-    <product name="libxml2">
-      <dep>Python</dep>
-    </product>    
     <product name="netgen">
       <dep>tcltk</dep>
       <dep>OpenCascade</dep>

diff --git a/config_Debian_6.0_64bit.xml b/config_Debian_6.0_64bit.xml
index b09268d4a802bcae7b42d5a24c269aa26b62fac0..a82294cc9641dab4c45dded91da5062999b135da 100755 (executable)
--- a/config_Debian_6.0_64bit.xml
+++ b/config_Debian_6.0_64bit.xml
@@ -581,6 +581,15 @@
                    installdiskspace="2970,9509,19100"
                    script="scotch.sh"/>
     </product>
+    <product name="libxml2" 
+            type="prerequisite"
+             description="XML C parser">
+      <installation os="Debian 6.0 64bit"
+                    version="2.9.0" 
+                   disable="false"
+                   installdiskspace="17681,45113,95387"
+                   script="libxml2.sh"/>
+    </product>
     <product name="ParaView"
             type="prerequisite"
             description="Scalable, open-source visualization application">
@@ -680,15 +689,6 @@
                    installdiskspace="18030,0,18030"
                    script="homard.sh"/>
     </product>
-    <product name="libxml2" 
-            type="prerequisite"
-             description="XML C parser">
-      <installation os="Debian 6.0 64bit"
-                    version="2.9.0" 
-                   disable="false"
-                   installdiskspace="17681,45113,95387"
-                   script="libxml2.sh"/>
-    </product>
     <product name="wso2" 
             type="prerequisite"
              description="WSO2 Web Services Framework for C++ (WSF/C++) is an extension to WSO2 Web Services Framework for C (WSF/C) wrapping the existing API.">
@@ -1103,6 +1103,9 @@
     <product name="Python">
       <dep>tcltk</dep>
     </product>
+    <product name="libxml2">
+      <dep>Python</dep>
+    </product>    
     <product name="Sip">
       <dep>Python</dep>
       <dep>Qt</dep>
@@ -1170,6 +1173,8 @@
       <dep>Qt</dep>
       <dep>boost</dep>
       <dep>gl2ps</dep>
+      <dep>freetype</dep>
+      <dep>libxml2</dep>
     </product>
     <product name="numpy">
       <dep>Python</dep>
@@ -1185,9 +1190,6 @@
     <product name="docutils">
       <dep>Python</dep>
     </product>
-    <product name="libxml2">
-      <dep>Python</dep>
-    </product>    
     <product name="netgen">
       <dep>tcltk</dep>
       <dep>OpenCascade</dep>

diff --git a/config_Debian_7_64bit.xml b/config_Debian_7_64bit.xml
index 9395927d7e64ce7ebd8b52809ea84dccf565bc13..02141ec3657261d71986d663c56e634ef5809dca 100644 (file)
--- a/config_Debian_7_64bit.xml
+++ b/config_Debian_7_64bit.xml
@@ -581,6 +581,15 @@
                    installdiskspace="2970,9509,19100"
                    script="scotch.sh"/>
     </product>
+    <product name="libxml2" 
+            type="prerequisite"
+             description="XML C parser">
+      <installation os="Debian 7 64bit"
+                    version="2.9.0" 
+                   disable="false"
+                   installdiskspace="17681,45113,95387"
+                   script="libxml2.sh"/>
+    </product>
     <product name="ParaView"
             type="prerequisite"
             description="Scalable, open-source visualization application">
@@ -680,15 +689,6 @@
                    installdiskspace="18030,0,18030"
                    script="homard.sh"/>
     </product>
-    <product name="libxml2" 
-            type="prerequisite"
-             description="XML C parser">
-      <installation os="Debian 7 64bit"
-                    version="2.9.0" 
-                   disable="false"
-                   installdiskspace="17681,45113,95387"
-                   script="libxml2.sh"/>
-    </product>
     <product name="wso2" 
             type="prerequisite"
              description="WSO2 Web Services Framework for C++ (WSF/C++) is an extension to WSO2 Web Services Framework for C (WSF/C) wrapping the existing API.">
@@ -1103,6 +1103,9 @@
     <product name="Python">
       <dep>tcltk</dep>
     </product>
+    <product name="libxml2">
+      <dep>Python</dep>
+    </product>    
     <product name="Sip">
       <dep>Python</dep>
       <dep>Qt</dep>
@@ -1170,6 +1173,8 @@
       <dep>Qt</dep>
       <dep>boost</dep>
       <dep>gl2ps</dep>
+      <dep>freetype</dep>
+      <dep>libxml2</dep>
     </product>
     <product name="numpy">
       <dep>Python</dep>
@@ -1185,9 +1190,6 @@
     <product name="docutils">
       <dep>Python</dep>
     </product>
-    <product name="libxml2">
-      <dep>Python</dep>
-    </product>    
     <product name="netgen">
       <dep>tcltk</dep>
       <dep>OpenCascade</dep>

diff --git a/config_Fedora_18_64bit.xml b/config_Fedora_18_64bit.xml
index 740f751c6b5251d0f8aa4c50fe7131083020179d..f1ce0f3007e8ca088b188713c103dc10038d49d7 100755 (executable)
--- a/config_Fedora_18_64bit.xml
+++ b/config_Fedora_18_64bit.xml
@@ -581,6 +581,15 @@
                    installdiskspace="2970,9509,19100"
                    script="scotch.sh"/>
     </product>
+    <product name="libxml2" 
+            type="prerequisite"
+             description="XML C parser">
+      <installation os="Fedora 18 64bit"
+                    version="2.9.0" 
+                   disable="false"
+                   installdiskspace="17681,45113,95387"
+                   script="libxml2.sh"/>
+    </product>
     <product name="ParaView"
             type="prerequisite"
             description="Scalable, open-source visualization application">
@@ -680,15 +689,6 @@
                    installdiskspace="18030,0,18030"
                    script="homard.sh"/>
     </product>
-    <product name="libxml2" 
-            type="prerequisite"
-             description="XML C parser">
-      <installation os="Fedora 18 64bit"
-                    version="2.9.0" 
-                   disable="false"
-                   installdiskspace="17681,45113,95387"
-                   script="libxml2.sh"/>
-    </product>
     <product name="wso2" 
             type="prerequisite"
              description="WSO2 Web Services Framework for C++ (WSF/C++) is an extension to WSO2 Web Services Framework for C (WSF/C) wrapping the existing API.">
@@ -1103,6 +1103,9 @@
     <product name="Python">
       <dep>tcltk</dep>
     </product>
+    <product name="libxml2">
+      <dep>Python</dep>
+    </product>    
     <product name="Sip">
       <dep>Python</dep>
       <dep>Qt</dep>
@@ -1170,6 +1173,8 @@
       <dep>Qt</dep>
       <dep>boost</dep>
       <dep>gl2ps</dep>
+      <dep>freetype</dep>
+      <dep>libxml2</dep>
     </product>
     <product name="numpy">
       <dep>Python</dep>
@@ -1185,9 +1190,6 @@
     <product name="docutils">
       <dep>Python</dep>
     </product>
-    <product name="libxml2">
-      <dep>Python</dep>
-    </product>    
     <product name="netgen">
       <dep>tcltk</dep>
       <dep>OpenCascade</dep>

diff --git a/config_Mandriva_2010.0_64bit.xml b/config_Mandriva_2010.0_64bit.xml
index 5e0564ae9a2999ed04a180d7cb32bd056722e434..2d4a047658e49551c4f7f532f41c627ae49e5307 100755 (executable)
--- a/config_Mandriva_2010.0_64bit.xml
+++ b/config_Mandriva_2010.0_64bit.xml
@@ -581,6 +581,15 @@
                    installdiskspace="2970,9509,19100"
                    script="scotch.sh"/>
     </product>
+    <product name="libxml2" 
+            type="prerequisite"
+             description="XML C parser">
+      <installation os="Mandriva 2010.0 64bit"
+                    version="2.9.0" 
+                   disable="true"
+                   installdiskspace="17681,45113,95387"
+                   script="libxml2.sh"/>
+    </product>
     <product name="ParaView"
             type="prerequisite"
             description="Scalable, open-source visualization application">
@@ -680,15 +689,6 @@
                    installdiskspace="18030,0,18030"
                    script="homard.sh"/>
     </product>
-    <product name="libxml2" 
-            type="prerequisite"
-             description="XML C parser">
-      <installation os="Mandriva 2010.0 64bit"
-                    version="2.9.0" 
-                   disable="true"
-                   installdiskspace="17681,45113,95387"
-                   script="libxml2.sh"/>
-    </product>
     <product name="wso2" 
             type="prerequisite"
              description="WSO2 Web Services Framework for C++ (WSF/C++) is an extension to WSO2 Web Services Framework for C (WSF/C) wrapping the existing API.">
@@ -1098,6 +1098,9 @@
     <product name="Python">
       <dep>tcltk</dep>
     </product>
+    <product name="libxml2">
+      <dep>Python</dep>
+    </product>    
     <product name="Sip">
       <dep>Python</dep>
       <dep>Qt</dep>
@@ -1165,6 +1168,7 @@
       <dep>Qt</dep>
       <dep>boost</dep>
       <dep>gl2ps</dep>
+      <dep>freetype</dep>
     </product>
     <product name="numpy">
       <dep>Python</dep>
@@ -1180,9 +1184,6 @@
     <product name="docutils">
       <dep>Python</dep>
     </product>
-    <product name="libxml2">
-      <dep>Python</dep>
-    </product>    
     <product name="netgen">
       <dep>tcltk</dep>
       <dep>OpenCascade</dep>

diff --git a/config_Ubuntu_13.10_64bit.xml b/config_Ubuntu_13.10_64bit.xml
index 90c329c3d862c61783bec0995ae37a8f00066dd1..9047ac9ae3910869a79af8431ad3011d6cc28226 100644 (file)
--- a/config_Ubuntu_13.10_64bit.xml
+++ b/config_Ubuntu_13.10_64bit.xml
@@ -581,6 +581,15 @@
                    installdiskspace="2970,9509,19100"
                    script="scotch.sh"/>
     </product>
+    <product name="libxml2" 
+            type="prerequisite"
+             description="XML C parser">
+      <installation os="Ubuntu 13.10 64bit"
+                    version="2.9.0" 
+                   disable="false"
+                   installdiskspace="17681,45113,95387"
+                   script="libxml2.sh"/>
+    </product>
     <product name="ParaView"
             type="prerequisite"
             description="Scalable, open-source visualization application">
@@ -680,15 +689,6 @@
                    installdiskspace="18030,0,18030"
                    script="homard.sh"/>
     </product>
-    <product name="libxml2" 
-            type="prerequisite"
-             description="XML C parser">
-      <installation os="Ubuntu 13.10 64bit"
-                    version="2.9.0" 
-                   disable="false"
-                   installdiskspace="17681,45113,95387"
-                   script="libxml2.sh"/>
-    </product>
     <product name="wso2" 
             type="prerequisite"
              description="WSO2 Web Services Framework for C++ (WSF/C++) is an extension to WSO2 Web Services Framework for C (WSF/C) wrapping the existing API.">
@@ -1103,6 +1103,9 @@
     <product name="Python">
       <dep>tcltk</dep>
     </product>
+    <product name="libxml2">
+      <dep>Python</dep>
+    </product>    
     <product name="Sip">
       <dep>Python</dep>
       <dep>Qt</dep>
@@ -1170,6 +1173,8 @@
       <dep>Qt</dep>
       <dep>boost</dep>
       <dep>gl2ps</dep>
+      <dep>freetype</dep>
+      <dep>libxml2</dep>
     </product>
     <product name="numpy">
       <dep>Python</dep>
@@ -1185,9 +1190,6 @@
     <product name="docutils">
       <dep>Python</dep>
     </product>
-    <product name="libxml2">
-      <dep>Python</dep>
-    </product>    
     <product name="netgen">
       <dep>tcltk</dep>
       <dep>OpenCascade</dep>

diff --git a/config_files/ParaView.sh b/config_files/ParaView.sh
index 2852f555ff6512ea2aad7a155d7e98962e6f7820..cd4478ce85475ce95522b7a995e660c5df82e1d1 100755 (executable)
--- a/config_files/ParaView.sh
+++ b/config_files/ParaView.sh
@@ -361,6 +361,8 @@ if [ "${patch_vtkconfig}" = "1" ] ; then
     sed -i "s%[^;\"]\+/Python-[0-9\.]\+/lib/\([^;]\+\)%${PYTHON_ROOT_DIR}/lib/\1%g" ${PRODUCT_DIR}/lib/cmake/paraview-${PVLIBVERSION}/VTKTargets.cmake
     sed -i "s%[^;\"]\+/hdf5-[0-9\.]\+/lib/\([^;]\+\)%${HDF5_ROOT_DIR}/lib/\1%g" ${PRODUCT_DIR}/lib/cmake/paraview-${PVLIBVERSION}/VTKTargets.cmake
     sed -i "s%[^;\"]\+/gl2ps-[0-9\.]\+/lib/\([^;]\+\)%${GL2PS_ROOT_DIR}/lib/\1%g" ${PRODUCT_DIR}/lib/cmake/paraview-${PVLIBVERSION}/VTKTargets.cmake
+    sed -i "s%[^;\"]\+/freetype-[0-9\.]\+/lib/\([^;]\+\)%${FREETYPE_ROOT_DIR}/lib/\1%g" ${PRODUCT_DIR}/lib/cmake/paraview-${PVLIBVERSION}/VTKTargets.cmake
+    sed -i "s%[^;\"]\+/libxml2-[0-9\.]\+/lib/\([^;]\+\)%${LIBXML2_ROOT_DIR}/lib/\1%g" ${PRODUCT_DIR}/lib/cmake/paraview-${PVLIBVERSION}/VTKTargets.cmake
 fi
 
 # patch: fix wrong NVidia drivers dependencies
@@ -428,6 +430,12 @@ sed -e "s%/[^\";]*/bin/moc%${QT4_ROOT_DIR}/bin/moc%g"     \
     -e "s%/[^\";]*/gl2ps-[0-9]\+\.[0-9]\+\.[0-9]\+/include%${GL2PS_ROOT_DIR}/include%g" \
     -e "s%/[^\";]*/lib/libgl2ps.so%${GL2PS_ROOT_DIR}/lib/libgl2ps.so%g" \
     -e "s%/[^\";]*/lib64/libgl2ps.so%${GL2PS_ROOT_DIR}/lib64/libgl2ps.so%g" \
+    -e "s%/[^\";]*/lib/libfreetype.so%${FREETYPE_ROOT_DIR}/lib/libfreetype.so%g" \
+    -e "s%/[^\";]*/lib64/libfreetype.so%${FREETYPE_ROOT_DIR}/lib64/libfreetype.so%g" \
+    -e "s%/[^\";]*/freetype-[0-9\.]\+/include%${FREETYPE_ROOT_DIR}/include%g" \
+    -e "s%/[^\";]*/lib/libxml2.so%${LIBXML2_ROOT_DIR}/lib/libxml2.so%g" \
+    -e "s%/[^\";]*/lib64/libxml2.so%${LIBXML2_ROOT_DIR}/lib64/libxml2.so%g" \
+    -e "s%/[^\";]*/libxml2-[0-9\.]\+/include%${LIBXML2_ROOT_DIR}/include%g" \
     -e "s%\(IMPORTED_LOCATION_RELEASE.*\"\).*/lib/paraview-${PVLIBVERSION}/\([^/]\+\"\)%\1${PRODUCT_DIR}/lib/paraview-${PVLIBVERSION}/\2%g" \
     -e "s%\(IMPORTED_LOCATION_RELEASE.* \"\).*/bin/\([^/]\+\"\)%\1${PRODUCT_DIR}/bin/\2%g" \
     ${f} > ${f}.new