Re: [ros-diffs] [chorns] 16520: Don't rebuild the module if a library is changed. Relinking the module is enough.

[Royce Mitchell III]

chorns(a)svn.reactos.com wrote:

>  Don't rebuild the module if a library is changed.
> Relinking the module is enough.
>
> Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
> Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h
>   
>
>  ------------------------------------------------------------------------
>  *Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp*
>
> --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp	2005-07-09 05:21:10 UTC
> (rev 16519)
> +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp	2005-07-09 07:50:48 UTC
> (rev 16520)
> @@ -874,7 +874,9 @@
>
>  		dependencies += " " + GetPrecompiledHeaderFilename ();
>  	
>  	/* WIDL generated headers may be used */
>   
>
> -	dependencies += " " + GetLinkingDependenciesMacro ();
>   
>
> +	vector<string> rpcDependencies;
> +	GetRpcHeaderDependencies ( rpcDependencies );
> +	dependencies += " " + v2s ( rpcDependencies, 5 );
>   
>
>  	dependencies += " " + NormalizeFilename ( module.xmlbuildFile );
>  
>  	string objectFilename = GetObjectFilename (
> @@ -1598,7 +1600,7 @@
>   
>
>  
>  void
>  MingwModuleHandler::GetRpcHeaderDependencies (
>   
>
> -	string_list& dependencies ) const
>   
>
> +	vector<string>& dependencies ) const
>   
>
>  {
>  	for ( size_t i = 0; i < module.non_if_data.libraries.size (); i++ )
>  	{
> @@ -1640,7 +1642,7 @@
>   
>
>  		module.non_if_data,
>  		&module.linkerFlags );
>  
>   
>
> -	string_list s;
>   
>
> +	vector<string> s;
>   
>
>  	if ( module.importLibrary )
>  	{
>  		const vector<File*>& files = module.non_if_data.files;
> @@ -1652,7 +1654,6 @@
>   
>
>  				GetSpecObjectDependencies ( s, file.name );
>  		}
>  	}
>   
>
> -	GetRpcHeaderDependencies ( s );
>   
>
>  	if ( s.size () > 0 )
>  	{
>  		fprintf (
>   
>
>  ------------------------------------------------------------------------
>  *Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h*
>
> --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h	2005-07-09 05:21:10 UTC (rev
> 16519)
> +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h	2005-07-09 07:50:48 UTC (rev
> 16520)
> @@ -179,7 +179,7 @@
>
>  	void GenerateBuildMapCode ();
>  	void GenerateBuildNonSymbolStrippedCode ();
>  	void CleanupFileVector ( std::vector<File*>& sourceFiles );
>   
>
> -	void GetRpcHeaderDependencies ( string_list& dependencies ) const;
>   
>
> +	void GetRpcHeaderDependencies ( std::vector<std::string>& dependencies )
> const;
>   
>
>  	std::string GetRpcServerHeaderFilename ( std::string basename ) const;
>  	std::string GetRpcClientHeaderFilename ( std::string basename ) const;
>  public:
>   
>  
I thought string_list was a typedef for vector<string>, why the change?

[Casper Hornstrup]

>   I thought string_list was a typedef for
> vector<string>, why the change? 
v2s() used vector<string>.

Casper

[Royce Mitchell III]

Casper Hornstrup wrote:

> >  I thought
> > string_list was a typedef for vector<string>, why the change?
> >     
> >  
> v2s() used vector<string>.
>
> C
>  
A typedef is interchangeable with it's type.