ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-02 19:26:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support installation of generated files

Browse Source 
svn path=/branches/xmlbuildsystem/; revision=14488
This commit is contained in:
Casper Hornstrup
2005-04-04 20:50:55 +00:00
parent 77b574742c
commit 19fa7f20af
8 changed files with 107 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/tools/rbuild/backend/mingw/mingw.cpp
+73 -62
View File
@@ -614,47 +614,6 @@ MingwBackend::DetectPCHSupport ()
// allow that to override use_pch if true
}
string
MingwBackend::GetNonModuleInstallDirectories ( const string& installDirectory )
{
string directories;
for ( size_t i = 0; i < ProjectNode.installfiles.size (); i++ )
{
const InstallFile& installfile = *ProjectNode.installfiles[i];
string targetDirectory ( installDirectory + SSEP + installfile.base );
if ( directories.size () > 0 )
directories += " ";
directories += MingwModuleHandler::PassThruCacheDirectory (
FixupTargetFilename ( targetDirectory ),
true );
}
return directories;
}
string
MingwBackend::GetInstallDirectories ( const string& installDirectory )
{
return GetNonModuleInstallDirectories ( installDirectory );
}
void
MingwBackend::GetNonModuleInstallFiles (
vector<string>& out ) const
{
for ( size_t i = 0; i < ProjectNode.installfiles.size (); i++ )
{
const InstallFile& installfile = *ProjectNode.installfiles[i];
out.push_back ( NormalizeFilename ( installfile.GetPath () ) );
}
}
void
MingwBackend::GetInstallFiles (
vector<string>& out ) const
{
GetNonModuleInstallFiles ( out );
}
void
MingwBackend::GetNonModuleInstallTargetFiles (
string installDirectory,
@@ -665,12 +624,31 @@ MingwBackend::GetNonModuleInstallTargetFiles (
const InstallFile& installfile = *ProjectNode.installfiles[i];
string targetFilenameNoFixup = installDirectory + SSEP + installfile.base + SSEP + installfile.newname;
string targetFilename = MingwModuleHandler::PassThruCacheDirectory (
FixupTargetFilename ( targetFilenameNoFixup ),
NormalizeFilename ( targetFilenameNoFixup ),
true );
out.push_back ( targetFilename );
}
}
void
MingwBackend::GetModuleInstallTargetFiles (
string installDirectory,
vector<string>& out ) const
{
for ( size_t i = 0; i < ProjectNode.modules.size (); i++ )
{
const Module& module = *ProjectNode.modules[i];
if ( module.installName.length () > 0 )
{
string targetFilenameNoFixup = installDirectory + SSEP + module.installBase + SSEP + module.installName;
string targetFilename = MingwModuleHandler::PassThruCacheDirectory (
NormalizeFilename ( targetFilenameNoFixup ),
true );
out.push_back ( targetFilename );
}
}
}
void
MingwBackend::GetInstallTargetFiles (
string installDirectory,
@@ -678,32 +656,64 @@ MingwBackend::GetInstallTargetFiles (
{
GetNonModuleInstallTargetFiles ( installDirectory,
out );
GetModuleInstallTargetFiles ( installDirectory,
out );
}
void
MingwBackend::OutputInstallfileTargets ( const string& installDirectory )
MingwBackend::OutputInstallTarget ( const string& installDirectory,
const string& sourceFilename,
const string& targetFilename,
const string& targetDirectory )
{
string normalizedTargetFilename = MingwModuleHandler::PassThruCacheDirectory (
NormalizeFilename ( installDirectory + SSEP + targetDirectory + SSEP + targetFilename ),
true );
string normalizedTargetDirectory = MingwModuleHandler::PassThruCacheDirectory (
NormalizeFilename ( installDirectory + SSEP + targetDirectory ),
true );
fprintf ( fMakefile,
"%s: %s %s\n",
normalizedTargetFilename.c_str (),
sourceFilename.c_str (),
normalizedTargetDirectory.c_str () );
fprintf ( fMakefile,
"\t$(ECHO_CP)\n" );
fprintf ( fMakefile,
"\t${cp} %s %s\n",
sourceFilename.c_str (),
normalizedTargetFilename.c_str () );
}
void
MingwBackend::OutputNonModuleInstallTargets ( const string& installDirectory )
{
for ( size_t i = 0; i < ProjectNode.installfiles.size (); i++ )
{
const InstallFile& installfile = *ProjectNode.installfiles[i];
string targetFilenameNoFixup = installDirectory + SSEP + installfile.base + SSEP + installfile.newname;
string targetFilename = MingwModuleHandler::PassThruCacheDirectory (
FixupTargetFilename ( targetFilenameNoFixup ),
true );
string targetDirectory = MingwModuleHandler::PassThruCacheDirectory (
FixupTargetFilename ( installDirectory + SSEP + installfile.base ),
true );
fprintf ( fMakefile,
"%s: %s %s\n",
targetFilename.c_str (),
installfile.GetPath ().c_str (),
targetDirectory.c_str () );
fprintf ( fMakefile,
"\t$(ECHO_CP)\n" );
fprintf ( fMakefile,
"\t${cp} %s %s\n",
installfile.GetPath ().c_str (),
targetFilename.c_str () );
OutputInstallTarget ( installDirectory,
installfile.GetPath (),
installfile.newname,
installfile.base );
}
}
void
MingwBackend::OutputModuleInstallTargets ( const string& installDirectory )
{
for ( size_t i = 0; i < ProjectNode.modules.size (); i++ )
{
const Module& module = *ProjectNode.modules[i];
if ( module.installName.length () > 0 )
{
string sourceFilename = MingwModuleHandler::PassThruCacheDirectory (
NormalizeFilename ( module.GetPath () ),
true );
OutputInstallTarget ( installDirectory,
sourceFilename,
module.installName,
module.installBase );
}
}
}
@@ -723,7 +733,8 @@ MingwBackend::GenerateInstallTarget ()
"install: %s %s\n",
installDirectory.c_str (),
installTargetFiles.c_str () );
OutputInstallfileTargets ( installDirectoryNoFixup );
OutputNonModuleInstallTargets ( installDirectoryNoFixup );
OutputModuleInstallTargets ( installDirectoryNoFixup );
fprintf ( fMakefile,
"\n" );
}
reactos/tools/rbuild/backend/mingw/mingw.h
+8 -1
View File
@@ -50,9 +50,16 @@ private:
void GetInstallFiles ( std::vector<std::string>& out ) const;
void GetNonModuleInstallTargetFiles ( std::string installDirectory,
std::vector<std::string>& out ) const;
void GetModuleInstallTargetFiles ( std::string installDirectory,
std::vector<std::string>& out ) const;
void GetInstallTargetFiles ( std::string installDirectory,
std::vector<std::string>& out ) const;
void OutputInstallfileTargets ( const std::string& installDirectory );
void OutputInstallTarget ( const std::string& installDirectory,
const std::string& sourceFilename,
const std::string& targetFilename,
const std::string& targetDirectory );
void OutputNonModuleInstallTargets ( const std::string& installDirectory );
void OutputModuleInstallTargets ( const std::string& installDirectory );
void GenerateInstallTarget ();
FILE* fMakefile;
bool use_pch;
reactos/tools/rbuild/backend/mingw/modulehandler.cpp
+1 -1
View File
@@ -97,7 +97,7 @@ MingwModuleHandler::RemoveVariables ( string path)
}
return path;
}
/*static*/ string
MingwModuleHandler::PassThruCacheDirectory (
const string &file, bool out )
reactos/tools/rbuild/module.cpp
+15 -1
View File
@@ -133,7 +133,9 @@ Module::Module ( const Project& project,
host (HostDefault)
{
if ( node.name != "module" )
throw Exception ( "internal tool error: Module created with non-<module> node" );
throw InvalidOperationException ( __FILE__,
__LINE__,
"Module created with non-<module> node" );
path = FixSeparator ( modulePath );
@@ -202,6 +204,18 @@ Module::Module ( const Project& project,
att = moduleNode.GetAttribute ( "prefix", false );
if ( att != NULL )
prefix = att->value;
att = moduleNode.GetAttribute ( "installbase", false );
if ( att != NULL )
installBase = att->value;
else
installBase = "";
att = moduleNode.GetAttribute ( "installname", false );
if ( att != NULL )
installName = att->value;
else
installName = "";
}
Module::~Module ()
reactos/tools/rbuild/rbuild.h
+2
View File
@@ -171,6 +171,8 @@ public:
bool cplusplus;
std::string prefix;
HostType host;
std::string installBase;
std::string installName;
Module ( const Project& project,
const XMLElement& moduleNode,
reactos/tools/rbuild/rbuild.txt
+3 -1
View File
@@ -107,7 +107,7 @@ Module element
There can be zero or more modules per xml build file.
Syntax:
<module name="msvcrt" type="win32dll" extension=".dll" entrypoint="_DllMain@12" baseaddress="0x70000000" mangledsymbols="true">
<module name="msvcrt" type="win32dll" extension=".dll" entrypoint="_DllMain@12" baseaddress="0x70000000" mangledsymbols="true" installbase="system32" installname="msvcrt.dll" >
...
</module>
@@ -118,6 +118,8 @@ Attributes:
entrypoint - Entrypoint symbol of the generated file if such file is generated for the particular module type.
baseaddress - Base address of the generated file if such file is generated for the particular module type.
mangledsymbols - Controls wether or not to pass --kill-at to dlltool. If this attribute has the value false then --kill-at is passed to dlltool. If the value is true, then --kill-at is not passed to dlltool. If the generated file exports C++ classes then this need to be true.
installbase - Base directory of the generated file in the installation directory. This attribute is optional.
installname - Name of generated file in the installation directory. This attribute is optional, but if not specified, the generated file is not copied to the installation directory.
Value:
None.
reactos/tools/rbuild/tests/data/module.xml
+1 -1
View File
@@ -7,7 +7,7 @@
</module>
</directory>
<directory name="dir2">
<module name="module2" type="kernelmodedll">
<module name="module2" type="kernelmodedll" installbase="reactos" installname="module2.ext">
<dependency>module1</dependency>
<library>module1</library>
<file>file3.c</file>
reactos/tools/rbuild/tests/moduletest.cpp
+4
View File
@@ -10,6 +10,7 @@ void ModuleTest::Run()
Module& module1 = *project.modules[0];
IS_TRUE(module1.type == BuildTool);
ARE_EQUAL(2, module1.non_if_data.files.size());
ARE_EQUAL("dir1" SSEP "file1.c", module1.non_if_data.files[0]->name);
ARE_EQUAL("dir1" SSEP "file2.c", module1.non_if_data.files[1]->name);
@@ -18,6 +19,9 @@ void ModuleTest::Run()
Module& module2 = *project.modules[1];
IS_TRUE(module2.type == KernelModeDLL);
ARE_EQUAL("reactos", module2.installBase);
ARE_EQUAL("module2.ext", module2.installName);
ARE_EQUAL(2, module2.non_if_data.files.size());
ARE_EQUAL("dir2" SSEP "file3.c", module2.non_if_data.files[0]->name);
ARE_EQUAL("dir2" SSEP "file4.c", module2.non_if_data.files[1]->name);