incubator-ooo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Pavel Janík <Pa...@Janik.cz>
Subject Re: [LINUX-BUILD] Developer Education -- Building on Linux event starts now
Date Thu, 08 Sep 2011 09:22:16 GMT

On Sep 7, 2011, at 9:32 PM, Pavel Janík wrote:

>> AFAIK source_config is the only way to get build.pl to look outside the
>> "main" repository/directory, so it is necessary.
>> 
>> given that we now have a more fixed directory layout with the SVN repo,
>> i guess it should be possible to hardcode the path to the "extras"
>> directory and have configure put something in the environment or just
>> make build.pl respect gb_REPOS which already exists, then we can finally
>> get rid of this source_config nonsense.
> 
> Yes, this is my goal after the clean build is finished.


Hmm, I forgot to send this yesterday.

I "modified" build.pl to automatically add extras repository:

--- /Users/pavel/.ooo/ooo/trunk/main/solenv/bin/build.pl	2011-08-28 20:19:41.000000000 +0200
+++ solenv/bin/build.pl	2011-09-07 22:22:48.000000000 +0200
@@ -1617,6 +1617,13 @@
 
 sub get_module_and_buildlist_paths {
     if ($build_all_parents || $checkparents) {
+
+	# Perl Hackery: add repo extras explicitly
+	my $extras;
+	$extras = $source_config->get_module_path('vcl');
+	$extras =~ s|vcl|../extras|g;
+	$source_config->add_repository($extras);
+
         $source_config_file = $source_config->get_config_file_path();
         $active_modules{$_}++ foreach ($source_config->get_active_modules());
         my %active_modules_copy = %active_modules;


This change is incorrect, should not be integrated. But shows what is needed to be changed
somewhere. I can only read Perl, so do not ask me why I used this approach...

With this change, you do not need source_config with localized builds.
-- 
Pavel Janík




Mime
View raw message