fixed various issue between dos and tccle.

windows_deliv/.gitignore

@@ -1 +1,3 @@
 nightly
+include
+isevpn

windows_deliv/make_installations.btm

@@ -58,17 +58,22 @@ iff .%1.==.. then
 	remtrace ==================================================
 	remtrace Recompile Custom actions for installation program
 	remtrace ==================================================
-
 	if "%NO_ENTERPRISE_BUILD%" NEQ "True" (
-		cdd %EIFFEL_SRC
+		remtrace NO_ENTERPRISE_BUILD=%NO_ENTERPRISE_BUILD%
+		cd %EIFFEL_SRC
 		cd tools
-		if EXIST %INIT_DIR%\isesvn\tools\setup (
+		iff EXIST %INIT_DIR%\isesvn\tools\setup then
-			if not EXIST setup (
+			remtrace Get ISE SVN tools setup from folder
-				xcopy %INIT_DIR%\isesvn\tools\setup setup /E /I
+			iff EXIST setup then
-			)
+				fullrd setup
-		) else (
+			endiff
+			xcopy /E /I /Y %INIT_DIR%\isesvn\tools\setup setup
+		else
+			remtrace Get ISE SVN tools setup from subversion
 			co %DEFAULT_ISE_SVN%/Src/tools/setup setup
-		)
+		endiff
+
+		remtrace Build studio setup.dll
 		cd %EIFFEL_SRC\tools\setup\studio
 		clean_project
 		finalize setup.ecf
@@ -96,19 +101,16 @@ safe_md %INSTALL_DIR\setups\enterprise
 
 ren %INSTALL_DIR%\releases\enterprise_version\LICENSE %INSTALL_DIR%\releases\enterprise_version\LICENSE_ENTERPRISE
 
+if exist %INSTALL_DIR%\%STUDIO_NAME% (
+    echo issue from previous building!
+    ren %INSTALL_DIR%\%STUDIO_NAME% %INSTALL_DIR%\EiffelStudio
+)
+
 
 remtrace Creating WIX files
 espawn -u:%ISE_C_COMPILER_VER% "nmake /nologo clean"
 espawn -u:%ISE_C_COMPILER_VER% "nmake /nologo"
 
-if "%NO_GPL_BUILD%" NEQ "True" (
-	remtrace Preparing GPL edition
-	remtrace Clean previous GPL WIX files
-	rem fullrd %INIT_DIR%\install\bin\studio_gpl_%WINNAME%
-	espawn -u:%ISE_C_COMPILER_VER%  "nmake /nologo gpl_%WINNAME"
-	safe_copy %INIT_DIR\install\bin\studio_gpl_%WINNAME\package.msi %INSTALL_DIR\setups\gpl\%STUDIO_NAME%_gpl_%SVN_VERSION-%ISE_PLATFORM%.msi
-)
-
 if "%NO_ENTERPRISE_BUILD%" NEQ "True" (
 	remtrace Preparing Commercial edition
 	remtrace Clean previous ENT WIX files
@@ -117,34 +119,49 @@ if "%NO_ENTERPRISE_BUILD%" NEQ "True" (
 	safe_copy %INIT_DIR\install\bin\studio_ent_%WINNAME\package.msi %INSTALL_DIR\setups\enterprise\%STUDIO_NAME%_ent_%SVN_VERSION-%ISE_PLATFORM%.msi
 )
 
+if "%NO_GPL_BUILD%" NEQ "True" (
+	remtrace Preparing GPL edition
+	remtrace Clean previous GPL WIX files
+	rem fullrd %INIT_DIR%\install\bin\studio_gpl_%WINNAME%
+	espawn -u:%ISE_C_COMPILER_VER%  "nmake /nologo gpl_%WINNAME"
+	safe_copy %INIT_DIR\install\bin\studio_gpl_%WINNAME\package.msi %INSTALL_DIR\setups\gpl\%STUDIO_NAME%_gpl_%SVN_VERSION-%ISE_PLATFORM%.msi
+)
 
 remtrace ==============================================
 remtrace Building the Zips
 remtrace ==============================================
 cdd %INSTALL_DIR
 if "%NO_GPL_BUILD%" NEQ "True" (
-	ren EiffelStudio %STUDIO_NAME%
+	if exist %INSTALL_DIR\setups\gpl\%STUDIO_NAME%_gpl_%SVN_VERSION-%ISE_PLATFORM%.7z (
-	remtrace GPL archive
+		remtrace GPL archive: reuse
-	safe_copy %INSTALL_DIR\releases\gpl_version\ec.exe %INSTALL_DIR\%STUDIO_NAME%\studio\spec\%ISE_PLATFORM%\bin
+	) else (
-	safe_copy %INSTALL_DIR\releases\gpl_version\ecb.exe %INSTALL_DIR\%STUDIO_NAME%\studio\spec\%ISE_PLATFORM%\bin
+		ren EiffelStudio %STUDIO_NAME%
-	iff exist %INSTALL_DIR\releases\gpl_version\LICENSE then
+		remtrace GPL archive
-		safe_copy %INSTALL_DIR\releases\gpl_version\LICENSE %INSTALL_DIR\%STUDIO_NAME%\LICENSE
+		safe_copy %INSTALL_DIR\releases\gpl_version\ec.exe %INSTALL_DIR\%STUDIO_NAME%\studio\spec\%ISE_PLATFORM%\bin
-	else
+		safe_copy %INSTALL_DIR\releases\gpl_version\ecb.exe %INSTALL_DIR\%STUDIO_NAME%\studio\spec\%ISE_PLATFORM%\bin
-		remtrace Missing GPL license text
+		iff exist %INSTALL_DIR\releases\gpl_version\LICENSE then
-	endiff
+			safe_copy %INSTALL_DIR\releases\gpl_version\LICENSE %INSTALL_DIR\%STUDIO_NAME%\LICENSE
-	7z a -t7z %INSTALL_DIR\setups\gpl\%STUDIO_NAME%_gpl_%SVN_VERSION-%ISE_PLATFORM%.7z %STUDIO_NAME% -mx9 >>& %INSTALL_LOG
+		else
+			remtrace Missing GPL license text
+		endiff
+		7z a -t7z %INSTALL_DIR\setups\gpl\%STUDIO_NAME%_gpl_%SVN_VERSION-%ISE_PLATFORM%.7z %STUDIO_NAME% -mx9 >>& %INSTALL_LOG
+	)
 )
 
 if "%NO_ENTERPRISE_BUILD%" NEQ "True" (
-	remtrace Enterprise archive
+	if exist %INSTALL_DIR\setups\enterprise\%STUDIO_NAME%_ent_%SVN_VERSION-%ISE_PLATFORM%.7z (
-	safe_copy %INSTALL_DIR\releases\enterprise_version\ec.exe %INSTALL_DIR\%STUDIO_NAME%\studio\spec\%ISE_PLATFORM%\bin
+		remtrace Enterprise archive: reuse
-	safe_copy %INSTALL_DIR\releases\enterprise_version\ecb.exe %INSTALL_DIR\%STUDIO_NAME%\studio\spec\%ISE_PLATFORM%\bin
+	) else (
-	iff exist %INSTALL_DIR\releases\enterprise_version\LICENSE_ENTERPRISE then
+		remtrace Enterprise archive
-		safe_copy %INSTALL_DIR\releases\enterprise_version\LICENSE_ENTERPRISE %INSTALL_DIR\%STUDIO_NAME%\LICENSE
+		safe_copy %INSTALL_DIR\releases\enterprise_version\ec.exe %INSTALL_DIR\%STUDIO_NAME%\studio\spec\%ISE_PLATFORM%\bin
-	else
+		safe_copy %INSTALL_DIR\releases\enterprise_version\ecb.exe %INSTALL_DIR\%STUDIO_NAME%\studio\spec\%ISE_PLATFORM%\bin
-		remtrace Missing Enterprise license text
+		iff exist %INSTALL_DIR\releases\enterprise_version\LICENSE then
-	endiff
+			safe_copy %INSTALL_DIR\releases\enterprise_version\LICENSE %INSTALL_DIR\%STUDIO_NAME%\LICENSE
-	7z a -t7z %INSTALL_DIR\setups\enterprise\%STUDIO_NAME%_ent_%SVN_VERSION-%ISE_PLATFORM%.7z %STUDIO_NAME% -mx9 >>& %INSTALL_LOG
+		else
+			remtrace Missing Enterprise license text
+		endiff
+		7z a -t7z %INSTALL_DIR\setups\enterprise\%STUDIO_NAME%_ent_%SVN_VERSION-%ISE_PLATFORM%.7z %STUDIO_NAME% -mx9 >>& %INSTALL_LOG
+	)
 )
 
 remtrace Restoring the layout to its original state