[Libreoffice-commits] .: 2 commits - .gitignore solenv/bin

Thomas Arnhold tarnhold at kemper.freedesktop.org
Wed Feb 16 12:02:19 PST 2011


 .gitignore                               |    8 
 solenv/bin/update_module_ignore_lists.pl |  253 -------------------------------
 2 files changed, 8 insertions(+), 253 deletions(-)

New commits:
commit eeeb44ffb3b147d02e8a2201c98c47a2b6511c0d
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Wed Feb 16 21:01:34 2011 +0100

    Updated gitignore to ignore build dirs on other platforms

diff --git a/.gitignore b/.gitignore
index df61cc5..4621c7b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,14 @@
 /*/wntmsc???.pro
 /*/unxmac??
 /*/unxmac??.pro
+/*/unx?bsd??
+/*/unx?bsd??.pro
+/*/unxdfly??
+/*/unxdfly??.pro
+/*/unxso???
+/*/unxso???.pro
+/*/unxaig??
+/*/unxaig??.pro
 /solver/*
 /instsetoo_native/*
 
commit ef76a189c7a4038b20231c3a88b9a2e78790ed40
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Wed Feb 16 20:56:02 2011 +0100

    Remove unused update_module_ignore_lists.pl
    
    Was used to update the svn ignore list

diff --git a/solenv/bin/update_module_ignore_lists.pl b/solenv/bin/update_module_ignore_lists.pl
deleted file mode 100644
index 4996d60..0000000
--- a/solenv/bin/update_module_ignore_lists.pl
+++ /dev/null
@@ -1,253 +0,0 @@
-:
-    eval 'exec perl -S $0 ${1+"$@"}'
-        if 0;
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-use Cwd;
-use File::Temp qw/ tempfile tempdir /;
-
-my $verbosity = 1;  # will be adjusted to the value of $Env{VERBOSE} below
-
-# platforms which are not supported anymore, and thus can be filtered from the svn:ignore list
-my %obsolete_platforms = (
-    );
-    # (none so far)
-
-# platforms whose output trees should appear in all modules' svn:ignore list
-my @platforms = (
-        "common",
-        "unxlngi6",
-        "unxlngx6",
-        "unxsols4",
-        "unxsolu4",
-        "unxsoli4",
-        "wntmsci12",
-        "unxmacxi",
-        "unxubit8",
-        "unxaixp",
-        "unxbsda",
-        "unxbsdi2",
-        "unxbsdi",
-        "unxbsds",
-        "unxfbsdi",
-        "unxfbsd",
-        "unxfbsdx",
-        "unxirgm",
-        "unxirxm3",
-        "unxirxm",
-        "unxlnga",
-        "unxlngm68k",
-        "unxlngmips",
-        "unxlngp",
-        "unxlngppc4",
-        "unxlngppc64",
-        "unxlngppc",
-        "unxlngr",
-        "unxlngs3904",
-        "unxlngs390x",
-        "unxlngs",
-        "unxlnxi",
-        "unxmacxp",
-        "unxsogi",
-        "unxsogs"
-    );
-
-
-# .........................................................................
-# retrieves the repository URL of the SVN working copy in the current directory
-sub retrieve_repo_url
-{
-    open( SVN, "svn info 2>&1 |" );
-    my @result = <SVN>;
-    close( SVN );
-
-    foreach (@result)
-    {
-        chomp;
-        next if ( ! /^URL: / );
-        s/^URL: //;
-        return $_;
-    }
-    return undef;
-}
-
-# .........................................................................
-# gets the "modules" below the given SVN repository URL, by calling "svn list"
-sub get_modules
-{
-    my @modules = ();
-
-    open( SVN, "svn list $_ 2>&1 |" );
-    my @result = <SVN>;
-    close( SVN );
-
-    foreach (@result)
-    {
-        chomp;
-        s/\/$//;
-        push @modules, $_;
-    }
-
-    return @modules;
-}
-
-# .........................................................................
-sub set_ignore_property
-{
-    my ($repo_url, @modules) = @_;
-
-    # max length of a module name
-    my $max_len = 0;
-    foreach ( @modules ) { $max_len = length( $_ ) if ( length( $_ ) > $max_len ); }
-
-    my $updated = 0;
-
-    my $current = 0;
-    my $count = $#modules + 1;
-    foreach $module ( @modules )
-    {
-        ++$current;
-
-        # print progress
-        if ( $verbosity > 1 )
-        {
-            my $progress = "$module ";
-            $progress .= "(" . $current . "/" . $count . ")";
-
-            my $dots = 3 + ( $max_len - length($module) );
-            $dots += int( digits( $count ) ) - int( digits( $current ) );
-
-            $progress .= ( "." x $dots );
-            $progress .= " ";
-
-            print STDOUT $progress;
-        }
-        elsif ( $verbosity > 0 )
-        {
-            print STDOUT ".";
-        }
-
-        # retrieve the current ignore list
-        open( SVN, "svn propget svn:ignore $module 2>&1 |" );
-        my @ignore_list = <SVN>;
-        close( SVN );
-
-        # the last item in the list is an empty string, usually. Don't let it confuse the below
-        # code
-        my $supposed_empty = pop @ignore_list;
-        chomp( $supposed_empty );
-        push( @ignore_list, $supposed_empty ) if ( !( $supposed_empty =~ /^$/ ) );
-
-        # filter out obsolte entries
-        my @stripped_ignore_list = ();
-        foreach $ignore_entry (@ignore_list)
-        {
-            chomp( $ignore_entry );
-            next if ( $ignore_entry =~ /^$/ );
-
-            if  (   ( exists $obsolete_platforms{$ignore_entry} )
-                ||  ( exists $obsolete_platforms{"$ignore_entry.pro"} )
-                )
-            {
-                next;
-            }
-            push @stripped_ignore_list, $ignore_entry;
-        }
-        my $removed = $#ignore_list - $#stripped_ignore_list;
-        @ignore_list = @stripped_ignore_list;
-
-        # append the platforms which should appear in the ignore list
-        my %ignore_list = ();
-        foreach (@ignore_list) { $ignore_list{$_} = 1; }
-        foreach $platform_entry ( @platforms )
-        {
-            $ignore_list{$platform_entry} = 1;
-            $ignore_list{"$platform_entry.pro"} = 1;
-        }
-        my @extended_ignore_list = keys %ignore_list;
-        my $added = $#extended_ignore_list - $#ignore_list;
-        @ignore_list = @extended_ignore_list;
-
-        if ( $removed || $added )
-        {
-            # create a temporary file taking the new content of the svn_ignore property
-            my $temp_dir = tempdir( CLEANUP => 1 );
-            my ($fh, $filename) = tempfile( DIR => $dir );
-            open( IGNORE, ">$filename" );
-            print IGNORE join "\n", @ignore_list;
-            close( IGNORE );
-
-            # actually set the property
-            open( SVN, "svn propset -F $filename svn:ignore $module 2>&1 |" );
-
-            ++$updated;
-        }
-
-        # statistics
-        print STDOUT "done (removed/added: $removed/$added)\n" if $verbosity > 1;
-    }
-
-    print STDOUT "\n" if $verbosity eq 1;
-    print STDOUT "$updated module(s) updated\n" if $verbosity > 0;
-}
-
-# .........................................................................
-sub digits
-{
-    my ($number, $base) = @_;
-    $base = 10 if !defined $base;
-    return log($number)/log($base);
-}
-
-# .........................................................................
-# 'main'
-
-# initialize verbosity
-my $verbose = $ENV{VERBOSE};
-if ( defined $verbose )
-{
-    $verbose = uc( $verbose );
-    $verbosity = 2 if ( $verbose eq "TRUE" );
-    $verbosity = 0 if ( $verbose eq "FALSE" );
-}
-
-# work on the current directory
-my $working_copy_root = cwd();
-die "current directory does not contain an SVN working copy" if !-d $working_copy_root . "/\.svn";
-
-# retrieve repository URL
-my $repo_url = retrieve_repo_url();
-die "unable to retrieve repository URL" if !defined $repo_url;
-print STDOUT "repository URL: $repo_url\n" if $verbosity > 1;
-
-# list modules
-my @modules = get_modules( $repo_url );
-print STDOUT "processing " . ( $#modules + 1 ) . " modules\n" if $verbosity > 0;
-
-# process modules, by setting the svn:ignore property
-set_ignore_property( $repo_url, @modules );


More information about the Libreoffice-commits mailing list