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

[Robert K. <kie...@us...>]

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

Modified Files:
	Setup.ins Setup.dbg setup.rul Setup.ino Setup.obs 
Log Message:
Update installation for RSA/RSM support

Index: Setup.ins
===================================================================
RCS file: /cvsroot/sblim/ecute/InstallShield55/ecute/Script Files/Setup.ins,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
Binary files /tmp/cvsmMxruE and /tmp/cvsubKnrQ differ

Index: setup.rul
===================================================================
RCS file: /cvsroot/sblim/ecute/InstallShield55/ecute/Script Files/setup.rul,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- setup.rul	12 Jul 2004 22:08:12 -0000	1.2
+++ setup.rul	8 Apr 2005 08:34:28 -0000	1.3
@@ -1,4 +1,3 @@
-
 ////////////////////////////////////////////////////////////////////////////////
 //
 //  IIIIIII SSSSSS
@@ -30,6 +29,14 @@
 ////////////////////// string defines ////////////////////////////
 
     #define UNINST_LOGFILE_NAME      "Uninst.isu"
+	
+	// Component Names
+	#define COMP_ECUTE4ROSE          "Rose Plugin"
+	#define COMP_ECUTE4ROSE_TPL      "Rose Plugin\\Templates"
+	#define COMP_ECUTE4RSA			 "RSA Plugin"
+	#define COMP_ECUTE4RSA_LINK      "RSA Plugin\\RSA Link"
+	#define COMP_ECUTE4RSA_TPL  	 "RSA Plugin\\Templates"
+	#define COMP_ROSE_FRAMEWORKS     "Rose Frameworks"
 
 //////////////////// installation declarations ///////////////////
 
@@ -77,7 +84,10 @@
 
 
     // your global variables
-	STRING      RoseDir;
+	STRING      svRoseDir;
+	BOOL        bRSAInstalled;
+	STRING      svRSADir;
+	BOOL		bRoseInstalled;
 
 ///////////////////////////////////////////////////////////////////////////////
 //
@@ -162,15 +172,16 @@
     if (nResult = BACK) goto Dlg_SdSetupType;
 
     Dlg_SdAskDestPath:
-    if (ComponentIsItemSelected ( MEDIA , "Program Files" )<1) then
-    	return 0;
-    endif;
-
-    nResult = DialogShowSdAskDestPath();
-    if (nResult = BACK) goto Dlg_SdSetupType;
+    if (ComponentIsItemSelected ( MEDIA , COMP_ECUTE4ROSE ) ||
+    	ComponentIsItemSelected ( MEDIA , COMP_ECUTE4RSA )) then
+    	nResult = DialogShowSdAskDestPath();
+   	 	if (nResult = BACK) goto Dlg_SdComponentDialog2;
+   	endif;
 
-	nResult = GetJacob();
-    if (nResult = BACK) goto Dlg_SdAskDestPath;
+    if (ComponentIsItemSelected ( MEDIA , COMP_ECUTE4ROSE )) then
+		nResult = GetJacob();
+    	if (nResult = BACK) goto Dlg_SdAskDestPath;
+   	endif;
 
 	return 0;
 
@@ -292,7 +303,8 @@
 ///////////////////////////////////////////////////////////////////////////////
 function ProcessAfterDataMove()
     STRING szReferenceFile, szMsg,tempSRCDIR, svReturnLine,svDisk,szLicenseFile;
-    NUMBER nvLineNumber;
+    STRING svLinkTargetDir;
+    NUMBER nvLineNumber, index;
 
 begin
 
@@ -314,96 +326,86 @@
                                             // subfolder of svDir add that here
     DeinstallSetReference( szReferenceFile );
     tempSRCDIR=SRCDIR;
-    SRCDIR=TARGETDIR;
-	
-	//Modify the .bat files and the .mnu for including the install path
-	
-	GetDisk ( TARGETDIR , svDisk );
+
+	//
+	// Customize Rational Rose Menu files
+	//
+	if (ComponentIsItemSelected (MEDIA, COMP_ECUTE4ROSE) ) then
+    	
+    	SRCDIR=TARGETDIR;
+		
+		//Modify the .bat files and the .mnu for including the install path
+		GetDisk ( TARGETDIR , svDisk );
 	
-    FileGrep ( "runImportMOF.bat" , "set ECUTE=", svReturnLine ,
-    	nvLineNumber , RESTART );
-    FileInsertLine ( "runImportMOF.bat" , "set ECUTE="+TARGETDIR ,
-    	nvLineNumber , REPLACE );
-    FileInsertLine ( "runImportMOF.bat" , svDisk ,
-    	nvLineNumber+1 , REPLACE );
+    	FileGrep ( "runImportMOF.bat" , "set ECUTE=", svReturnLine , nvLineNumber , RESTART );
+    	FileInsertLine ( "runImportMOF.bat" , "set ECUTE="+TARGETDIR , nvLineNumber , REPLACE );
+    	FileInsertLine ( "runImportMOF.bat" , svDisk , nvLineNumber+1 , REPLACE );
 
-    FileGrep ( "runExportMOF.bat" , "set ECUTE=", svReturnLine ,
-    	nvLineNumber , RESTART );
-    FileInsertLine ( "runExportMOF.bat" , "set ECUTE="+TARGETDIR ,
-    	nvLineNumber , REPLACE );
-    FileInsertLine ( "runExportMOF.bat" , svDisk ,
-    	nvLineNumber+1 , REPLACE );
+    	FileGrep ( "runExportMOF.bat" , "set ECUTE=", svReturnLine , nvLineNumber , RESTART );
+    	FileInsertLine ( "runExportMOF.bat" , "set ECUTE="+TARGETDIR , nvLineNumber , REPLACE );
+    	FileInsertLine ( "runExportMOF.bat" , svDisk ,nvLineNumber+1 , REPLACE );
 
-    FileGrep ( "runGenerateProviders.bat" , "set ECUTE=", svReturnLine ,
-    	nvLineNumber , RESTART );
-    FileInsertLine ( "runGenerateProviders.bat" , "set ECUTE="+TARGETDIR ,
-    	nvLineNumber , REPLACE );
-    FileInsertLine ( "runGenerateProviders.bat" , svDisk ,
-    	nvLineNumber+1 , REPLACE );
+    	FileGrep ( "runGenerateProviders.bat" , "set ECUTE=", svReturnLine , nvLineNumber , RESTART );
+    	FileInsertLine ( "runGenerateProviders.bat" , "set ECUTE="+TARGETDIR , nvLineNumber , REPLACE );
+    	FileInsertLine ( "runGenerateProviders.bat" , svDisk , nvLineNumber+1 , REPLACE );
 
-    FileGrep ( "runEntryPoint.bat" , "set ECUTE=", svReturnLine ,
-    	nvLineNumber , RESTART );
-    FileInsertLine ( "runEntryPoint.bat" , "set ECUTE="+TARGETDIR ,
-    	nvLineNumber , REPLACE );
-    FileInsertLine ( "runEntryPoint.bat" , svDisk ,
-    	nvLineNumber+1 , REPLACE );
+    	FileGrep ( "runEntryPoint.bat" , "set ECUTE=", svReturnLine , nvLineNumber , RESTART );
+    	FileInsertLine ( "runEntryPoint.bat" , "set ECUTE="+TARGETDIR , nvLineNumber , REPLACE );
+    	FileInsertLine ( "runEntryPoint.bat" , svDisk , nvLineNumber+1 , REPLACE );
     	
-    FileGrep ( "runCheck.bat" , "set ECUTE=", svReturnLine ,
-    	nvLineNumber , RESTART );
-    FileInsertLine ( "runCheck.bat" , "set ECUTE="+TARGETDIR ,
-    	nvLineNumber , REPLACE );
-    FileInsertLine ( "runCheck.bat" , svDisk ,
-    	nvLineNumber+1 , REPLACE );
+    	FileGrep ( "runCheck.bat" , "set ECUTE=", svReturnLine , nvLineNumber , RESTART );
+    	FileInsertLine ( "runCheck.bat" , "set ECUTE="+TARGETDIR , nvLineNumber , REPLACE );
+    	FileInsertLine ( "runCheck.bat" , svDisk , nvLineNumber+1 , REPLACE );
 
-    FileGrep ( "runEdit.bat" , "set ECUTE=", svReturnLine ,
-    	nvLineNumber , RESTART );
-    FileInsertLine ( "runEdit.bat" , "set ECUTE="+TARGETDIR ,
-    	nvLineNumber , REPLACE );
-    FileInsertLine ( "runEdit.bat" , svDisk ,
-    	nvLineNumber+1 , REPLACE );
+    	FileGrep ( "runEdit.bat" , "set ECUTE=", svReturnLine , nvLineNumber , RESTART );
+    	FileInsertLine ( "runEdit.bat" , "set ECUTE="+TARGETDIR , nvLineNumber , REPLACE );
+    	FileInsertLine ( "runEdit.bat" , svDisk , nvLineNumber+1 , REPLACE );
         	
-    FileGrep ( "executeProject.bat" , "set ECUTE=", svReturnLine ,
-    	nvLineNumber , RESTART );
-    FileInsertLine ( "executeProject.bat" , "set ECUTE="+TARGETDIR ,
-    	nvLineNumber , REPLACE );
-    FileInsertLine ( "executeProject.bat" , svDisk ,
-    	nvLineNumber+1 , REPLACE );
+    	FileGrep ( "executeProject.bat" , "set ECUTE=", svReturnLine , nvLineNumber , RESTART );
+    	FileInsertLine ( "executeProject.bat" , "set ECUTE="+TARGETDIR , nvLineNumber , REPLACE );
+    	FileInsertLine ( "executeProject.bat" , svDisk , nvLineNumber+1 , REPLACE );
         	
-    FileGrep ( "ecute.mnu" , "runImportMOF.bat"
-    	, svReturnLine , nvLineNumber , RESTART );
-    FileInsertLine ( "ecute.mnu" , "      Exec "+TARGETDIR+"\\runImportMOF.bat"
-    	, nvLineNumber , REPLACE );
+    	FileGrep ( "ecute.mnu" , "runImportMOF.bat", svReturnLine , nvLineNumber , RESTART );
+    	FileInsertLine ( "ecute.mnu" , "      Exec "+TARGETDIR+"\\runImportMOF.bat"	, nvLineNumber , REPLACE );
 
-    FileGrep ( "ecute.mnu" , "runExportMOF.bat"
-    	, svReturnLine , nvLineNumber , RESTART );
-    FileInsertLine ( "ecute.mnu" , "      Exec "+TARGETDIR+"\\runExportMOF.bat"
-    	, nvLineNumber , REPLACE );
+    	FileGrep ( "ecute.mnu" , "runExportMOF.bat", svReturnLine , nvLineNumber , RESTART );
+    	FileInsertLine ( "ecute.mnu" , "      Exec "+TARGETDIR+"\\runExportMOF.bat"	, nvLineNumber , REPLACE );
 
-    FileGrep ( "ecute.mnu" , "runGenerateProviders.bat"
-    	, svReturnLine , nvLineNumber , RESTART );
-    FileInsertLine ( "ecute.mnu" , "      Exec "+TARGETDIR+"\\runGenerateProviders.bat"
-    	, nvLineNumber , REPLACE );
+    	FileGrep ( "ecute.mnu" , "runGenerateProviders.bat"	, svReturnLine , nvLineNumber , RESTART );
+    	FileInsertLine ( "ecute.mnu" , "      Exec "+TARGETDIR+"\\runGenerateProviders.bat" , nvLineNumber , REPLACE );
 
-    FileGrep ( "ecute.mnu" , "runEntryPoint.bat"
-    	, svReturnLine , nvLineNumber , RESTART );
-    FileInsertLine ( "ecute.mnu" , "      Exec "+TARGETDIR+"\\runEntryPoint.bat"
-    	, nvLineNumber , REPLACE );
+    	FileGrep ( "ecute.mnu" , "runEntryPoint.bat", svReturnLine , nvLineNumber , RESTART );
+    	FileInsertLine ( "ecute.mnu" , "      Exec "+TARGETDIR+"\\runEntryPoint.bat", nvLineNumber , REPLACE );
 
-    FileGrep ( "ecute.mnu" , "runCheck.bat"
-    	, svReturnLine , nvLineNumber , RESTART );
-    FileInsertLine ( "ecute.mnu" , "      Exec "+TARGETDIR+"\\runCheck.bat"
-    	, nvLineNumber , REPLACE );
+    	FileGrep ( "ecute.mnu" , "runCheck.bat", svReturnLine , nvLineNumber , RESTART );
+    	FileInsertLine ( "ecute.mnu" , "      Exec "+TARGETDIR+"\\runCheck.bat", nvLineNumber , REPLACE );
 
-    FileGrep ( "ecute.mnu" , "runEdit.bat"
-    	, svReturnLine , nvLineNumber , RESTART );
-    FileInsertLine ( "ecute.mnu" , "      Exec "+TARGETDIR+"\\runEdit.bat"
-    	, nvLineNumber , REPLACE );
-    	
-    SRCDIR=tempSRCDIR;
+    	FileGrep ( "ecute.mnu" , "runEdit.bat", svReturnLine , nvLineNumber , RESTART );
+    	FileInsertLine ( "ecute.mnu" , "      Exec "+TARGETDIR+"\\runEdit.bat", nvLineNumber , REPLACE );
+    endif;
 
-    //Copy License
+	//
+	// Customize RSA Eclipse Link file
+	//
+	if (ComponentIsItemSelected (MEDIA, COMP_ECUTE4RSA) ) then
+		SRCDIR = svRSADir+"\\eclipse\\links";
+		svLinkTargetDir = TARGETDIR;
+		
+		for index = 0 to StrLength(svLinkTargetDir)
+			if (svLinkTargetDir[index] = "\\") then
+				svLinkTargetDir[index] = "/";
+			endif;
+		endfor;
+		
+	   	FileGrep ( "com.ibm.ecute.link" , "path=", svReturnLine , nvLineNumber , RESTART );
+    	FileInsertLine ( "com.ibm.ecute.link" , "path="+svLinkTargetDir , nvLineNumber , REPLACE );
+	endif;
+ 	
+	
+	SRCDIR=tempSRCDIR;
 
-    szLicenseFile = "Ecute License.txt";
+    //Copy License
+	szLicenseFile = "Ecute License.txt";
     VarSave (SRCTARGETDIR);
     SRCDIR = SUPPORTDIR;
     CopyFile ( szLicenseFile , szLicenseFile );
@@ -496,9 +498,10 @@
 ///////////////////////////////////////////////////////////////////////////////
 function SetupInstall()
 
-	STRING CRMKEY;
+	STRING CRMKEY, RSAKEY1,RSAKEY2;
 	NUMBER nvSize,rtype;
 	NUMBER bOpt1, bOpt2;
+	NUMBER res;
 
 begin
 	
@@ -513,21 +516,65 @@
     RegDBSetDefaultRoot ( HKEY_LOCAL_MACHINE );
 	CRMKEY="SOFTWARE\\Rational Software\\Rose";
 	if (RegDBKeyExist ( CRMKEY)=1) then
-		RegDBGetKeyValueEx ( CRMKEY , "InstallDir" , rtype , RoseDir , nvSize );		
-		ComponentSetTarget (MEDIA, "<RoseDir>", RoseDir+"\\framework\\frameworks");
+		RegDBGetKeyValueEx ( CRMKEY , "InstallDir" , rtype , svRoseDir , nvSize );		
+		ComponentSetTarget (MEDIA, "<RoseDir>", svRoseDir+"\\framework\\frameworks");
+		ComponentSelectItem (MEDIA, COMP_ECUTE4ROSE, TRUE);
+	    bRoseInstalled = TRUE;
+	else
+		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_ROSE_FRAMEWORKS, COMPONENT_FIELD_VISIBLE, FALSE, "");
+	   	ComponentSetTarget (MEDIA, "<RoseDir>", TARGETDIR);
+		bRoseInstalled = FALSE;
+    endif;
+	
+    // Check if RSA is installed and remember installation path
 
+    RegDBSetDefaultRoot ( HKEY_LOCAL_MACHINE );
+	RSAKEY1="SOFTWARE\\IBM\\Rational\\Software Development Platform\\products\\com.ibm.rational.software.architect";
+	RSAKEY2="SOFTWARE\\IBM\\Rational\\Software Development Platform\\products\\com.ibm.rational.software.modeler";
+	if (RegDBKeyExist ( RSAKEY1)=1) then
+		RegDBGetKeyValueEx ( RSAKEY1 , "location" , rtype , svRSADir , nvSize );		
+		ComponentSetTarget (MEDIA, "<RSADir>", svRSADir);
+		ComponentSetData (MEDIA, COMP_ECUTE4RSA, COMPONENT_FIELD_VISIBLE, TRUE, "");
+		ComponentSelectItem (MEDIA, COMP_ECUTE4RSA, TRUE);
+	
+		bRSAInstalled = TRUE;
+	elseif (RegDBKeyExist ( RSAKEY2)=1) then
+		RegDBGetKeyValueEx ( RSAKEY2 , "location" , rtype , svRSADir , nvSize );		
+		ComponentSetTarget (MEDIA, "<RSADir>", svRSADir);
+		ComponentSetData (MEDIA, COMP_ECUTE4RSA, COMPONENT_FIELD_VISIBLE, TRUE, "");
+		ComponentSelectItem (MEDIA, COMP_ECUTE4RSA, TRUE);
+	
+		bRSAInstalled = TRUE;
 	else
-		SdFinish ( "Rose not installled" , "Rational Rose is not installed." ,
-		 	"Please, install Rose before installing this plugin" ,"","",bOpt1  ,bOpt2  );	
+		ComponentSelectItem (MEDIA, COMP_ECUTE4RSA, FALSE);
+	 	ComponentSelectItem (MEDIA, COMP_ECUTE4RSA_TPL, FALSE);
+	    ComponentSelectItem (MEDIA, COMP_ECUTE4RSA_LINK, FALSE);
+	  	ComponentSetData (MEDIA, COMP_ECUTE4RSA, COMPONENT_FIELD_VISIBLE, FALSE, "");
+	  	ComponentSetTarget (MEDIA, "<RSADir>", TARGETDIR);
+		bRSAInstalled = FALSE;
+    endif;
+	
+	
+	// Terminate installation when neither Rose nor RSA was found
+	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" ,
+		 	       "", "",bOpt1  ,bOpt2  );	
 		bInstallAborted = TRUE;
 		return -1;
 	endif;
 	
+	
 	//Detect the old installation
 	
-	CRMKEY="SOFTWARE\\Rational Software\\Rose";
 	RegDBSetDefaultRoot ( HKEY_LOCAL_MACHINE );
-	CRMKEY="SOFTWARE\\Rational Software\\Rose\\AddIns\\ecute";
+	CRMKEY="SOFTWARE\\IBM\\Ecute";
+	//CRMKEY="SOFTWARE\\Rational Software\\Rose\\AddIns\\ecute";
 	if (RegDBKeyExist ( CRMKEY)=1) then
 		RegDBGetKeyValueEx ( CRMKEY , "InstallDir" , rtype , svDir , nvSize );
 		//RegDBDeleteKey ( CRMKEY );
@@ -691,37 +738,20 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 function DialogShowSdSetupType()
-    NUMBER nResult, nType;
-    STRING szTitle, szMsg;
+    NUMBER nResult;
+    STRING szTitle, szMsg, svType;
 
 begin
 
-    switch (svSetupType)
-    case "Typical":
-        nType = TYPICAL;
-    case "Custom":
-        nType = CUSTOM;
-    case "Compact":
-        nType = COMPACT;
-    case "":
-        svSetupType = "Typical";
-        nType = TYPICAL;
-    endswitch;
+    if (svSetupType="") then
+       svSetupType = "Typical";
+   	endif;
 
     szTitle = "";
     szMsg   = "";
-    nResult = SetupType( szTitle, szMsg, "", nType, 0 );
-
-    switch (nResult)
-        case COMPACT:
-            svSetupType = "Compact";
-        case TYPICAL:
-            svSetupType = "Typical";
-        case CUSTOM:
-            svSetupType = "Custom";
-    endswitch;
+    nResult = SdSetupTypeEx( szTitle, szMsg, "", svSetupType, 0 );
 
-    return nResult;
+   return nResult;
 end;
 
 
@@ -789,7 +819,7 @@
     STRING szLicenseFile,svString,element,svResult;
 	LIST listID;	
 begin
-	if (FindFile ( svDir , "jacobBin_17.zip" , svResult )=0) then
+	if (FindFile ( svDir , "jacobBin_18.zip" , svResult )=0) then
 		return OK;
 	endif;
 	
@@ -807,7 +837,7 @@
 	nResult    = AskYesNo ( svString , YES );
 	
 	if (nResult=YES) then
-		LaunchAppAndWait ("cmd","/c \""+SUPPORTDIR+"\\Download jacobBin_17.zip.url\"", WAIT);		
+		LaunchAppAndWait ("cmd","/c \""+SUPPORTDIR+"\\Download jacobBin_18.zip.url\"", WAIT);
    	endif;
 
     return OK;
@@ -877,3 +907,11 @@
 
 
 
+
+
+
+
+
+
+
+

Index: Setup.obs
===================================================================
RCS file: /cvsroot/sblim/ecute/InstallShield55/ecute/Script Files/Setup.obs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
Binary files /tmp/cvsDf2ThX and /tmp/cvsW6A6q9 differ

Index: Setup.ino
===================================================================
RCS file: /cvsroot/sblim/ecute/InstallShield55/ecute/Script Files/Setup.ino,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
Binary files /tmp/cvsqQcmh2 and /tmp/cvs10nOte differ

Index: Setup.dbg
===================================================================
RCS file: /cvsroot/sblim/ecute/InstallShield55/ecute/Script Files/Setup.dbg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvs1Z9Ynk and /tmp/cvsFnicMw differ