Changeset 0382b68 in rtems-tools


Ignore:
Timestamp:
Oct 18, 2015, 8:19:08 AM (4 years ago)
Author:
Chris Johns <chrisj@…>
Branches:
4.10, master
Children:
bd94415
Parents:
2f11c36
git-author:
Chris Johns <chrisj@…> (10/18/15 08:19:08)
git-committer:
Chris Johns <chrisj@…> (10/18/15 22:06:49)
Message:

Fix Windows build issues.

Fix biulding the mmap Windows code.
Fix installing the files for Windows.

Files:
8 edited

Legend:

Unmodified
Added
Removed
  • linkers/wscript

    r2f11c36 r0382b68  
     1#
     2# RTEMS Tools Project (http://www.rtems.org/)
     3# Copyright 2014, 2015 Chris Johns (chrisj@rtems.org)
     4# All rights reserved.
     5#
     6# This file is part of the RTEMS Tools package in 'rtems-tools'.
     7#
     8# Redistribution and use in source and binary forms, with or without
     9# modification, are permitted provided that the following conditions are met:
     10#
     11# 1. Redistributions of source code must retain the above copyright notice,
     12# this list of conditions and the following disclaimer.
     13#
     14# 2. Redistributions in binary form must reproduce the above copyright notice,
     15# this list of conditions and the following disclaimer in the documentation
     16# and/or other materials provided with the distribution.
     17#
     18# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
     19# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
     20# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
     21# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
     22# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
     23# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
     24# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
     25# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
     26# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
     27# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
     28# POSSIBILITY OF SUCH DAMAGE.
     29#
     30
    131#
    232# RTEMS Linker build script.
  • rtemstoolkit/elftoolchain/libelf/mmap_win32.c

    r2f11c36 r0382b68  
    11/*-
    2  * Copyright (c) 2011 Chris Johns <chrisj@rtems.org>
     2 * Copyright (c) 2011, 2015 Chris Johns <chrisj@rtems.org>
    33 * All rights reserved.
    44 *
     
    4040#include <errno.h>
    4141#include <stdint.h>
     42#include <io.h>
    4243#include <windows.h>
    4344
  • rtemstoolkit/wscript

    r2f11c36 r0382b68  
     1#
     2# RTEMS Tools Project (http://www.rtems.org/)
     3# Copyright 2014, 2015 Chris Johns (chrisj@rtems.org)
     4# All rights reserved.
     5#
     6# This file is part of the RTEMS Tools package in 'rtems-tools'.
     7#
     8# Redistribution and use in source and binary forms, with or without
     9# modification, are permitted provided that the following conditions are met:
     10#
     11# 1. Redistributions of source code must retain the above copyright notice,
     12# this list of conditions and the following disclaimer.
     13#
     14# 2. Redistributions in binary form must reproduce the above copyright notice,
     15# this list of conditions and the following disclaimer in the documentation
     16# and/or other materials provided with the distribution.
     17#
     18# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
     19# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
     20# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
     21# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
     22# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
     23# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
     24# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
     25# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
     26# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
     27# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
     28# POSSIBILITY OF SUCH DAMAGE.
     29#
     30
    131#
    232# RTEMS Toolkit build script.
     
    2353    conf_libiberty(conf)
    2454    conf_libelf(conf)
     55
     56    conf.find_program('m4')
    2557
    2658    conf.check(header_name='sys/wait.h',  features = 'c', mandatory = False)
     
    139171def bld_libelf(bld, conf):
    140172    libelf = 'elftoolchain/libelf/'
    141 
    142     #
    143     # Work around the ${SRC} having Windows slashes which the MSYS m4 does not
    144     # understand.
    145     #
    146     if sys.platform == 'win32':
    147         m4_rule = 'type ${SRC} | m4 -D SRCDIR=../rtemstoolkit/' + libelf[:-1] + '> ${TGT}"'
    148     else:
    149         m4_rule = 'm4 -D SRCDIR=../rtemstoolkit/' + libelf[:-1] + ' ${SRC} > ${TGT}'
     173    m4_rule = '${M4} -D SRCDIR=../rtemstoolkit/' + libelf[:-1] + ' ${SRC} > ${TGT}'
    150174    if bld.env.DEST_OS == 'win32':
    151175        includes = ['win32']
  • tester/rt/console.py

    r2f11c36 r0382b68  
    3434
    3535import errno
    36 import fcntl
    3736import os
    3837import threading
    3938import time
    4039
    41 import stty
     40#
     41# Not available on Windows. Not sure what this means.
     42#
     43if os.name != 'nt':
     44    import fcntl
     45    import stty
     46else:
     47    fcntl = None
     48    stty = None
    4249
    4350def save():
    44     return stty.save()
     51    if stty is not None:
     52        return stty.save()
     53    return None
    4554
    4655def restore(attributes):
    47     stty.restore(attributes)
     56    if attributes is not None and stty is not None:
     57        stty.restore(attributes)
    4858
    4959class console(object):
     
    92102        if self._tracing():
    93103            print ':: tty close', self.dev
    94         fcntl.fcntl(me.tty.fd, fcntl.F_SETFL,
    95                     fcntl.fcntl(me.tty.fd, fcntl.F_GETFL) & ~os.O_NONBLOCK)
     104        if fcntl is not None:
     105            fcntl.fcntl(me.tty.fd, fcntl.F_SETFL,
     106                        fcntl.fcntl(me.tty.fd, fcntl.F_GETFL) & ~os.O_NONBLOCK)
    96107        self.close()
    97108
     
    100111            if self._tracing():
    101112                print ':: tty runner started', self.dev
    102             fcntl.fcntl(me.tty.fd, fcntl.F_SETFL,
    103                         fcntl.fcntl(me.tty.fd, fcntl.F_GETFL) | os.O_NONBLOCK)
     113            if fcntl is not None:
     114                fcntl.fcntl(me.tty.fd, fcntl.F_SETFL,
     115                            fcntl.fcntl(me.tty.fd, fcntl.F_GETFL) | os.O_NONBLOCK)
    104116            line = ''
    105117            while me.running:
  • tester/rt/gdb.py

    r2f11c36 r0382b68  
    3636import Queue
    3737import sys
    38 import termios
    3938import threading
    4039
  • tester/rtems-test

    r2f11c36 r0382b68  
    3434parent = os.path.dirname(base)
    3535rtems = os.path.join(parent, 'share', 'rtems')
    36 sys.path = [base, parent, rtems] + sys.path
     36tester = os.path.join(parent, 'share', 'rtems', 'tester')
     37sys.path = [parent, rtems, tester] + sys.path
    3738
    3839try:
  • tester/wscript

    r2f11c36 r0382b68  
    6161                  'rt/test.py',
    6262                  'rt/version.py'],
    63         install_path = '${PREFIX}/share/rtems/rt')
     63        install_path = '${PREFIX}/share/rtems/tester')
    6464    bld(features = 'py',
    6565        source = ['rt/pygdb/__init__.py',
    6666                  'rt/pygdb/mi_parser.py',
    6767                  'rt/pygdb/spark.py'],
    68         install_path = '${PREFIX}/share/rtems/rt/pygdb')
     68        install_path = '${PREFIX}/share/rtems/tester')
    6969    bld.install_files('${PREFIX}/bin', ['rtems-test'], chmod = 0o755)
    7070
  • wscript

    r2f11c36 r0382b68  
    11#
    22# RTEMS Tools Project (http://www.rtems.org/)
    3 # Copyright 2014 Chris Johns (chrisj@rtems.org)
     3# Copyright 2014, 2015 Chris Johns (chrisj@rtems.org)
    44# All rights reserved.
    55#
Note: See TracChangeset for help on using the changeset viewer.