You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by mb...@apache.org on 2011/08/29 11:49:01 UTC
svn commit: r1162699 [2/3] - in /incubator/ooo/trunk/main:
gettext/gettext-0.18.1.1.patch libcroco/libcroco-0.6.2.patch
solenv/bin/cwstouched.pl
testautomation/writer/optional/input/import/mactext.txt
writerfilter/source/doctok/escher.html
Added: incubator/ooo/trunk/main/libcroco/libcroco-0.6.2.patch
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/libcroco/libcroco-0.6.2.patch?rev=1162699&view=auto
==============================================================================
--- incubator/ooo/trunk/main/libcroco/libcroco-0.6.2.patch (added)
+++ incubator/ooo/trunk/main/libcroco/libcroco-0.6.2.patch Mon Aug 29 09:49:00 2011
@@ -0,0 +1,110 @@
+--- misc/libcroco-0.6.2/src/makefile.mk Wed Aug 20 14:33:55 2008
++++ misc/build/libcroco-0.6.2/src/makefile.mk Wed Aug 20 14:26:42 2008
+@@ -1 +1,106 @@
+-dummy
++#*************************************************************************
++#
++# 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.
++#
++#*************************************************************************
++
++PRJ=..$/..$/..$/..$/..
++#PRJINC=..
++PRJNAME=libcroco
++TARGET=libcroco-0.6-3
++
++#ENABLE_EXCEPTIONS=TRUE
++VISIBILITY_HIDDEN=TRUE
++EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
++
++# --- Settings ----------------------------------
++
++.INCLUDE : settings.mk
++
++CFLAGS+=-I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external$/glib-2.0
++
++# --- Files -------------------------------------
++
++SLOFILES=\
++ $(SLO)$/cr-utils.obj \
++ $(SLO)$/cr-input.obj \
++ $(SLO)$/cr-enc-handler.obj \
++ $(SLO)$/cr-num.obj \
++ $(SLO)$/cr-rgb.obj \
++ $(SLO)$/cr-token.obj \
++ $(SLO)$/cr-tknzr.obj \
++ $(SLO)$/cr-term.obj \
++ $(SLO)$/cr-attr-sel.obj \
++ $(SLO)$/cr-pseudo.obj \
++ $(SLO)$/cr-additional-sel.obj \
++ $(SLO)$/cr-simple-sel.obj \
++ $(SLO)$/cr-selector.obj \
++ $(SLO)$/cr-doc-handler.obj \
++ $(SLO)$/cr-parser.obj \
++ $(SLO)$/cr-declaration.obj \
++ $(SLO)$/cr-statement.obj \
++ $(SLO)$/cr-stylesheet.obj \
++ $(SLO)$/cr-cascade.obj \
++ $(SLO)$/cr-om-parser.obj \
++ $(SLO)$/cr-style.obj \
++ $(SLO)$/cr-sel-eng.obj \
++ $(SLO)$/cr-fonts.obj \
++ $(SLO)$/cr-prop-list.obj \
++ $(SLO)$/cr-parsing-location.obj \
++ $(SLO)$/cr-string.obj
++
++
++# --- Library -----------------------------------
++
++SHL1TARGET= $(TARGET)
++SHL1OBJS=$(SLOFILES)
++SHL1STDLIBS=\
++ gio-2.0.lib \
++ gobject-2.0.lib \
++ gthread-2.0.lib \
++ glib-2.0.lib \
++ intl.lib \
++ $(LIBXML2LIB)
++
++
++SHL1DEPN=
++#SHL1IMPLIB=$(TARGET)
++#SHL1USE_EXPORTS=name
++
++SHL1DEF= $(MISC)$/$(SHL1TARGET).def
++
++DEF1NAME= $(SHL1TARGET)
++DEF1DEPN= $(MISC)$/$(SHL1TARGET).flt \
++ $(SLB)$/$(TARGET).lib
++DEFLIB1NAME=$(TARGET)
++
++# --- Targets ----------------------------------
++
++.INCLUDE : target.mk
++
++# --- filter file ------------------------------
++
++$(MISC)$/$(SHL1TARGET).flt: makefile.mk
++ @echo CLEAR_THE_FILE > $@
++
Added: incubator/ooo/trunk/main/solenv/bin/cwstouched.pl
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/bin/cwstouched.pl?rev=1162699&view=auto
==============================================================================
--- incubator/ooo/trunk/main/solenv/bin/cwstouched.pl (added)
+++ incubator/ooo/trunk/main/solenv/bin/cwstouched.pl Mon Aug 29 09:49:00 2011
@@ -0,0 +1,151 @@
+:
+eval 'exec perl -wS $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 strict;
+use Cwd;
+
+#### module lookup
+my @lib_dirs;
+BEGIN {
+ if ( !defined($ENV{SOLARENV}) ) {
+ die "No environment found (environment variable SOLARENV is undefined)";
+ }
+ push(@lib_dirs, "$ENV{SOLARENV}/bin/modules");
+}
+use lib (@lib_dirs);
+
+use Cws;
+
+# Prototypes
+sub getMinor($);
+sub getCwsWorkStamp();
+
+my $workstamp = $ENV{'WORK_STAMP'};
+my $solenv= $ENV{'SOLARENV'};
+my $cwsWorkStamp = getCwsWorkStamp();
+my $minor = getMinor($cwsWorkStamp);
+
+my $oldWorkStamp = $workstamp."_".$minor;
+my $svndiff="svn diff --summarize --old=svn://svn.services.openoffice.org/ooo/tags/".$oldWorkStamp." --new=svn://svn.services.openoffice.org/ooo/cws/".$cwsWorkStamp;
+
+my @diff = `$svndiff`;
+
+my @modules;
+foreach(@diff)
+{
+ if (/.*svn:\/\/svn.services.openoffice.org.*/)
+ {
+ $_ =~ /.*$oldWorkStamp\/(\w*)/;
+ my $newModule=$1;
+ if (defined($newModule))
+ {
+ if ( ! grep(/$newModule/,@modules))
+ {
+ push(@modules, $newModule);
+ }
+
+ }
+ }
+}
+
+foreach(@modules)
+{
+ print "$_\n";
+}
+
+exit(0);
+
+sub getMinor($)
+{
+ my $workst = shift;
+ my $min="";
+
+ if ( ! defined($ENV{'UPDMINOR'}))
+ {
+ my $cws = Cws->new();
+ $cws->child($workst);
+ $cws->master($ENV{'WORK_STAMP'});
+ my $masterws = $cws->master();
+ my $childws = $cws->child();
+
+ # check if we got a valid child workspace
+ my $id = $cws->eis_id();
+ if ( !$id )
+ {
+ print("Child workspace '$childws' for master workspace '$masterws' not found in EIS database.\n");
+ exit(1);
+ }
+
+ my @milestones = $cws->milestone();
+ foreach (@milestones) {
+ if ( defined($_) )
+ {
+ $min=$_;
+ }
+ }
+ }
+ else
+ {
+ $min = $ENV{'UPDMINOR'};
+ }
+
+ chomp($min);
+ return $min;
+}
+
+sub getCwsWorkStamp()
+{
+ my $cwsWorkSt="";
+
+ if ( ! defined($ENV{'CWS_WORK_STAMP'}))
+ {
+ my $currPath= cwd;
+
+ chdir($ENV{'SOLARENV'});
+
+ my @info = `svn info`;
+
+ foreach(@info)
+ {
+ if ( /URL:.*/ )
+ {
+ # URL: svn+ssh://svn@svn.services.openoffice.org/ooo/cws/qadev37/solenv
+ $_ =
~ /.*svn.services.openoffice.org(.*\/(.*))\/\w*/;
+ $cwsWorkSt=$2; #qadev37
+ }
+ }
+
+ }
+ else
+ {
+ $cwsWorkSt = $ENV{'CWS_WORK_STAMP'};
+ }
+ return $cwsWorkSt
+}
Propchange: incubator/ooo/trunk/main/solenv/bin/cwstouched.pl
------------------------------------------------------------------------------
svn:executable = *
Added: incubator/ooo/trunk/main/testautomation/writer/optional/input/import/mactext.txt
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/testautomation/writer/optional/input/import/mactext.txt?rev=1162699&view=auto
==============================================================================
--- incubator/ooo/trunk/main/testautomation/writer/optional/input/import/mactext.txt (added)
+++ incubator/ooo/trunk/main/testautomation/writer/optional/input/import/mactext.txt Mon Aug 29 09:49:00 2011
@@ -0,0 +1 @@
+Dies ist ein ganz einfacher MAC-Text.
Es werden auch ein paar Sonderzeichen benutzt:
\=Chr(92)
=Chr(132)
-=Chr(45)
¤=Chr(245)
Lieber Test schau doch mal was Du hiermit anfangen kannst.
Alles was in dem folgenden Satz steht trifft fr den MAC-Editor ( SimpleText ) nicht zu, aber es ist langer nicht umgebrochener Text. Jetzt hoffe ich, da§ das Dokument auf der 2 Seite ist, wenn nicht dann ist es schlecht. Aber hier wird auch mal geschaut, ob die Grenze von 256 Zeichen pro Zeile keine Probleme machen. Dies wre doch ein ganz schn doofer Fehler, hoffentlich wurde das schon mal getestet. Wie lang geht die Zeile im Dos-Editor denn noch, ich bin doch schon bei 348 Spalten. Oh es geht doch sehr viel weiter, dann hre ich hier mal auf.
Tschau
TZ
Propchange: incubator/ooo/trunk/main/testautomation/writer/optional/input/import/mactext.txt
------------------------------------------------------------------------------
svn:executable = *