If library/cURL exists, do not copy cURL to contrib/library/network/cURL

This commit is contained in:
Jocelyn Fiat
2012-06-26 22:49:14 +02:00
parent c7db4529a3
commit 37e60a1f92
2 changed files with 7 additions and 5 deletions

View File

@@ -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

View File

@@ -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