[Libreoffice-commits] .: 2 commits - download solenv/inc

[François Tigeot]

 download                   |   15 +--------------
 solenv/inc/tg_propmerge.mk |    5 -----
 2 files changed, 1 insertion(+), 19 deletions(-)

New commits:
commit 0fa0f6405efe4e56b1007fff1a692863159a2bbd
Author: Francois Tigeot <ftigeot at wolfpond.org>
Date:   Sat Mar 26 23:25:40 2011 +0100

    Use the default PATH to find the curl executable.
    
    The previous code was trying to pick up the full curl path in a harcoded
    list of places and actually failed to locate binaries on some hosts, even
    though they were present in $PATH .

diff --git a/download b/download
index 578f26d..f325c4c 100755
--- a/download
+++ b/download
@@ -66,7 +66,7 @@ fi
 # check for wget and md5sum
 wget=
 md5sum=
-curl=
+curl=`which curl`
 
 for i in wget /usr/bin/wget /usr/local/bin/wget /usr/sfw/bin/wget /opt/sfw/bin/wget /opt/local/bin/wget; do
     eval "$i --version" > /dev/null 2>&1
@@ -77,19 +77,6 @@ for i in wget /usr/bin/wget /usr/local/bin/wget /usr/sfw/bin/wget /opt/sfw/bin/w
     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
-            break
-        fi
-    done
-fi
-
 if [ -z "$wget" -a -z "$curl" ]; then
     echo "ERROR: neither  wget nor curl found!"
     exit 1
commit 8c2458ef96f14eb96ca011a18c98c975c332d981
Author: Francois Tigeot <ftigeot at wolfpond.org>
Date:   Sat Mar 26 17:36:40 2011 +0100

    Remove jpropex, it is unused.

diff --git a/solenv/inc/tg_propmerge.mk b/solenv/inc/tg_propmerge.mk
index 796bca9..e23b6ef 100755
--- a/solenv/inc/tg_propmerge.mk
+++ b/solenv/inc/tg_propmerge.mk
@@ -50,13 +50,8 @@ $(CLASSDIR)/$(PACKAGE)/%.properties $(MERGEPHONY) : %.properties
 
 $(MISC)/$(TARGET).pmerge.mk : $(PMERGELIST)
 .IF "$(WITH_LANG)"!=""
-# jpropex command file requirements:
-# - one file per line
-# - no spaces
-# - no empty lines
 # $(uniq ...) to workaround $assign adding the value twice...
     @noop $(assign PMERGEFILELIST:=$(uniq $(PMERGELIST)))
-    $(COMMAND_ECHO)$(SOLARBINDIR)/jpropex -p $(PRJNAME) -r $(PRJ) -o $(PDESTDIR) -i @$(mktmp $(PMERGEFILELIST:t"\n":s/ //)) -l all -lf $(alllangiso:s/ /,/) -m $(LOCALIZESDF)
 .ENDIF          # "$(WITH_LANG)"!=""
     @-$(RM) $@
     $(COMMAND_ECHO)echo last_merge=$(alllangiso) > $@