From d539ea061a472006b3c631ae6e06fc579154a436 Mon Sep 17 00:00:00 2001 From: Jocelyn Fiat Date: Tue, 26 Jun 2012 22:49:14 +0200 Subject: [PATCH] If library/cURL exists, do not copy cURL to contrib/library/network/cURL --- tools/install_ewf.bat | 4 ++-- tools/install_ewf.sh | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/tools/install_ewf.bat b/tools/install_ewf.bat index c71be48e..80ff0d24 100644 --- a/tools/install_ewf.bat +++ b/tools/install_ewf.bat @@ -85,8 +85,8 @@ rem #--- IF Missing ---# echo Install cURL if missing %SAFE_MD% %TMP_CONTRIB_DIR%\library\network -if not exist %TMP_CONTRIB_DIR%\library\cURL %COPYCMD% %TMP_DIR%\contrib\ise_library\cURL %TMP_CONTRIB_DIR%\library\network\cURL -if not exist %TMP_CONTRIB_DIR%\library\cURL\cURL.ecf %SVNCO% https://svn.eiffel.com/eiffelstudio/trunk/Src/library/cURL %TMP_CONTRIB_DIR%\library\network\cURL +if not exist %TMP_TARGET_DIR%\library\cURL %COPYCMD% %TMP_DIR%\contrib\ise_library\cURL %TMP_CONTRIB_DIR%\library\network\cURL +if not exist %TMP_TARGET_DIR%\library\cURL if not exist %TMP_CONTRIB_DIR%\library\cURL\cURL.ecf %SVNCO% https://svn.eiffel.com/eiffelstudio/trunk/Src/library/cURL %TMP_CONTRIB_DIR%\library\network\cURL echo Install json if missing if not exist %TMP_CONTRIB_DIR%\library\text\parser\json %COPYCMD% %TMP_DIR%\contrib\library\text\parser\json %TMP_CONTRIB_DIR%\library\text\parser\json diff --git a/tools/install_ewf.sh b/tools/install_ewf.sh index 576afcd3..b22e9ea8 100644 --- a/tools/install_ewf.sh +++ b/tools/install_ewf.sh @@ -79,14 +79,16 @@ rm -rf $TMP_CONTRIB_DIR/library/network/server/nino/example/SimpleWebServer/webr echo Install cURL if missing mkdir -p $TMP_CONTRIB_DIR/library/network COPYCMDIFMISSING $TMP_TARGET_DIR/library/cURL $TMP_DIR/contrib/ise_library/cURL $TMP_CONTRIB_DIR/library/network/cURL -if [ ! -d "$TMP_CONTRIB_DIR/library/network/cURL/cURL.ecf" ]; then - SVNCO https://svn.eiffel.com/eiffelstudio/trunk/Src/library/cURL $TMP_CONTRIB_DIR/library/network/cURL +if [ ! -f "$TMP_TARGET_DIR/library/cURL/cURL.ecf" ]; then + if [ ! -f "$TMP_CONTRIB_DIR/library/network/cURL/cURL.ecf" ]; then + SVNCO https://svn.eiffel.com/eiffelstudio/trunk/Src/library/cURL $TMP_CONTRIB_DIR/library/network/cURL + fi fi echo Install json if missing mkdir -p $TMP_CONTRIB_DIR/library/text/parser COPYCMDIFMISSING $TMP_CONTRIB_DIR/library/text/parser/json $TMP_DIR/contrib/library/text/parser/json $TMP_CONTRIB_DIR/library/text/parser/json -if [ ! -d "$TMP_CONTRIB_DIR/library/text/parser/json/library/json.ecf" ]; then +if [ ! -f "$TMP_CONTRIB_DIR/library/text/parser/json/library/json.ecf" ]; then SVNCO https://svn.github.com/eiffelhub/json.git $TMP_CONTRIB_DIR/library/text/parser/json fi