Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-30 22:12:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

Correct some wrong dependencies for 'make bootcd'

Browse source 
svn path=/branches/xmlbuildsystem/; revision=14532
This commit is contained in:
Casper Hornstrup 2005-04-06 20:49:49 +00:00
parent f81cbc31f1
commit 1ea35be664
4 changed files with 40 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

7
reactos/Makefile
View file

@ -178,6 +178,13 @@ else
endif
OUTPUT_ := $(OUTPUT)$(SEP)
ifneq ($(ROS_TEMPORARY),)
TEMPORARY := $(ROS_TEMPORARY)
else
TEMPORARY := .
endif
TEMPORARY_ := $(TEMPORARY)$(SEP)
ifneq ($(ROS_INSTALL),)
INSTALL := $(ROS_INSTALL)
else

12
reactos/tools/cabman/cabman.mak
View file

@ -18,7 +18,7 @@ endif
CABMAN_TARGET = \
$(EXEPREFIX)$(CABMAN_OUT_)cabman$(EXEPOSTFIX)
CABMAN_SOURCES = $(addprefix $(CABMAN_INT_), \
CABMAN_SOURCES = $(addprefix $(CABMAN_BASE_), \
cabinet.cxx \
dfp.cxx \
main.cxx \
@ -42,23 +42,23 @@ $(CABMAN_TARGET): $(CABMAN_OBJECTS) $(CABMAN_HOST_LIBS) $(CABMAN_OUT)
$(ECHO_LD)
${host_gpp} $(CABMAN_OBJECTS) $(CABMAN_HOST_LFLAGS) -o $@
$(CABMAN_INT_)cabinet.o: $(CABMAN_BASE_)cabinet.cxx $(CABMAN_BASE_DIR)
$(CABMAN_INT_)cabinet.o: $(CABMAN_BASE_)cabinet.cxx $(CABMAN_INT)
$(ECHO_CC)
${host_gpp} $(CABMAN_HOST_CFLAGS) -c $< -o $@
$(CABMAN_INT_)dfp.o: $(CABMAN_BASE_)dfp.cxx $(CABMAN_BASE_DIR)
$(CABMAN_INT_)dfp.o: $(CABMAN_BASE_)dfp.cxx $(CABMAN_INT)
$(ECHO_CC)
${host_gpp} $(CABMAN_HOST_CFLAGS) -c $< -o $@
$(CABMAN_INT_)main.o: $(CABMAN_BASE_)main.cxx $(CABMAN_BASE_DIR)
$(CABMAN_INT_)main.o: $(CABMAN_BASE_)main.cxx $(CABMAN_INT)
$(ECHO_CC)
${host_gpp} $(CABMAN_HOST_CFLAGS) -c $< -o $@
$(CABMAN_INT_)mszip.o: $(CABMAN_BASE_)mszip.cxx $(CABMAN_BASE_DIR)
$(CABMAN_INT_)mszip.o: $(CABMAN_BASE_)mszip.cxx $(CABMAN_INT)
$(ECHO_CC)
${host_gpp} $(CABMAN_HOST_CFLAGS) -c $< -o $@
$(CABMAN_INT_)raw.o: $(CABMAN_BASE_)raw.cxx $(CABMAN_BASE_DIR)
$(CABMAN_INT_)raw.o: $(CABMAN_BASE_)raw.cxx $(CABMAN_INT)
$(ECHO_CC)
${host_gpp} $(CABMAN_HOST_CFLAGS) -c $< -o $@

29
reactos/tools/rbuild/backend/mingw/modulehandler.cpp
View file

@ -10,7 +10,7 @@ using std::vector;
#define CLEAN_FILE(f) clean_files.push_back ( f ); /*if ( module.name == "crt" ) printf ( "%s(%i): clean: %s\n", __FILE__, __LINE__, f.c_str() )*/
static string ros_temp = "$(ROS_TEMPORARY)";
static string ros_temp = "$(TEMPORARY)";
MingwBackend*
MingwModuleHandler::backend = NULL;
FILE*
@ -339,6 +339,8 @@ MingwModuleHandler::GetObjectFilename (
const string& sourceFilename,
string_list* pclean_files ) const
{
Directory* directoryTree;
string newExtension;
string extension = GetExtension ( sourceFilename );
if ( extension == ".rc" || extension == ".RC" )
@ -347,11 +349,17 @@ MingwModuleHandler::GetObjectFilename (
newExtension = ".stubs.o";
else
newExtension = ".o";
if ( module.type == BootSector )
directoryTree = backend->outputDirectory;
else
directoryTree = backend->intermediateDirectory;
string obj_file = PassThruCacheDirectory (
NormalizeFilename ( ReplaceExtension (
RemoveVariables ( sourceFilename ),
newExtension ) ),
backend->intermediateDirectory );
directoryTree );
if ( pclean_files )
{
string_list& clean_files = *pclean_files;
@ -2188,7 +2196,9 @@ MingwIsoModuleHandler::OutputBootstrapfileCopyCommands (
if ( m.bootstrap != NULL )
{
string targetFilenameNoFixup ( bootcdDirectory + SSEP + m.bootstrap->base + SSEP + m.bootstrap->nameoncd );
string targetFilename ( GetTargetMacro ( module ) );
string targetFilename = MingwModuleHandler::PassThruCacheDirectory (
NormalizeFilename ( targetFilenameNoFixup ),
backend->outputDirectory );
fprintf ( fMakefile,
"\t$(ECHO_CP)\n" );
fprintf ( fMakefile,
@ -2272,7 +2282,12 @@ MingwIsoModuleHandler::GetBootstrapCdFiles (
{
const Module& m = *module.project.modules[i];
if ( m.bootstrap != NULL )
out.push_back ( NormalizeFilename ( m.GetPath () ) );
{
string filename = PassThruCacheDirectory (
NormalizeFilename ( m.GetPath () ),
backend->outputDirectory );
out.push_back ( filename );
}
}
}
@ -2283,7 +2298,7 @@ MingwIsoModuleHandler::GetNonModuleCdFiles (
for ( size_t i = 0; i < module.project.cdfiles.size (); i++ )
{
const CDFile& cdfile = *module.project.cdfiles[i];
out.push_back ( NormalizeFilename ( cdfile.GetPath () ) );
out.push_back ( cdfile.GetPath () );
}
}
@ -2299,7 +2314,9 @@ void
MingwIsoModuleHandler::GenerateIsoModuleTarget ()
{
string bootcdDirectory = "cd";
string isoboot = NormalizeFilename ( "boot/freeldr/bootsect/isoboot.o" );
string isoboot = PassThruCacheDirectory (
NormalizeFilename ( "boot/freeldr/bootsect/isoboot.o" ),
backend->intermediateDirectory );
string bootcdReactosNoFixup = bootcdDirectory + "/reactos";
string bootcdReactos = PassThruCacheDirectory (
NormalizeFilename ( bootcdReactosNoFixup ),

5
reactos/tools/rbuild/module.cpp
View file

@ -589,7 +589,10 @@ Module::GetBasePath () const
string
Module::GetPath () const
{
return path + CSEP + GetTargetName ();
if ( path.length() > 0 )
return path + CSEP + GetTargetName ();
else
return GetTargetName ();
}
string