From 3a40135f59bc0f252d5ecc04151a70173fba0d01 Mon Sep 17 00:00:00 2001 From: Serge Rehbinder Date: Thu, 2 Jun 2016 08:42:35 +0200 Subject: [PATCH] Default archive name for products that are in archive mode --- commands/prepare.py | 1 + data/products/CAS.pyconf | 6 +----- data/products/Cython.pyconf | 6 +----- data/products/Homard.pyconf | 6 +----- data/products/Jinja2.pyconf | 6 +----- data/products/MeshGems.pyconf | 6 +----- data/products/ParMetis.pyconf | 4 ---- data/products/PyQt.pyconf | 6 +----- data/products/Pygments.pyconf | 6 +----- data/products/Python.pyconf | 6 +----- data/products/Sphinx.pyconf | 6 +----- data/products/boost.pyconf | 6 +----- data/products/cgns.pyconf | 6 +----- data/products/cmake.pyconf | 6 +----- data/products/cppunit.pyconf | 6 +----- data/products/dateutil.pyconf | 6 +----- data/products/distribute.pyconf | 6 +----- data/products/docutils.pyconf | 6 +----- data/products/doxygen.pyconf | 4 ---- data/products/fftw.pyconf | 6 +----- data/products/freeimage.pyconf | 4 ---- data/products/graphviz.pyconf | 4 ---- data/products/hdf5.pyconf | 6 +----- data/products/lapack.pyconf | 6 +----- data/products/libxml2.pyconf | 1 - data/products/markupsafe.pyconf | 6 +----- data/products/med.pyconf | 6 +----- data/products/metis.pyconf | 6 +----- data/products/numpy.pyconf | 6 +----- data/products/omniORB.pyconf | 6 +----- data/products/omniORBpy.pyconf | 6 +----- data/products/opencv.pyconf | 6 +----- data/products/paraview.pyconf | 4 ---- data/products/pyparsing.pyconf | 6 +----- data/products/pyreadline.pyconf | 6 +----- data/products/pytz.pyconf | 6 +----- data/products/qt.pyconf | 4 ---- data/products/scipy.pyconf | 4 ---- data/products/scotch.pyconf | 4 ---- data/products/setuptools.pyconf | 6 +----- data/products/sip.pyconf | 6 +----- data/products/six.pyconf | 6 +----- data/products/swig.pyconf | 6 +----- data/products/tcl.pyconf | 6 +----- data/products/tk.pyconf | 6 +----- src/product.py | 11 +++++++++++ 46 files changed, 47 insertions(+), 208 deletions(-) diff --git a/commands/prepare.py b/commands/prepare.py index 8930ac9..3dedf61 100644 --- a/commands/prepare.py +++ b/commands/prepare.py @@ -157,6 +157,7 @@ def run(args, runner, logger): if do_clean: msg = _("Clean the source directories ...") logger.write(msg, 3) + logger.flush() res_clean, __ = runner.clean(args_clean, batch=True, verbose = 0, logger_add_link = logger) if res_clean == 0: diff --git a/data/products/CAS.pyconf b/data/products/CAS.pyconf index 610302b..c19c9da 100644 --- a/data/products/CAS.pyconf +++ b/data/products/CAS.pyconf @@ -1,13 +1,9 @@ -CAS_6_9_1p1 : +CAS : { name : "CAS" build_source : "autotools" configure_options : "-without-tcl --without-tk --disable-draw --with-freetype=$FREETYPEDIR --enable-debug=no --enable-production=yes --with-gl2ps=$GL2PSDIR --with-freeimage=$FREEIMAGEDIR" get_source : "archive" - archive_info: - { - archive_name : $SITE.prepare.archive_dir + $name + "-6.9.1p1.tar.gz" - } environ : { env_script : $VARS.datadir + $VARS.sep + "env_scripts" + $VARS.sep + $name + ".py" diff --git a/data/products/Cython.pyconf b/data/products/Cython.pyconf index 3b15fcf..67547f3 100644 --- a/data/products/Cython.pyconf +++ b/data/products/Cython.pyconf @@ -1,13 +1,9 @@ -Cython_0_23_2 : +Cython : { name : "Cython" build_source : "script" compil_script : "cython.sh" get_source : "archive" - archive_info: - { - archive_name : $SITE.prepare.archive_dir + "Cython-0.23.2.tar.gz" - } environ : { env_script : $VARS.datadir + $VARS.sep + "env_scripts" + $VARS.sep + $name + ".py" diff --git a/data/products/Homard.pyconf b/data/products/Homard.pyconf index a737fb5..bbd3563 100644 --- a/data/products/Homard.pyconf +++ b/data/products/Homard.pyconf @@ -1,13 +1,9 @@ -Homard_11_7 : +Homard : { name : "Homard" build_source : "script" compil_script : $name + ".sh" get_source : "archive" - archive_info: - { - archive_name : $SITE.prepare.archive_dir + $name + "-11.7.tar.gz" - } environ : { env_script : $VARS.datadir + $VARS.sep + "env_scripts" + $VARS.sep + $name + ".py" diff --git a/data/products/Jinja2.pyconf b/data/products/Jinja2.pyconf index acd63c7..bd5d752 100644 --- a/data/products/Jinja2.pyconf +++ b/data/products/Jinja2.pyconf @@ -1,13 +1,9 @@ -Jinja2_2_7_3 : +Jinja2 : { name : "Jinja2" build_source : "script" compil_script : $name + ".sh" get_source : "archive" - archive_info: - { - archive_name : $SITE.prepare.archive_dir + $name + "-2.7.3.tar.gz" - } environ : { env_script : $VARS.datadir + $VARS.sep + "env_scripts" + $VARS.sep + $name + ".py" diff --git a/data/products/MeshGems.pyconf b/data/products/MeshGems.pyconf index bb64d7d..1da5ad0 100644 --- a/data/products/MeshGems.pyconf +++ b/data/products/MeshGems.pyconf @@ -1,13 +1,9 @@ -MeshGems_2_1_11 : +MeshGems : { name : "MeshGems" build_source : "script" compil_script : $name + ".sh" get_source : "archive" - archive_info: - { - archive_name : $SITE.prepare.archive_dir + $name + "-2.1-11.tar.gz" - } environ : { env_script : $VARS.datadir + $VARS.sep + "env_scripts" + $VARS.sep + $name + ".py" diff --git a/data/products/ParMetis.pyconf b/data/products/ParMetis.pyconf index 22c50b1..57f82e8 100644 --- a/data/products/ParMetis.pyconf +++ b/data/products/ParMetis.pyconf @@ -4,10 +4,6 @@ ParMetis_3_1_1 : build_source : "script" compil_script : $name + "-3.sh" get_source : "archive" - archive_info: - { - archive_name : $SITE.prepare.archive_dir + $name + "-3.1.1.tar.gz" - } environ : { env_script : $VARS.datadir + $VARS.sep + "env_scripts" + $VARS.sep + $name + ".py" diff --git a/data/products/PyQt.pyconf b/data/products/PyQt.pyconf index ec22b72..aceaac8 100644 --- a/data/products/PyQt.pyconf +++ b/data/products/PyQt.pyconf @@ -1,13 +1,9 @@ -PyQt_4_9_6 : +PyQt : { name : "PyQt" build_source : "script" compil_script : $name + ".sh" get_source : "archive" - archive_info: - { - archive_name : $SITE.prepare.archive_dir + $name + "-4.9.6.tar.gz" - } environ : { env_script : $VARS.datadir + $VARS.sep + "env_scripts" + $VARS.sep + $name + ".py" diff --git a/data/products/Pygments.pyconf b/data/products/Pygments.pyconf index 55296ac..2dc0ab0 100644 --- a/data/products/Pygments.pyconf +++ b/data/products/Pygments.pyconf @@ -1,13 +1,9 @@ -Pygments_2_0_2 : +Pygments : { name : "Pygments" build_source : "script" compil_script : $name + ".sh" get_source : "archive" - archive_info: - { - archive_name : $SITE.prepare.archive_dir + $name + "-2.0.2.tar.gz" - } environ : { env_script : $VARS.datadir + $VARS.sep + "env_scripts" + $VARS.sep + $name + ".py" diff --git a/data/products/Python.pyconf b/data/products/Python.pyconf index a4213ec..a504604 100644 --- a/data/products/Python.pyconf +++ b/data/products/Python.pyconf @@ -1,13 +1,9 @@ -Python_2_7_10 : +Python : { name : "Python" build_source : "script" compil_script : "Python.sh" get_source : "archive" - archive_info: - { - archive_name : $SITE.prepare.archive_dir + "Python-2.7.10.tar.gz" - } environ : { env_script : $VARS.datadir + $VARS.sep + "env_scripts" + $VARS.sep + $name + ".py" diff --git a/data/products/Sphinx.pyconf b/data/products/Sphinx.pyconf index 5d862ca..cff3bf2 100644 --- a/data/products/Sphinx.pyconf +++ b/data/products/Sphinx.pyconf @@ -1,13 +1,9 @@ -Sphinx_1_2_3 : +Sphinx : { name : "Sphinx" build_source : "script" compil_script : $name + ".sh" get_source : "archive" - archive_info: - { - archive_name : $SITE.prepare.archive_dir + $name + "-1.2.3.tar.gz" - } environ : { env_script : $VARS.datadir + $VARS.sep + "env_scripts" + $VARS.sep + $name + ".py" diff --git a/data/products/boost.pyconf b/data/products/boost.pyconf index ec4b0ee..6f0763e 100644 --- a/data/products/boost.pyconf +++ b/data/products/boost.pyconf @@ -1,13 +1,9 @@ -boost_1_58_0 : +boost : { name : "boost" build_source : "script" compil_script : $name + ".sh" get_source : "archive" - archive_info: - { - archive_name : $SITE.prepare.archive_dir + $name + "-1.58.0.tar.gz" - } environ : { env_script : $VARS.datadir + $VARS.sep + "env_scripts" + $VARS.sep + $name + ".py" diff --git a/data/products/cgns.pyconf b/data/products/cgns.pyconf index 5eb94ae..8b20f8c 100644 --- a/data/products/cgns.pyconf +++ b/data/products/cgns.pyconf @@ -1,13 +1,9 @@ -cgns_3_1_3_4 : +cgns : { name : "cgns" build_source : "script" compil_script : $name + ".sh" get_source : "archive" - archive_info: - { - archive_name : $SITE.prepare.archive_dir + $name + "-3.1.3-4.tar.gz" - } environ : { env_script : $VARS.datadir + $VARS.sep + "env_scripts" + $VARS.sep + $name + ".py" diff --git a/data/products/cmake.pyconf b/data/products/cmake.pyconf index 748b197..548536c 100644 --- a/data/products/cmake.pyconf +++ b/data/products/cmake.pyconf @@ -1,13 +1,9 @@ -cmake_3_5_2 : +cmake : { name : "cmake" build_source : "script" compil_script : $name + ".sh" get_source : "archive" - archive_info: - { - archive_name : $SITE.prepare.archive_dir + $name + "-3.5.2.tar.gz" - } environ : { env_script : $VARS.datadir + $VARS.sep + "env_scripts" + $VARS.sep + $name + ".py" diff --git a/data/products/cppunit.pyconf b/data/products/cppunit.pyconf index bc3482d..ca13725 100644 --- a/data/products/cppunit.pyconf +++ b/data/products/cppunit.pyconf @@ -1,13 +1,9 @@ -cppunit_1_12_1 : +cppunit : { name : "cppunit" build_source : "script" compil_script : $name + ".sh" get_source : "archive" - archive_info: - { - archive_name : $SITE.prepare.archive_dir + $name + "-1.12.1.tar.gz" - } environ : { env_script : $VARS.datadir + $VARS.sep + "env_scripts" + $VARS.sep + $name + ".py" diff --git a/data/products/dateutil.pyconf b/data/products/dateutil.pyconf index 674d1c3..dca1a20 100644 --- a/data/products/dateutil.pyconf +++ b/data/products/dateutil.pyconf @@ -1,13 +1,9 @@ -dateutil_2_4_0 : +dateutil : { name : "dateutil" build_source : "script" compil_script : $name + ".sh" get_source : "archive" - archive_info: - { - archive_name : $SITE.prepare.archive_dir + $name + "-2.4.0.tar.gz" - } environ : { env_script : $VARS.datadir + $VARS.sep + "env_scripts" + $VARS.sep + $name + ".py" diff --git a/data/products/distribute.pyconf b/data/products/distribute.pyconf index a13ce64..ec8b41d 100644 --- a/data/products/distribute.pyconf +++ b/data/products/distribute.pyconf @@ -1,13 +1,9 @@ -distribute_0_6_28 : +distribute : { name : "distribute" build_source : "script" compil_script : $name + ".sh" get_source : "archive" - archive_info: - { - archive_name : $SITE.prepare.archive_dir + $name + "-0.6.28.tar.gz" - } environ : { env_script : $VARS.datadir + $VARS.sep + "env_scripts" + $VARS.sep + $name + ".py" diff --git a/data/products/docutils.pyconf b/data/products/docutils.pyconf index 8181696..7ca1db1 100644 --- a/data/products/docutils.pyconf +++ b/data/products/docutils.pyconf @@ -1,13 +1,9 @@ -docutils_0_12 : +docutils : { name : "docutils" build_source : "script" compil_script : $name + ".sh" get_source : "archive" - archive_info: - { - archive_name : $SITE.prepare.archive_dir + $name + "-0.12.tar.gz" - } environ : { env_script : $VARS.datadir + $VARS.sep + "env_scripts" + $VARS.sep + $name + ".py" diff --git a/data/products/doxygen.pyconf b/data/products/doxygen.pyconf index 0d5b48d..90f5d16 100644 --- a/data/products/doxygen.pyconf +++ b/data/products/doxygen.pyconf @@ -4,10 +4,6 @@ doxygen_1_8_3_1 : build_source : "script" compil_script : $name + ".sh" get_source : "archive" - archive_info: - { - archive_name : $SITE.prepare.archive_dir + $name + "-1.8.3.1.tar.gz" - } environ : { env_script : $VARS.datadir + $VARS.sep + "env_scripts" + $VARS.sep + $name + ".py" diff --git a/data/products/fftw.pyconf b/data/products/fftw.pyconf index 2902bc7..242e720 100644 --- a/data/products/fftw.pyconf +++ b/data/products/fftw.pyconf @@ -1,13 +1,9 @@ -fftw_3_3_4 : +fftw : { name : "fftw" build_source : "script" compil_script : $name + ".sh" get_source : "archive" - archive_info: - { - archive_name : $SITE.prepare.archive_dir + $name + "-3.3.4.tar.gz" - } environ : { env_script : $VARS.datadir + $VARS.sep + "env_scripts" + $VARS.sep + $name + ".py" diff --git a/data/products/freeimage.pyconf b/data/products/freeimage.pyconf index bd8fac7..52f3209 100644 --- a/data/products/freeimage.pyconf +++ b/data/products/freeimage.pyconf @@ -4,10 +4,6 @@ freeimage_3_16_0 : build_source : "script" compil_script : $name + "-3.16.0.sh" get_source : "archive" - archive_info: - { - archive_name : $SITE.prepare.archive_dir + $name + "-3.16.0.tar.gz" - } environ : { env_script : $VARS.datadir + $VARS.sep + "env_scripts" + $VARS.sep + $name + ".py" diff --git a/data/products/graphviz.pyconf b/data/products/graphviz.pyconf index e294399..3c570db 100644 --- a/data/products/graphviz.pyconf +++ b/data/products/graphviz.pyconf @@ -4,10 +4,6 @@ graphviz_2_38_0 : build_source : "script" compil_script : $name + "-2.38.0.sh" get_source : "archive" - archive_info: - { - archive_name : $SITE.prepare.archive_dir + $name + "-2.38.0.tar.gz" - } environ : { env_script : $VARS.datadir + $VARS.sep + "env_scripts" + $VARS.sep + $name + ".py" diff --git a/data/products/hdf5.pyconf b/data/products/hdf5.pyconf index 0c7ff92..f86eaef 100644 --- a/data/products/hdf5.pyconf +++ b/data/products/hdf5.pyconf @@ -1,13 +1,9 @@ -hdf5_1_8_14 : +hdf5 : { name : "hdf5" build_source : "script" compil_script : $name + "CMake.sh" get_source : "archive" - archive_info: - { - archive_name : $SITE.prepare.archive_dir + $name + "-1.8.14.tar.gz" - } environ : { env_script : $VARS.datadir + $VARS.sep + "env_scripts" + $VARS.sep + $name + ".py" diff --git a/data/products/lapack.pyconf b/data/products/lapack.pyconf index 1793b7d..6902150 100644 --- a/data/products/lapack.pyconf +++ b/data/products/lapack.pyconf @@ -1,13 +1,9 @@ -lapack_3_5_0 : +lapack : { name : "lapack" build_source : "script" compil_script : $name + ".sh" get_source : "archive" - archive_info: - { - archive_name : $SITE.prepare.archive_dir + $name + "-3.5.0.tar.gz" - } environ : { env_script : $VARS.datadir + $VARS.sep + "env_scripts" + $VARS.sep + $name + ".py" diff --git a/data/products/libxml2.pyconf b/data/products/libxml2.pyconf index bcfb7c2..2b9ea5c 100644 --- a/data/products/libxml2.pyconf +++ b/data/products/libxml2.pyconf @@ -6,7 +6,6 @@ libxml2_2_9_0 : get_source : "archive" archive_info: { - archive_name : $SITE.prepare.archive_dir + $name + "-2.9.0.tar.gz" } environ : { diff --git a/data/products/markupsafe.pyconf b/data/products/markupsafe.pyconf index e565924..b3372e8 100644 --- a/data/products/markupsafe.pyconf +++ b/data/products/markupsafe.pyconf @@ -1,13 +1,9 @@ -markupsafe_0_23 : +markupsafe : { name : "markupsafe" build_source : "script" compil_script : $name + ".sh" get_source : "archive" - archive_info: - { - archive_name : $SITE.prepare.archive_dir + $name + "-0.23.tar.gz" - } environ : { env_script : $VARS.datadir + $VARS.sep + "env_scripts" + $VARS.sep + $name + ".py" diff --git a/data/products/med.pyconf b/data/products/med.pyconf index ee731a0..0cbd430 100644 --- a/data/products/med.pyconf +++ b/data/products/med.pyconf @@ -1,13 +1,9 @@ -med_3_2_0 : +med : { name : "med" build_source : "script" compil_script : $name + "CMake.sh" get_source : "archive" - archive_info: - { - archive_name : $SITE.prepare.archive_dir + $name + "-3.2.0.tar.gz" - } environ : { env_script : $VARS.datadir + $VARS.sep + "env_scripts" + $VARS.sep + $name + ".py" diff --git a/data/products/metis.pyconf b/data/products/metis.pyconf index f97f98f..7c83ea8 100644 --- a/data/products/metis.pyconf +++ b/data/products/metis.pyconf @@ -1,13 +1,9 @@ -metis_5_1_0 : +metis : { name : "metis" build_source : "script" compil_script : $name + ".sh" get_source : "archive" - archive_info: - { - archive_name : $SITE.prepare.archive_dir + $name + "-5.1.0.tar.gz" - } environ : { env_script : $VARS.datadir + $VARS.sep + "env_scripts" + $VARS.sep + $name + ".py" diff --git a/data/products/numpy.pyconf b/data/products/numpy.pyconf index 555d8a2..dfb175d 100644 --- a/data/products/numpy.pyconf +++ b/data/products/numpy.pyconf @@ -1,13 +1,9 @@ -numpy_1_9_2 : +numpy : { name : "numpy" build_source : "script" compil_script : "numpy.sh" get_source : "archive" - archive_info: - { - archive_name : $SITE.prepare.archive_dir + "numpy-1.9.2.tar.gz" - } environ : { env_script : $VARS.datadir + $VARS.sep + "env_scripts" + $VARS.sep + $name + ".py" diff --git a/data/products/omniORB.pyconf b/data/products/omniORB.pyconf index c17a846..855efbf 100644 --- a/data/products/omniORB.pyconf +++ b/data/products/omniORB.pyconf @@ -1,13 +1,9 @@ -omniORB_4_1_6 : +omniORB : { name : "omniORB" build_source : "script" compil_script : $name + ".sh" get_source : "archive" - archive_info: - { - archive_name : $SITE.prepare.archive_dir + $name + "-4.1.6.tar.gz" - } environ : { env_script : $VARS.datadir + $VARS.sep + "env_scripts" + $VARS.sep + $name + ".py" diff --git a/data/products/omniORBpy.pyconf b/data/products/omniORBpy.pyconf index 0396db3..a342439 100644 --- a/data/products/omniORBpy.pyconf +++ b/data/products/omniORBpy.pyconf @@ -1,13 +1,9 @@ -omniORBpy_3_6 : +omniORBpy : { name : "omniORBpy" build_source : "script" compil_script : $name + ".sh" get_source : "archive" - archive_info: - { - archive_name : $SITE.prepare.archive_dir + $name + "-3.6.tar.gz" - } environ : { env_script : $VARS.datadir + $VARS.sep + "env_scripts" + $VARS.sep + $name + ".py" diff --git a/data/products/opencv.pyconf b/data/products/opencv.pyconf index ebafed0..aceef96 100644 --- a/data/products/opencv.pyconf +++ b/data/products/opencv.pyconf @@ -1,13 +1,9 @@ -opencv_2_4_6_1 : +opencv : { name : "opencv" build_source : "script" compil_script : $name + ".sh" get_source : "archive" - archive_info: - { - archive_name : $SITE.prepare.archive_dir + $name + "-2.4.6.1.tar.gz" - } environ : { env_script : $VARS.datadir + $VARS.sep + "env_scripts" + $VARS.sep + $name + ".py" diff --git a/data/products/paraview.pyconf b/data/products/paraview.pyconf index 675015c..e3b1265 100644 --- a/data/products/paraview.pyconf +++ b/data/products/paraview.pyconf @@ -4,10 +4,6 @@ ParaView_5_0_1p1 : build_source : "script" compil_script : $name + "-5.0.sh" get_source : "archive" - archive_info: - { - archive_name : $SITE.prepare.archive_dir + $name + "-5.0.1p1.tar.gz" - } environ : { env_script : $VARS.datadir + $VARS.sep + "env_scripts" + $VARS.sep + $name + ".py" diff --git a/data/products/pyparsing.pyconf b/data/products/pyparsing.pyconf index f260bf2..3731761 100644 --- a/data/products/pyparsing.pyconf +++ b/data/products/pyparsing.pyconf @@ -1,13 +1,9 @@ -pyparsing_1_5_6 : +pyparsing : { name : "pyparsing" build_source : "script" compil_script : $name + ".sh" get_source : "archive" - archive_info: - { - archive_name : $SITE.prepare.archive_dir + $name + "-1.5.6.tar.gz" - } environ : { env_script : $VARS.datadir + $VARS.sep + "env_scripts" + $VARS.sep + $name + ".py" diff --git a/data/products/pyreadline.pyconf b/data/products/pyreadline.pyconf index ebfe5b7..c5bfbb9 100644 --- a/data/products/pyreadline.pyconf +++ b/data/products/pyreadline.pyconf @@ -1,13 +1,9 @@ -pyreadline_2_0 : +pyreadline : { name : "pyreadline" build_source : "script" compil_script : $name + ".sh" get_source : "archive" - archive_info: - { - archive_name : $SITE.prepare.archive_dir + $name + "-2.0.tar.gz" - } environ : { env_script : $VARS.datadir + $VARS.sep + "env_scripts" + $VARS.sep + $name + ".py" diff --git a/data/products/pytz.pyconf b/data/products/pytz.pyconf index 14c0cef..905b973 100644 --- a/data/products/pytz.pyconf +++ b/data/products/pytz.pyconf @@ -1,13 +1,9 @@ -pytz_2014_10 : +pytz : { name : "pytz" build_source : "script" compil_script : $name + ".sh" get_source : "archive" - archive_info: - { - archive_name : $SITE.prepare.archive_dir + $name + "-2014.10.tar.gz" - } environ : { env_script : $VARS.datadir + $VARS.sep + "env_scripts" + $VARS.sep + $name + ".py" diff --git a/data/products/qt.pyconf b/data/products/qt.pyconf index db907b1..0e60d87 100644 --- a/data/products/qt.pyconf +++ b/data/products/qt.pyconf @@ -4,10 +4,6 @@ qt_4_8_4 : build_source : "script" compil_script : $name + ".sh" get_source : "archive" - archive_info: - { - archive_name : $SITE.prepare.archive_dir + $name + "-4.8.4.tar.gz" - } environ : { env_script : $VARS.datadir + $VARS.sep + "env_scripts" + $VARS.sep + $name + ".py" diff --git a/data/products/scipy.pyconf b/data/products/scipy.pyconf index e172b79..5158ab3 100644 --- a/data/products/scipy.pyconf +++ b/data/products/scipy.pyconf @@ -4,10 +4,6 @@ scipy_0_15_1 : build_source : "script" compil_script : $name + ".sh" get_source : "archive" - archive_info: - { - archive_name : $SITE.prepare.archive_dir + $name + "-0.15.1.tar.gz" - } environ : { env_script : $VARS.datadir + $VARS.sep + "env_scripts" + $VARS.sep + $name + ".py" diff --git a/data/products/scotch.pyconf b/data/products/scotch.pyconf index 5e05303..f76caba 100644 --- a/data/products/scotch.pyconf +++ b/data/products/scotch.pyconf @@ -4,10 +4,6 @@ scotch_5_1_12b : build_source : "script" compil_script : $name + "-5.1.12.sh" get_source : "archive" - archive_info: - { - archive_name : $SITE.prepare.archive_dir + $name + "-5.1.12b.tar.gz" - } environ : { env_script : $VARS.datadir + $VARS.sep + "env_scripts" + $VARS.sep + $name + ".py" diff --git a/data/products/setuptools.pyconf b/data/products/setuptools.pyconf index 0c5d58f..7a19ecc 100644 --- a/data/products/setuptools.pyconf +++ b/data/products/setuptools.pyconf @@ -1,13 +1,9 @@ -setuptools_0_6c11 : +setuptools : { name : "setuptools" build_source : "script" compil_script : $name + ".sh" get_source : "archive" - archive_info: - { - archive_name : $SITE.prepare.archive_dir + $name + "-0.6c11.tar.gz" - } environ : { env_script : $VARS.datadir + $VARS.sep + "env_scripts" + $VARS.sep + $name + ".py" diff --git a/data/products/sip.pyconf b/data/products/sip.pyconf index cc1c6a9..a5bb9b9 100644 --- a/data/products/sip.pyconf +++ b/data/products/sip.pyconf @@ -1,13 +1,9 @@ -sip_4_14_2 : +sip : { name : "sip" build_source : "script" compil_script : $name + ".sh" get_source : "archive" - archive_info: - { - archive_name : $SITE.prepare.archive_dir + $name + "-4.14.2.tar.gz" - } environ : { env_script : $VARS.datadir + $VARS.sep + "env_scripts" + $VARS.sep + $name + ".py" diff --git a/data/products/six.pyconf b/data/products/six.pyconf index ccec6e5..2ea5a7b 100644 --- a/data/products/six.pyconf +++ b/data/products/six.pyconf @@ -1,13 +1,9 @@ -six_1_9_0 : +six : { name : "six" build_source : "script" compil_script : $name + ".sh" get_source : "archive" - archive_info: - { - archive_name : $SITE.prepare.archive_dir + $name + "-1.9.0.tar.gz" - } environ : { env_script : $VARS.datadir + $VARS.sep + "env_scripts" + $VARS.sep + $name + ".py" diff --git a/data/products/swig.pyconf b/data/products/swig.pyconf index c91e3e9..975bff9 100644 --- a/data/products/swig.pyconf +++ b/data/products/swig.pyconf @@ -1,13 +1,9 @@ -swig_2_0_8 : +swig : { name : "swig" build_source : "script" compil_script : $name + ".sh" get_source : "archive" - archive_info: - { - archive_name : $SITE.prepare.archive_dir + $name + "-2.0.8.tar.gz" - } environ : { env_script : $VARS.datadir + $VARS.sep + "env_scripts" + $VARS.sep + $name + ".py" diff --git a/data/products/tcl.pyconf b/data/products/tcl.pyconf index 9094496..fadb746 100644 --- a/data/products/tcl.pyconf +++ b/data/products/tcl.pyconf @@ -1,13 +1,9 @@ -tcl_8_6_0 : +tcl : { name : "tcl" build_source : "script" compil_script : $name + ".sh" get_source : "archive" - archive_info: - { - archive_name : $SITE.prepare.archive_dir + $name + "-8.6.0.tar.gz" - } environ : { env_script : $VARS.datadir + $VARS.sep + "env_scripts" + $VARS.sep + $name + ".py" diff --git a/data/products/tk.pyconf b/data/products/tk.pyconf index 02c6859..c508dfc 100644 --- a/data/products/tk.pyconf +++ b/data/products/tk.pyconf @@ -1,13 +1,9 @@ -tk_8_6_0 : +tk : { name : "tk" build_source : "script" compil_script : $name + ".sh" get_source : "archive" - archive_info: - { - archive_name : $SITE.prepare.archive_dir + $name + "-8.6.0.tar.gz" - } environ : { env_script : $VARS.datadir + $VARS.sep + "env_scripts" + $VARS.sep + $name + ".py" diff --git a/src/product.py b/src/product.py index e306f22..d19a5e5 100644 --- a/src/product.py +++ b/src/product.py @@ -129,6 +129,17 @@ def get_product_config(config, product_name): prod_info.dev = dev prod_info.version = version + # Set the archive_info if the product is get in archive mode + if prod_info.get_source == "archive": + if not "archive_info" in prod_info: + prod_info.addMapping("archive_info", + src.pyconf.Mapping(prod_info), + "") + if "archive_name" not in prod_info.archive_info: + arch_name = os.path.join(config.SITE.prepare.archive_dir, + product_name + "-" + version + ".tar.gz") + prod_info.archive_info.archive_name = arch_name + # Set the install_dir key if "install_dir" not in prod_info: # Set it to the default value (in application directory) -- 2.30.2