diff --git a/windows/install/_setup.dll b/windows/install/_setup.dll index 084d1d358..270be7b20 100755 Binary files a/windows/install/_setup.dll and b/windows/install/_setup.dll differ diff --git a/windows/install/declare.rul b/windows/install/declare.rul index 077d94297..b63e4cda0 100755 --- a/windows/install/declare.rul +++ b/windows/install/declare.rul @@ -10,7 +10,6 @@ declare BOOL bInstPresente, bNuovaInst, bDatiPresenti; BOOL bIsNet; BOOL bProgrammiServer; - BOOL bInstNTEutron, bInstNTHardlock; BOOL bCannotExecute; NUMBER nSystemFileModified; @@ -93,7 +92,6 @@ declare prototype _ProgramPrologue( ); prototype _ProgramEpilogue( ); prototype _Benvenuto( ); -prototype _FindExistingInst(BYREF STRING);// controlla la presenza dell'applicazione prototype _CheckExistingInst(STRING);// controlla la presenza dell'applicazione prototype _CheckExistingData(STRING);// controlla la presenza dell'applicazione @@ -105,18 +103,14 @@ prototype _SelectNetConfig(BYREF NUMBER ); prototype _SelectDataDestination(BYREF NUMBER); prototype _SelectDataType( BYREF NUMBER); prototype _SelectDongleServer(BYREF NUMBER); -prototype _SelectDongleXP(BYREF NUMBER); prototype _FindAutoStartFolder(BYREF NUMBER); prototype _SelectDongleServerDestination(BYREF NUMBER); -prototype _AddOrOverwrite(BYREF NUMBER); prototype _ConfirmInstallation(BYREF NUMBER ); prototype _InstallData(BYREF NUMBER); prototype _InstallInitialFiles(BYREF NUMBER); prototype _InstallServerAutoStart(BYREF NUMBER); prototype _ResetDongleServer(BYREF STRING); prototype _RestoreDongleServer(STRING); -prototype _InstallDongleXP(BYREF NUMBER); -prototype _NewNetWorkPlace(BYREF NUMBER); // first level prototype _ExitOnConfirm( ); @@ -134,7 +128,6 @@ prototype _CambiaDirectory( ); prototype _CreateDLG( STRING, INT, LONG ); prototype _FineInstallazione( ); -prototype _UpdateSysFiles( ); prototype _SetCampoIni(); prototype _CopiaADMININI( ); diff --git a/windows/install/licenza.txt b/windows/install/licenza.txt index 71149d828..07b2ff1a7 100755 --- a/windows/install/licenza.txt +++ b/windows/install/licenza.txt @@ -1,6 +1,6 @@ ACCORDO DI LICENZA SUL SOFTWARE -Ai termini ed alle condizioni che seguono, DOUBLE-ONE S.p.A., in forza dei diritti di sfruttamento commerciale, si obbliga e concede in licenza d'uso al Cliente il prodotto di software corredato dalla documentazione d'uso. Pertanto DOUBLE-ONE S.p.A. (di seguito indicata come Concedente), non vende alcun diritto per il proprio software, e mantiene ogni diritto su tutto il software distribuito. +Ai termini ed alle condizioni che seguono, AGA s.r.l., in forza dei diritti di sfruttamento commerciale, si obbliga e concede in licenza d'uso al Cliente il prodotto di software corredato dalla documentazione d'uso. Pertanto AGA s.r.l. (di seguito indicata come Concedente), non vende alcun diritto per il proprio software, e mantiene ogni diritto su tutto il software distribuito. Il Concedente da una parte ed il Cliente dall'altra, concordano quindi tra loro quanto segue: L'installazione dei programmi contenuti in questo CD-ROM implica l'accettazione e l'osservanza dei termini specificati in questo accordo di licenza, tranne che per quanto concerne l'applicazione dell'art. 1341 C.C. diff --git a/windows/install/psetup.dll b/windows/install/psetup.dll index 893e8ffb6..cbf165a3a 100755 Binary files a/windows/install/psetup.dll and b/windows/install/psetup.dll differ diff --git a/windows/install/setup.rul b/windows/install/setup.rul index 3570f35c1..acd999e4e 100755 --- a/windows/install/setup.rul +++ b/windows/install/setup.rul @@ -10,8 +10,8 @@ declare NUMBER nHandle, nResult, nReinstall, nNewInstall; STRING szText, szModifiedPath, szDongle, szInstType,szReinstallPath,szCampoIni; - BOOL bSetupStandard, bInstallModules, bInstallEnv, bInstallFirm, bInstallDemo, bInstallDemoData, bInstallNetWrkChk; - BOOL bInstallData, bInstallPrg, bUseDongleServer, bInstallServer, bXPServicesInstalled; + BOOL bSetupStandard, bInstallEnv, bInstallFirm, bInstallDemo, bInstallDemoData, bInstallNetWrkChk; + BOOL bInstallData, bInstallPrg, bUseDongleServer, bInstallServer; // Function declarations. prototype _SetupScreen(); prototype _CheckRequirements(); @@ -31,10 +31,6 @@ Step_start: nNewInstall = 0; bInstallPrg = TRUE; bInstallData = FALSE; - bInstNTEutron = FALSE; - bInstNTHardlock = FALSE; - bCannotExecute = FALSE; - bXPServicesInstalled = FALSE; _ProgramPrologue(); @@ -49,8 +45,7 @@ Step_start: #define APPBASE_PATH "\\" #define COMPANY_NAME "A.G.A. Informatica srl" #define PRODUCT_NAME "Campo" -#define PRODUCT_VERSION "2.2 " - +#define PRODUCT_VERSION "3.1" #define DEINSTALL_KEY "SampleDeinstKey" #define PRODUCT_KEY "ba0.exe" #define DATATYPE_FILE "datatype." @@ -87,13 +82,17 @@ Step_chooseinst: _SelectSetupMode(nDirection); if (nDirection=BACK) then goto Step_license; - endif ; + endif; -Step_choosewhere: - _SelectProgramDestination(nDirection); - if (nDirection=BACK) then - goto Step_chooseinst; - endif ; +Step_choosewhere: + _SelectProgramDestination(nDirection); + if (nDirection=BACK) then + goto Step_chooseinst; + endif; + if (nReinstall > 0 && szReinstallPath != "") then + bInstallEnv = TRUE; + goto Step_installPrg; + endif; Step_choosecomp: _SelectWhatToInstall(nDirection); @@ -125,12 +124,6 @@ Step_chooseDongleServer: goto Step_choosedata; endif; -//Step_chooseNTDongle: -// _SelectDongleXP(nDirection); -// if nDirection=BACK then -// goto Step_chooseDongleServer; -// endif; - Step_whereDongleServer: _FindAutoStartFolder(nDirection); _SelectDongleServerDestination(nDirection); @@ -139,18 +132,14 @@ Step_whereDongleServer: endif; // *********************************** -// * local installation +// * installation Step_newORupdate: - _AddOrOverwrite(nDirection); - if nDirection=BACK then - goto Step_whereDongleServer; - endif; -Step_confirm1: +Step_confirm: _ConfirmInstallation(nDirection); if nDirection=BACK then - goto Step_newORupdate; + goto Step_whereDongleServer; endif; Step_installData: @@ -172,12 +161,11 @@ Step_installServerAutoStart: endif; Step_LaunchBa1: - if bInstallModules then - ChangeDirectory(szAppPath); - _ResetDongleServer(szDongle); - LaunchAppAndWait("ba1.exe","-6 -uADMIN",WAIT); - _RestoreDongleServer(szDongle); - endif; + ChangeDirectory(szAppPath); + _ResetDongleServer(szDongle); + LaunchAppAndWait("ba1.exe","-6 -uADMIN",WAIT); + _RestoreDongleServer(szDongle); + Step_LaunchServer: if bInstallServer then @@ -188,39 +176,10 @@ Step_LaunchServer: _ProgramEpilogue(); exit; -// *********************************** -// * network installation - -//Step_installnet: -// _ConfirmInstallation(nDirection); -// if nDirection=BACK then -// goto Step_whereDongleServer; -// endif; - -//Step_installKeyServices: -// _InstallDongleXP(nDirection); -// if nDirection=BACK then -// goto Step_whereDongleServer; -// endif; - -//nStep_installData: -// _InstallData(nDirection); -// if (nDirection=BACK) then -// goto Step_whereDongleServer; -// endif; - -//Step_installwrkst: -// _NewNetWorkPlace(nDirection); -// if (nDirection=BACK) then -// goto Step_whereDongleServer; -// endif; - -// _ProgramEpilogue(); -// exit; - #include "setup1.rul" #include "setup2.rul" #include "setup3.rul" #include "setup4.rul" #include "winsub.rul" #include "sddialog.rul" +