[Libreoffice-commits] .: 2 commits - bin/stats.pl patches/dev300
Michael Meeks
michael at kemper.freedesktop.org
Fri Apr 1 04:27:57 PDT 2011
bin/stats.pl | 178 ++++++++++++++++++++++++++++
patches/dev300/apply | 36 +----
patches/dev300/default-no-style-dialog.diff | 20 ---
patches/dev300/disable-checkdeliver.diff | 12 -
patches/dev300/ok-cancel-btn-add-accel.diff | 43 ------
patches/dev300/recovery-report.diff | 20 ---
6 files changed, 188 insertions(+), 121 deletions(-)
New commits:
commit 302e868ec53a0290e43a9394c65fa74bd872b582
Author: Michael Meeks <michael.meeks at novell.com>
Date: Fri Apr 1 12:19:40 2011 +0100
remove merged patch, and obsolete Defaults done differently in master
diff --git a/patches/dev300/apply b/patches/dev300/apply
index a2ff22b..f84b624 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -20,12 +20,12 @@ Common : BuildBits, TemporaryHacks, FixesNotForUpstream, \
BuildFix, WriterDocComparison, \
MySQL, BorderTypes
-LinuxCommon : Common, Defaults, FontConfigTemporaryHacks, \
+LinuxCommon : Common, FontConfigTemporaryHacks, \
FedoraLinuxOnlyFixes, LinuxOnly, msaccess, \
CliMonoCommon, Mono, MonoComp, QuickStarter, KDE4, Netbook, \
GlobalNSPluginSupport
-MacOSXCommon : Common, Defaults
-Win32Common : Common, Defaults, Win32Only, CliMonoCommon, CliComponent
+MacOSXCommon : Common
+Win32Common : Common, Win32Only, CliMonoCommon, CliComponent
# Experimental sections
Experimental: VBAUntested, ArkOnlyExperimental, \
UnUsedButNotYetRemovedFromGit, WebDAV, \
@@ -117,11 +117,11 @@ Pardus2008: PardusOnly, LinuxCommon
# Solaris
Solaris: NovellBase, UnstableExtensions
# OxygenOffice Professional
-OxygenOfficeLinuxCommon : Common, Defaults, FontConfigTemporaryHacks, LinuxOnly, \
+OxygenOfficeLinuxCommon : Common, FontConfigTemporaryHacks, LinuxOnly, \
msaccess, OpenGLTransitions, CliMonoCommon, Mono, MonoComp, QuickStarter, KDE4,\
Netbook, GlobalNSPluginSupport
-OxygenOfficeMacOSXCommon : Common, Defaults
-OxygenOfficeWin32Common : Common, Defaults, Win32Only, CliMonoCommon, CliComponent
+OxygenOfficeMacOSXCommon : Common
+OxygenOfficeWin32Common : Common, Win32Only, CliMonoCommon, CliComponent
OxygenOfficeLinux: OxygenOfficeLinuxCommon, OxygenOfficePalettes, OxygenOfficeDefaultSettings, OxygenOfficeExtras, OxygenOfficeLinuxOnly
OxygenOfficeWindows: OxygenOfficeWin32Common, OxygenOfficePalettes, OxygenOfficeDefaultSettings, OxygenOfficeExtras, OxygenOfficeWin32Only
@@ -147,9 +147,10 @@ cli-mono-common.diff
[ CliComponent ]
cli-component.diff
-[ LinuxOnly ]
-# add accelerator to the OK and Cancel buttons.
-ok-cancel-btn-add-accel.diff, kohei
+[ BuildBits ]
+
+# Upgraded internal ICU to 4.2.1
+icu-4.2.1.diff, cbosdo
[ TemporaryHacks ]
@@ -443,23 +444,6 @@ novell-win32-xp-fpicker-detail.diff, bnc#620924
win32-prebuilt-writingaids-zip.diff
win32-prebuilt-writingaids-zip-scp2.diff
-# ux.openoffice.org deals with defaults
-#
-[ Defaults ]
-# Disable the recovery report dialog
-recovery-report.diff, i#53531, martink
-
-#
-# Controversial bits - no use filing up-stream
-#
-
-# don't throw up the style dialog on 1st run
-default-no-style-dialog.diff, michael
-
-# disable checkdeliver, no point in doing that, especially when we
-# hardlink to solver instead of copying :-)
-disable-checkdeliver.diff, jholesov
-
[ DefaultSettings ]
# default to anti-alias at point size of 1 point
diff --git a/patches/dev300/default-no-style-dialog.diff b/patches/dev300/default-no-style-dialog.diff
deleted file mode 100644
index edb8b02..0000000
--- a/patches/dev300/default-no-style-dialog.diff
+++ /dev/null
@@ -1,20 +0,0 @@
----
- sfx2/source/appl/appreg.cxx | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git sfx2/source/appl/appreg.cxx sfx2/source/appl/appreg.cxx
-index a80b014..6a854b9 100644
---- sfx2/source/appl/appreg.cxx
-+++ sfx2/source/appl/appreg.cxx
-@@ -67,7 +67,7 @@ void SfxApplication::Registrations_Impl()
- SfxRecordingFloatWrapper_Impl::RegisterChildWindow();
- SfxNavigatorWrapper::RegisterChildWindow( FALSE, NULL, SFX_CHILDWIN_NEVERHIDE );
- SfxPartChildWnd_Impl::RegisterChildWindow();
-- SfxTemplateDialogWrapper::RegisterChildWindow(TRUE);
-+ SfxTemplateDialogWrapper::RegisterChildWindow();
- SfxDockingWrapper::RegisterChildWindow();
-
- // Controller
---
-1.7.0.1
-
diff --git a/patches/dev300/disable-checkdeliver.diff b/patches/dev300/disable-checkdeliver.diff
deleted file mode 100644
index eff0af2..0000000
--- a/patches/dev300/disable-checkdeliver.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git postprocess/prj/build.lst postprocess/prj/build.lst
-index c760129..26fb92d 100644
---- postprocess/prj/build.lst
-+++ postprocess/prj/build.lst
-@@ -1,7 +1,6 @@
- po postprocess :: accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts DICTIONARIES:dictionaries pyuno readlicense_oo unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc NLPSOLVER:nlpsolver NULL
- po postprocess usr1 - all po_mkout NULL
- po postprocess\checkxml nmake - all po_checkxml NULL
--po postprocess\checkdeliver nmake - all po_checkdlv NULL
- po postprocess\packconfig nmake - all po_packconfig po_checkxml NULL
- po postprocess\packregistry nmake - all po_packregistry NULL
- po postprocess\rebase nmake - w po_rebase NULL
diff --git a/patches/dev300/ok-cancel-btn-add-accel.diff b/patches/dev300/ok-cancel-btn-add-accel.diff
deleted file mode 100644
index 490e3d4..0000000
--- a/patches/dev300/ok-cancel-btn-add-accel.diff
+++ /dev/null
@@ -1,43 +0,0 @@
----
- vcl/source/src/btntext.src | 4 ++--
- vcl/unx/gtk/app/gtksys.cxx | 5 ++++-
- 2 files changed, 6 insertions(+), 3 deletions(-)
-
-diff --git vcl/source/src/btntext.src vcl/source/src/btntext.src
-index 99579f0..82a3a71 100644
---- vcl/source/src/btntext.src
-+++ vcl/source/src/btntext.src
-@@ -33,12 +33,12 @@
-
- String SV_BUTTONTEXT_OK
- {
-- Text [ en-US ] = "OK";
-+ Text [ en-US ] = "~OK";
- };
-
- String SV_BUTTONTEXT_CANCEL
- {
-- Text [ en-US ] = "Cancel";
-+ Text [ en-US ] = "~Cancel";
- };
-
- String SV_BUTTONTEXT_YES
-diff --git vcl/unx/gtk/app/gtksys.cxx vcl/unx/gtk/app/gtksys.cxx
-index c928b6f..ab16794 100644
---- vcl/unx/gtk/app/gtksys.cxx
-+++ vcl/unx/gtk/app/gtksys.cxx
-@@ -74,7 +74,10 @@ int GtkSalSystem::ShowNativeDialog( const String& rTitle,
- int nButton = 0;
- for( std::list< String >::const_iterator it = rButtons.begin(); it != rButtons.end(); ++it )
- {
-- ByteString aLabel( *it, RTL_TEXTENCODING_UTF8 );
-+ String aStr = *it;
-+ // GTK uses '_' to indicate mnemonic, not '~'.
-+ aStr.SearchAndReplaceAscii("~", String::CreateFromAscii("_"));
-+ ByteString aLabel( aStr, RTL_TEXTENCODING_UTF8 );
-
- if( nButton == nDefButton )
- {
---
-1.7.0.1
-
diff --git a/patches/dev300/recovery-report.diff b/patches/dev300/recovery-report.diff
deleted file mode 100644
index 8a4a9cf..0000000
--- a/patches/dev300/recovery-report.diff
+++ /dev/null
@@ -1,20 +0,0 @@
----
- .../schema/org/openoffice/Office/Recovery.xcs | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git officecfg/registry/schema/org/openoffice/Office/Recovery.xcs officecfg/registry/schema/org/openoffice/Office/Recovery.xcs
-index f424180..e08bf38 100644
---- officecfg/registry/schema/org/openoffice/Office/Recovery.xcs
-+++ officecfg/registry/schema/org/openoffice/Office/Recovery.xcs
-@@ -127,7 +127,7 @@
- <info>
- <desc>Specifies if the crash reporter should be enabled or disabled.</desc>
- </info>
-- <value>true</value>
-+ <value>false</value>
- </prop>
- </group>
- <group oor:name="AutoSave">
---
-1.7.0.1
-
commit 95d40e9ebf5626e78955234c7fed3324c0257de7
Author: Michael Meeks <michael.meeks at novell.com>
Date: Thu Mar 31 14:21:51 2011 +0100
add download stats analysis tool
diff --git a/bin/stats.pl b/bin/stats.pl
new file mode 100755
index 0000000..1417581
--- /dev/null
+++ b/bin/stats.pl
@@ -0,0 +1,178 @@
+#!/usr/bin/perl -w
+
+# segment by Date, then by Product, then count
+my %data;
+my %products;
+
+# Analysing stats:
+#
+# grep for 'multi' - yields the Windows installer ... (also grep for 'all_lang') - all of them [!]
+# grep for 'Linux' and 'en-US' yields total Linux main binary downloads ...
+# grep for 'Mac' and 'en-US' yields total Mac main binary numbers ...
+
+while (<>) {
+ chomp();
+ my $line = $_;
+# print "line '$_'\n";
+# 17424 2011-01-25 LibO Win-x86 3.3.0 all_lang qa 1
+ if ($line =~ m/^\s*(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s*$/) {
+ my ($id, $date, $product, $osname, $version, $lang, $country, $count) = ($1, $2, $3, $4, $5, $6, $7, $8);
+# print "$count downloads on date $date, os $osname $lang\n";
+
+ if ($date lt '2011-01-25') {
+# print STDERR "ignoring $date\n";
+ next
+ }
+
+ my $clean_product;
+
+ # Ignore Mac / Linux help packs etc.
+ if (($osname =~ /Linux/ || $osname =~ /MacOS/) && $lang eq 'en-US') {
+ $clean_product = $osname;
+ }
+ # Detect Windows distinctions
+ if (($product eq 'LibO' || $product eq 'LO') &&
+ $osname =~ /Win/ && ($lang =~ /multi/ || $lang =~ /all_lang/)) {
+ $clean_product = "$osname-$lang";
+ }
+
+ # Detect PortableOffice distinctions
+ if ($product eq 'LibreOfficePortable') {
+ $clean_product = $product;
+ }
+
+ if (!defined $clean_product) {
+# print "uninteresting line '$line'\n";
+ next;
+ }
+
+ $products{$clean_product} = 1;
+ if (!defined $data{$date}) {
+ my %byproduct;
+ $data{$date} = \%byproduct;
+ }
+ if (!defined ($data{$date}->{$clean_product})) {
+ $data{$date}->{$clean_product} = 0;
+ }
+ $data{$date}->{$clean_product} += $count;
+# print "count for '$date' and '$clean_product' == $data{$date}->{$clean_product} [ added $count ]\n";
+ } else {
+# print STDERR "malformed line '$_'\n";
+ }
+}
+
+# now output this as a spreadsheet ... fods ...
+print << "EOF"
+<?xml version="1.0" encoding="UTF-8"?>
+<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
+ xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
+ xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+ xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
+ xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+ xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
+ xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
+ xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
+ xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
+ xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
+ xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
+ xmlns:math="http://www.w3.org/1998/Math/MathML"
+ xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
+ xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
+ xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0"
+ xmlns:ooo="http://openoffice.org/2004/office"
+ xmlns:ooow="http://openoffice.org/2004/writer"
+ xmlns:oooc="http://openoffice.org/2004/calc"
+ xmlns:dom="http://www.w3.org/2001/xml-events"
+ xmlns:xforms="http://www.w3.org/2002/xforms"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:rpt="http://openoffice.org/2005/report"
+ xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2"
+ xmlns:xhtml="http://www.w3.org/1999/xhtml"
+ xmlns:grddl="http://www.w3.org/2003/g/data-view#"
+ xmlns:tableooo="http://openoffice.org/2009/table"
+ xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0"
+ xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
+ xmlns:css3t="http://www.w3.org/TR/css3-text/"
+ office:version="1.2"
+ grddl:transformation="http://docs.oasis-open.org/office/1.2/xslt/odf2rdf.xsl"
+ office:mimetype="application/vnd.oasis.opendocument.spreadsheet">
+ <office:styles>
+ <number:date-style style:name="isodatenum">
+ <number:year number:style="long"/>
+ <number:text>-</number:text>
+ <number:month number:style="long"/>
+ <number:text>-</number:text>
+ <number:day number:style="long"/>
+ </number:date-style>
+ <style:style style:name="boldheader" style:family="table-cell" style:parent-style-name="Default">
+ <style:text-properties fo:font-style="italic" fo:font-weight="bold"/>
+ </style:style>
+ <style:style style:name="isodate" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="isodatenum"/>
+ </office:styles>
+ <office:body>
+ <office:spreadsheet>
+ <table:table table:name="RawData">
+ <table:table-row>
+ <table:table-cell table:style-name="boldheader" office:value-type="string">
+ <text:p>Date</text:p>
+ </table:table-cell>
+EOF
+;
+ at prods = sort keys %products;
+for my $product (@prods) {
+print << "EOF"
+ <table:table-cell table:style-name="boldheader" office:value-type="string">
+ <text:p>$product</text:p>
+ </table:table-cell>
+EOF
+ ;
+}
+print << "EOF"
+ <table:table-cell table:style-name="boldheader" office:value-type="string">
+ <text:p>Total</text:p>
+ </table:table-cell>
+ </table:table-row>
+EOF
+;
+
+my $row = 1;
+
+# FIXME: ODF is -incredibly- lame in this regard ... we badly want R1C1 style referencing here [!]
+my $colcount = @prods;
+die ("odff needs R1C1") if ($colcount > 25);
+my $colname = chr (ord('A') + $colcount);
+print STDERR "cols: $colcount - colname $colname @prods\n";
+
+for my $date (sort keys %data) {
+print << "EOF"
+ <table:table-row>
+ <table:table-cell table:style-name="isodate" office:value-type="date" office:date-value="$date"/>
+EOF
+;
+ for my $product (@prods) {
+ my $count = $data{$date}->{$product};
+ $count = 0 if (!defined $count);
+print << "EOF"
+ <table:table-cell office:value-type="float" office:value="$count"/>
+EOF
+;
+ }
+ $row++;
+print << "EOF"
+ <table:table-cell table:formula="of:=SUM([.B$row:.$colname$row])" office:value-type="float"/>
+ </table:table-row>
+EOF
+;
+}
+
+print << "EOF"
+ </table:table>
+ </office:spreadsheet>
+ </office:body>
+</office:document>
+EOF
+;
More information about the Libreoffice-commits
mailing list