mirror of
git://code.qt.io/qt/qt5.git
synced 2026-05-04 02:07:48 +08:00
Adjust pre-existing script to use the new common.sourced.sh
Change-Id: Icf7829d3499110a76b90679ba2d067f80d189e69 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
This commit is contained in:
Dimitrios Apostolou
@@ -39,22 +39,20 @@
|
|||||||
# and they sometimes create problems to the build process and telegraf.
|
# and they sometimes create problems to the build process and telegraf.
|
||||||
|
|
||||||
|
|
||||||
# Must have this variable set in the environment
|
set -e
|
||||||
[ x"$PROVISION_DIR" = x ] && exit 38
|
|
||||||
|
PROVISIONING_DIR="$(dirname "$0")/../../"
|
||||||
|
. "$PROVISIONING_DIR"/common/unix/common.sourced.sh
|
||||||
|
|
||||||
|
|
||||||
echo "Current limits are:"
|
echo "Current limits are:"
|
||||||
ulimit -a
|
ulimit -a
|
||||||
launchctl limit
|
launchctl limit
|
||||||
|
|
||||||
sudo cp $PROVISION_DIR/common/macos/limit.maxfiles.plist /Library/LaunchDaemons/
|
$CMD_INSTALL -m 644 -o root -g wheel \
|
||||||
sudo cp $PROVISION_DIR/common/macos/limit.maxproc.plist /Library/LaunchDaemons/
|
$PROVISIONING_DIR/common/macos/limit.maxfiles.plist \
|
||||||
|
$PROVISIONING_DIR/common/macos/limit.maxproc.plist \
|
||||||
sudo chown root:wheel /Library/LaunchDaemons/limit.maxfiles.plist
|
/Library/LaunchDaemons/
|
||||||
sudo chown root:wheel /Library/LaunchDaemons/limit.maxproc.plist
|
|
||||||
|
|
||||||
sudo chmod 644 /Library/LaunchDaemons/limit.maxfiles.plist
|
|
||||||
sudo chmod 644 /Library/LaunchDaemons/limit.maxproc.plist
|
|
||||||
|
|
||||||
# Activate the new limits immediately (not for the current session though)
|
# Activate the new limits immediately (not for the current session though)
|
||||||
sudo launchctl load -w /Library/LaunchDaemons/limit.maxfiles.plist
|
sudo launchctl load -w /Library/LaunchDaemons/limit.maxfiles.plist
|
||||||
|
|||||||
@@ -1,44 +1,3 @@
|
|||||||
#!/usr/bin/env bash
|
#!/bin/sh
|
||||||
|
|
||||||
#############################################################################
|
"$(dirname "$0")"/../common/macos/increase_limits.sh
|
||||||
##
|
|
||||||
## Copyright (C) 2019 The Qt Company Ltd.
|
|
||||||
## Contact: http://www.qt.io/licensing/
|
|
||||||
##
|
|
||||||
## This file is part of the provisioning scripts of the Qt Toolkit.
|
|
||||||
##
|
|
||||||
## $QT_BEGIN_LICENSE:LGPL21$
|
|
||||||
## Commercial License Usage
|
|
||||||
## Licensees holding valid commercial Qt licenses may use this file in
|
|
||||||
## accordance with the commercial license agreement provided with the
|
|
||||||
## Software or, alternatively, in accordance with the terms contained in
|
|
||||||
## a written agreement between you and The Qt Company. For licensing terms
|
|
||||||
## and conditions see http://www.qt.io/terms-conditions. For further
|
|
||||||
## information use the contact form at http://www.qt.io/contact-us.
|
|
||||||
##
|
|
||||||
## GNU Lesser General Public License Usage
|
|
||||||
## Alternatively, this file may be used under the terms of the GNU Lesser
|
|
||||||
## General Public License version 2.1 or version 3 as published by the Free
|
|
||||||
## Software Foundation and appearing in the file LICENSE.LGPLv21 and
|
|
||||||
## LICENSE.LGPLv3 included in the packaging of this file. Please review the
|
|
||||||
## following information to ensure the GNU Lesser General Public License
|
|
||||||
## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
|
|
||||||
## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
|
||||||
##
|
|
||||||
## As a special exception, The Qt Company gives you certain additional
|
|
||||||
## rights. These rights are described in The Qt Company LGPL Exception
|
|
||||||
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
|
||||||
##
|
|
||||||
## $QT_END_LICENSE$
|
|
||||||
##
|
|
||||||
#############################################################################
|
|
||||||
|
|
||||||
|
|
||||||
set -ex
|
|
||||||
|
|
||||||
|
|
||||||
PROVISION_DIR="$(dirname "$0")/.."
|
|
||||||
export PROVISION_DIR
|
|
||||||
|
|
||||||
|
|
||||||
. "$PROVISION_DIR"/common/macos/increase_limits.sh
|
|
||||||
|
|||||||
@@ -1,44 +1,3 @@
|
|||||||
#!/usr/bin/env bash
|
#!/bin/sh
|
||||||
|
|
||||||
#############################################################################
|
"$(dirname "$0")"/../common/macos/increase_limits.sh
|
||||||
##
|
|
||||||
## Copyright (C) 2019 The Qt Company Ltd.
|
|
||||||
## Contact: http://www.qt.io/licensing/
|
|
||||||
##
|
|
||||||
## This file is part of the provisioning scripts of the Qt Toolkit.
|
|
||||||
##
|
|
||||||
## $QT_BEGIN_LICENSE:LGPL21$
|
|
||||||
## Commercial License Usage
|
|
||||||
## Licensees holding valid commercial Qt licenses may use this file in
|
|
||||||
## accordance with the commercial license agreement provided with the
|
|
||||||
## Software or, alternatively, in accordance with the terms contained in
|
|
||||||
## a written agreement between you and The Qt Company. For licensing terms
|
|
||||||
## and conditions see http://www.qt.io/terms-conditions. For further
|
|
||||||
## information use the contact form at http://www.qt.io/contact-us.
|
|
||||||
##
|
|
||||||
## GNU Lesser General Public License Usage
|
|
||||||
## Alternatively, this file may be used under the terms of the GNU Lesser
|
|
||||||
## General Public License version 2.1 or version 3 as published by the Free
|
|
||||||
## Software Foundation and appearing in the file LICENSE.LGPLv21 and
|
|
||||||
## LICENSE.LGPLv3 included in the packaging of this file. Please review the
|
|
||||||
## following information to ensure the GNU Lesser General Public License
|
|
||||||
## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
|
|
||||||
## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
|
||||||
##
|
|
||||||
## As a special exception, The Qt Company gives you certain additional
|
|
||||||
## rights. These rights are described in The Qt Company LGPL Exception
|
|
||||||
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
|
||||||
##
|
|
||||||
## $QT_END_LICENSE$
|
|
||||||
##
|
|
||||||
#############################################################################
|
|
||||||
|
|
||||||
|
|
||||||
set -ex
|
|
||||||
|
|
||||||
|
|
||||||
PROVISION_DIR="$(dirname "$0")/.."
|
|
||||||
export PROVISION_DIR
|
|
||||||
|
|
||||||
|
|
||||||
. "$PROVISION_DIR"/common/macos/increase_limits.sh
|
|
||||||
|
|||||||
@@ -1,44 +1,3 @@
|
|||||||
#!/usr/bin/env bash
|
#!/bin/sh
|
||||||
|
|
||||||
#############################################################################
|
"$(dirname "$0")"/../common/macos/increase_limits.sh
|
||||||
##
|
|
||||||
## Copyright (C) 2019 The Qt Company Ltd.
|
|
||||||
## Contact: http://www.qt.io/licensing/
|
|
||||||
##
|
|
||||||
## This file is part of the provisioning scripts of the Qt Toolkit.
|
|
||||||
##
|
|
||||||
## $QT_BEGIN_LICENSE:LGPL21$
|
|
||||||
## Commercial License Usage
|
|
||||||
## Licensees holding valid commercial Qt licenses may use this file in
|
|
||||||
## accordance with the commercial license agreement provided with the
|
|
||||||
## Software or, alternatively, in accordance with the terms contained in
|
|
||||||
## a written agreement between you and The Qt Company. For licensing terms
|
|
||||||
## and conditions see http://www.qt.io/terms-conditions. For further
|
|
||||||
## information use the contact form at http://www.qt.io/contact-us.
|
|
||||||
##
|
|
||||||
## GNU Lesser General Public License Usage
|
|
||||||
## Alternatively, this file may be used under the terms of the GNU Lesser
|
|
||||||
## General Public License version 2.1 or version 3 as published by the Free
|
|
||||||
## Software Foundation and appearing in the file LICENSE.LGPLv21 and
|
|
||||||
## LICENSE.LGPLv3 included in the packaging of this file. Please review the
|
|
||||||
## following information to ensure the GNU Lesser General Public License
|
|
||||||
## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
|
|
||||||
## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
|
||||||
##
|
|
||||||
## As a special exception, The Qt Company gives you certain additional
|
|
||||||
## rights. These rights are described in The Qt Company LGPL Exception
|
|
||||||
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
|
||||||
##
|
|
||||||
## $QT_END_LICENSE$
|
|
||||||
##
|
|
||||||
#############################################################################
|
|
||||||
|
|
||||||
|
|
||||||
set -ex
|
|
||||||
|
|
||||||
|
|
||||||
PROVISION_DIR="$(dirname "$0")/.."
|
|
||||||
export PROVISION_DIR
|
|
||||||
|
|
||||||
|
|
||||||
. "$PROVISION_DIR"/common/macos/increase_limits.sh
|
|
||||||
|
|||||||
Reference in New Issue
Block a user