From fb123f93f9f5ce42c8e5785d2f8e0edaf951740e Mon Sep 17 00:00:00 2001 From: Lorry Tar Creator Date: Wed, 26 Mar 2014 19:21:20 +0000 Subject: Imported from /home/lorry/working-area/delta_VirtualBox/VirtualBox-4.3.10.tar.bz2. --- tools/CommonFetch.kmk | 2 +- tools/Makefile-ose.kmk | 2 +- tools/bin/gen-slickedit-workspace.cmd | 86 +++++++-------- tools/bin/gen-slickedit-workspace.sh | 63 +++++++++-- tools/bin/retry.cmd | 45 ++++++++ tools/kBuildTools/VBoxXGccAmd64LinuxGnu.kmk | 155 +++++++++++++++++++++++++++ tools/kBuildTools/VBoxXGccX86RedHatLinux.kmk | 154 ++++++++++++++++++++++++++ 7 files changed, 453 insertions(+), 54 deletions(-) create mode 100644 tools/bin/retry.cmd create mode 100644 tools/kBuildTools/VBoxXGccAmd64LinuxGnu.kmk create mode 100644 tools/kBuildTools/VBoxXGccX86RedHatLinux.kmk (limited to 'tools') diff --git a/tools/CommonFetch.kmk b/tools/CommonFetch.kmk index ee380ff5..13f7fe76 100644 --- a/tools/CommonFetch.kmk +++ b/tools/CommonFetch.kmk @@ -5,7 +5,7 @@ # # -# Copyright (C) 2006-2007 Oracle Corporation +# Copyright (C) 2006-2012 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/tools/Makefile-ose.kmk b/tools/Makefile-ose.kmk index 922f48e6..16dd8ab9 100644 --- a/tools/Makefile-ose.kmk +++ b/tools/Makefile-ose.kmk @@ -4,7 +4,7 @@ # # -# Copyright (C) 2006-2007 Oracle Corporation +# Copyright (C) 2006-2010 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/tools/bin/gen-slickedit-workspace.cmd b/tools/bin/gen-slickedit-workspace.cmd index bcd6cca1..716c81ec 100644 --- a/tools/bin/gen-slickedit-workspace.cmd +++ b/tools/bin/gen-slickedit-workspace.cmd @@ -1,43 +1,43 @@ -@echo off -rem $Id: gen-slickedit-workspace.cmd $ -rem rem @file -rem Windows NT batch script for launching gen-slickedit-workspace.sh -rem - -rem -rem Copyright (C) 2009-2011 Oracle Corporation -rem -rem This file is part of VirtualBox Open Source Edition (OSE), as -rem available from http://www.virtualbox.org. This file is free software; -rem you can redistribute it and/or modify it under the terms of the GNU -rem General Public License (GPL) as published by the Free Software -rem Foundation, in version 2 as it comes in the "COPYING" file of the -rem VirtualBox OSE distribution. VirtualBox OSE is distributed in the -rem hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. -rem - - -setlocal ENABLEEXTENSIONS -setlocal - -rem -rem gen-slickedit-workspace.sh should be in the same directory as this script. -rem -set MY_SCRIPT=%~dp0gen-slickedit-workspace.sh -if exist "%MY_SCRIPT%" goto found -echo gen-slickedit-workspace.cmd: failed to find gen-slickedit-workspace.sh in "%~dp0". -goto end - -rem -rem Found it, convert slashes and tell kmk_ash to interpret it. -rem -:found -set MY_SCRIPT=%MY_SCRIPT:\=/% -set MY_ARGS=%* -if ".%MY_ARGS%." NEQ ".." set MY_ARGS=%MY_ARGS:\=/% -kmk_ash %MY_SCRIPT% --windows-host %MY_ARGS% - -:end -endlocal -endlocal - +@echo off +rem $Id: gen-slickedit-workspace.cmd $ +rem rem @file +rem Windows NT batch script for launching gen-slickedit-workspace.sh +rem + +rem +rem Copyright (C) 2009-2011 Oracle Corporation +rem +rem This file is part of VirtualBox Open Source Edition (OSE), as +rem available from http://www.virtualbox.org. This file is free software; +rem you can redistribute it and/or modify it under the terms of the GNU +rem General Public License (GPL) as published by the Free Software +rem Foundation, in version 2 as it comes in the "COPYING" file of the +rem VirtualBox OSE distribution. VirtualBox OSE is distributed in the +rem hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. +rem + + +setlocal ENABLEEXTENSIONS +setlocal + +rem +rem gen-slickedit-workspace.sh should be in the same directory as this script. +rem +set MY_SCRIPT=%~dp0gen-slickedit-workspace.sh +if exist "%MY_SCRIPT%" goto found +echo gen-slickedit-workspace.cmd: failed to find gen-slickedit-workspace.sh in "%~dp0". +goto end + +rem +rem Found it, convert slashes and tell kmk_ash to interpret it. +rem +:found +set MY_SCRIPT=%MY_SCRIPT:\=/% +set MY_ARGS=%* +if ".%MY_ARGS%." NEQ ".." set MY_ARGS=%MY_ARGS:\=/% +kmk_ash %MY_SCRIPT% --windows-host %MY_ARGS% + +:end +endlocal +endlocal + diff --git a/tools/bin/gen-slickedit-workspace.sh b/tools/bin/gen-slickedit-workspace.sh index e4c19d97..239baa82 100644 --- a/tools/bin/gen-slickedit-workspace.sh +++ b/tools/bin/gen-slickedit-workspace.sh @@ -5,7 +5,7 @@ # # -# Copyright (C) 2009-2011 Oracle Corporation +# Copyright (C) 2009-2012 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; @@ -49,6 +49,8 @@ out/win.amd64/debug \ out/win.x86/debug \ out/darwin.amd64/debug \ out/darwin.x86/debug \ +out/haiku.amd64/debug \ +out/haiku.x86/debug \ out/solaris.amd64/debug \ out/solaris.x86/debug"; @@ -63,6 +65,7 @@ MY_WS_NAME="VirtualBox.vpw" MY_DBG="" MY_WINDOWS_HOST="" MY_OPT_MINIMAL="" +MY_OPT_USE_WILDCARDS="yes" #MY_KBUILD_PATH="${KBUILD_PATH}" #test -z "${MY_KBUILD_PATH}" && MY_KBUILD_PATH="${PATH_KBUILD}" @@ -110,6 +113,7 @@ my_get_name() # # @param $1 The output file name base. # @param $2 The file name. +# @param $3 Optional folder override. my_file() { # sort and filter by file type. @@ -125,7 +129,7 @@ my_file() ;; # by extension. - *.c|*.cpp|*.m|*.mm|*.pl|*.py|*.as|*.c.h|*.cpp.h) + *.c|*.cpp|*.m|*.mm|*.pl|*.py|*.as|*.c.h|*.cpp.h|*.java) MY_FOLDER="$1-Sources.lst" ;; @@ -141,6 +145,10 @@ my_file() MY_FOLDER="$1-Others.lst" ;; esac + if test -n "$3"; + then + MY_FOLDER="$1-$3.lst" + fi ## @todo only files which are in subversion. # if ${MY_SVN} info "${2}" > /dev/null 2>&1; then @@ -149,11 +157,23 @@ my_file() # fi } +## +# Generate file entry for the specified file if it was found to be of interest. +# +# @param $1 The output file name base. +# @param $2 The wildcard spec. +my_wildcard() +{ + EXCLUDES="*.log;*.kup;*~;*.pyc;*.exe;*.sys;*.dll;*.o;*.obj;*.lib;*.a;*.ko;*.class;.svn/*" + echo ' ' >> "$1-All.lst" +} + ## # Generate file entries for the specified sub-directory tree. # # @param $1 The output filename. # @param $2 The sub-directory. +# @param $3 Optional folder override. my_sub_tree() { if test -n "$MY_DBG"; then echo "dbg: my_sub_tree: ${2}"; fi @@ -170,9 +190,9 @@ my_sub_tree() do if test -d "${f}"; then - my_sub_tree "${1}" "${f}" + my_sub_tree "${1}" "${f}" "${3}" else - my_file "${1}" "${f}" + my_file "${1}" "${f}" "${3}" fi done return 0; @@ -190,6 +210,7 @@ my_generate_folder() shift # Zap existing file collections. + > "${MY_FILE}-All.lst" > "${MY_FILE}-Sources.lst" > "${MY_FILE}-Headers.lst" > "${MY_FILE}-Assembly.lst" @@ -203,7 +224,18 @@ my_generate_folder() do if test -d "${f}"; then - my_sub_tree "${MY_FILE}" "${f}" + if test -z "${MY_OPT_USE_WILDCARDS}"; + then + my_sub_tree "${MY_FILE}" "${f}" + else + case "${f}" in + ${MY_ROOT_DIR}/include*) + my_sub_tree "${MY_FILE}" "${f}" "Headers" + ;; + *) my_wildcard "${MY_FILE}" "${f}" + ;; + esac + fi else my_file "${MY_FILE}" "${f}" fi @@ -212,6 +244,10 @@ my_generate_folder() done # Generate the folders. + if test -s "${MY_FILE}-All.lst"; + then + ${MY_SORT} "${MY_FILE}-All.lst" | ${MY_SED} -e 's/