[Sblim-commit] ecute/InstallShield55/ecute/Script Files Setup.dbg,1.3,1.4 Setup.ins,1.5,1.6 Setup.ino,1.5,1.6 Setup.obs,1.5,1.6 setup.rul,1.5,1.6

[Benjamin B. <bg...@us...>]

Update of /cvsroot/sblim/ecute/InstallShield55/ecute/Script Files
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2181/InstallShield55/ecute/Script Files

Modified Files:
	Setup.dbg Setup.ins Setup.ino Setup.obs setup.rul 
Log Message:
Version 2.1 beta 1f:
Changed CMPI Templates path for RSA
New InstallShield settings for RSA CMPI provider support

Index: Setup.ins
===================================================================
RCS file: /cvsroot/sblim/ecute/InstallShield55/ecute/Script Files/Setup.ins,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
Binary files /tmp/cvs8AlHSA and /tmp/cvs3EfOqj differ

Index: setup.rul
===================================================================
RCS file: /cvsroot/sblim/ecute/InstallShield55/ecute/Script Files/setup.rul,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- setup.rul	31 May 2005 14:38:50 -0000	1.5
+++ setup.rul	30 Jun 2005 14:58:30 -0000	1.6
@@ -178,7 +178,7 @@
    	 	if (nResult = BACK) goto Dlg_SdComponentDialog2;
    	endif;
 
-    if (ComponentIsItemSelected ( MEDIA , COMP_ECUTE4ROSE )) then
+    if (bRoseInstalled = TRUE && ComponentIsItemSelected ( MEDIA , COMP_ECUTE4ROSE )) then
 		nResult = GetJacob();
     	if (nResult = BACK) goto Dlg_SdAskDestPath;
    	endif;
@@ -498,7 +498,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 function SetupInstall()
 
-	STRING CRMKEY, RSAKEY1,RSAKEY2;
+	STRING ROSEKEY1, ROSEKEY2, RSAKEY1, RSAKEY2, ECUTEKEY;
 	NUMBER nvSize,rtype;
 	NUMBER bOpt1, bOpt2;
 	NUMBER res;
@@ -514,9 +514,10 @@
     // Check if Rose is installed
 
     RegDBSetDefaultRoot ( HKEY_LOCAL_MACHINE );
-	CRMKEY="SOFTWARE\\Rational Software\\Rose\\Rose";
-	if (RegDBKeyExist ( CRMKEY)=1) then
-		RegDBGetKeyValueEx ( CRMKEY , "InstallDir" , rtype , svRoseDir , nvSize );		
+	ROSEKEY1="SOFTWARE\\Rational Software\\Rose\\Rose";
+	ROSEKEY2="SOFTWARE\\Rational Software\\Rose";
+	if (RegDBKeyExist ( ROSEKEY1)=1) then
+		RegDBGetKeyValueEx ( ROSEKEY2 , "InstallDir" , rtype , svRoseDir , nvSize );		
 		ComponentSetTarget (MEDIA, "<RoseDir>", svRoseDir+"\\framework\\frameworks");
 		ComponentSelectItem (MEDIA, COMP_ECUTE4ROSE, TRUE);
 	    bRoseInstalled = TRUE;
@@ -524,7 +525,7 @@
 		ComponentSelectItem (MEDIA, COMP_ECUTE4ROSE, FALSE);
 		ComponentSelectItem (MEDIA, COMP_ROSE_FRAMEWORKS, FALSE);
 		ComponentSelectItem (MEDIA, COMP_ECUTE4ROSE_TPL, FALSE);
-	  	ComponentSetData (MEDIA, COMP_ECUTE4ROSE, COMPONENT_FIELD_VISIBLE, FALSE, "");
+		ComponentSetData (MEDIA, COMP_ECUTE4ROSE, COMPONENT_FIELD_VISIBLE, FALSE, "");
 	   	ComponentSetData (MEDIA, COMP_ROSE_FRAMEWORKS, COMPONENT_FIELD_VISIBLE, FALSE, "");
 	   	ComponentSetTarget (MEDIA, "<RoseDir>", TARGETDIR);
 		bRoseInstalled = FALSE;
@@ -563,7 +564,7 @@
 	if (!bRoseInstalled && !bRSAInstalled) then
 		SdFinish ( "Rational product is not installled" ,
 		           "Neither Rational Rose nor Rational Software Architect is installed." ,
-		 	       "Please, install either of these Rational products before installing eCute" ,
+		 	       "Please, install either of these Rational products before installing ECUTE" ,
 		 	       "", "",bOpt1  ,bOpt2  );	
 		bInstallAborted = TRUE;
 		return -1;
@@ -573,10 +574,10 @@
 	//Detect the old installation
 	
 	RegDBSetDefaultRoot ( HKEY_LOCAL_MACHINE );
-	CRMKEY="SOFTWARE\\IBM\\Ecute";
+	ECUTEKEY="SOFTWARE\\IBM\\Ecute";
 	//CRMKEY="SOFTWARE\\Rational Software\\Rose\\AddIns\\ecute";
-	if (RegDBKeyExist ( CRMKEY)=1) then
-		RegDBGetKeyValueEx ( CRMKEY , "InstallDir" , rtype , svDir , nvSize );
+	if (RegDBKeyExist ( ECUTEKEY)=1) then
+		RegDBGetKeyValueEx ( ECUTEKEY , "InstallDir" , rtype , svDir , nvSize );
 		//RegDBDeleteKey ( CRMKEY );
 		RegDBSetDefaultRoot ( HKEY_CLASSES_ROOT );
 	else
@@ -917,3 +918,5 @@
 
 
 
+
+

Index: Setup.obs
===================================================================
RCS file: /cvsroot/sblim/ecute/InstallShield55/ecute/Script Files/Setup.obs,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
Binary files /tmp/cvs3aGlBE and /tmp/cvsGaOGdn differ

Index: Setup.ino
===================================================================
RCS file: /cvsroot/sblim/ecute/InstallShield55/ecute/Script Files/Setup.ino,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
Binary files /tmp/cvsxLDixK and /tmp/cvsHuBLbt differ

Index: Setup.dbg
===================================================================
RCS file: /cvsroot/sblim/ecute/InstallShield55/ecute/Script Files/Setup.dbg,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
Binary files /tmp/cvs52DWBO and /tmp/cvsyKa2ix differ