backup/EWF
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated structure of EWF, applied

Browse Source 
Now "nino" is under contrib/library/network/server/nino  (as git merge subtree, and not anymore as submodule)
This commit is contained in:
Jocelyn Fiat
2012-06-14 13:35:08 +02:00
parent 2b730186a2
commit 3702842337
8 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@@ -1,6 +1,3 @@
[submodule "contrib/library/server/nino"]
path = contrib/library/server/nino
url = https://github.com/Eiffel-World/EiffelWebNino.git
[submodule "contrib/library/text/parser/json"] [submodule "contrib/library/text/parser/json"]
path = contrib/library/text/parser/json path = contrib/library/text/parser/json
url = https://github.com/Eiffel-World/json.git url = https://github.com/Eiffel-World/json.git

1
contrib/library/server/nino

Submodule contrib/library/server/nino deleted from e85213689e

2
library/server/ewsgi/connectors/nino/nino-safe.ecf
View File

@@ -12,7 +12,7 @@
<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/> <library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
<library name="ewsgi" location="..\..\ewsgi-safe.ecf" readonly="false"/> <library name="ewsgi" location="..\..\ewsgi-safe.ecf" readonly="false"/>
<library name="http" location="../../../../network/protocol/http/http-safe.ecf"/> <library name="http" location="../../../../network/protocol/http/http-safe.ecf"/>
<library name="nino" location="..\..\..\..\..\contrib\library\server\nino\nino-safe.ecf" readonly="false"> <library name="nino" location="../../../wsf/connector/nino-safe.ecf" readonly="false">
<renaming old_name="HTTP_CONSTANTS" new_name="NINO_HTTP_CONSTANTS"/> <renaming old_name="HTTP_CONSTANTS" new_name="NINO_HTTP_CONSTANTS"/>
</library> </library>
<cluster name="src" location=".\src\" recursive="true"/> <cluster name="src" location=".\src\" recursive="true"/>

2
library/server/ewsgi/connectors/nino/nino.ecf
View File

@@ -12,7 +12,7 @@
<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/> <library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
<library name="ewsgi" location="..\..\ewsgi.ecf" readonly="false"/> <library name="ewsgi" location="..\..\ewsgi.ecf" readonly="false"/>
<library name="http" location="../../../../network/protocol/http/http.ecf"/> <library name="http" location="../../../../network/protocol/http/http.ecf"/>
<library name="nino" location="..\..\..\..\..\contrib\library\server\nino\nino.ecf" readonly="false"> <library name="nino" location="../../../wsf/connector/nino.ecf" readonly="false">
<renaming old_name="HTTP_CONSTANTS" new_name="NINO_HTTP_CONSTANTS"/> <renaming old_name="HTTP_CONSTANTS" new_name="NINO_HTTP_CONSTANTS"/>
</library> </library>
<cluster name="src" location=".\src\" recursive="true"/> <cluster name="src" location=".\src\" recursive="true"/>

2
library/server/wsf/connector/all-safe.ecf
View File

@@ -16,7 +16,7 @@
<library name="connector_cgi" location="../../ewsgi/connectors/cgi/cgi-safe.ecf"/> <library name="connector_cgi" location="../../ewsgi/connectors/cgi/cgi-safe.ecf"/>
<library name="connector_libfcgi" location="../../ewsgi/connectors/libfcgi/libfcgi-safe.ecf"/> <library name="connector_libfcgi" location="../../ewsgi/connectors/libfcgi/libfcgi-safe.ecf"/>
<library name="connector_nino" location="../../ewsgi/connectors/nino/nino-safe.ecf"/> <library name="connector_nino" location="../../ewsgi/connectors/nino/nino-safe.ecf"/>
<library name="nino" location="..\..\..\..\contrib\library\server\nino\nino-safe.ecf" readonly="false"> <library name="nino" location="nino-safe.ecf" readonly="false">
<renaming old_name="HTTP_CONSTANTS" new_name="NINO_HTTP_CONSTANTS"/> <renaming old_name="HTTP_CONSTANTS" new_name="NINO_HTTP_CONSTANTS"/>
</library> </library>

2
library/server/wsf/connector/nino-safe.ecf
View File

@@ -14,7 +14,7 @@
<library name="ewsgi" location="../../ewsgi/ewsgi-safe.ecf"/> <library name="ewsgi" location="../../ewsgi/ewsgi-safe.ecf"/>
<library name="wsf" location="../wsf-safe.ecf"/> <library name="wsf" location="../wsf-safe.ecf"/>
<library name="connector_nino" location="../../ewsgi/connectors/nino/nino-safe.ecf"/> <library name="connector_nino" location="../../ewsgi/connectors/nino/nino-safe.ecf"/>
<library name="nino" location="..\..\..\..\contrib\library\server\nino\nino-safe.ecf" readonly="false"> <library name="nino" location="" readonly="false">
<renaming old_name="HTTP_CONSTANTS" new_name="NINO_HTTP_CONSTANTS"/> <renaming old_name="HTTP_CONSTANTS" new_name="NINO_HTTP_CONSTANTS"/>
</library> </library>

2
library/server/wsf/connector/nino.ecf
View File

@@ -14,7 +14,7 @@
<library name="ewsgi" location="../../ewsgi/ewsgi.ecf"/> <library name="ewsgi" location="../../ewsgi/ewsgi.ecf"/>
<library name="wsf" location="../wsf.ecf"/> <library name="wsf" location="../wsf.ecf"/>
<library name="connector_nino" location="../../ewsgi/connectors/nino/nino.ecf"/> <library name="connector_nino" location="../../ewsgi/connectors/nino/nino.ecf"/>
<library name="nino" location="..\..\..\..\contrib\library\server\nino\nino.ecf" readonly="false"> <library name="nino" location="" readonly="false">
<renaming old_name="HTTP_CONSTANTS" new_name="NINO_HTTP_CONSTANTS"/> <renaming old_name="HTTP_CONSTANTS" new_name="NINO_HTTP_CONSTANTS"/>
</library> </library>

10
tools/install_ewf.bat
View File

@@ -61,16 +61,16 @@ echo Install examples
%COPYCMD% %TMP_DIR%\examples %TMP_TARGET_DIR%\examples\ewf %COPYCMD% %TMP_DIR%\examples %TMP_TARGET_DIR%\examples\ewf
echo Install library: error echo Install library: error
%COPYCMD% %TMP_DIR%\library\error %TMP_TARGET_DIR%\library\utility\general\error %COPYCMD% %TMP_DIR%\library\utility\general\error %TMP_TARGET_DIR%\library\utility\general\error
echo Install library: http_client echo Install library: http_client
%COPYCMD% %TMP_DIR%\library\client\http_client %TMP_TARGET_DIR%\library\network\http_client %COPYCMD% %TMP_DIR%\library\network\http_client %TMP_TARGET_DIR%\library\network\http_client
echo Install library: http echo Install library: http
%COPYCMD% %TMP_DIR%\library\protocol\http %TMP_TARGET_DIR%\library\network\protocol\http %COPYCMD% %TMP_DIR%\library\network\protocol\http %TMP_TARGET_DIR%\library\network\protocol\http
echo Install library: uri_template echo Install library: uri_template
%COPYCMD% %TMP_DIR%\library\protocol\uri_template %TMP_TARGET_DIR%\library\text\parser\uri_template %COPYCMD% %TMP_DIR%\library\text\parser\uri_template %TMP_TARGET_DIR%\library\text\parser\uri_template
echo Install contrib library: nino echo Install contrib library: nino
%COPYCMD% %TMP_DIR%\contrib\library\server\nino %TMP_TARGET_DIR%\contrib\library\network\server\nino %COPYCMD% %TMP_DIR%\contrib\library\network\server\nino %TMP_TARGET_DIR%\contrib\library\network\server\nino
cd %TMP_TARGET_DIR% cd %TMP_TARGET_DIR%
call %~dp0\bin\ecf_updater.bat --force --backup --verbose --diff --ise_library . call %~dp0\bin\ecf_updater.bat --force --backup --verbose --diff --ise_library .