updated git howto

README.md

@@ -1,5 +1,7 @@
 # Eiffel Web Framework
 
+## Version: v0.1
+
 
 ## Overview
 
@@ -46,7 +48,7 @@ An alternative to the last 2 instructions is to use the script from tools folder
   * connectors: various web server connectors for EWSGI
 * libfcgi: Wrapper for libfcgi SDK 
 * __wsf__: Web Server Framework [read more](library/server/wsf)
-  *  __router__: URL dispatching/routing based on uri, uri_template, or custom [read more](library/server/wsf/router)
+  *  include URL dispatching/routing based on uri, uri_template, or custom [read more](library/server/wsf/router)
 
 ### protocol
 * __http__: HTTP related classes, constants for status code, content types, ... [read more](library/protocol/http)
@@ -59,16 +61,15 @@ An alternative to the last 2 instructions is to use the script from tools folder
 ### text
 * __encoder__: Various simpler encoders: base64, url-encoder, xml entities, html entities [read more](library/text/encoder)
 
-### crypto
-* eel
-* eapml
-
 ### Others
 * error: very simple/basic library to handle error
 
 ## External libraries under 'contrib'
 * [Eiffel Web Nino](contrib/library/server/nino)
-* ..
+* contrib/ise_library/cURL
+* contrib/ise_library/math/eapml
+* contrib/ise_library/text/encryption/eel
+* contrib/library/text/parser/json
 
 ## Draft folder = call for contribution ##
 ### library/server/request ###

VERSION.txt

@@ -0,0 +1 @@
+Version v0.1

doc/git-tips.txt

@@ -10,6 +10,37 @@ For instance
 Update
 :	git pull -s subtree ewf_wiki master
 
+Reconnect subtree from a cloned repository
+- doc/wiki
+  git remote add -f ewf_wiki https://github.com/EiffelWebFramework/EWF.wiki.git
+  git merge -s ours --no-commit --squash ewf_wiki/master
+  git pull -s subtree ewf_wiki master
+- contrib/ise_library/cURL
+  git remote add -f ewf_curl https://github.com/EiffelSoftware/mirror-Eiffel-cURL.git
+  git merge -s ours --no-commit --squash ewf_curl/master
+  git pull -s subtree ewf_curl master
+- contrib/library/text/parser/json
+  git remote add -f ewf_json https://github.com/eiffelhub/json.git
+  git merge -s ours --no-commit --squash ewf_json/master
+  git pull -s subtree ewf_json master
+- contrib/library/network/server/nino
+  git remote add -f ewf_nino  https://github.com/Eiffel-World/EiffelWebNino.git
+  git merge -s ours --no-commit --squash ewf_nino/master
+  git pull -s subtree ewf_nino master
+
+When there are troubles ... to pull subtree from a cloned repository
+  git remote add -f ewf_nino  https://github.com/Eiffel-World/EiffelWebNino.git
+  git merge -s ours --no-commit --squash ewf_nino/master
+  git checkout ewf_nino/master -b ewf_nino
+  git pull ewf_nino master
+  git checkout master
+  git merge --squash -s subtree --no-commit ewf_nino/master
+
+Note ... even if git is working great also on Windows
+It might occurs that handling the subtree pulling fails on Windows, and works
+on Linux. So I would advice to use Linux to manipulate those subtree
+operation.
+
 
 = remove git submodule =
 1. Delete the relevant section from the .gitmodules file.
@@ -23,3 +54,19 @@ Ex:
 :	git rm --cached doc/wiki
 :	git commit -m "Removed submodule doc/wiki"
 
+= Remove remote tag =
+:	git pull # to marge changes from others
+:	git tag -d v0.1 # delete the tag
+:	git push origin :refs/tags/v0.1 # this remove tag from remote repository
+:	git tag -a v0.1 -m "First official version" # this mark the most recent commit
+:	git push origin v0.1 # push a new tag position to remote repository
+
+= git branches and remote =
+* git push origin my_branch	#push local my_branch to the remote "origin"
+* git push origin :my_branch #delete remote branch "my_branch" from "origin"
+* git branch -d my_branch #delete local branch "my_branch"
+
+* Then from another local repository, you can get this new branch using
+: git fetch origin
+: git checkout --track origin/my_branch -b my_branch
+

tools/install_ewf.bat

@@ -2,7 +2,8 @@
 setlocal
 set TMP_EXCLUDE=%~dp0.install_ewf-copydir-exclude
 set COPYCMD= xcopy /EXCLUDE:%TMP_EXCLUDE% /I /E /Y 
-set SVNCO=svn checkout 
+set SVNCO=svn checkout
+set SVNEXPORT=svn export 
 set TMP_DIR=%~dp0..
 set SAFE_MD=call safe_md
 
@@ -78,37 +79,45 @@ echo Install library: uri_template
 
 echo Install contrib library: nino
 %COPYCMD% %TMP_DIR%\contrib\library\network\server\nino	%TMP_CONTRIB_DIR%\library\network\server\nino
+rem remove fonts folder from nino examples
+rd /q/s %TMP_CONTRIB_DIR%\library\network\server\nino\example\SimpleWebServer\webroot\example\fonts
 
 rem #--- IF Missing ---#
 
+:curl
 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_TARGET_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 if not exist %TMP_CONTRIB_DIR%\library\cURL\cURL.ecf %SVNEXPORT% https://svn.eiffel.com/eiffelstudio/trunk/Src/library/cURL %TMP_CONTRIB_DIR%\library\network\cURL
 
+:json
 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
-if not exist %TMP_CONTRIB_DIR%\library\text\parser\json\library\json.ecf %SVNCO% https://svn.github.com/eiffelhub/json.git %TMP_CONTRIB_DIR%\library\text\parser\json
+if not exist %TMP_CONTRIB_DIR%\library\text\parser\json\library\json.ecf %SVNEXPORT% https://svn.github.com/eiffelhub/json.git %TMP_CONTRIB_DIR%\library\text\parser\json
 
+:eapml
 echo Install eapml if missing
 if not exist %TMP_CONTRIB_DIR%\library\math\eapml %COPYCMD% %TMP_DIR%\contrib\ise_library\math\eapml	%TMP_CONTRIB_DIR%\library\math\eapml
 
+:eel
 echo Install eel if missing
 if not exist %TMP_CONTRIB_DIR%\library\text\encryption\eel %COPYCMD% %TMP_DIR%\contrib\ise_library\text\encryption\eel	%TMP_CONTRIB_DIR%\library\text\encryption\eel
 
+goto ecf_updating
 rem #--- Update ecf files ---#
 
+:ecf_updating
 cd %TMP_TARGET_DIR%
 
 if -%ECF_UPDATER_PATH%- == -- goto use_bin_dir
 set TMP_ECF_UPDATER_CMD=%ECF_UPDATER_PATH%\ecf_updater.exe
-goto ecf_update
+goto call_ecf_update
 
 :use_bin_dir
 set TMP_ECF_UPDATER_CMD=%~dp0\bin\ecf_updater.bat
-goto ecf_update
+goto call_ecf_update
 
-:ecf_update
+:call_ecf_update
 call %TMP_ECF_UPDATER_CMD% --force %2 %3 %4 %5 %6 %7 %8 %9 contrib
 
 :end

tools/install_ewf.sh

@@ -9,7 +9,10 @@ CLEANDIR() {
 	done
 }
 SVNCO() {
-	svn co $1 $2
+	svn checkout $1 $2
+}
+SVNEXPORT() {
+	svn export $1 $2
 }
 COPYCMD() {
 	if [ -d "$1" ]; then
@@ -71,21 +74,25 @@ COPYCMD $TMP_DIR/library/text/parser/uri_template $TMP_CONTRIB_DIR/library/text/
 echo Install contrib library: nino
 mkdir -p $TMP_CONTRIB_DIR/library/network/server
 COPYCMD $TMP_DIR/contrib/library/network/server/nino	$TMP_CONTRIB_DIR/library/network/server/nino
+# remove fonts folder from nino examples
+rm -rf $TMP_CONTRIB_DIR/library/network/server/nino/example/SimpleWebServer/webroot/example/fonts
 
 #--- IF Missing ---#
 
 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
+if [ ! -f "$TMP_TARGET_DIR/library/cURL/cURL.ecf" ]; then
-	SVNCO https://svn.eiffel.com/eiffelstudio/trunk/Src/library/cURL $TMP_CONTRIB_DIR/library/network/cURL
+	if [ ! -f "$TMP_CONTRIB_DIR/library/network/cURL/cURL.ecf" ]; then
+		SVNEXPORT 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
+	SVNEXPORT https://svn.github.com/eiffelhub/json.git $TMP_CONTRIB_DIR/library/text/parser/json
 fi
 
 echo Install eapml if missing