Updated roc tools, and associated scripts.

Also include Eiffel Store ODBC persistence.

examples/demo/demo-safe.ecf

@@ -36,8 +36,8 @@
 				<assertions/>
 			</option>
 		</library>
-		<!--
 		<library name="persistence_store_odbc" location="..\..\library\persistence\store_odbc\store_odbc-safe.ecf" />
+		<!--
 		<library name="persistence_store_mysql" location="..\..\library\persistence\store_mysql\store_mysql-safe.ecf" />
 		-->
 		<library name="wsf" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf-safe.ecf"/>
@@ -52,7 +52,7 @@
 		<option debug="true">
 			<debug name="dbglog" enabled="true"/>
 		</option>
-		<setting name="concurrency" value="thread"/>
+		<setting name="concurrency" value="scoop"/>
 		<variable name="httpd_ssl_disabled" value="true"/>
 		<library name="standalone_launcher" location="..\..\launcher\standalone-safe.ecf" readonly="false"/>
 		<cluster name="src" location=".\src\" recursive="true"/>

examples/demo/src/demo_cms_execution.e

@@ -35,7 +35,7 @@ feature -- CMS storage
 		do
 			a_setup.storage_drivers.force (create {CMS_STORAGE_SQLITE3_BUILDER}.make, "sqlite3")
 --			a_setup.storage_drivers.force (create {CMS_STORAGE_STORE_MYSQL_BUILDER}.make, "mysql")
---			a_setup.storage_drivers.force (create {CMS_STORAGE_STORE_ODBC_BUILDER}.make, "odbc")
+			a_setup.storage_drivers.force (create {CMS_STORAGE_STORE_ODBC_BUILDER}.make, "odbc")
 		end
 
 feature -- CMS modules

tools/install.bat

@@ -4,6 +4,7 @@ set TMP_EXCLUDE=%~dp0.install_ROC-copydir-exclude
 set COPYCMD= xcopy /EXCLUDE:%TMP_EXCLUDE% /I /E /Y 
 set TMP_DIR=%~dp0..
 set SAFE_RMDIR=rd /q/s
+set SAFE_RM=del
 
 echo EIFGENs > %TMP_EXCLUDE%
 echo .git >> %TMP_EXCLUDE%
@@ -61,6 +62,10 @@ echo Install ROC as CMS ewf
 %COPYCMD% %TMP_DIR%\modules	%TMP_UNSTABLE_DIR%\library\web\cms\modules
 %COPYCMD% %TMP_DIR%\examples	%TMP_UNSTABLE_DIR%\library\web\cms\examples
 
+%COPYCMD% %TMP_DIR%\tools	%TMP_UNSTABLE_DIR%\library\web\cms\tools
+%SAFE_RM% %TMP_UNSTABLE_DIR%\library\web\cms\tools\install.bat
+%SAFE_RM% %TMP_UNSTABLE_DIR%\library\web\cms\tools\safe_md.bat
+
 copy %TMP_DIR%\cms.ecf %TMP_UNSTABLE_DIR%\library\web\cms\cms.ecf
 copy %TMP_DIR%\cms-safe.ecf %TMP_UNSTABLE_DIR%\library\web\cms\cms-safe.ecf
 copy %TMP_DIR%\README.md %TMP_UNSTABLE_DIR%\library\web\cms\README.md

tools/roc/roc_install_command.e

@@ -170,6 +170,8 @@ feature -- Execution
 						print ("%NCheck the module elements at ")
 						print (l_dest_dir.path.name)
 						print (".%N")
+						print ("Copied " + directories_count.out + " directories.%N")
+						print ("Copied " + files_count.out + " files.%N")
 					else
 						print ({STRING_32} "The CMS Application located at " + l_cms_path.name + "does not have the site or modules folders.%N")
 					end
@@ -202,9 +204,17 @@ feature -- Execution
 			if not l_dest_dir.exists then
 				l_dest_dir.create_dir
 			end
+			files_count := 0
+			directories_count := -1
 			copy_directory (l_src_dir, l_dest_dir, True)
 		end
 
+	files_count: INTEGER
+			-- Number of copied files during installation.
+
+	directories_count: INTEGER
+			-- Number of copied directories during installation.
+
 feature {NONE} -- System/copy files
 
 	copy_directory (a_src: DIRECTORY; a_dest: DIRECTORY; is_recursive: BOOLEAN)
@@ -217,6 +227,7 @@ feature {NONE} -- System/copy files
 			l_file: FILE
 			ut: FILE_UTILITIES
 		do
+			directories_count := directories_count + 1
 			across
 				a_src.entries as ic
 			loop
@@ -259,6 +270,7 @@ feature {NONE} -- System/copy files
 						a_file.copy_to (l_dest)
 						a_file.close
 						l_dest.close
+						files_count := files_count + 1
 					end
 				end
 			end