CWS-TOOLING: integrate CWS native258_DEV300

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

1 files changed, 30 insertions, 2 deletions

diff --git a/solenv/bin/gen_update_info.pl b/solenv/bin/gen_update_info.pl
index fe543cf75405..d1a2e1ba2dee 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 / ) {