From a05e08c2074f0173c84c2ecbf286d44cab49cc8b Mon Sep 17 00:00:00 2001 From: Jocelyn Fiat Date: Wed, 27 Mar 2013 13:07:55 +0100 Subject: [PATCH 1/5] corrected null-safe.ecf --- library/server/ewsgi/connectors/null/null-safe.ecf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/server/ewsgi/connectors/null/null-safe.ecf b/library/server/ewsgi/connectors/null/null-safe.ecf index 6d82d779..5039c428 100644 --- a/library/server/ewsgi/connectors/null/null-safe.ecf +++ b/library/server/ewsgi/connectors/null/null-safe.ecf @@ -1,5 +1,5 @@ - + From 403b9f7bde603269e0de973ac9199da3914c3759 Mon Sep 17 00:00:00 2001 From: Jocelyn Fiat Date: Wed, 27 Mar 2013 13:08:57 +0100 Subject: [PATCH 2/5] better use a root class --- library/text/parser/uri_template/tests/tests-safe.ecf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/text/parser/uri_template/tests/tests-safe.ecf b/library/text/parser/uri_template/tests/tests-safe.ecf index a06d669e..0d2c7549 100644 --- a/library/text/parser/uri_template/tests/tests-safe.ecf +++ b/library/text/parser/uri_template/tests/tests-safe.ecf @@ -1,7 +1,7 @@ - + /.git$ /EIFGENs$ From 9f132a7b72ea1b94a98358e934d1e9794b41b0f4 Mon Sep 17 00:00:00 2001 From: Jocelyn Fiat Date: Wed, 27 Mar 2013 13:11:49 +0100 Subject: [PATCH 3/5] new integration ecf file that includes most of the library .ecf of EWF (note to include non library ecf, the related ecf should have a library_target) --- tests/all-safe.ecf | 61 +++++++++++++++++++++++++++++----------------- 1 file changed, 39 insertions(+), 22 deletions(-) diff --git a/tests/all-safe.ecf b/tests/all-safe.ecf index 0cb7a441..03898065 100644 --- a/tests/all-safe.ecf +++ b/tests/all-safe.ecf @@ -1,6 +1,6 @@ - compile many lib from EWF + Integration project including many lib @@ -10,34 +10,52 @@ - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + - - - - - - + + + + + + + + + + + + + + + + + Compiling as Windows , on other platforms than Windows @@ -49,5 +67,4 @@ - From 178a48cd7ef1c8c3bc75438553879f4bfe98a6b8 Mon Sep 17 00:00:00 2001 From: Jocelyn Fiat Date: Wed, 27 Mar 2013 15:22:32 +0100 Subject: [PATCH 4/5] Updated all-safe.ecf (add all-stable-safe.ecf that includes only the library, examples and specific draft lib) --- .../application/cms/example/cms_demo-safe.ecf | 2 +- examples/restbucksCRUD/client/client-safe.ecf | 2 +- examples/upload_image/upload_image-safe.ecf | 2 +- .../ewsgi/examples/hello_world/hello-safe.ecf | 2 +- .../parser/uri_template/tests/tests-safe.ecf | 2 +- tests/all-safe.ecf | 8 ++- tests/all-stable-safe.ecf | 65 +++++++++++++++++++ tools/ise_wizard/ewf_ise_wizard-safe.ecf | 2 +- 8 files changed, 77 insertions(+), 8 deletions(-) create mode 100644 tests/all-stable-safe.ecf diff --git a/draft/application/cms/example/cms_demo-safe.ecf b/draft/application/cms/example/cms_demo-safe.ecf index ffe42c05..2696592f 100644 --- a/draft/application/cms/example/cms_demo-safe.ecf +++ b/draft/application/cms/example/cms_demo-safe.ecf @@ -1,5 +1,5 @@ - + diff --git a/examples/restbucksCRUD/client/client-safe.ecf b/examples/restbucksCRUD/client/client-safe.ecf index ed09ae8f..5c53670e 100644 --- a/examples/restbucksCRUD/client/client-safe.ecf +++ b/examples/restbucksCRUD/client/client-safe.ecf @@ -1,5 +1,5 @@ - + diff --git a/examples/upload_image/upload_image-safe.ecf b/examples/upload_image/upload_image-safe.ecf index b8b8633d..ba2e34de 100644 --- a/examples/upload_image/upload_image-safe.ecf +++ b/examples/upload_image/upload_image-safe.ecf @@ -1,5 +1,5 @@ - + diff --git a/library/server/ewsgi/examples/hello_world/hello-safe.ecf b/library/server/ewsgi/examples/hello_world/hello-safe.ecf index 76cdb452..a381ea19 100644 --- a/library/server/ewsgi/examples/hello_world/hello-safe.ecf +++ b/library/server/ewsgi/examples/hello_world/hello-safe.ecf @@ -1,5 +1,5 @@ - + diff --git a/library/text/parser/uri_template/tests/tests-safe.ecf b/library/text/parser/uri_template/tests/tests-safe.ecf index 0d2c7549..45b0300e 100644 --- a/library/text/parser/uri_template/tests/tests-safe.ecf +++ b/library/text/parser/uri_template/tests/tests-safe.ecf @@ -1,5 +1,5 @@ - + diff --git a/tests/all-safe.ecf b/tests/all-safe.ecf index 03898065..6d973ec5 100644 --- a/tests/all-safe.ecf +++ b/tests/all-safe.ecf @@ -16,16 +16,19 @@ + + + - + @@ -34,6 +37,7 @@ + @@ -51,11 +55,11 @@ - + Compiling as Windows , on other platforms than Windows diff --git a/tests/all-stable-safe.ecf b/tests/all-stable-safe.ecf new file mode 100644 index 00000000..534da848 --- /dev/null +++ b/tests/all-stable-safe.ecf @@ -0,0 +1,65 @@ + + + Integration project including many lib + + + + /.git$ + /EIFGENs$ + /.svn$ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Compiling as Windows , on other platforms than Windows + + + + + Compiling as UNIX , on other platforms than Unix + + + + diff --git a/tools/ise_wizard/ewf_ise_wizard-safe.ecf b/tools/ise_wizard/ewf_ise_wizard-safe.ecf index fa4c6cd1..af052664 100644 --- a/tools/ise_wizard/ewf_ise_wizard-safe.ecf +++ b/tools/ise_wizard/ewf_ise_wizard-safe.ecf @@ -1,5 +1,5 @@ - + From ab9c30459706d8e9455b5aa07cb8a290e82c23d1 Mon Sep 17 00:00:00 2001 From: Jocelyn Fiat Date: Wed, 27 Mar 2013 15:24:40 +0100 Subject: [PATCH 5/5] added wsf_html for (un)installation --- tools/install_ewf.bat | 2 ++ tools/install_ewf.sh | 3 +++ 2 files changed, 5 insertions(+) diff --git a/tools/install_ewf.bat b/tools/install_ewf.bat index 87f82c80..005a5656 100644 --- a/tools/install_ewf.bat +++ b/tools/install_ewf.bat @@ -59,6 +59,8 @@ echo Install library: ewf/wsf %COPYCMD% %TMP_DIR%\library\server\wsf %TMP_CONTRIB_DIR%\library\web\framework\ewf\wsf echo Install library: ewf/wsf_extension %COPYCMD% %TMP_DIR%\library\server\wsf_extension %TMP_CONTRIB_DIR%\library\web\framework\ewf\wsf_extension +echo Install library: ewf/wsf_html +%COPYCMD% %TMP_DIR%\library\server\wsf_html %TMP_CONTRIB_DIR%\library\web\framework\ewf\wsf_html echo Install library: ewf/encoder %COPYCMD% %TMP_DIR%\library\text\encoder %TMP_CONTRIB_DIR%\library\web\framework\ewf\text\encoder diff --git a/tools/install_ewf.sh b/tools/install_ewf.sh index b36c5bfd..439f8acf 100644 --- a/tools/install_ewf.sh +++ b/tools/install_ewf.sh @@ -49,6 +49,9 @@ echo Install library: ewf/wsf COPYCMD $TMP_DIR/library/server/wsf $TMP_CONTRIB_DIR/library/web/framework/ewf/wsf echo Install library: ewf/wsf_extension COPYCMD $TMP_DIR/library/server/wsf_extension $TMP_CONTRIB_DIR/library/web/framework/ewf/wsf_extension +echo Install library: ewf/wsf_html +COPYCMD $TMP_DIR/library/server/wsf_html $TMP_CONTRIB_DIR/library/web/framework/ewf/wsf_html + echo Install library: ewf/encoder 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