Default archive name for products that are in archive mode

diff --git a/commands/prepare.py b/commands/prepare.py
index 8930ac94c1162847eab2745dbcd4463125091f27..3dedf61255e406396e5b4529f3527598cdc75590 100644 (file)
--- 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 610302b241de11e2276f0b2a9e7875a041650ced..c19c9da34a7103bfe50bea1c4d81b8d1c026accc 100644 (file)
--- 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 3b15fcfc9f0457a46dfb73cdd80e1f54ef32a9a0..67547f3f4401009bb35f53cd84bd6a228908bc46 100644 (file)
--- 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 a737fb5a4c08cb597e32ed643b1a3b80b4690faf..bbd35637ba0d4d24357f93e9a54aa6e9e6571233 100644 (file)
--- 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 acd63c7ec1af853d81e5e85ca553bd55d1d8acd9..bd5d752702b6bb3ce9a9ef57da19ab006a8c4236 100644 (file)
--- 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 bb64d7d6c3dfc7b7e467fd60b911b5fdc7224319..1da5ad082bbf2a8d8b6aac0e8819c2a9b8ec4fc8 100644 (file)
--- 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 22c50b1747cc5dfe26763e5fc51f790cd5f344b0..57f82e89ee4ab316e3ff231a6f3dbdbdfbb9833d 100644 (file)
--- 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 ec22b72b8fbe4a3d5be704ae5a2667b60621a1ab..aceaac8400239960d319d89b949ef275319dc0d1 100644 (file)
--- 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 55296acf78b19b975560f87aa35aa05e676275a6..2dc0ab0f09ca413cf8397663a47e7c2b2b50a38f 100644 (file)
--- 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 a4213ecd742b11ad63c2f31b9c254b4018a1a54b..a50460468c5df9e069ce7a1a3ef62437432525b1 100644 (file)
--- 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 5d862ca42ad2fbe494a535650d32b58b0b4e28db..cff3bf2deb6f44e97d915f221e582b3854b7fd1c 100644 (file)
--- 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 ec4b0ee8012f0fafc7d9d27aae6e5522e3f59d66..6f0763e43f68f588342519a45dc2146b01bf898c 100644 (file)
--- 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 5eb94aebab9c2848fc8d9c2860f834b0e9c7b9e5..8b20f8c7ce5772311d2b8c2265d9efd16907092d 100644 (file)
--- 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 748b197048d93baa0a7508113a8c76e992389ea0..548536caecc6fb445175bd67bedee303617cf558 100644 (file)
--- 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 bc3482d8bbbc02f1d408c44a2445f9130cc9828a..ca13725d529f7bcc38cb30183c6e2a105710434c 100644 (file)
--- 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 674d1c30a4ca7f39fa298e3d5b88ff8988f06d9b..dca1a20e15b644623679bb18eb36fdaa16e9f082 100644 (file)
--- 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 a13ce64928e53d2c097ee55d81db2efb52b71ab6..ec8b41d544c45c8a4071b47e55550b747d60c926 100644 (file)
--- 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 8181696039acda66290ab36b3c55d3826d55fdea..7ca1db1c95c2e4a4d802640f94e1d92e8c94677b 100644 (file)
--- 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 0d5b48d4cc696b94346720ee19c878d3dd32c2f1..90f5d1668042391000b89ad44f6779d0a636d3cd 100644 (file)
--- 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 2902bc7f89216ed6912c731935428f05c6b9f3e5..242e720070a96d3a66f29b661dbacd92d989a28b 100644 (file)
--- 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 bd8fac77342242f15ac7f2aac07abe6c944490db..52f32095b2ad1f054617a6e59da1b1e2844ced4f 100644 (file)
--- 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 e29439986d4ff8d4ff39807161136652fb31de36..3c570db2d8e8dbb4ee3de6ade0987a81165d7dcb 100644 (file)
--- 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 0c7ff923c5f1549a855e0a78d80d72dfe96f9b61..f86eaef1407b5a9e05f9877cf5ffa719f7716068 100644 (file)
--- 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 1793b7d693bd9c5a884704ddbed9fa26ae6c2003..69021503fe8bc0f2975e5114c44e964c7365f212 100644 (file)
--- 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 bcfb7c228984e34ecf0de43bbd5184da6953ee1d..2b9ea5c36928d3f312fdb1b6abdf76b2fa40d9bf 100644 (file)
--- 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 e565924d57abf9c46b0e2a945cad2aa8b8bfea49..b3372e8e12e5d469b542e82b109c424c2454c92d 100644 (file)
--- 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 ee731a047dc514931570050adc1176756491fdf9..0cbd43089c5397cb71648de5499976e680d24e3a 100644 (file)
--- 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 f97f98fb41dad0524246c7fb7a81fc155e9524fc..7c83ea8ddfdbf06841b4bd7beef013fd4daf14de 100644 (file)
--- 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 555d8a2008677e509ee1e6a27cc8afa93872e44d..dfb175d4c24c97751a60d2ba01c11ad8a3549304 100644 (file)
--- 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 c17a846a2a533c74d7526e4de753b5c85c00f84d..855efbf373a64d7efb1616d6a906851797bab44a 100644 (file)
--- 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 0396db30689e98e93c610b1aad85fab34fa8581f..a3424397eef573baac21a57e599237dad415d3cc 100644 (file)
--- 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 ebafed0bf87003d676c1b4031851ff9840c0c86c..aceef961ae6e6cbb59348729c50eed43cd6ce114 100644 (file)
--- 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 675015c1f458f1973cf27f552bccd510a945988a..e3b12653b902aee7c8cbb45e23a3c8ba2099dd60 100644 (file)
--- 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 f260bf2ca2a079e35c3ebeea617f9cb76356383a..3731761f894bdb2b93eb173d091a82e5e7e2c180 100644 (file)
--- 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 ebfe5b79f92b7745a971556e8715f9b46065b902..c5bfbb9aa0966047807a62a64ce31e2167db5f89 100644 (file)
--- 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 14c0cef93f7c1f1e697712696f7fc2ae70154dec..905b973aed85a0196aa29e6f5db211492996e044 100644 (file)
--- 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 db907b1f1993603f43934a5de42c9d13db592a54..0e60d87bea4ce94c93d545d6041ed012cd6465b1 100644 (file)
--- 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 e172b799ed4b0f152207ca522fd96daf86e8ccdf..5158ab39d18910b102d93494afb505da73038232 100644 (file)
--- 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 5e05303b6a8c53cce0a20fdb07a6ccbac4a0e4e3..f76cabaef7cd5ee9b97cf30531455f51f801cdd1 100644 (file)
--- 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 0c5d58f256ca24353385ab720cbd576c56c581ce..7a19eccf61948e525db2b4893536c4c3ea6a39d0 100644 (file)
--- 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 cc1c6a9376315904bb5c73672ceda44959a405c4..a5bb9b976fa4294cc99e6a197c640cc587b5c431 100644 (file)
--- 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 ccec6e594d6d109815a1d5f4aa911690c7a330ce..2ea5a7b8c8e534bbdf1d05d0f8bc0e92c42aba52 100644 (file)
--- 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 c91e3e9d6150b4d9a9a8d88ea1541cd667aa295b..975bff9a961a59279d1578d2307ad856cb7d6153 100644 (file)
--- 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 9094496976494396bba6b66ffc0a6092b3588afd..fadb7460d223b5e960d6081bfa33e66c0d804963 100644 (file)
--- 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 02c6859a3841b5c8088cd539b26f02a53cfc48c3..c508dfc72e888db00807596865e376193855963f 100644 (file)
--- 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 e306f2278f009cd7bd9427fcbc79a012f9501b9a..d19a5e52629727953782ec51e88fd6688ae57611 100644 (file)
--- 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)