buildframework/helium/sf/java/imaker/src/com/nokia/helium/imaker/ant/engines/JavaEngine.java
author wbernard
Fri, 13 Aug 2010 14:59:05 +0300
changeset 628 7c4a911dc066
parent 588 c7c26511138f
permissions -rw-r--r--
helium_11.0.0-e00f171ca185
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
587
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
     1
/*
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
     2
* Copyright (c) 2007-2008 Nokia Corporation and/or its subsidiary(-ies).
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
     3
* All rights reserved.
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
     4
* This component and the accompanying materials are made available
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
     5
* under the terms of the License "Eclipse Public License v1.0"
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
     6
* which accompanies this distribution, and is available
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
     7
* at the URL "http://www.eclipse.org/legal/epl-v10.html".
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
     8
*
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
     9
* Initial Contributors:
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    10
* Nokia Corporation - initial contribution.
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    11
*
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    12
* Contributors:
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    13
*
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    14
* Description:  
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    15
*
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    16
*/
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    17
package com.nokia.helium.imaker.ant.engines;
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    18
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    19
import java.io.File;
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    20
import java.io.FileNotFoundException;
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    21
import java.io.FileOutputStream;
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    22
import java.io.IOException;
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    23
import java.io.OutputStreamWriter;
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    24
import java.util.ArrayList;
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    25
import java.util.Date;
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    26
import java.util.List;
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    27
import java.util.Map.Entry;
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    28
import java.util.concurrent.ArrayBlockingQueue;
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    29
import java.util.concurrent.ThreadPoolExecutor;
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    30
import java.util.concurrent.TimeUnit;
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    31
628
7c4a911dc066 helium_11.0.0-e00f171ca185
wbernard
parents: 588
diff changeset
    32
import org.apache.tools.ant.BuildException;
587
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    33
import org.apache.tools.ant.Project;
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    34
import org.apache.tools.ant.types.DataType;
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    35
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    36
import com.nokia.helium.core.plexus.StreamRecorder;
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    37
import com.nokia.helium.imaker.IMaker;
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    38
import com.nokia.helium.imaker.IMakerException;
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    39
import com.nokia.helium.imaker.ant.Command;
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    40
import com.nokia.helium.imaker.ant.Engine;
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    41
import com.nokia.helium.imaker.ant.taskdefs.IMakerTask;
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    42
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    43
/**
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    44
 * Engine purely based on Java. Parallelisation is
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    45
 * implemented using multithreading.
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    46
 * 
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    47
 * <pre>
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    48
 * &lt;defaultEngine id="imaker.default" threads="4" /&gt;
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    49
 * </pre>
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    50
 * 
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    51
 * @ant.type name=defaultEngine category="imaker"
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    52
 */
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    53
public class JavaEngine extends DataType implements Engine {
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    54
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    55
    private IMakerTask task;
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    56
    private OutputStreamWriter output;
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    57
    private int threads = 1;
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    58
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    59
    /**
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    60
     * {@inheritDoc}
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    61
     */
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    62
    @Override
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    63
    public void setTask(IMakerTask task) {
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    64
        this.task = task;
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    65
    }
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    66
    
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    67
    /**
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    68
     * Defines the number of iMaker jobs running in
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    69
     * parallel. 
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    70
     * @ant.not-required Default value is 1.
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    71
     */
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    72
    public void setThreads(int threads) {
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    73
        this.threads = threads;
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    74
    }
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    75
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    76
    /**
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    77
     * {@inheritDoc}
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    78
     */
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    79
    @Override
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    80
    public void build(List<List<Command>> cmds) throws IMakerException {
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    81
        task.log("Building with Ant engine.");
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    82
        if (threads <= 0) {
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    83
            throw new BuildException("'threads' must be >= 0. (current value: " + threads + ")");
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    84
        }
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    85
        openLog();
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    86
        // Do something with the configurations
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    87
        for (List<Command> cmdlist : cmds) {
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    88
            task.log("Building command list in parallel.");
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    89
            if (cmdlist.size() > 0) {
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    90
                ArrayBlockingQueue<Runnable> queue = new ArrayBlockingQueue<Runnable>(cmdlist.size());
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    91
                ThreadPoolExecutor threadPool = new ThreadPoolExecutor(threads, threads, 10, TimeUnit.MILLISECONDS, queue);
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    92
                task.log("Adding " + cmdlist.size() + " to queue.");
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    93
                for (final Command cmd : cmdlist) {
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    94
                    // Create a Runnable to wrap the image
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    95
                    // building.
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    96
                    threadPool.execute(new Runnable() {
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    97
                        public void run() {
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    98
                            try {
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
    99
                                buildCommand(cmd);
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   100
                            } catch (IMakerException e) {
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   101
                                task.log(e.getMessage(), Project.MSG_ERR);
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   102
                            }
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   103
                        }
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   104
                    });
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   105
                }
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   106
                threadPool.shutdown();
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   107
                try {
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   108
                    while (!threadPool.isTerminated()) {
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   109
                        threadPool.awaitTermination(100, TimeUnit.MILLISECONDS);
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   110
                    }
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   111
                } catch (InterruptedException e) {
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   112
                    e.printStackTrace();
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   113
                }
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   114
            }
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   115
        }
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   116
        closeLog();
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   117
    }
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   118
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   119
  
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   120
    /**
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   121
     * Build a Command.
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   122
     * @param cmd
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   123
     * @throws IMakerException
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   124
     */
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   125
    protected void buildCommand(Command cmd) throws IMakerException {
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   126
        IMaker imaker = task.getIMaker();
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   127
        StreamRecorder rec = new StreamRecorder();
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   128
        imaker.addOutputLineHandler(rec);
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   129
        imaker.addErrorLineHandler(rec);
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   130
        
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   131
        rec.consumeLine("-- " + cmd.getCmdLine());
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   132
        rec.consumeLine("++ Started at " + new Date());
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   133
        rec.consumeLine("+++ HiRes Start " + new Date().getTime());
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   134
        
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   135
        List<String> args = new ArrayList<String>();
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   136
        args.addAll(cmd.getArguments());
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   137
        // Setting the working dir for the image creation.
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   138
        File tempDir = imaker.createWorkDir();
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   139
        args.add("WORKDIR=" + tempDir.getAbsolutePath());
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   140
        // Pushing custom variables
588
c7c26511138f helium-10.0.0-bc45d50958fe
wbernard
parents: 587
diff changeset
   141
        for (Entry<String, String> cmdEnum : cmd.getVariables().entrySet()) {
c7c26511138f helium-10.0.0-bc45d50958fe
wbernard
parents: 587
diff changeset
   142
            if (cmdEnum.getKey().equals("WORKDIR")) {
587
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   143
                task.log("WORKDIR cannot be defined by the user, the value will be ignored.", Project.MSG_WARN);
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   144
            } else {
588
c7c26511138f helium-10.0.0-bc45d50958fe
wbernard
parents: 587
diff changeset
   145
                args.add(cmdEnum.getKey() + "=" + cmdEnum.getValue());
587
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   146
            }
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   147
        }
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   148
        // Setting the target
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   149
        args.add(cmd.getTarget());                
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   150
        try {
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   151
            imaker.execute(args.toArray(new String[args.size()]));
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   152
        } catch (IMakerException e) {
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   153
            // logging iMaker execution error to the 
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   154
            // task and the output log.
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   155
            task.log(e.getMessage(), Project.MSG_ERR);
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   156
            rec.consumeLine(e.getMessage());
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   157
        } finally {
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   158
            rec.consumeLine("+++ HiRes End " + new Date().getTime());
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   159
            rec.consumeLine("++ Finished at " + new Date());
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   160
        }
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   161
        // writing data
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   162
        writeLog(rec.getBuffer().toString());
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   163
    }
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   164
    
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   165
    private void openLog() throws IMakerException {
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   166
        if (task.getOutput() != null) {
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   167
            try {
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   168
                output = new OutputStreamWriter(new FileOutputStream(task.getOutput()));
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   169
            } catch (FileNotFoundException e) {
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   170
                throw new IMakerException(e.getMessage(), e);
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   171
            }
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   172
        }
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   173
    }
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   174
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   175
    private synchronized void writeLog(String str) throws IMakerException {
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   176
        if (output != null) {
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   177
            try {
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   178
                output.write(str);
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   179
            } catch (IOException e) {
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   180
                throw new IMakerException(e.getMessage(), e);
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   181
            }
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   182
        }
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   183
    }
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   184
    
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   185
    private void closeLog() throws IMakerException {
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   186
        if (output != null) {
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   187
            try {
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   188
                output.close();
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   189
            } catch (IOException e) {
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   190
                throw new IMakerException(e.getMessage(), e);
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   191
            }
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   192
        }
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   193
    }
85df38eb4012 helium_9.0-a7879c935424
wbernard
parents:
diff changeset
   194
}