Skip to content
Snippets Groups Projects
  1. Feb 13, 2017
    • Attila Krasznahorkay's avatar
      Merge branch 'build-infrastructure-improvements' into 'master' · e074a14b
      Attila Krasznahorkay authored
      Build infrastructure improvements
      
      This merge improves the robustness and the utility of the Athena build scripts.
      
      For the `build_externals.sh` script if an install of AthenaExternals and Gaudi is found then the script will exit, unless `-f` is specified. This allows the script to be called multiple times safely, e.g., by the continuous integration system. Specifically the check is done against installs of AthenaExternals and Gaudi, so failed builds should not cause the script to think that there is a valid installation. There were minor improvements to use absolute paths internally that make debugging easier.
      
      In the main `build.sh` script, I factorised out the environment setup piece to `build_env.sh`, allowing it to be easily sourced when someone wants to manage the build themselves or invoke the build commands in special ways.
      
      There is also now support for options in the main build script to control which pieces of the build are done (cmake, make, install, cpack) allowing more detailed control (e.g., the continuous integration system certainly doesn't care about making RPMs - @cgumpert will like that).
      
      Finally, there is a small change to the main `CMakeLists.txt` file to remove the zero compression option from RPM generation (which only saves a small amount of time, but inflates the RPM size greatly).
      
      See merge request !177
      
      Former-commit-id: 2e50c8578bf057a110a5f97eb8af01e4e65cefa6
      e074a14b
    • Attila Krasznahorkay's avatar
      Merge branch 'missing-package-imports' into 'master' · 14c0acf9
      Attila Krasznahorkay authored
      Add TriggerRelease package back into master
      
      This package was accidentally omitted due to a filter on package
      names ending in "Release" (needed to filter out unnecessary auto-generated
      packages from Tag Collector). It's now re-added at the current dev tag,
      TriggerRelease-00-12-15.
      
      See merge request !180
      
      Former-commit-id: bf8837f175fad98cd2448d2569aba90bfc3f2283
      14c0acf9
    • Graeme Stewart's avatar
      Remove zero compression of Athena RPM · 763e6c17
      Graeme Stewart authored
      It seems this saves very little time anyway (rpmbuild spends most
      of its time on other things) and it hugely inflates the RPM
      size (> x4). See discussion on ATLINFR-1466.
      
      
      Former-commit-id: a77b0407c103d25d2efd390ffa0811bcd0f3f517
      763e6c17
    • Graeme Stewart's avatar
      Improved build helper scripts' robustness and functionality · 601cd688
      Graeme Stewart authored
      In the externals build script if an install of AthenaExternals and
      Gaudi is found then the script will exit, unless -f is specified. This
      allows the script to be called multiple times safely, e.g., by the
      continuous integration system. Specifically the check is done against
      installs of AthenaExternals and Gaudi, so failed builds should not
      cause the script to think that there is a valid installation.
      
      In the main build script, factorise out the environment setup piece to
      build_env.sh, allowing it to be easily sourced when someone wants to
      manage the build themselvs or invoke the build commands in special
      ways.
      
      Support options in the main build script to control which pieces of
      the build are done (cmake, make, install, cpack) allowing more
      detailed control (e.g., the continuous integration system certainly
      doesn't care about making RPMs).
      
      
      Former-commit-id: 6412405cafcf41f8234da6db185107b4c3543a78
      601cd688
    • Christian Gumpert's avatar
      Merge branch 'port_CI_scripts' into 'master' · 7c2b1184
      Christian Gumpert authored
      port CI scripts from 21.0 branch
      
      The CI setup was developed initially using the 21.0 branch. This
      setup needs to be merged into the main development branch now. It
      should be cherry-picked in other development branches later.
      
      See merge request !179
      
      Former-commit-id: d5fc049768f849287ff8c5a2d090c1c3897d11e7
      7c2b1184
    • Christian Gumpert's avatar
      port CI scripts from 21.0 branch · 63436f7d
      Christian Gumpert authored
      The CI setup was developed initially using the 21.0 branch. This
      setup needs to be merged into the main development branch now. It
      should be cherry-picked in other development branches later.
      
      
      Former-commit-id: de63de45
      63436f7d
    • Christian Gumpert's avatar
      Merge branch 'build_externals_changes' into 'master' · 3ef2b029
      Christian Gumpert authored
      handle already existing source directories
      
      The build scripts were failing when executed twice with the same
      build directory. Re-using previous builds is essential for
      incremental builds.
      
      See merge request !176
      
      Former-commit-id: 5f0e8e73b509b2e0b77d8a4b44261700298337dd
      3ef2b029
    • Graeme Stewart's avatar
      Add TriggerRelease package back into master · 7b3cd41a
      Graeme Stewart authored
      This package was accidentally omitted due to a filter on package
      names ending in "Release" (needed to filter out unnecessary auto-generated
      packages from Tag Collector).
      
      
      Former-commit-id: fcd18b4b
      7b3cd41a
    • ATLAS Robot's avatar
      handle already existing source directories · 1b28a4bf
      ATLAS Robot authored
      The build scripts were failing when executed twice with the same
      build directory. Re-using previous builds is essential for
      incremental builds.
      
      
      Former-commit-id: 534656e776627b272db19ed50903356cc1e2f676
      1b28a4bf
  2. Feb 08, 2017
    • Graeme Stewart's avatar
      Merge branch 'master-build2' into 'master' · 2706425d
      Graeme Stewart authored
      Master build2
      
      This is another set of changes to improve the build success rate on master branch.
      
      Most generators are re-enabled, but fail. However, this avoids problems with packages that depend on generator header files (FastSim).
      
      I will just rush this in as an urgent bugfix for tonight's NICOS build.
      
      See merge request !175
      
      Former-commit-id: d6291360fb35fb0af424b08bbab816d5f6930b2a
      2706425d
    • Graeme Stewart's avatar
      Remove ShowerDeconstruction components · 254d9096
      Graeme Stewart authored
      Former-commit-id: 2e0debac17f8a629832f6599ee714ffea01283ef
      254d9096
    • Graeme Stewart's avatar
      Add missing dependency on InDetRecToolInterfaces to CMakeLists · 6c6675a9
      Graeme Stewart authored
      Former-commit-id: dddcd4fcb1ff0689ee1f7493160c5b400d25c683
      6c6675a9
    • Graeme Stewart's avatar
      Merge branch 'patch-1' into 'master' · c002fbe0
      Graeme Stewart authored
      Update HLT package filter
      
      Java packages are no longer part of offline release. Remove HLT testing package.
      
      See merge request !170
      
      Former-commit-id: 64036cb1afe33ab717fef7a95dd660831b09501a
      c002fbe0
    • Graeme Stewart's avatar
      Merge branch 'doxygen_migration' into 'master' · 76589c64
      Graeme Stewart authored
      Doxygen migration
      
      For git builds, we will create the doxygen documentation differently: instead of generating it per package, we will now generate it in one pass. This means that we can no longer have per package mainpage.h files, and no-one is allowed to use the @mainpage command. I have used the removeMainpages.py script to implement this, as well as remove links to e.g. requirements files which make no sense any more.
      Details have been presented in various talks in atlas git team meetings: https://indico.cern.ch/category/130/
      
      See merge request !171
      
      Former-commit-id: 43b5fa21251287f73b2b2b67246c4bfdda09b5f6
      76589c64
    • Graeme Stewart's avatar
      Remove code that depends on the binary only shower reconstruction library · e55d345b
      Graeme Stewart authored
      JetSubStructureMomentTools had a tool that depended on the binary only
      shower reconstruction library that currently does build from git. As this
      was never even built for the analysis releases then it seems it's
      appropriate to remove this code now.
      
      
      Former-commit-id: d657bbac02039aa6854984a682f08dc68208cfb2
      e55d345b
    • Graeme Stewart's avatar
      Correct CMakeLists for accidentally linking target library to itself · 7b9c404f
      Graeme Stewart authored
      Former-commit-id: b8bfaa1f9e2921c56b218bc35c27b5afb2f53b7a
      7b9c404f
    • Graeme Stewart's avatar
      More complete package build list · 76f851ee
      Graeme Stewart authored
      Remove the overly aggressive package vetos (especially for Generators).
      Definitively add the AsgAnalysisInterfaces that was mistakenly classed
      as an analysis only package.
      
      
      Former-commit-id: 5b95cf29a3ccdd4ef421a10eb5caa27b768a9fca
      76f851ee
  3. Feb 07, 2017
  4. Feb 06, 2017
    • Walter Lampl's avatar
      Merge branch 'master-svn-sweep' into 'master' · 5daf5bbb
      Walter Lampl authored
      Master svn sweep to 2017-02-06
      
      This merge request contains the SVN changes to 22.0.0 (non-VAL) from 2107-02-02 to 2017-02-06.
      
      This merge request is the first true test of moving changes from SVN into a *live* git branch.
      
      This set of changes will be the starting point for fixing the master branch build.
      
      See merge request !168
      
      Former-commit-id: 3210a651fdea82e39bfd4b0dc2aeca347013ae35
      5daf5bbb
    • Shaun Roe's avatar
      tag prior to git move (InDetPhysValMonitoring-00-04-44) · 98f34b6d
      Shaun Roe authored
      	* tag version prior to git migration
      	* tag as InDetPhysValMonitoring-00-04-44
      
      2017-02-03  Liza Mijovic  <lmijovic@lxplus115.cern.ch>
      	* postprocessing: adding temporary copy of
      		postprocessing script with command-line options
      		needed for new merging schema
      
      2017-02-02  Liza Mijovic  <lmijovic@lxplus115.cern.ch>
      	* run/postprocessHistos.cxx :
      	* * removing 200 lines of unused or useless code
      	* * testing and doc-ing command line running
      
      2017-02-02 Nora Pettersson
      	* Fix asymmetry in resolutions
      
      2017-02-01 Nora Pettersson
      	* Reduce memory consumpution for resITk plots
      
      2017-01-30  Liza Mijovic  <lmijovic@lxplus078.cern.ch>
      ...
      (Long ChangeLog diff - truncated)
      
      
      Former-commit-id: d8ed38e6
      98f34b6d
    • Scott Snyder's avatar
      Fix warning. (RootFileTools-00-01-62) · d9898df8
      Scott Snyder authored
      	* Tagging RootFileTools-00-01-62.
      	* src/merge.cxx: Fix warning.
      
      
      Former-commit-id: 7fcad279
      d9898df8
Loading