GNOME.org
 

[gnumeric] Release: infrastructure improvements.

commit 912f31325d2e831c242f43adec35453f44aee19e
Author: Morten Welinder <terra gnome org>
Date:   Sun Feb 16 12:11:58 2014 -0500

    Release: infrastructure improvements.

 ChangeLog            |    4 +++
 NEWS                 |    4 +++
 src/func.c           |   51 ++++++++++++++++++++++++++++++++++++++++++-------
 tools/release-do-www |   19 ++++++++++-------
 4 files changed, 62 insertions(+), 16 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 6e62f20..70b1fd7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-02-16  Morten Welinder  <terra gnome org>
+
+       * src/func.c (function_dump_defs): Update boilerplate.
+
 2014-02-11  Morten Welinder <terra gnome org>
 
        * configure.ac: Post-release bump.
diff --git a/NEWS b/NEWS
index 8f7b40c..85baf86 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,10 @@ Gnumeric 1.12.11
 Jean:
        * Fix hang on xls/biff7 save.  [#724399]
 
+Morten:
+       * Release infrastructure improvements.
+       * Improve testing for xls/biff7.
+
 --------------------------------------------------------------------------
 Gnumeric 1.12.10
 
diff --git a/src/func.c b/src/func.c
index f4f4c4c..febb34f 100644
--- a/src/func.c
+++ b/src/func.c
@@ -283,9 +283,15 @@ function_dump_defs (char const *filename, int dump_type)
                }
 
                fprintf (output_file,
-                        "<!--#set var=\"title\" value=\"Functions\" -->"
-                        "<!--#set var=\"rootdir\" value=\".\" -->"
-                        "<!--#include virtual=\"header-begin.shtml\" -->\n"
+                        "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+                        "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" 
\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\";>\n"
+                        "<html xmlns=\"http://www.w3.org/1999/xhtml\"; xml:lang=\"en\" lang=\"en\">\n"
+                        "<!-- DEFINE current=Home -->\n"
+                        "<!-- MARKER: start-header -->\n"
+                        "<head>\n"
+                        "<title>Gnumeric</title>\n"
+                        "<link rel=\"stylesheet\" href=\"style/style.css\" type=\"text/css\" />\n"
+                        "<link rel=\"icon\" type=\"image/png\" href=\"logo.png\" />\n"
                         "<style type=\"text/css\"><!--\n"
                         "  div.functiongroup {\n"
                         "    margin-top: 1em;\n"
@@ -320,10 +326,30 @@ function_dump_defs (char const *filename, int dump_type)
                         "  td.imp-devel          { background: #ff6c00; }\n"
                         "  td.imp-gnumeric       { background: #44be18; }\n"
                         "--></style>\n"
-                        "<!--#include virtual=\"header-end.shtml\" -->"
-                        "<h1>Gnumeric Sheet Functions</h1>\n"
-                        "<p>Gnumeric currently has %d functions for use in spreadsheets.\n"
-                        "%d of these are unique to Gnumeric.</p>\n",
+                        "</head>\n"
+                        "<body>\n"
+                        "<div id=\"wrap\">\n"
+                        "  <a href=\"/\"><div id=\"header\">\n"
+                        "    <h1 id=\"logo-text\"><span>Gnumeric</span></h1>\n"
+                        "    <p id=\"slogan\">Free, Fast, Accurate &mdash; Pick Any Three!</p>\n"
+                        "    <img id=\"logo\" src=\"gnumeric.png\" alt=\"logo\" class=\"float-right\"/>\n"
+                        "    </div></a>\n"
+                        "\n"
+                        "  <div id=\"nav\">\n"
+                        "    <ul>\n"
+                        "      <li id=\"current\"><a href=\"/\">Home</a></li>\n"
+                        "      <li><a href=\"development.html\">Development</a></li>\n"
+                        "      <li><a href=\"contact.html\">Contact</a></li>\n"
+                        "    </ul>\n"
+                        "  </div>\n"
+                        "\n"
+                        "  <div id=\"content-wrap\">\n"
+                        "    <!-- MARKER: start-main -->\n"
+                        "    <div id=\"main\">\n"
+                        "      <div class=\"generalitem\">\n"
+                        "      <h2><span class=\"gnumeric-bullet\"></span>Gnumeric Sheet Functions</h2>\n"
+                        "      <p>Gnumeric currently has %d functions for use in spreadsheets.\n"
+                        "      %d of these are unique to Gnumeric.</p>\n",
                         ordered->len, unique);
        }
 
@@ -507,7 +533,16 @@ function_dump_defs (char const *filename, int dump_type)
        }
        if (dump_type == 0) {
                if (group) fprintf (output_file, "</table></div>\n");
-               fprintf (output_file, "<!--#include virtual=\"footer.shtml\"-->\n");
+               fprintf (output_file,
+                        "      </div>\n"
+                        "    </div>\n"
+                        "    <!-- MARKER: end-main -->\n"
+                        "    <!-- MARKER: start-sidebar -->\n"
+                        "    <!-- MARKER: end-sidebar -->\n"
+                        "  </div>\n"
+                        "</div>\n"
+                        "</body>\n"
+                        "</html>\n");
        }
 
        g_ptr_array_free (ordered, TRUE);
diff --git a/tools/release-do-www b/tools/release-do-www
index d0a6736..b04e6f2 100644
--- a/tools/release-do-www
+++ b/tools/release-do-www
@@ -13,14 +13,17 @@ die "$0: you must supply the new versions as arguments.\n"
 my $newgnumeric2 = $newgnumeric;
 $newgnumeric2 =~ s/^(\d+\.\d+)\..*/$1/;
 
-my $wwwdir = "www.gnumeric.org";
+$newgnumeric =~ /^(\d+)\.(\d+)\.(\d+)$/;
+my $oldgnumeric = $1 . "." . $2 . "." . ($3 - 1);
+
+my $wwwdir = "www-gnumeric-org";
 my $makenews = "gnumeric/tools/news-to-html";
-my $annfile = "announcements/$newgnumeric2/gnumeric-$newgnumeric.shtml";
+my $annfile = "announcements/$newgnumeric2/gnumeric-$newgnumeric.html";
 
 # -----------------------------------------------------------------------------
 
-system ("perl -pi -e '\$_ .= \"\tgnumeric-$newgnumeric.shtml \\\\\n\" if /^page_SCRIPTS/;' 
$wwwdir/announcements/$newgnumeric2/Makefile.am");
-system ("perl -pi -e '\$_ .= \"  <li><a href=\\\"gnumeric-$newgnumeric.shtml\\\">$newgnumeric</a></li>\n\" 
if /^<ul>/;' $wwwdir/announcements/$newgnumeric2/index.shtml");
+system ("perl -pi -e '\$_ .= \"\t$annfile\t\\\\\\n\" if /gnumeric-(\\S+)\\.html/ && \$1 eq 
\"$oldgnumeric\";' $wwwdir/Makefile");
+system ("perl -pi -e 'next unless /id=.main./ .. 0; \$_ .= \"        <li><a 
href=\\\"gnumeric-$newgnumeric.html\\\">$newgnumeric</a></li>\n\" if /^\\s*<ul>/;' 
$wwwdir/announcements/$newgnumeric2/index.html");
 
 chdir "gnumeric";
 system ("perl ../$makenews $newgnumeric >../$wwwdir/$annfile");
@@ -32,8 +35,10 @@ chdir "..";
 
 # -----------------------------------------------------------------------------
 
+if (0) {
 system ("perl -pi -e '\$_ .= \"\tchangelog-$newgnumeric.txt\t\\\\\n\" if /^page_SCRIPTS/;' 
$wwwdir/changelogs/$newgnumeric2/Makefile.am");
-system ("perl -pi -e '\$_ .= \"  <li><a href=\\\"changelog-$newgnumeric.txt\\\">$newgnumeric</a></li>\n\" if 
/new entries go on top/;' $wwwdir/changelogs/$newgnumeric2/index.shtml");
+system ("perl -pi -e '\$_ .= \"  <li><a href=\\\"changelog-$newgnumeric.txt\\\">$newgnumeric</a></li>\n\" if 
/new entries go on top/;' $wwwdir/changelogs/$newgnumeric2/index.html");
+}
 
 my $v = $newgnumeric;
 $v =~ s/\./\\./;
@@ -43,9 +48,7 @@ system ("perl -e '\$/=undef; \$_=<STDIN>; s{^.*\n(\\S(\\S| |\t)+\n\n\t\\* Releas
 
 my $v2 = $newgnumeric2;
 $v2 =~ s/\./\\./;
-system ("perl -pi -e 's{$v2\\.\\d+\\.tar\\.}{$newgnumeric.tar.} if m{ftp\.gnome\.org/pub/GNOME/sources};' 
$wwwdir/header-end.shtml");
-
-system ("perl -pi -e 's{$v2\\.\\d+\\.tar\\.}{$newgnumeric.tar.} if m{ftp\.gnome\.org/pub/GNOME/sources}; 
s{$v2\\.\\d+}{$newgnumeric} if m{current stable version} || m {gnumeric-$v2\\.\\d+.shtml};' 
$wwwdir/downloads.shtml");
+system ("perl -pi -e 's{$v2\\.\\d+\\.tar\\.}{$newgnumeric.tar.} if m{ftp\.gnome\.org/pub/GNOME/sources};' 
$wwwdir/download.html");
 
 # -----------------------------------------------------------------------------
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]