From 03b8504405d4bd464a383f03b758b50f36289665 Mon Sep 17 00:00:00 2001 From: luca Date: Fri, 15 Dec 2006 11:14:07 +0000 Subject: [PATCH] Patch level :4.0 567 Files correlati : Ricompilazione Demo : [ ] Commento :setup.ins & friends git-svn-id: svn://10.65.10.50/trunk@14644 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- windows/install/_setup.dll | Bin 15360 -> 15360 bytes windows/install/declare.rul | 7 --- windows/install/licenza.txt | 2 +- windows/install/psetup.dll | Bin 27232 -> 14480 bytes windows/install/setup.rul | 85 ++++++++++-------------------------- 5 files changed, 23 insertions(+), 71 deletions(-) diff --git a/windows/install/_setup.dll b/windows/install/_setup.dll index 084d1d358e739fcd08c213d877ecd587866ba93e..270be7b202242d9c2e537cabf44e5e67fa8a7e46 100755 GIT binary patch delta 1155 zcmah|F-`+95F8VfK$E1QLkf`)qNIj`k}puv@Bt*6bay`hUVy|4kn({%fCo@q5s436 zx)hPj?5yn^0g08eUVCPD_PkC#t7q@S;U32G@$mHQu%GQ^dQ>S!I>9e%41&CIxa&{| zG!6IihRF&+FbRa|EnAd?+rDWkg9^bJPLPr#Tin!Dhzr9IEIp_JR|s8=&=4YrUX(s8 zF2+q$1v@i_S&B2m0A{)u?s3LF)BPX$Do1G&QUf_w0qIq0%-W<-j@by!D<sIu6V|3ZXVI++`MK&=H>IUGNo|JArRX^jCF_+c-jDXB~v(h~6678SOXDh=1jQIJx=0k#NNNR=`Y7vKimAd1qY3{e^i zq|JM?vtY=G_5OTs-i&`(%oek^EW3EkRyUa|uf4@`*q^7h&hjr#FgB-xv!t`Fn0{=* z+_nYX<{}AmjuI=P#agtgDpgn)5r+UpKvWe5c4}b`@FpiT94ZwUACKoIpn-W*Rm#@h z>@IGeN5V1S6SB_L;MFbjGd4Osuc3k?d&RKfC@8);D}FU#1%(LQ0$lq=Ww z;XStA$v`@`+QK=Vd9JJ5*tXpav$XkaqQYuCj5h()3RXN_}p?M|?M zBl`ToDL7(9GLH&AGAbaBM|-X?%!WajZo;3z5q^ ktZNZ@7Rh)l#>1GQmBC+|X4dlUQ+ca4EVuD@Ug?x7- zzR0ZW2R^9ma-k0j5>V6>N@pBUakb<{)PPt;@ud%o4Hl@$-uFDyL0xi8?Ia=u*yG6lES) zyiTpmLyAA67;~TEZ|Q#K9~A#WQp7FATa@5tzbcMt@~o%$u$E@Nq4~roJvoen&5g(DshOPd(OK*8{d%Y#mXe?c)0OE3J>8nUKO9mdmG@9b^k_L~R+*^<8r9OasCa^q*gcatrRN z7!JU#74L077rQZ7JD+}+PztFjs6*S z2W)c7gS;_wtfslOM{a8F$WSrl+G7JmY4`hk57E2c6Xb4;8x5j7Ipb!sOBCsx}ue)ERR0R!7&X zAV>L$gu$a)wRx2R$8v1Pu{pr24D3tLxd0EnDp%fC)eXnC71Y(}i9}si@F2(ekAHWc z&&!jJ)X0PXx)qcrClNG2pe>Lg1qISrU0vY*ef8g19iNx!09UOy2z*`x0lO|=h7_p$ zezopT0AI%5w;*4UE-Ko?mM`rF&!pvVHxB!EklLBn7Fvcqgi|#jx-&O`ND=aL=Wn1s nrN6=P+MYab1gWhWhX3(k`8#vV^!+=_zQ6sqYRk(#KI--_ZrpB) delta 6353 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 Bg%|(; 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" +