From a43ce0c3c0e679d479beee97db584f2d37067154 Mon Sep 17 00:00:00 2001 From: luca Date: Mon, 27 Sep 2004 08:37:51 +0000 Subject: [PATCH] Patch level :2.2 nopatch Files correlati : Ricompilazione Demo : [ ] Commento : cvs-ate le modifiche al setup sul main trunk git-svn-id: svn://10.65.10.50/trunk@12345 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- windows/install/SETUP.LST | 2 +- windows/install/setup.rul | 2 +- windows/install/setup1.rul | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/windows/install/SETUP.LST b/windows/install/SETUP.LST index 45abeb8d3..8e3b7a74a 100755 --- a/windows/install/SETUP.LST +++ b/windows/install/SETUP.LST @@ -1,6 +1,6 @@ 1; datidemo.z -datiditt.z +datistd.z sys.z winsys.z sysnt.z diff --git a/windows/install/setup.rul b/windows/install/setup.rul index 1cfd9bddd..9ca7ca414 100755 --- a/windows/install/setup.rul +++ b/windows/install/setup.rul @@ -49,7 +49,7 @@ Step_start: #define APPBASE_PATH "\\" #define COMPANY_NAME "A.G.A. Informatica srl" #define PRODUCT_NAME "OneRed" -#define PRODUCT_VERSION "2.1 " +#define PRODUCT_VERSION "2.2 " #define DEINSTALL_KEY "SampleDeinstKey" #define PRODUCT_KEY "ba0.exe" #define DATATYPE_FILE "datatype." diff --git a/windows/install/setup1.rul b/windows/install/setup1.rul index 1a0f2fd20..4fe19b19e 100755 --- a/windows/install/setup1.rul +++ b/windows/install/setup1.rul @@ -125,6 +125,7 @@ begin endif; nRetv=AskDestPath( "", "", szConfigPath, 0 ); + StrRemoveLastSlash(szConfigPath); if (nRetv=BACK) then return ; endif; @@ -535,7 +536,7 @@ begin endif; endwhile; if bCannotExecute then - _Attenzione("Assicurarsi che i servizi NT/2000/XP siano attivi prima di lanciare il programma"); + _Attenzione("Assicurarsi che i servizi NT/2000/XP siano attivi prima di eseguire il programma"); endif; endif; #endif @@ -791,7 +792,7 @@ begin elseif bInstallFirm then szTitle = "Installazione dati comuni e standard su " + szDataPath; FileSetBeginDefine ( "DATI"); - if ( CompressGet( "DATIDITT.Z", "*.*", INCLUDE_SUBDIR ) < 0) then + if ( CompressGet( "DATISTD.Z", "*.*", INCLUDE_SUBDIR ) < 0) then szText = STR_ERR_DECOMPRESS + " il modulo Dati ditta."; _Attenzione( szText ); endif;