Updated structure of EWF, applied
Now "nino" is under contrib/library/network/server/nino (as git merge subtree, and not anymore as submodule)
This commit is contained in:
3
.gitmodules
vendored
3
.gitmodules
vendored
@@ -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"]
|
||||
path = contrib/library/text/parser/json
|
||||
url = https://github.com/Eiffel-World/json.git
|
||||
|
||||
Submodule contrib/library/server/nino deleted from e85213689e
@@ -12,7 +12,7 @@
|
||||
<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
|
||||
<library name="ewsgi" location="..\..\ewsgi-safe.ecf" readonly="false"/>
|
||||
<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"/>
|
||||
</library>
|
||||
<cluster name="src" location=".\src\" recursive="true"/>
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
|
||||
<library name="ewsgi" location="..\..\ewsgi.ecf" readonly="false"/>
|
||||
<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"/>
|
||||
</library>
|
||||
<cluster name="src" location=".\src\" recursive="true"/>
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
<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_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"/>
|
||||
</library>
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
<library name="ewsgi" location="../../ewsgi/ewsgi-safe.ecf"/>
|
||||
<library name="wsf" location="../wsf-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"/>
|
||||
</library>
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
<library name="ewsgi" location="../../ewsgi/ewsgi.ecf"/>
|
||||
<library name="wsf" location="../wsf.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"/>
|
||||
</library>
|
||||
|
||||
|
||||
@@ -61,16 +61,16 @@ echo Install examples
|
||||
%COPYCMD% %TMP_DIR%\examples %TMP_TARGET_DIR%\examples\ewf
|
||||
|
||||
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
|
||||
%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
|
||||
%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
|
||||
%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
|
||||
%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%
|
||||
call %~dp0\bin\ecf_updater.bat --force --backup --verbose --diff --ise_library .
|
||||
|
||||
Reference in New Issue
Block a user