COTECH - align Linux prerequisites on Windows - prepare products - does not impact...

diff --git a/products/Sphinx.pyconf b/products/Sphinx.pyconf
index 9b50d209a2bd0cd0e08989a126ae14a395a7e941..a3ce9dbbe581358ce0ed7a4358c846de2d20ee74 100644 (file)
--- a/products/Sphinx.pyconf
+++ b/products/Sphinx.pyconf
@@ -38,6 +38,12 @@ default_win :
     }
 }
 
+version_2_1_2:
+{
+   depend : ["Python", "setuptools", "Pygments", "Jinja2", "docutils", "sphinxcontrib_applehelp", "sphinxcontrib_serializinghtml","sphinxcontrib_websupport", "sphinxcontrib_htmlhelp", "sphinxcontrib_qthelp", "sphinxcontrib_devhelp", "sphinxcontrib_jsmath", "packaging", "requests", "imagesize", "alabaster", "Babel", "snowballstemmer", "markupsafe"]
+
+}
+
 version_1_1_3_to_1_2_3 :
 {
     name : "Sphinx"

diff --git a/products/compil_scripts/graphviz-2.38.0.sh b/products/compil_scripts/graphviz-2.38.0.sh
index 291a68813cad65b03748cfc02d3bfc38232cbad9..c5ef6e170c3d78db9b3950253335ea8556d087b0 100755 (executable)
--- a/products/compil_scripts/graphviz-2.38.0.sh
+++ b/products/compil_scripts/graphviz-2.38.0.sh
@@ -11,8 +11,6 @@ cp -r $SOURCE_DIR/* .
 echo "graphviz compilation"
 
 echo
-#echo "*** ./configure --prefix=${PRODUCT_INSTALL} --with-tcl=${TCLHOME}/lib --with-expat=no --with-qt=no --with-cgraph=no  --enable-perl=no"
-#./configure --prefix=${PRODUCT_INSTALL} --with-tcl=${TCLHOME}/lib --with-expat=no --with-qt=no --with-cgraph=no --enable-perl=no
 echo "*** ./configure --prefix=${PRODUCT_INSTALL}  --enable-tcl=no --with-expat=no --with-qt=no  --enable-perl=no --enable-ocaml=no"
 ./configure --prefix=${PRODUCT_INSTALL} --enable-tcl=no --with-expat=no --with-qt=no  --enable-perl=no --enable-ocaml=no --with-ghostscript=no --enable-python=no --enable-java=no
 

diff --git a/products/env_scripts/pycairo.py b/products/env_scripts/pycairo.py
new file mode 100644 (file)
index 0000000..4e89c90
--- /dev/null
+++ b/products/env_scripts/pycairo.py
@@ -0,0 +1,11 @@
+#!/usr/bin/env python
+#-*- coding:utf-8 -*-
+
+import os.path
+import platform
+
+def set_env(env, prereq_dir, version):
+    env.set('PYCAIRO_ROOT_DIR', prereq_dir)
+
+def set_nativ_env(env):
+    pass

diff --git a/products/graphviz.pyconf b/products/graphviz.pyconf
index 505cee456f1a96f99550e456121981f9080a4883..43147a4ac0b2bcb17d2db519fc61f26dda2b71d6 100755 (executable)
--- a/products/graphviz.pyconf
+++ b/products/graphviz.pyconf
@@ -41,10 +41,12 @@ default_win :
 
 version_2_44_1 :
 {
+    build_source : "cmake"
 }
 
 version_2_44_1_win :
 {
+    build_source : "script"
     compil_script :  "graphviz-2.44.1" + $VARS.scriptExtension
     depend : ['expat','zlib','libpng','libxml2', 'libjpeg','cmake']
 }

diff --git a/products/nlopt.pyconf b/products/nlopt.pyconf
index 336664ac8823e2c052791cd13c56068b4e7fe0ca..b031195f63e5897b0add997035a10cd799a7ee12 100644 (file)
--- a/products/nlopt.pyconf
+++ b/products/nlopt.pyconf
@@ -30,3 +30,14 @@ default_win:
      single_install_dir : "yes"
    }
 }
+
+version_2_5_0:
+{
+    build_source : "cmake"
+    cmake_options : "-DBUILD_SHARED_LIBS:BOOL=ON -DNLOPT_MATLAB:BOOL=OFF -DNLOPT_OCTAVE:BOOL=OFF -DNLOPT_GUILE:BOOL=OFF"
+}
+
+version_2_5_0_win:
+{
+    build_source : "script"
+}

diff --git a/products/pycairo.pyconf b/products/pycairo.pyconf
new file mode 100644 (file)
index 0000000..c8a935b
--- /dev/null
+++ b/products/pycairo.pyconf
@@ -0,0 +1,20 @@
+default :
+{
+    name : "pycairo"
+    build_source : "script"
+    compil_script : "pip_install" + $VARS.scriptExtension
+    get_source : "archive"
+    environ :
+    {
+        env_script : $name + ".py"
+    }
+    depend : ['Python','six','setuptools']
+    source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
+    build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name
+    install_dir : 'base'
+    properties:
+    {
+      incremental : "yes"
+      pip : "yes"
+    }
+}