CWS-TOOLING: integrate CWS ause119

fetch_tarballs.sh

@@ -3,14 +3,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -65,25 +61,31 @@ for i in wget /usr/bin/wget /usr/local/bin/wget /usr/sfw/bin/wget /opt/sfw/bin/w
     fi
 done
 
-for i in curl /usr/bin/curl /usr/local/bin/curl /usr/sfw/bin/curl /opt/sfw/bin/curl /opt/local/bin/curl; do
-# mac curl returns "2" on --version
-#    eval "$i --version" > /dev/null 2>&1
-#    ret=$?
-#    if [ $ret -eq 0 ]; then
-    if [ -x $i ]; then
-        curl=$i
-        echo found curl: $curl
-        break 2
-    fi
-done
+if [ -z "$wget" ]; then
+    for i in curl /usr/bin/curl /usr/local/bin/curl /usr/sfw/bin/curl /opt/sfw/bin/curl /opt/local/bin/curl; do
+    # mac curl returns "2" on --version
+    #    eval "$i --version" > /dev/null 2>&1
+    #    ret=$?
+    #    if [ $ret -eq 0 ]; then
+        if [ -x $i ]; then
+            curl=$i
+            echo found curl: $curl
+            break 2
+        fi
+    done
+fi
 
 if [ -z "$wget" -a -z "$curl" ]; then
     echo "ERROR: neither  wget nor curl found!"
     exit
 fi
 
-for i in md5sum /usr/local/bin/md5sum gmd5sum /usr/sfw/bin/md5sum /opt/sfw/bin/gmd5sum /opt/local/bin/md5sum; do
-    eval "$i --version" > /dev/null 2>&1
+for i in md5 md5sum /usr/local/bin/md5sum gmd5sum /usr/sfw/bin/md5sum /opt/sfw/bin/gmd5sum /opt/local/bin/md5sum; do
+    if [ "$i" = "md5" ]; then
+        eval "$i -x" > /dev/null 2>&1
+    else
+        eval "$i --version" > /dev/null 2>&1
+    fi
     ret=$?
     if [ $ret -eq 0 ]; then
         md5sum=$i
@@ -92,44 +94,61 @@ for i in md5sum /usr/local/bin/md5sum gmd5sum /usr/sfw/bin/md5sum /opt/sfw/bin/g
     fi
 done
 
+if [ "$md5sum" = "md5" ]; then
+    md5special=-r
+fi
+
 if [ -z "$md5sum" ]; then
     echo "Warning: no md5sum: found!"
 fi
 
 start_dir=`pwd`
+logfile=$TARFILE_LOCATION/fetch.log
+date >> $logfile
+
 filelist=`cat $1`
-cd $TARFILE_LOCATION
+mkdir -p $TARFILE_LOCATION/tmp
+cd $TARFILE_LOCATION/tmp
+echo $$ > fetch-running
 for i in $filelist ; do
-#   echo $i
+#    echo $i
     if [ "$i" != `echo $i | sed "s/^http:\///"` ]; then
         tarurl=$i
     # TODO: check for comment
     else
         if [ "$tarurl" != "" ]; then
-            if [ ! -f "$i" ]; then
+            if [ ! -f "../$i" ]; then
+                echo $i
                 if [ ! -z "$wget" ]; then
-                    $wget -nv -N $tarurl/$i
+                    $wget -nv -N $tarurl/$i 2>&1 | tee -a $logfile
                 else
                     echo fetching $i
-                    $curl $file_date_check -O $tarurl/$i
+                    $curl $file_date_check -O $tarurl/$i 2>&1 | tee -a $logfile
                 fi
                 wret=$?
                 if [ $wret -ne 0 ]; then
+                    mv $i ${i}_broken
                     failed="$failed $i"
                     wret=0
                 fi
                 if [ -f $i -a -n "$md5sum" ]; then
-                    sum=`$md5sum $i | sed "s/ [ *].*//"`
+                    sum=`$md5sum $md5special $i | sed "s/ .*//"`
                     sum2=`echo $i | sed "s/-.*//"`
                     if [ "$sum" != "$sum2" ]; then
-                        echo checksum failure for $i
+                        echo checksum failure for $i 2>&1 | tee -a $logfile
                         failed="$failed $i"
+                        mv $i ${i}_broken
+                    else
+                        mv $i ..
                     fi
+                else
+                    mv $i ..
                 fi
             fi
         fi
     fi
 done
+rm $TARFILE_LOCATION/tmp/*-*
 cd $start_dir
 
 if [ ! -z "$failed" ]; then

solenv/bin/cws.pl

@@ -2206,6 +2206,7 @@ sub do_fetch
     my $ooo_svn_server = $config->get_ooo_svn_server();
     my $so_svn_server = $config->get_so_svn_server();
     my $prebuild_dir = $config->get_prebuild_binaries_location();
+    my $external_tarball_source = $prebuild_dir;
     # Check early for platforms so we can bail out before anything time consuming is done
     # in case of a missing platform
     my @platforms;
@@ -2368,10 +2369,10 @@ sub do_fetch
         }
     }
 
-    if ( !$onlysolver ) {
+    if ( !$onlysolver && defined($external_tarball_source) ) {
         my $source_root_dir = "$workspace/$masterws";
-        my $external_tarball_source = "$prebuild_dir/$masterws/ext_sources";
-        if ( -e "$source_root_dir/ooo/ooo.lst" && defined($prebuild_dir) && -d $external_tarball_source ) {
+        $external_tarball_source .= "/$masterws/ext_sources";
+        if ( -e "$source_root_dir/ooo/ooo.lst" && -d $external_tarball_source ) {
             fetch_external_tarballs($source_root_dir, $external_tarball_source);
         }
     }

solenv/bin/mhids.pl

@@ -155,7 +155,9 @@ $filebase =~ s/\..*?$//;
 # now stript it to something that doesn't togger vista execution prevention :(
 $flbs = $filebase;
 $flbs =~ s/[aeiou]//g;
-$workfile = "$tmpdir/${flbs}_".$$;
+# call srand ony once per script!
+srand();
+$workfile = "$tmpdir/${flbs}_".$$.rand();
 #$workfile =~ s/setup/set_up/;
 
 # now get $workfile ready for shell usage...
@@ -171,7 +173,7 @@ unlink "$workfile.obj";
 
 if ( -f "$workfile.hid" )
 {
-    unlink "$workfile.hid" or die "ERRROR - cannot remove $workfile.hid\n";;
+    unlink "$workfile.hid" or die "ERRROR - cannot remove $workfile.hid\n";
 }
 
 # hack to quit for files which cannot be handled

solenv/bin/modules/installer/epmfile.pm

@@ -1447,6 +1447,8 @@ sub set_autoprovreq_in_specfile
         $autoreqprovline = "AutoReqProv\: no\n";
     }
 
+    $autoreqprovline .= "%define _binary_filedigest_algorithm 1\n%define _binary_payload w9.gzdio\n";
+
     for ( my $i = 0; $i <= $#{$changefile}; $i++ )
     {
         # Adding "autoreqprov" behind the line beginning with: Group:

solenv/inc/tg_config.mk

@@ -120,10 +120,12 @@ $(PROCESSOUT)/registry/data/$(PACKAGEDIR)/%.xcu : %.xcu
     $(COMMAND_ECHO)$(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))/$(subst,$(PRJ), $(@:d))$*.val) \
                 --stringparam xcs $(XCSROOTURL)/registry/schema/$(XSLTPACKAGEDIR)/$*.xcs \
                 --stringparam schemaRoot $(XCSROOTURL)/registry/schema \
+            --path $(DTDDIR)/registry \
                 $(SYSXSLDIR)data_val.xsl $<
     $(COMMAND_ECHO)$(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))/$(subst,$(PRJ), $@)) \
                 --stringparam xcs $(XCSROOTURL)/registry/schema/$(XSLTPACKAGEDIR)/$*.xcs \
                 --stringparam schemaRoot $(XCSROOTURL)/registry/schema \
+            --path $(DTDDIR)/registry \
                 $(SYSXSLDIR)alllang.xsl $<
     @+-$(RM) $(@:d)$*.val > $(NULLDEV)
 
@@ -154,6 +156,7 @@ $(PROCESSOUT)/registry/res/{$(alllangiso)}/$(PACKAGEDIR)/%.xcu :| %.xcu
                 --stringparam xcs $(XCSROOTURL)/registry/schema/$(XSLTPACKAGEDIR)/$*.xcs \
                 --stringparam schemaRoot $(XCSROOTURL)/registry/schema \
                 --stringparam locale {$(subst,/$(PACKAGEDIR)/$(@:f), $(subst,$(PROCESSOUT)/registry/res/, $@))} \
+                --path $(DTDDIR)/registry \
                 $(SYSXSLDIR)alllang.xsl $<
 
 # --- languagepack tag modules ---