[ooo-build-commit] Branch 'ooo/master' - 2 commits - solenv/bin solenv/inc

[Jan Holesovsky]

 solenv/bin/gen_update_info.pl |   32 ++++++++++++++++++++++++++++++--
 solenv/inc/minor.mk           |    6 +++---
 2 files changed, 33 insertions(+), 5 deletions(-)

New commits:
commit 0cac9d5de647999562b7e575af637e9e20afde0a
Author: Jens-Heiner Rechtien <hr at openoffice.org>
Date:   Thu Jul 30 13:19:13 2009 +0000

    DEV300

diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 333b903..1ac537e 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
 RSCVERSION=300
-RSCREVISION=300m53(Build:9412)
-BUILD=9412
-LAST_MINOR=m53
+RSCREVISION=300m54(Build:9416)
+BUILD=9416
+LAST_MINOR=m54
 SOURCEVERSION=DEV300
commit dc83741d865fad6df7b633306401823a75c02613
Author: Jens-Heiner Rechtien <hr at openoffice.org>
Date:   Wed Jul 29 15:47:31 2009 +0000

    CWS-TOOLING: integrate CWS native258_DEV300
    2009-07-16 13:55:09 +0200 is  r274050 : #i103569# providing minor and micro for udpate database

diff --git a/solenv/bin/gen_update_info.pl b/solenv/bin/gen_update_info.pl
index fb9770a..cd5b951 100644
--- a/solenv/bin/gen_update_info.pl
+++ b/solenv/bin/gen_update_info.pl
@@ -79,6 +79,32 @@ if( $^O =~ /cygwin/i ) {
 }
 
 # read openoffice.lst
+# reading Globals section
+unless(open(LSTFILE, "sed -n \"/^Globals\$/,/^}\$/ p\" $lstfile |")) {
+    print STDERR "Can't open $lstfile file: $!\n";
+    return;   
+}
+
+while (<LSTFILE>) {
+    if( /\bPRODUCTNAME / ) {
+        chomp;
+        s/.*PRODUCTNAME //;
+        $productname = $_;
+    }
+    if( /\bPACKAGEVERSION / ) {
+        chomp;
+        s/.*PACKAGEVERSION //;
+        $productversion = $_;
+    }
+    if( /\bPRODUCTEDITION / ) {
+        chomp;
+        s/.*PRODUCTEDITION //;
+        $productedition = $_;
+    }
+}
+
+close(LSTFILE);
+
 ### may be hierarchical ...
 if(open(LSTFILE, "sed -n \"/^$product:/,/^}\$/ p\" $lstfile |")) {
     while (<LSTFILE>) {
@@ -94,6 +120,8 @@ if(open(LSTFILE, "sed -n \"/^$product:/,/^}\$/ p\" $lstfile |")) {
 }
 close(LSTFILE);
 
+# Reading product specific settings
+
 unless(open(LSTFILE, "sed -n \"/^$product\$/,/^}\$/ p\" $lstfile |")) {
     print STDERR "Can't open $lstfile file: $!\n";
     return;   
@@ -105,9 +133,9 @@ while (<LSTFILE>) {
         s/.*PRODUCTNAME //;
         $productname = $_;
     }
-    if( /\bPRODUCTVERSION / ) {
+    if( /\bPACKAGEVERSION / ) {
         chomp;
-        s/.*PRODUCTVERSION //;
+        s/.*PACKAGEVERSION //;
         $productversion = $_;
     }
     if( /\bPRODUCTEDITION / ) {