mirror of
https://github.com/reactos/RosBE.git
synced 2024-10-07 00:43:20 +00:00
[ROSBE-UNIX] Remove last traces of make
and our supplemental buildtime
tool.
This commit is contained in:
parent
7e3502b711
commit
3701d25fc2
@ -201,7 +201,6 @@ if $update; then
|
||||
else
|
||||
rs_process_binutils=true
|
||||
rs_process_bison=true
|
||||
rs_process_buildtime=true
|
||||
rs_process_cmake=true
|
||||
rs_process_cpucount=true
|
||||
rs_process_flex=true
|
||||
@ -261,10 +260,6 @@ echo "Using CFLAGS=\"$CFLAGS\""
|
||||
echo "Using CXXFLAGS=\"$CXXFLAGS\""
|
||||
echo
|
||||
|
||||
if $rs_process_buildtime; then
|
||||
rs_do_command $CC -s -o "$rs_prefixdir/bin/buildtime" "$rs_scriptdir/tools/buildtime.c"
|
||||
fi
|
||||
|
||||
if $rs_process_cpucount; then
|
||||
rs_do_command $CC -s -o "$rs_prefixdir/bin/cpucount" "$rs_scriptdir/tools/cpucount.c"
|
||||
fi
|
||||
|
@ -4,8 +4,6 @@ alias charch="source $_ROSBE_ROSSCRIPTDIR/charch.sh"
|
||||
alias chdefdir="source $_ROSBE_ROSSCRIPTDIR/chdefdir.sh"
|
||||
alias clean="$_ROSBE_ROSSCRIPTDIR/clean.sh"
|
||||
alias help="$_ROSBE_ROSSCRIPTDIR/help.sh"
|
||||
alias make="$_ROSBE_ROSSCRIPTDIR/build.sh"
|
||||
alias makex="$_ROSBE_ROSSCRIPTDIR/build-multi.sh"
|
||||
alias scut="source $_ROSBE_ROSSCRIPTDIR/scut.sh"
|
||||
alias version="$_ROSBE_ROSSCRIPTDIR/version.sh"
|
||||
|
||||
|
@ -1,14 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
#
|
||||
# Detects the CPU cores in your system and builds ReactOS with this number of threads
|
||||
# Part of RosBE for Unix-based Operating Systems
|
||||
# Copyright 2007-2011 Colin Finck <colin@reactos.org>
|
||||
#
|
||||
# Released under GNU GPL v2 or any later version.
|
||||
|
||||
source "$_ROSBE_ROSSCRIPTDIR/rosbelibrary.sh"
|
||||
|
||||
CPUCOUNT=`cpucount -x1`
|
||||
execute_hooks pre-build $*
|
||||
buildtime make -j $CPUCOUNT $*
|
||||
execute_hooks post-build $*
|
@ -1,13 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
#
|
||||
# Builds ReactOS with one thread
|
||||
# Part of RosBE for Unix-based Operating Systems
|
||||
# Copyright 2007-2011 Colin Finck <colin@reactos.org>
|
||||
#
|
||||
# Released under GNU GPL v2 or any later version.
|
||||
|
||||
source "$_ROSBE_ROSSCRIPTDIR/rosbelibrary.sh"
|
||||
|
||||
execute_hooks pre-build $*
|
||||
buildtime make $*
|
||||
execute_hooks post-build $*
|
@ -8,12 +8,6 @@
|
||||
|
||||
echo
|
||||
echo "Available Commands:"
|
||||
echo " make [OPTIONS] - make, without options does a standard build of"
|
||||
echo " ReactOS. OPTIONS are the standard ReactOS build"
|
||||
echo " options, i.e. bootcd."
|
||||
echo " makex [OPTIONS] - Same as 'make' but automatically determines the"
|
||||
echo " number of CPUs in the system and uses -j with"
|
||||
echo " the appropriate number."
|
||||
echo " basedir - Switch back to the ReactOS source directory."
|
||||
echo " charch [OPTIONS] - Change the Architecture to build ReactOS for"
|
||||
echo " for the current RosBE session."
|
||||
|
@ -1,6 +0,0 @@
|
||||
Place here all the hooks that will be executed after the build ends.
|
||||
You have to name it that way: ID-name.sh
|
||||
Scripts with lower IDs will be executed first.
|
||||
All the hook scripts will receive as arguments the build target.
|
||||
The hooks will be executed even if the build failed. You have
|
||||
no way to know the result of the build once the hook is called.
|
@ -1,11 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
#
|
||||
# Pre-build hook script to force CMake rehandle
|
||||
# reactos.dff (in then, handle optional components)
|
||||
# Part of RosBE for Unix-based Operating Systems
|
||||
# Copyright 2012-2012 Pierre Schweitzer <pierre@reactos.org>
|
||||
#
|
||||
# Released under GNU GPL v2 or any later version.
|
||||
|
||||
# Just touch the file
|
||||
touch boot/bootdata/packages/reactos.dff.in
|
@ -1,4 +0,0 @@
|
||||
Place here all the hooks that will be executed before the build actually begins.
|
||||
You have to name it that way: ID-name.sh
|
||||
Scripts with lower IDs will be executed first.
|
||||
All the hook scripts will receive as arguments the build target.
|
@ -1,74 +0,0 @@
|
||||
/* Program for computing the build time.
|
||||
|
||||
Developed by Colin Finck <colin@reactos.org>
|
||||
Derived from "buildtime.c" of RosBE for Windows
|
||||
Released under GNU GPL v2 or any later version.
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/wait.h>
|
||||
#include <time.h>
|
||||
#include <unistd.h>
|
||||
|
||||
int
|
||||
main(int argc, char* argv[])
|
||||
{
|
||||
pid_t ProcessId;
|
||||
|
||||
/* Do we have command line arguments? */
|
||||
if(argc <= 1)
|
||||
{
|
||||
fprintf(stderr, "buildtime: No command line arguments!\n");
|
||||
return 1;
|
||||
}
|
||||
|
||||
ProcessId = fork();
|
||||
if(ProcessId < 0)
|
||||
{
|
||||
/* Error */
|
||||
fprintf(stderr, "buildtime: fork() failed!\n");
|
||||
return 1;
|
||||
}
|
||||
else if(ProcessId == 0)
|
||||
{
|
||||
/* Child process */
|
||||
execvp(argv[1], &argv[1]);
|
||||
|
||||
/* If this function returned, an error occured */
|
||||
fprintf(stderr, "execvp() failed!\n");
|
||||
return 1;
|
||||
}
|
||||
else
|
||||
{
|
||||
/* Parent process */
|
||||
double TotalTime;
|
||||
int Hour;
|
||||
int Minute;
|
||||
int Ret;
|
||||
int Second;
|
||||
time_t StartTime;
|
||||
time_t FinishTime;
|
||||
|
||||
time(&StartTime);
|
||||
|
||||
if(wait(&Ret) != ProcessId)
|
||||
{
|
||||
fprintf(stderr, "buildtime: wait() failed!\n");
|
||||
return 1;
|
||||
}
|
||||
|
||||
time(&FinishTime);
|
||||
|
||||
/* Compute the needed time and print it */
|
||||
TotalTime = difftime(FinishTime, StartTime);
|
||||
|
||||
Second = (int)TotalTime % 60;
|
||||
TotalTime = TotalTime / 60;
|
||||
Minute = (int)TotalTime % 60;
|
||||
Hour = TotalTime / 60;
|
||||
|
||||
printf("\nTotal Build Time: %02d:%02d:%02d\n", Hour, Minute, Second);
|
||||
return WEXITSTATUS(Ret);
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue
Block a user