Added README and detection of 64 bits using /lib.

README

@@ -1,32 +0,0 @@
-Coriolis is a free database, placement tool and routing tool for VLSI designs.
-
-Purpose
-=======
-
-Coriolis provides several tools to perform the layout of VLSI circuits.
-Its main components are the Hurricane database, the Etesian placer and the Kite router,
-but other tools can use the Hurricane database and the parsers provided.
-
-The user interface cgt is the prefered way to use Coriolis, but all
-Coriolis tools are python modules and thus scriptable.
-
-Documentation
-=============
-
-The full documentation is available [online](https://soc-extras.lip6.fr/en/coriolis/coriolis2-users-guide/) and, once built, as documentation/UsersGuide/UsersGuide.html. Basic build instructions are given below.
-
-Building and running Coriolis
-=============================
-
-To build Coriolis, ensure the prerequisites are met, including cmake, boost, bison, flex, Qt, libxml2 and a C++11 compiler.
-
-Copy the sources or clone the git repository as ~/coriolis-2.x/src/coriolis
-Then in this directory run the build command:
-
-    ./bootstrap/ccb.py --project=coriolis --make="-jN install"
-
-After the build succeeds, to run the graphical interface:
-
-    eval `~/coriolis-2.x/src/coriolis/bootstrap/coriolisEnv.py`
-    cgt -V
-

README.rst

@@ -0,0 +1,84 @@
+.. -*- Mode: rst -*-
+
+
+===============
+Coriolis README
+===============
+
+
+Coriolis is a free database, placement tool and routing tool for VLSI designs.
+
+
+Purpose
+=======
+
+Coriolis provides several tools to perform the layout of VLSI circuits.  Its
+main components are the Hurricane database, the Etesian placer and the Kite
+router, but other tools can use the Hurricane database and the parsers
+provided.
+
+The user interface <cgt> is the prefered way to use Coriolis, but all
+Coriolis tools are Python modules and thus scriptables.
+
+
+Documentation
+=============
+
+The complete documentation is available here, both in pdf & html:
+
+   ./documentation/UsersGuide/UsersGuide.html
+   ./documentation/UsersGuide/UsersGuide.pdf
+
+The documentation of the latest *stable* version is also
+available online. It may be quite outdated from the *devel*
+version.
+
+    https://soc-extras.lip6.fr/en/coriolis/coriolis2-users-guide/
+
+
+Building Coriolis
+=================
+
+To build Coriolis, ensure the following prerequisites are met:
+
+* Python 2.7.
+* cmake.
+* boost.
+* bison & flex.
+* Qt 4 or 5.
+* libxml2.
+* A C++11 compliant compiler.
+
+The build system relies on a fixed directory tree from the root
+of the user currently building it. Thus first step is to get a clone of
+the repository in the right place. Proceed as follow: ::
+
+   ego@home:~$ mkdir -p ~/coriolis-2.x/src
+   ego@home:~$ cd ~/coriolis-2.x/src
+   ego@home:src$ git clone https://www-soc.lip6.fr/git/coriolis.git
+   ego@home:src$ cd coriolis
+
+If you want to use the *devel* branch: ::
+
+    ego@home:coriolis$ git checkout devel
+
+Then, build the tool, where ``N`` is your number of threads: ::
+
+    ego@home:coriolis$ ./bootstrap/ccb.py --project=coriolis --make="-jN install"
+
+Coriolis gets installed at the root of the following tree: ::
+
+    ~/coriolis-2.x/<OS>.<DISTRIB>/Release.Shared/install/
+
+Where ``<OS>`` is the name of your operating system and ``<DISTRIB>`` your
+distribution.
+
+
+Using Coriolis
+==============
+
+A helper is provided to setup the environment ``coriolisEnv.py``: ::
+
+    ego@home:~$ eval `~/coriolis-2.x/src/coriolis/bootstrap/coriolisEnv.py`
+    ego@home:~$ cgt -V
+

bootstrap/builder/Configuration.py

@@ -191,6 +191,9 @@ class Configuration ( object ):
 
             print "[WARNING] Unrecognized OS: \"%s\"." % lines[0][:-1]
             print "          (using: \"%s\")" % self._osType
+
+        if self._libSuffix == '64' and not os.path.exists('/usr/lib64'):
+            self._libSuffix = None
         
         return
 

bootstrap/coriolisEnv.py

@@ -116,6 +116,9 @@ def guessOs ():
 
     ldLibraryPath = os.getenv('LD_LIBRARY_PATH')
     if not ldLibraryPath or 'devtoolset' in ldLibraryPath: useDevtoolset2 = False
+
+    if libDir == 'lib64' and not os.path.exists('/usr/lib64'):
+      libDir = 'lib'
     
     return (osType,libDir,useDevtoolset2)
       

documentation/UsersGuide/UsersGuide.rst

@@ -478,8 +478,7 @@ In the |Coriolis| |git| repository, two branches are present:
   command just after the first step: ::
 
       dummy@lepka:~$ git checkout devel
-      dummy@lepka:src$ ./bootstrap/ccp.py --project=importeds \
-                                          --project=coriolis \
+      dummy@lepka:src$ ./bootstrap/ccp.py --project=coriolis \
                                           --make="-j4 install" --debug
 
   Be aware that it may requires newer versions of the dependencies and may introduce

unicorn/src/coriolis.py

@@ -82,7 +82,7 @@ osType = uname( ['-s'] )
 arch   = uname( ['-m'] )
 
 libDir = '/lib'
-if arch == 'x86_64': libDir = '/lib64'
+if arch == 'x86_64' and os.path.exists('/usr/lib64'): libDir = '/lib64'
 
 pythonSitePackages = os.path.join( *(distutils.sysconfig.get_python_lib(1).split('/')[-3:]) )