peterfpeterson

The problem

This example explains how to merge 4f894cb54 into the release-v3.5.0 branch.

Normally patch releases are done via either merging the feature branch in to the release branch, or by cherry-picking the individual commits into the release branch. In this case the source files were moved by (in general terms) removing the Code/Mantid levels of the repository to be more consistent with other CMake based projects. The effect is that changes made based off of master cannot be simply cherry-picked into the release branch.

The hard way

peterfpeterson

Description of work.

To test: Instructions for testing.

Fixes #xxxx.

Either link to Release notes change-set or state "Does not need to be in the release notes."

---

peterfpeterson

#!/usr/bin/env python
import os
import re

withargs_matchline = re.compile(r'.*boost::shared_ptr<(.+)>\(new\s+(\w+)\(.+\)\)')
withargs_expression = re.compile(r'(boost::shared_ptr<).+>.*\((.*new\s+\w+\().+(\)\))')

withoutargs_matchline = re.compile(r'.*boost::shared_ptr<(.+)>\(new (.+)\s*\)')
withoutargs_expression = re.compile(r'.*(boost::shared_ptr<).+>\((new .+)(\s*\)).*')

peterfpeterson

#!/usr/bin/env python
import datetime
date = datetime.date.today()

import sys
if len(sys.argv) > 1:
    delta = datetime.timedelta(int(sys.argv[1]))
    date += delta

print "%4d-%02d-%02d" % (date.year, date.month, date.day)

peterfpeterson

# bash completion for ctest(1)                             -*- shell-script -*-

_ctest()
{
    local cur prev words cword
    _gst_init_completion -n = || return

    case "$prev" in
        -C|--build-config)
            COMPREPLY=( $( compgen -W 'Debug Release RelWithDebInfo

peterfpeterson

#
# Copyright (C) 2010-2012 Vinay Sajip. All rights reserved. Licensed under the new BSD license.
#
import ctypes
import logging
import os

class ColorizingStreamHandler(logging.StreamHandler):
    # color names to indices
    color_map = {

peterfpeterson

• Request
• Authorisation
• Development
• Code Review
• Clean builds passed
• System test builds failed
• Release Notes
• Update Version Number
• Create a new release on GitHub, which will create a new version tag
• Put packages on GitHub & sourceforge

peterfpeterson

MoleQueue http://wiki.openchemistry.org/MoleQueue and [http://doc.openchemistry.org/molequeue/api/](API docs).

$ mkdir build && cd build
$ cmake ../ -DUSE_ZERO_MQ=ON -G Ninja
$ ninja

The create the input file (for a local job) and the test python file. Run the python and enjoy.

peterfpeterson

This is information gleaned from various places (some are even linked) for using abrt. I assume you have installed abrt-cli and have the abrtd daemon running.

For things that aren't in /usr/ you will need to enable handling of unpackaged software. In short

# sed -i 's/ProcessUnpackaged = no/ProcessUnpackaged = yes/' \
    /etc/abrt/abrt-action-save-package-data.conf

If, for some reason, you want to turn it off just flip the sed script

# sed -i 's/ProcessUnpackaged = yes/ProcessUnpackaged = no/' \

peterfpeterson

This is a backport of a patch taken from VTK/Rendering/OpenGL/vtkXOpenGLRenderWindow.cxx. It has to do with using legacy openGL.