[patch] /usr/local/portage/app-office/openoffice/files/1.1.4/OOo_1.1.4-getcompver.awk.gcc-datesuffix.diff

OOo_1.1.4-getcompver.awk.gcc-datesuffix.diff (text/plain), 1.56 KB, created by Mark Dominik Bürkle on 2005-04-01 06:49:53 UTC

--- solenv/bin/getcompver.awk.org	2003-07-02 15:42:35.000000000 +0200
+++ solenv/bin/getcompver.awk	2005-03-30 20:06:31.000000000 +0200
@@ -82,28 +82,37 @@
 }
 # Java
 /java version/ {
     compiler_matched = 1
     # match on the format of the java versions ( d[d].d[d].d[d] )
-    x = match( $0, /".*\..*\..*"/ )
+    x = match( $0, /".*\..*\..*"/ )    # what w/returning "1.5.0-135"??
     CCversion = substr( $0, RSTART+1, RLENGTH-2)
 }
-/^[0-9]*[.][0-9]*$/ {
+/^[0-9]*\.([0-9]*\.)?[0-9]*$/ {
     if ( compiler_matched == 0 ) {
-# need to blow to x.xx.xx for comparing
-    	CCversion = $0 ".0"
+    	CCversion = $0
     }
 }
-/^[0-9]*[.][0-9]*[.][0-9]*$/ {
+/^[0-9]*\.([0-9]*\.)?[0-9-]*$/ {
     if ( compiler_matched == 0 ) {
-        CCversion = $0
+        # cut off gcc-date "-YYYYmmdd"
+        x = match( $0, /[^-]*/ )
+        CCversion = substr( $0, RSTART, RLENGTH)
+        ## or to include trailing sub-version as ".YYYYmmdd", which
+        ## might make trouble with "%04d" numeric output
+        #CCversion = gensub("-", ".", "g", $0);
     }
 }
 END {
+    if (match ("^[0-9]*\.[0-9]*$", CCversion)) {
+# need to blow to x.xx.xx for comparing
+        CCversion = CCversion ".0"
+    }
     if ( num == "true" ) {
-        tokencount = split (CCversion,vertoken,".")
-        for ( i = 1 ; i <= tokencount ; i++ ) {
+        tokencount = split (CCversion,vertoken,"[.-]")
+        # "need to blow" => need to limit! :-(
+        for ( i = 1 ; (i <= tokencount) && (i <= 3) ; i++ ) {
             printf ("%04d",vertoken[i] )
         }
     } else
         print CCversion
 }