Commit Graph

178 Commits

Author SHA1 Message Date
Damien Dupuis 8bb398b88f Adding definition so compilation always use version 2 of boost/filesystem (and not v3 because our code is not compliant) 2011-08-22 08:40:46 +00:00
The Coriolis Project c2d8a58124 Added support for SL 6. 2011-06-28 10:49:59 +00:00
Damien Dupuis 18aadd65c5 Adding new SETUP_SVNH macro to generate svn.h file for a specific project 2011-05-17 12:29:28 +00:00
Jean-Paul Chaput 64c5e39423 * ./bootstrap:
- New: In coriolisEnv.py, support for Scientific Linux 6.
2011-04-12 20:36:00 +00:00
Jean-Paul Chaput 2318ac5b61 Added support for Scientific Linux 6. 2011-03-18 13:41:02 +00:00
Jean-Paul Chaput 19b8436da0 * <All Tools>/CMakeLists.txt:
- Change: For the setup_sysconfdir() boostrap/cmake macro uses the
        CMAKE_INSTALL_PREFIX to guess where we are being installed.
        Should be more reliable than any *_TOP environment variable.

  * ./bootstrap:
    - Change: In builCoriolis.py, detect not only when the X_TOP is not
        sets but also when it's sets to an empty value. In either case
        gives priority of the X_USER_TOP over the X_TOP.
2011-02-15 13:15:24 +00:00
The Coriolis Project 09a212cb64 Unset the temporary variables when done. 2011-02-09 17:00:36 +00:00
Jean-Paul Chaput d9fa15ac40 Recognize SoC context. 2011-02-09 16:48:07 +00:00
The Coriolis Project 8e0bd6d4b9 Bug corrections. 2011-02-09 16:40:49 +00:00
Jean-Paul Chaput e1751177e0 Environment helpers makes more educated guesses as to where to
find coriolis2. Three cases:
1/ System-wide : /usr
2/ SoC wide : /asim/coriolis2
3/ User defined. Either ~/coriolis-2.x or --root.
2011-02-09 15:47:27 +00:00
Jean-Paul Chaput df8f91b97d Separate Debian package in two: normal + devel.
Add a #!/bin/bash to coriolis2.sh to shut up debian/lintian.
2011-02-04 11:32:30 +00:00
Jean-Paul Chaput b4b77e5fdd Copy the copyright from the Debian package. 2011-02-03 10:34:43 +00:00
Jean-Paul Chaput ff9881a58a Package versioned libraries... 2011-02-02 23:46:36 +00:00
Jean-Paul Chaput d98f912827 Uses the "installed" doc. 2011-02-02 20:07:51 +00:00
Jean-Paul Chaput 12991f174f A hopefully correct license description. 2011-02-02 17:39:55 +00:00
Jean-Paul Chaput a50592266e Grrr. 2011-02-02 16:47:45 +00:00
Jean-Paul Chaput daaa33b523 Ship pyc & pyo. 2011-02-02 16:15:33 +00:00
Jean-Paul Chaput f69714e8f1 Fix the list of packaged projects in --rpm & --deb mode.
So I will not forgot one...
2011-02-02 15:42:41 +00:00
Jean-Paul Chaput cb59c2070d Correct the list of shipped files. 2011-02-02 15:35:54 +00:00
Damien Dupuis 4d3936fe3f Using BOOTSTRAP_TOP instead of CORIOLIS_TOP 2011-02-02 15:26:08 +00:00
Jean-Paul Chaput 5d4041ca3b Bad install.dir in spec file. 2011-02-02 14:49:56 +00:00
Jean-Paul Chaput 4dd83fb9a0 Uses the <build> rule of the Makefile when building in rpm. 2011-02-02 14:29:43 +00:00
Jean-Paul Chaput 65e658f12c Typo. 2011-02-02 14:09:40 +00:00
Jean-Paul Chaput 72b18733d0 Document buildCoriolis.sh command line options.
Put the debian original tarball at the right location.
Sets the SVN version on the fly in debian/changelog.
2011-02-02 14:08:12 +00:00
Jean-Paul Chaput 23a78697a6 changelog version :-( 2011-02-02 13:06:34 +00:00
Jean-Paul Chaput 1ce2186f3b Typo. 2011-02-02 13:05:51 +00:00
Jean-Paul Chaput 47483c0233 Printing what tool is being build in the Makefile. 2011-02-02 12:58:46 +00:00
Jean-Paul Chaput db7409465f Adds the orig file in the debbuild directory.
Problem of the changelog version number that must follow
the svn tag.
2011-02-02 12:56:49 +00:00
Jean-Paul Chaput e4f3d86553 Small adjustements. 2011-02-02 12:02:39 +00:00
Jean-Paul Chaput d13d4832e7 * ./bootstrap:
- New: "debian" directory holding the paraphernalia needed to create a
        Debian/Ubuntu package.
    - New: In buildCoriolis, add a Debian packaging method.
    - Change: In coriolis2.spec, the build/install procedure now makes uses of
        the top-level Makefile.
    - Change: In FindBoostrap, detection of the distribution type. Finally not
        needed but kept here, just in case. Based on "lsb_release".
    - Change: In FindPythonSitePackages, simplificate the detection of the Python
        site-package directory. No longer on-the-fly generate a python script.
2011-02-02 10:40:25 +00:00
Jean-Paul Chaput 179a9b4019 Revert version number to 1.0. The SVN version should suffice. 2011-01-28 13:10:43 +00:00
Jean-Paul Chaput 7fceed8ca2 A top level Makefile for Debian packaging.
Mimicking an autotool top-level Makefile.
2011-01-28 12:57:00 +00:00
Jean-Paul Chaput d8a8dfcee9 Small correction. 2011-01-09 23:06:07 +00:00
Jean-Paul Chaput 9ab38b5651 New --install switch to corectly manage /asim/coriolis2 2011-01-09 22:55:51 +00:00
Jean-Paul Chaput e043fc6724 Pre-debian packaging (for Ubuntu).
doc exception for generating stratus doc.
2011-01-09 19:21:01 +00:00
Jean-Paul Chaput c356715d80 * ./bootstrap:
- Change: Now installing coriolisEnv.py & coriolis2.sh to simplificate
        the environement initialiszation for students.
2010-12-13 14:00:40 +00:00
Damien Dupuis 4e4a13c265 Adding autoDTR tool in Chams project 2010-12-06 09:42:58 +00:00
Jean-Paul Chaput e85332a0bb Improved environment support & detection. 2010-08-25 14:14:57 +00:00
Jean-Paul Chaput eae107b259 Latest updates. 2010-08-25 13:03:30 +00:00
Jean-Paul Chaput 9557174f24 Try to be consistent, rename utilitarians from Caiman to Mangrove. 2010-08-25 12:18:29 +00:00
Jean-Paul Chaput 88a335ee44 Utilitarians for building Mangrove & Caiman. 2010-08-25 12:15:15 +00:00
Jean-Paul Chaput 048841ef07 * ./vlsisapd/src/bootstrap:
- New: coriolisEnv.py, little helper script to setup the environment.
    - New: Icon & desktop entry for Linux (doesn't work yet).
    - Bug: In FindLEFDEF, uses LIB_SUFFIX to find libraries on 64 bits systems.
2010-08-25 11:57:11 +00:00
Jean-Paul Chaput d3cc60a4ab * ./vlsisapd/src/bootstrap:
- Change: FindLEFDEF moved here from crlcore.
    - Change: In FindLEFDEF, when LEF/DEF is not found sets the include and
        library pathes to the empty chain "" instead of NOTFOUND which prevents
        usage in derived CMakeLists.
2010-08-18 20:34:47 +00:00
Sophie Belloeil f76755d803 No more setup_apple macro 2010-07-21 13:03:36 +00:00
Jean-Paul Chaput 6ca9f496c1 * All Tools:
- Change: Using more Bootstrap macros. Simpler way of setting the
        CMAKE_MODULE_PATH.
2010-07-15 14:09:16 +00:00
Jean-Paul Chaput 42df785cb4 Print boost libraries one per line. 2010-07-15 12:33:45 +00:00
Jean-Paul Chaput 0258a0fd90 * All Tools:
- Change: Switch from "goodies" to "bootstrap".
2010-07-14 19:50:21 +00:00
Jean-Paul Chaput 3f4c4be8de All tools: using the new Goodies macro.
Suppress loops in Hurricane libraries.
2010-07-13 16:25:15 +00:00
Jean-Paul Chaput 34720e3844 Forgotten. 2010-07-13 11:26:04 +00:00
Jean-Paul Chaput b3f693c754 UNSTABLE DO NOT UPDATE 2010-07-13 11:02:11 +00:00
Jean-Paul Chaput 48b782d6a8 UNSTABLE VERSION DO NOT UPDATE 2010-07-13 10:43:20 +00:00
Jean-Paul Chaput 67020af4e6 Integrate cumulus & stratus1 in the Coriolis project. 2010-07-12 15:38:13 +00:00
Jean-Paul Chaput 5a07df0d03 * ./goodies:
- In buildCoriolis.py, small tweek in environment variable settings.
2010-07-01 12:05:15 +00:00
Jean-Paul Chaput 91bf62956b * ./goodies:
- New: In buildCoriolis.py, integrate all changes for Nimbus, Metis & Mauka.
2010-06-26 13:14:28 +00:00
Jean-Paul Chaput 668a435529 * ./goodies:
- New: Added Nimbus & Mauka tools.
2010-06-08 12:15:31 +00:00
Jean-Paul Chaput 3fea4150e6 * ./goodies:
- Bug: In coriolis2.spec.in, typos in static libraries commands.
2010-06-01 12:20:37 +00:00
Jean-Paul Chaput 1a0a226314 * ./goodies:
- New: In coriolis2.spec.in, adds switch to generate package with static libraries.
2010-05-31 12:40:04 +00:00
Jean-Paul Chaput fa981769cc Adapt spec file to fc12 (install directory is cleaned between %build
and %install).
2010-05-28 10:59:59 +00:00
Jean-Paul Chaput 149922ac87 Correctly disable the trace level (for distribution). 2010-05-27 16:26:48 +00:00
Jean-Paul Chaput fd07e33e1f Small error in patch file. 2010-05-27 13:57:07 +00:00
Jean-Paul Chaput 736d3346e4 Patch for distribution is now applied *before* generating the archive
so that unwanted files are not includeds in the source package.
Adds mention to the Flute LICENSE in the code.
2010-05-27 11:54:24 +00:00
Jean-Paul Chaput f8b5ab1b0f Add HTML version of the doc. 2010-05-26 22:24:03 +00:00
Jean-Paul Chaput 6e275beea8 Patch that suppress the trace argument on cgt.
Do not want to show too much of Kite for now.
2010-05-26 07:56:32 +00:00
Jean-Paul Chaput e9a8d8b84a Build doc in seperate stage to uses -j1.
UseLATEX seems to fails with -jX...
2010-05-26 07:30:53 +00:00
Jean-Paul Chaput 5d452ce345 Remove references to DTR & OpenChams in %file section. 2010-05-25 20:55:50 +00:00
Jean-Paul Chaput a5701a1e0f Adds --doc for crlcore. 2010-05-25 20:38:07 +00:00
Jean-Paul Chaput 2ca6dbb299 * ./goodies:
- Change: In buildCoriolis.py, adds "dvi" & "safepdf" targets on "crlcore" tool.
        Not very clean because it's hard-coded.
2010-05-25 16:00:53 +00:00
Jean-Paul Chaput 399cbb542c Uses %__rm -rf for deletion to avoid bad return code. 2010-05-23 11:31:10 +00:00
Jean-Paul Chaput 117c14f738 Uses the correct rm rpm macro: %__rm ... 2010-05-23 11:14:31 +00:00
Jean-Paul Chaput e0a95da527 * ./goodies:
- Bug: In coriolis2.spec.in, just remove the installed doc then install them
        from build with the %doc directive.
2010-05-23 10:57:01 +00:00
Jean-Paul Chaput 156fa3d16d * ./goodies:
- Bug: In coriolis2.spec.in, split the build in two steps so the documentation
        can be installed in the right docdir.
2010-05-23 10:37:22 +00:00
Jean-Paul Chaput 31b8197356 Bug in python site package detection. 2010-05-22 23:18:32 +00:00
Jean-Paul Chaput a222bbd5a0 Correction 2010-05-22 22:54:33 +00:00
Jean-Paul Chaput 6b4757f8d8 New python modules directory. 2010-05-22 22:24:55 +00:00
Jean-Paul Chaput 7745f1a8fb The doc files in the right place. 2010-05-22 15:27:37 +00:00
Jean-Paul Chaput ab4aa044e9 * ./goodies:
- Bug: In coriolis2.spec.in, needs to add the CMAKE_MODULE_PATH component
        pointing into the %{buildroot} for tools to find their ".cmake".
2010-05-22 13:39:38 +00:00
Jean-Paul Chaput e4c1030407 * ./goodies:
- New: In buildCoriolis.py, support for the distribution patch.
        The distribution patch do some customizations needed for the distribution.
    - Change: In coriolis2.spec.in, support for patch, include starter
        documentation. Do not prepend %{buildroot} to CORIOLIS_TOP environment
        variables.
2010-05-22 13:21:24 +00:00
Jean-Paul Chaput da6d10883a * ./goodies:
- Change: In coriolis2.spec.in, now do a install "in system", that is
        under /usr witch configuration in /etc. Create a patch file to
        sets up accordingly the pathes in configurations files.
    - Change: More accurate detection of the qt version based on distribution
        recognition (%{rhel} & %{fedora}).
2010-05-22 09:08:31 +00:00
Jean-Paul Chaput 5be1cb8724 One more try. 2010-05-21 17:12:15 +00:00
Jean-Paul Chaput 91d6bcf358 Adjust rhel detection. 2010-05-21 17:10:36 +00:00
Jean-Paul Chaput c70b261d74 * ./goodies:
- Change: In coriolis2.spec.in, now do a install "in system", that is
        under /usr witch configuration in /etc.
2010-05-21 17:03:22 +00:00
The Coriolis Project 57377a79b5 Adding -f option in rm command for --rm-build (in case build does not exist) 2010-05-19 14:47:48 +00:00
Jean-Paul Chaput c5b8635126 Rename io -> vlsisapd 2010-05-18 15:18:56 +00:00
Jean-Paul Chaput ed6fbe9f5f * All tools:
- Change: take account of the renaming "io" -> "vlsisapd".
2010-05-18 15:12:27 +00:00
Jean-Paul Chaput e468caf46c * All tools:
- Change: adopt a tree layout compliant with the UNIX FHS.
        * includes under      TOP/include/coriolis2.
        * shared datas under  TOP/shared/coriolis2.
        * docs under          TOP/share/doc/coriolis2.
        * configuration under TOP/etc/coriolis2

  * ./crlcore:
    - Change: In Environment, comply to the new tree layout, search configuration
        files under TOP/etc/coriolis2/.

  * ./knik:
    - Change: In flute, comply to the new tree layout, get the "POW*.dat" files
        from TOP/share/coriolis2/flute-2.4.
2010-05-18 13:00:48 +00:00
Jean-Paul Chaput 71cb988c5e This time it will work! 2010-05-17 23:28:50 +00:00
Jean-Paul Chaput 334b23c834 Sets the LIB_SUFFIX on 64 bits. 2010-05-17 23:20:40 +00:00
Jean-Paul Chaput 560d02ff08 Forgot this one. 2010-05-17 23:11:07 +00:00
Jean-Paul Chaput 029c5e8989 Adds LIB_SUFFIX to all CMakeLists install "lib" targets, so that 64 bits
libraries gets installed in "lib64" instead of "lib".

buildCoriolis.py sets automatically LIB_SUFFIX for cmake.
coriolis2.spec modificated to uses lib64 on 64 bits.
2010-05-17 21:19:02 +00:00
Jean-Paul Chaput d2206fd246 No %arch tag, uses %_arch 2010-05-17 16:54:08 +00:00
Jean-Paul Chaput 92e0a06744 Adds arch extention to the binary tar.bz2. 2010-05-17 16:31:28 +00:00
Jean-Paul Chaput f28298c0c4 Requires takes an "s"! 2010-05-17 16:21:50 +00:00
Jean-Paul Chaput 8bac5355da Adding Requires and call to ldconfig in post stage. 2010-05-17 16:20:07 +00:00
Jean-Paul Chaput 0136f845bc Correct dynamic link configuration. 2010-05-17 16:00:09 +00:00
Jean-Paul Chaput 729844178c Another modif. 2010-05-17 15:46:21 +00:00
Jean-Paul Chaput e671371443 Small corrections in version & release numbers. 2010-05-17 15:37:30 +00:00
Jean-Paul Chaput 9ac035bb49 * ./goodies:
- New: In buildCoriolis.py, support to build rpm packages (in user's "rpm"
        directory).
    - Added: coriolis2.spec.in for rpm building. Install under /opt/coriolis2.
        This spec files has the particularity to also buildup a binary tarball
        of the compiled & installed files, this avoid a second complete build
        stage. The tarball is put into "rpm/SOURCES".
2010-05-17 14:45:55 +00:00
Damien Dupuis 3401114216 Do not forget to call "make" in command of self._doBuild 2010-05-17 08:20:02 +00:00
Jean-Paul Chaput 4fcd26a6bf * All tools:
- Change: In the CMakeLists.txt, in all the install commands remove all
        the leading "/" as they prevents the CMAKE_INSTALL_PREFIX to be took
        into account. It was nevertheless working because buildCoriolis.py was
        using DESTDIR which is prepended anyway.
  * ./goodies:
    - Change: In buildCoriolis.py, no longer uses the DESTDIR but instead
        CMAKE_INSTALL_PREFIX.
2010-05-16 16:41:25 +00:00
Jean-Paul Chaput 17ac99fa46 * ./goodies:
- New: In buildCoriolis.py, adds a "--rm-build" option which removes the
        tool's build directory before building it. A very crude way to ensure
        that nothing obsolete form a previous build will gets in the way...
2010-04-28 15:54:30 +00:00