[Libreoffice-commits] core.git: 3 commits - instsetoo_native/util solenv/bin vcl/aqua
Michael Stahl
mstahl at redhat.com
Mon Apr 15 05:55:55 PDT 2013
instsetoo_native/util/openoffice.lst.in | 4
solenv/bin/guw.pl | 329 -------------------
vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm | 2
3 files changed, 3 insertions(+), 332 deletions(-)
New commits:
commit d8b8530d4b920618e188bdfbe8e17d0a150df692
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Apr 12 21:21:17 2013 +0200
remove guw.pl, whatever that is
Change-Id: I3fb41fe649f68f82566e465ba4fa2de52e6201ac
diff --git a/solenv/bin/guw.pl b/solenv/bin/guw.pl
deleted file mode 100644
index 99bd4a1..0000000
--- a/solenv/bin/guw.pl
+++ /dev/null
@@ -1,329 +0,0 @@
-:
-eval 'exec perl -wS $0 ${1+"$@"}'
- if 0;
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed
-# with this work for additional information regarding copyright
-# ownership. The ASF licenses this file to you under the Apache
-# License, Version 2.0 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-# Description: ??
-
-#---------------------------------------------------------------------------
-# external modules
-use Text::ParseWords;
-
-# global vars
- at params = ();
-
-# set debug mode here:
-#$debug="true";
-#$debug_light="true";
-
-#---------------------------------------------------------------------------
-# Define known parameter exceptions
-%knownpara = ( 'echo', [ '/TEST', 'QQQ', 'CCC', 'uno:' ],
- 'cl', [ '-clr:', '-Z' ],
- 'csc', [ '-target:' ],
- 'lib', [ 'OUT:', 'EXTRACT:','out:', 'def:', 'machine:' ],
- 'link', [ 'BASE:', 'DEBUG', 'DLL', 'LIBPATH', 'MACHINE:',
- 'MAP', 'NODEFAULTLIB', 'OPT', 'PDB', 'RELEASE',
- 'SUBSYSTEM', 'STACK', 'out:', 'map:', 'ENTRY:',
- 'implib:', 'delayload:', 'def', 'COMMENT:' ],
- 'regmerge', [ '/UCR' ],
- 'rc', [ '-D' ],
- 'rsc', [ '-DOOO_' ] );
-
-#---------------------------------------------------------------------------
-# procedures
-
-
-#----------------------------------------------------------
-# Function name: myCygpath
-# Description: Transform POSIX path to DOS path
-# Arguments: 1. Variable (string) with one token
-# 2. optional - if set remove spaces and shorten to 8.3
-# representation.
-# Return value: Reformatted String
-#----------------------------------------------------------
-sub myCygpath {
- my $posixpath = shift;
- my $shortenpath = shift || '';
-
- my $dospath;
-
- if ( $posixpath =~ / / and $shortenpath ) {
- chomp( $dospath = qx{cygpath -d "$posixpath"} );
- # "cygpath -d" returns "" if the file doesn't exist.
- if ($dospath eq "") {
- $dospath = ".";
- print(STDERR "Error: guw.pl: Path: $posixpath:\nhas a problem! Probably nonexistent filename with space.\n");
- if ( (defined $debug_light) or (defined $debug) ) {
- die "exiting ...\n";
- }
- }
- } else {
- if ( $posixpath =~ /^\// ) {
- chomp( $dospath = qx{cygpath -w "$posixpath"} );
- } else {
- $dospath = $posixpath;
- $dospath =~ s/\//\\/g;
- }
- }
- return $dospath;
-}
-
-#----------------------------------------------------------
-# Function name: WinFormat
-# Description: Format variables to Windows Format.
-# Arguments: 1. Variable (string) with one token
-# Return value: Reformatted String
-#----------------------------------------------------------
-sub WinFormat {
- my $variable = shift @_;
- my( $d1, $d1_prefix, $d2 );
-
- $variable =~ s/(\$\w+)/$1/eeg ; # expand the variables
- $variable =~ s/(\$\w+)/$1/eeg ; # expand the variables twice!
-
- # Include paths or parameters with filenames
- if ( $variable =~ /\A(-D[\w\.]*=)[\'\"]?((?:\/?[\w\.\-\+ ~]+)+\/?)[\'\"]?\Z/ ) {
- # This regex evaluates -D<something>=<path>, sometimes with quotes or "/" at the end
- # option -> $1, filename without quotes -> $2
- if ( defined $debug ) { print(STDERR "WinFormat:\ninclude (-D<something>=<path>) path:\n$variable\n"); }
- $d1_prefix = $1;
- $d1 = $2;
- $d2 = myCygpath($2,1);
- if ( $d2 ne "" ) {
- $d2 =~ s/\\/\\\\/g ;
- }
- } elsif ( $variable =~ /\A(-?\w[\w\.]*=)[\'\"]?((?:\/?[\w\.\-\+ ~]+)+\/?)[\'\"]?\Z/ ) {
- # This regex evaluates [-]X<something>=<path>, sometimes with quotes or "/" at the end
- # option -> $1, filename without quotes -> $2
- if ( defined $debug ) { print(STDERR "WinFormat:\ninclude ([-]<something>=<path>) path:\n$variable\n"); }
- $d1_prefix = $1;
- $d1 = $2;
- $d2 = myCygpath($2,1);
- } elsif ( $variable =~ /\A(--\w[\w\.\-]*=)[\'\"]?((?:\/?[\w\.\-\+ ~]+)+\/?)[\'\"]?\Z/ ) {
- # This regex evaluates --<something>=<path>, sometimes with quotes or "/" at the end
- # option -> $1, filename without quotes -> $2
- if ( defined $debug ) { print(STDERR "WinFormat:\ninclude (--<something>=<path>) path:\n$variable\n"); }
- $d1_prefix = $1;
- $d1 = $2;
- $d2 = myCygpath($2,1);
- } elsif ( $variable =~ /\A(-\w[\w\.]*:)[\'\"]?((?:\/?[\w\.\-\+ ~]+)+\/?)[\'\"]?\Z/ ) {
- # This regex evaluates -X<something>:<path>, sometimes with quotes or "/" at the end
- # option -> $1, filename without quotes -> $2
- if ( defined $debug ) { print(STDERR "WinFormat:\nFound (-<something>:<path>):\n$variable\n"); }
- $d1_prefix = $1;
- $d1 = $2;
- $d2 = myCygpath($2,1);
- } elsif ( $variable =~ /\A(-\w+:)(.*)\Z/ ) {
- # This regex evaluates -X<something>:<NO-path>, and prevents translating of these.
- # option -> $1, rest -> $2
- if ( defined $debug ) { print(STDERR "WinFormat:\nFound (-<something>:<no-path>):\n$variable\n"); }
- $d1_prefix = $1;
- $d1 = $2;
- $d2 = myCygpath($2,1);
- } elsif ( $variable =~ /\A(\w+:)[\'\"]?\/\/\/((?:\/?[\w\.\-\+ ~]+)+\/?)[\'\"]?\Z/ ) {
- # See iz35982 for the reason for the special treatment of this switch.
- # This regex evaluates <something>:///<path>, sometimes with quotes or "/" at the end
- # option -> $1, filename without quotes -> $2
- if ( defined $debug ) { print(STDERR "WinFormat:\nFound (<something>:///<path>):\n$variable\n"); }
- $d1_prefix = $1."///";
- $d1 = $2;
- $d2 = myCygpath($2,1);
- $d2 =~ s/\\/\//g ;
- } elsif ( $variable =~ /\A(-\w)[\'\"]?((?:\/[\w\.\-\+ ~]+)+\/?)[\'\"]?\Z/ ) {
- # This regex evaluates -X<path>, sometimes with quotes or "/" at the end
- # option -> $1, filename without quotes -> $2
- if ( defined $debug ) { print(STDERR "WinFormat:\ninclude (-X<absolute path>) path:\n$variable\n"); }
- $d1_prefix = $1;
- $d1 = $2;
- $d2 = myCygpath($2,1);
- } elsif ( $variable =~ /\A(-F[ARdemopr])[\'\"]?((?:\/[\w\.\-\+ ~]+)+\/?)[\'\"]?\Z/ ) {
- # This regex evaluates -FX<path> (MSVC switches for output naming), sometimes with quotes or "/" at the end
- # option -> $1, filename without quotes -> $2
- if ( defined $debug ) { print(STDERR "WinFormat:\ncompiler naming (-FX<absolute path>) path:\n$variable\n"); }
- $d1_prefix = $1;
- $d1 = $2;
- $d2 = myCygpath($2,1);
- } else {
- $d2 = "";
- }
- if ( $d2 ne "" ) {
- # Found a parameter
- $d1 =~ s/\+/\\\+/ ;
- $d1 =~ s/\./\\\./ ;
- $variable =~ s/$d1/$d2/ ;
- } else {
- # Found no parameter, assume a path
- $variable =~ s/:/;/g;
- $variable =~ s/([;]|\A)(\w);/$1$2:/g; # get back the drives
-
- # Search for posix path ;entry; (The regex accepts valid paths with at least one /)
- # and replace with DOS path, accept quotes.
- # iz28717 Accept ',' as path seperator.
- while ( $variable =~ /(?:[;,]|\A)[\'\"]?([\w\.\-\+ ~]*(?:\/[\w\.\-\+ ~]+)+\/?)[\'\"]?(?:[;,]|\Z)/ ) {
- # Normal paths
- $d1 = $1;
- $d2 = myCygpath($d1);
- if ( defined $debug ) {
- print(STDERR "WinFormat:\nFull path:\n$variable\nTranslated part:$d2\n");
- }
- $d1 =~ s/\+/\\\+/ ;
- $variable =~ s/$d1/$d2/ ;
- }
- }
-
- # Sanity check for -X<path>
- if ( $variable =~ /-\w[\'\"]?(?:(?:\/[\w\.\-\+ ~]+)+)/ ) {
- print(STDERR "Error: guw.pl: WinFormat: Not converted -X/... type switch in :$variable:.\n");
- if ( (defined $debug_light) or (defined $debug) ) { die "\nNot processed -X/...\n"; }
- }
- # Sanity check for [-]X<something>(:|=)<path> case
- if ( $variable =~ /\A-?\w[\w\.]*[=:][\'\"]?(?:\/[\w\.\-\+ ~]+)+/ ) {
- print(STDERR "Error: guw.pl: WinFormat: Not converted [-]X<something>(=|:)/<path> type switch in :$variable:.\n");
- if ( (defined $debug_light) or (defined $debug) ) { die "\nNot processed [-]X<something>(=|:)/...\n"; }
- }
-
- if ( defined $debug ) { print(STDERR "WinFormat:\nresult:$variable\n");};
- return $variable;
-}
-
-#----------------------------------------------------------
-# Function name: replace_cyg
-# Description: Process all arguments and change them to Windows Format.
-# Arguments: Reference to array with arguments
-# Return value: -
-#----------------------------------------------------------
-sub replace_cyg {
- my $args = shift;
- my( @cmd_file, @cmd_temp );
- my $atchars;
- foreach my $para ( @$args )
- {
- if ( $para =~ "^@" ) {
- # it's a command file
- if ( defined $debug ) { print(STDERR "----------------------------\n");};
- # Workaround, iz28717, keep number of @'s.
- $para =~ s/(^\@+)//;
- $atchars = $1;
- $filename = $para;
- if ( defined $debug ) { print(STDERR "filename = $filename \n");};
- # open this command file for reading
- open(CMD, "$filename");
- while ( <CMD> ) {
- # Remove DOS lineendings. Bug in Cygwin / Perl?
- $_ =~ s/\r//g;
- # Remove lineendings and trailing spaces. ( Needed by &parse_line )
- $_ =~ s/\n$//g;
- $_ =~ s/\s+$//g;
- # Fill all tokens into array
- @cmd_temp = &parse_line('\s+', 1, $_ );
- if ( $#cmd_temp > -1 ) {
- push( @cmd_file, @cmd_temp);
- }
- }
- close(CMD);
- # reformat all tokens
- replace_cyg(\@cmd_file);
- if ( defined $debug ) { print(STDERR "Tokens processed:\n");};
- foreach $i (@cmd_file) {
- if ( defined $debug ) { print(STDERR "!".$i."!\n");};
- }
- # open this filename for writing (truncate) Textmode?
- open(CMD, '>', $filename);
- # write all tokens back into this file
- print(CMD join(' ', @cmd_file));
- close(CMD);
- # convert '@filename' to dos style
- $para = WinFormat( $para );
- if ( defined $debug ) { print(STDERR "----------------------------\n");};
- if ( (defined $debug_light) or (defined $debug) ) { print(STDERR "\nParameter in File:".join(' ', @cmd_file).":\n");}
- $para = $atchars.$para;
- } else {
- # it's just a parameter
- if ( defined $debug ) { print(STDERR "\nParameter:---${para}---\n");};
- # If $tmp1 is empty then $para is a parameter.
- my $is_no_para = 1;
- # remove .exe and convert to lower case
- $shortcommand = lc $command ;
- $shortcommand =~ s/\.exe$//;
- $shortcommand =~ /([^\/]+$)/;
- $shortcommand = $1;
- foreach $i (@{$knownpara{$shortcommand}}) {
- if( $para =~ /$i/ ) {
- $is_no_para = 0;
- if ( defined $debug ) { print(STDERR "Is parameter exception for ${shortcommand}: ${para}:\n" );};
- last;
- }
- }
- if( $is_no_para ) {
- $para = WinFormat($para);
- }
- if ( defined $debug ) { print(STDERR "Converted line:${para}:\n" );};
- } # else
- } # foreach loop
-}
-
-#----------------------------------------------------------
-# Function name: replace_cyg_env
-# Description: Process selected environment variables and change
-# them to Windows Format.
-# Arguments: -
-# Return value: -
-#----------------------------------------------------------
-sub replace_cyg_env {
- @affected_vars = (
- 'SOLAR_VERSION',
- 'SOLARVERSION',
- 'SOLARVER',
- 'SRC_ROOT',
- 'SOLARENV',
- 'CLASSPATH',
- 'JAVA_HOME'
- );
- foreach my $one_var ( @affected_vars )
- {
- my $this_var = $ENV{ $one_var };
- if ( defined $this_var )
- {
- if ( defined $debug ) { print(STDERR "ENV $one_var before: ".$ENV{ $one_var}."\n" );};
- $ENV{ $one_var } = WinFormat( $this_var );
- if ( defined $debug ) { print(STDERR "ENV $one_var after : ".$ENV{ $one_var}."\n" );};
- }
- }
-
-}
-#---------------------------------------------------------------------------
-# main
- at params = @ARGV;
-
-$command = shift(@params);
-while ( $command =~ /^-/ )
-{
- if ( $command eq "-env" )
- {
- replace_cyg_env;
- }
-
- $command = shift(@params);
-}
-if ( (defined $debug_light) or (defined $debug) ) { print( STDERR "Command: $command\n" ); }
-
-replace_cyg(\@params);
-if ( (defined $debug_light) or (defined $debug) ) { print(STDERR "\n---------------------\nExecute: $command @params\n----------------\n");};
-exec( "$command", @params) or die( "\nError: guw.pl: executing $command failed!\n" );
-
commit 127840be1180075b1b082bb0cf46a0eb3561c3e2
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon Apr 15 14:10:56 2013 +0200
AquaA11yTextAttributesWrapper: trigraphs confuse llvm-g++ 4.2.1
Change-Id: Ic45a2219c8352625f40619373f5828b981864fef
diff --git a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
index e3b62c7..d35a53f 100644
--- a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
+++ b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
@@ -64,7 +64,7 @@ using namespace ::rtl;
+(int)convertItalicStyle:(PropertyValue)property {
int italicStyle = 0;
- sal_Int16 value = property.Value.get<::css_awt::FontSlant>();
+ sal_Int16 value = property.Value.get< ::css_awt::FontSlant>();
if ( value == ::css_awt::FontSlant_ITALIC ) {
italicStyle = NSItalicFontMask;
}
commit 48f03861115f14b01b70dd84839830785ef3dca0
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon Apr 15 14:49:58 2013 +0200
instsetoo_native: gid_File_Lib_Vcl is now auto_File_Lib_vcl
Change-Id: Ie5404a378cc3bffdc3ba7a858814f3490fb82e3e
diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in
index 0e0975a..60e402f 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -64,7 +64,7 @@ LibreOffice
PACKAGEVERSION @LIBO_VERSION_MAJOR at .@LIBO_VERSION_MINOR at .@LIBO_VERSION_MICRO at .@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
PACKAGEREVISION {buildid}
LICENSENAME LGPL
- GLOBALFILEGID gid_File_Lib_Vcl
+ GLOBALFILEGID auto_File_Lib_vcl
GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
SPELLCHECKERFILE spellchecker_selection.txt
OOODOWNLOADNAME 1
@@ -120,7 +120,7 @@ LibreOffice_Dev
PACKAGEVERSION @LIBO_VERSION_MAJOR at .@LIBO_VERSION_MINOR at .@LIBO_VERSION_MICRO at .@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
PACKAGEREVISION {buildid}
LICENSENAME LGPL
- GLOBALFILEGID gid_File_Lib_Vcl
+ GLOBALFILEGID auto_File_Lib_vcl
GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
SPELLCHECKERFILE spellchecker_selection.txt
OOODOWNLOADNAME 1
More information about the Libreoffice-commits
mailing list