From 50146cebf51bf3ba83dd0f4906f3442487d2770b Mon Sep 17 00:00:00 2001 From: Jocelyn Fiat Date: Tue, 19 Jun 2012 15:24:16 +0200 Subject: [PATCH] Put examples under examples/web/ewf/... --- tools/install_ewf.bat | 11 +++++++---- tools/install_ewf.sh | 6 +++--- tools/safe_md.bat | 10 ++++++++++ 3 files changed, 20 insertions(+), 7 deletions(-) create mode 100644 tools/safe_md.bat diff --git a/tools/install_ewf.bat b/tools/install_ewf.bat index ca01e6f5..3cb04c61 100644 --- a/tools/install_ewf.bat +++ b/tools/install_ewf.bat @@ -4,6 +4,7 @@ set TMP_EXCLUDE=%~dp0.install_ewf-copydir-exclude set COPYCMD= xcopy /EXCLUDE:%TMP_EXCLUDE% /I /E /Y set SVNCO=svn checkout set TMP_DIR=%~dp0.. +set SAFE_MD=call safe_md echo EIFGENs > %TMP_EXCLUDE% echo .git >> %TMP_EXCLUDE% @@ -48,7 +49,7 @@ goto start set TMP_CONTRIB_DIR=%TMP_TARGET_DIR%\contrib echo Install framework ewf -mkdir %TMP_CONTRIB_DIR%\library\web\framework\ewf +%SAFE_MD% %TMP_CONTRIB_DIR%\library\web\framework\ewf echo Install library: ewf/ewsgi %COPYCMD% %TMP_DIR%\library\server\ewsgi %TMP_CONTRIB_DIR%\library\web\framework\ewf\ewsgi echo Install library: ewf/libfcgi @@ -61,8 +62,10 @@ echo Install library: ewf/encoder %COPYCMD% %TMP_DIR%\library\text\encoder %TMP_CONTRIB_DIR%\library\web\framework\ewf\text\encoder echo Install examples -%COPYCMD% %TMP_DIR%\examples %TMP_CONTRIB_DIR%\examples\ewf -%COPYCMD% %TMP_DIR%\precomp %TMP_CONTRIB_DIR%\examples\ewf_precomp +%SAFE_MD% %TMP_CONTRIB_DIR%\examples +%SAFE_MD% %TMP_CONTRIB_DIR%\examples\web +%COPYCMD% %TMP_DIR%\examples %TMP_CONTRIB_DIR%\examples\web\ewf +%COPYCMD% %TMP_DIR%\precomp %TMP_CONTRIB_DIR%\examples\web\ewf_precomp echo Install library: error %COPYCMD% %TMP_DIR%\library\utility\general\error %TMP_CONTRIB_DIR%\library\utility\general\error @@ -79,7 +82,7 @@ echo Install contrib library: nino rem #--- IF Missing ---# echo Install cURL if missing -mkdir -p %TMP_CONTRIB_DIR%\library\network +%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 diff --git a/tools/install_ewf.sh b/tools/install_ewf.sh index 117de2a0..80660698 100644 --- a/tools/install_ewf.sh +++ b/tools/install_ewf.sh @@ -51,9 +51,9 @@ mkdir -p $TMP_CONTRIB_DIR/library/web/framework/ewf/text COPYCMD $TMP_DIR/library/text/encoder $TMP_CONTRIB_DIR/library/web/framework/ewf/text/encoder echo Install examples -mkdir -p $TMP_CONTRIB_DIR/examples -COPYCMD $TMP_DIR/examples $TMP_CONTRIB_DIR/examples/ewf -COPYCMD $TMP_DIR/precomp $TMP_CONTRIB_DIR/examples/ewf_precomp +mkdir -p $TMP_CONTRIB_DIR/examples/web +COPYCMD $TMP_DIR/examples $TMP_CONTRIB_DIR/examples/web/ewf +COPYCMD $TMP_DIR/precomp $TMP_CONTRIB_DIR/examples/web/ewf_precomp echo Install library: error mkdir -p $TMP_CONTRIB_DIR/library/utility/general diff --git a/tools/safe_md.bat b/tools/safe_md.bat new file mode 100644 index 00000000..aecd1772 --- /dev/null +++ b/tools/safe_md.bat @@ -0,0 +1,10 @@ +if exist "%1" goto already +echo Create directory [%1] +mkdir "%1" +goto end + +:already +echo Directory [%1] already exists +goto end + +:end