[gobo-eiffel-commits] CVS: gobo/test/precomp test_precomp.e,1.11,1.12 precomp.xace,1.6,1.7

[Eric B. <er...@us...>]

Update of /cvsroot/gobo-eiffel/gobo/test/precomp
In directory sc8-pr-cvs1:/tmp/cvs-serv3399/test/precomp

Modified Files:
	test_precomp.e precomp.xace 
Log Message:
Precompile in dotnet mode with ISE Eiffel when $GOBO_DOTNET has been set.

Index: test_precomp.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/test/precomp/test_precomp.e,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** test_precomp.e	25 Nov 2003 21:03:55 -0000	1.11
--- test_precomp.e	27 Nov 2003 16:47:50 -0000	1.12
***************
*** 95,115 ****
  			eif_compiler: STRING
  			define_base: STRING
! 			ise_5_1: STRING
  		do
! 			ise_5_1 := Execution_environment.variable_value ("ISE_5_1")
  			old_cwd := file_system.cwd
  			file_system.create_directory (testdir)
  			assert (testdir + "_exists", file_system.directory_exists (testdir))
  			file_system.cd (testdir)
  				-- Generate Ace file.
  			if base then
! 				if ise_5_1 /= Void and then ise_5_1.count > 0 then
! 					define_base := "--define=%"GOBO_EIFFELBASE ISE_5_1%" "
  				else
  					define_base := "--define=%"GOBO_EIFFELBASE%" "
  				end
  			else
! 				if ise_5_1 /= Void and then ise_5_1.count > 0 then
! 					define_base := "--define=%"ISE_5_1%" "
  				else
  					define_base := ""
--- 95,118 ----
  			eif_compiler: STRING
  			define_base: STRING
! 			dotnet: STRING
  		do
! 			dotnet := Execution_environment.variable_value ("GOBO_DOTNET")
  			old_cwd := file_system.cwd
  			file_system.create_directory (testdir)
  			assert (testdir + "_exists", file_system.directory_exists (testdir))
  			file_system.cd (testdir)
+ 				-- Make sure that there is not left-over from
+ 				-- previous precompilation.
+ 			assert ("EIFGEN_not_exists", not file_system.directory_exists ("EIFGEN"))
  				-- Generate Ace file.
  			if base then
! 				if dotnet /= Void and then dotnet.count > 0 then
! 					define_base := "--define=%"GOBO_EIFFELBASE GOBO_DOTNET%" "
  				else
  					define_base := "--define=%"GOBO_EIFFELBASE%" "
  				end
  			else
! 				if dotnet /= Void and then dotnet.count > 0 then
! 					define_base := "--define=%"GOBO_DOTNET%" "
  				else
  					define_base := ""
***************
*** 123,131 ****
  			assert_execute ("finish_freezing -silent" + output_log)
  				-- Check creation of precompiled files.
! 			eif_compiler := Execution_environment.variable_value ("ISE_C_COMPILER")
! 			if eif_compiler /= Void and then eif_compiler.count > 0 then
! 				assert ("driver_exists", file_system.file_exists (file_system.pathname (eif_compiler, "driver" + file_system.exe_extension)))
  			else
! 				assert ("driver_exists", file_system.file_exists ("driver" + file_system.exe_extension))
  			end
  				-- Done.
--- 126,138 ----
  			assert_execute ("finish_freezing -silent" + output_log)
  				-- Check creation of precompiled files.
! 			if dotnet /= Void and then dotnet.count > 0 then
! 				assert ("driver_exists", file_system.file_exists ("precomp" + file_system.exe_extension))
  			else
! 				eif_compiler := Execution_environment.variable_value ("ISE_C_COMPILER")
! 				if eif_compiler /= Void and then eif_compiler.count > 0 then
! 					assert ("driver_exists", file_system.file_exists (file_system.pathname (eif_compiler, "driver" + file_system.exe_extension)))
! 				else
! 					assert ("driver_exists", file_system.file_exists ("driver" + file_system.exe_extension))
! 				end
  			end
  				-- Done.

Index: precomp.xace
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/test/precomp/precomp.xace,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** precomp.xace	7 Feb 2003 13:21:00 -0000	1.6
--- precomp.xace	27 Nov 2003 16:47:50 -0000	1.7
***************
*** 10,13 ****
--- 10,18 ----
  	</description>
  
+ 	<option if="${GOBO_DOTNET}">
+ 		<option name="msil_generation" value="true"/>
+ 		<option name="line_generation" value="true"/>
+ 	</option>
+ 
  	<mount location="${GOBO}/library/kernel/library.xace"/>
  	<mount location="${GOBO}/library/lexical/library.xace"/>