Menu
▾
▴
sblim-commit — CVS Commit Info for SBLIM
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
(1) |
Mar
(45) |
Apr
(150) |
May
(145) |
Jun
(150) |
Jul
(79) |
Aug
(313) |
Sep
(160) |
Oct
(309) |
Nov
(115) |
Dec
(60) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(160) |
Feb
(144) |
Mar
(127) |
Apr
(48) |
May
(102) |
Jun
(54) |
Jul
(245) |
Aug
(94) |
Sep
(152) |
Oct
(162) |
Nov
(166) |
Dec
(740) |
| 2007 |
Jan
(752) |
Feb
(437) |
Mar
(328) |
Apr
(373) |
May
(569) |
Jun
(399) |
Jul
(369) |
Aug
(627) |
Sep
(100) |
Oct
(306) |
Nov
(166) |
Dec
(282) |
| 2008 |
Jan
(68) |
Feb
(145) |
Mar
(180) |
Apr
(160) |
May
(277) |
Jun
(229) |
Jul
(1188) |
Aug
(51) |
Sep
(97) |
Oct
(99) |
Nov
(95) |
Dec
(170) |
| 2009 |
Jan
(39) |
Feb
(73) |
Mar
(120) |
Apr
(121) |
May
(104) |
Jun
(262) |
Jul
(57) |
Aug
(171) |
Sep
(131) |
Oct
(88) |
Nov
(64) |
Dec
(83) |
| 2010 |
Jan
(55) |
Feb
(67) |
Mar
(124) |
Apr
(64) |
May
(130) |
Jun
(75) |
Jul
(164) |
Aug
(64) |
Sep
(44) |
Oct
(17) |
Nov
(43) |
Dec
(31) |
| 2011 |
Jan
(21) |
Feb
(10) |
Mar
(43) |
Apr
(46) |
May
(52) |
Jun
(71) |
Jul
(7) |
Aug
(16) |
Sep
(51) |
Oct
(14) |
Nov
(33) |
Dec
(15) |
| 2012 |
Jan
(12) |
Feb
(61) |
Mar
(129) |
Apr
(76) |
May
(70) |
Jun
(52) |
Jul
(29) |
Aug
(41) |
Sep
(32) |
Oct
(23) |
Nov
(38) |
Dec
(26) |
| 2013 |
Jan
(35) |
Feb
(37) |
Mar
(51) |
Apr
(15) |
May
(52) |
Jun
(15) |
Jul
(23) |
Aug
(21) |
Sep
(46) |
Oct
(69) |
Nov
(57) |
Dec
(26) |
| 2014 |
Jan
(5) |
Feb
(13) |
Mar
(17) |
Apr
(1) |
May
(5) |
Jun
|
Jul
(2) |
Aug
(2) |
Sep
(1) |
Oct
(16) |
Nov
(8) |
Dec
(4) |
| 2015 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
(1) |
Jun
(4) |
Jul
|
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
|
From: Robert K. <kie...@us...> - 2005-04-08 08:35:13
|
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 |
|
From: Robert K. <kie...@us...> - 2005-04-08 08:35:13
|
Update of /cvsroot/sblim/ecute/InstallShield55/ecute/Component Definitions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10131/InstallShield55/ecute/Component Definitions Modified Files: Default.fgl Default.cdf Log Message: Update installation for RSA/RSM support Index: Default.fgl =================================================================== RCS file: /cvsroot/sblim/ecute/InstallShield55/ecute/Component Definitions/Default.fgl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Default.fgl 12 Jul 2004 22:08:11 -0000 1.2 +++ Default.fgl 8 Apr 2005 08:34:15 -0000 1.3 @@ -16,6 +16,7 @@ [USERDEFINED] DISPLAYTEXT=Script-defined Folders SubDir0=USERDEFINED\<RoseDir> +SubDir1=USERDEFINED\<RSADir> TYPE=USERSTART fulldirectory= @@ -36,6 +37,11 @@ TYPE=TEXTSUBFIXED fulldirectory= +[USERDEFINED\<RSADir>] +DISPLAYTEXT= +TYPE=TEXTSUB +fulldirectory= + [<WINDIR>] DISPLAYTEXT=Windows Operating System SubDir0=<WINDIR>\<WINSYSDIR> Index: Default.cdf =================================================================== RCS file: /cvsroot/sblim/ecute/InstallShield55/ecute/Component Definitions/Default.cdf,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Default.cdf 12 Jul 2004 22:08:11 -0000 1.2 +++ Default.cdf 8 Apr 2005 08:34:26 -0000 1.3 @@ -1,25 +1,4 @@ -[Components] -component0=Program Files -component1=Program Files\Templates -component2=framework - -[TopComponents] -component0=Program Files -component1=framework - -[SetupType] -setuptype0=Compact -setuptype1=Custom -setuptype2=Typical - -[SetupTypeItem-Compact] -Comment= -item0=Program Files -item1=Program Files\Templates -Descrip=Full install -DisplayText=Full install - -[Program Files\Templates] +[Rose Plugin\Templates] SELECTED=Yes FILENEED=STANDARD HTTPLOCATION= @@ -33,7 +12,7 @@ IMAGE= DEFSELECTION=Yes filegroup0=CMPITemplates -requiredby0=Program Files +requiredby0=Rose Plugin COMMENT= INCLUDEINBUILD=Yes INSTALLATION=ALWAYSOVERWRITE @@ -45,29 +24,30 @@ PASSWORD= TARGETHIDDEN=General Application Destination\CMPITemplates -[Program Files] -required0=Program Files\Templates +[Rose Plugin] +required0=Rose Plugin\Templates SELECTED=Yes FILENEED=STANDARD HTTPLOCATION= -STATUS=Copying program files +STATUS=Copying Rational Rose Plugin files UNINSTALLABLE=Yes TARGET=<TARGETDIR> -member0=Program Files\Templates +member0=Rose Plugin\Templates FTPLOCATION= VISIBLE=Yes -DESCRIPTION=This component includes all runable binary executables from the plugin -DISPLAYTEXT=Program files +DESCRIPTION=This component includes the eCute Plugin for Rational Rose +DISPLAYTEXT=eCute for Rational Rose IMAGE= DEFSELECTION=Yes -filegroup0=Jacob +filegroup0=Docs COMMENT= INCLUDEINBUILD=Yes -filegroup1=java classes +filegroup1=Jacob INSTALLATION=ALWAYSOVERWRITE -filegroup2=Program files -filegroup3=qualifiersDefinition +filegroup2=java classes +filegroup3=eCute4Rose COMPRESSIFSEPARATE=No +filegroup4=qualifiersDefinition MISC= ENCRYPT=No DISK=ANYDISK @@ -75,15 +55,50 @@ PASSWORD= TARGETHIDDEN=General Application Destination -[SetupTypeItem-Custom] -Comment= -item0=Program Files -item1=Program Files\Templates -item2=framework -Descrip= -DisplayText= +[RSA Plugin\RSA Link] +SELECTED=Yes +FILENEED=STANDARD +HTTPLOCATION= +STATUS=Copying Eclipse link files +UNINSTALLABLE=Yes +TARGET=<RSADir> +FTPLOCATION= +VISIBLE=No +DESCRIPTION=This component includes the Eclipse link files required to register eCute as an Eclipse plugin +DISPLAYTEXT=Eclipse Link for RSA +IMAGE= +DEFSELECTION=Yes +filegroup0=eclipse link +requiredby0=RSA Plugin +COMMENT= +INCLUDEINBUILD=Yes +INSTALLATION=ALWAYSOVERWRITE +COMPRESSIFSEPARATE=No +MISC= +ENCRYPT=No +DISK=ANYDISK +TARGETDIRCDROM= +PASSWORD= +TARGETHIDDEN=Script-defined Folders\<RSADir> -[framework] +[Components] +component0=Rose Plugin\Templates +component1=RSA Plugin\RSA Link +component2=Rose Plugin +component3=Rose Frameworks +component4=RSA Plugin\Templates +component5=RSA Plugin + +[TopComponents] +component0=Rose Plugin +component1=Rose Frameworks +component2=RSA Plugin + +[SetupType] +setuptype0=Custom +setuptype1=Typical + +[Rose Frameworks] SELECTED=Yes FILENEED=HIGHLYRECOMMENDED HTTPLOCATION= @@ -92,8 +107,8 @@ TARGET=<RoseDir> FTPLOCATION= VISIBLE=Yes -DESCRIPTION=This component includes a framework for Rose with the whole CIM Schema package -DISPLAYTEXT=CIM Schema 2.7 and 2.8.1 frameworks +DESCRIPTION=This component includes the CIM Schemas as frameworks for Rational Rose +DISPLAYTEXT=CIM Schema frameworks for Rational Rose IMAGE= DEFSELECTION=Yes filegroup0=Schema @@ -108,16 +123,86 @@ PASSWORD= TARGETHIDDEN=Script-defined Folders\<RoseDir> +[SetupTypeItem-Custom] +item5=RSA Plugin +Comment= +item0=Rose Plugin\Templates +item1=RSA Plugin\RSA Link +item2=Rose Plugin +item3=Rose Frameworks +Descrip=Allows to select which components of eCute are installed +item4=RSA Plugin\Templates +DisplayText=Custom Install + +[RSA Plugin\Templates] +SELECTED=Yes +FILENEED=STANDARD +HTTPLOCATION= +STATUS= +UNINSTALLABLE=Yes +TARGET=<TARGETDIR>\CMPITemplates +FTPLOCATION= +VISIBLE=No +DESCRIPTION= +DISPLAYTEXT= +IMAGE= +DEFSELECTION=Yes +filegroup0=CMPITemplates +requiredby0=RSA Plugin +COMMENT= +INCLUDEINBUILD=Yes +INSTALLATION=ALWAYSOVERWRITE +COMPRESSIFSEPARATE=No +MISC= +ENCRYPT=No +DISK=ANYDISK +TARGETDIRCDROM= +PASSWORD= +TARGETHIDDEN=General Application Destination\CMPITemplates + [Info] Type=CompDef Version=1.00.000 Name= [SetupTypeItem-Typical] +item5=RSA Plugin Comment= -item0=Program Files -item1=Program Files\Templates -item2=framework -Descrip=Full install +item0=Rose Plugin\Templates +item1=RSA Plugin\RSA Link +item2=Rose Plugin +item3=Rose Frameworks +Descrip=Installs all applicable components of eCute +item4=RSA Plugin\Templates DisplayText=Full install +[RSA Plugin] +required0=RSA Plugin\Templates +SELECTED=Yes +FILENEED=STANDARD +required1=RSA Plugin\RSA Link +HTTPLOCATION= +STATUS=Copying RSA Eclipse plugin files +UNINSTALLABLE=Yes +TARGET=<TARGETDIR> +member0=RSA Plugin\RSA Link +FTPLOCATION= +member1=RSA Plugin\Templates +VISIBLE=Yes +DESCRIPTION=This component includes the eCute Plugin for the Rational Software Architect +DISPLAYTEXT=eCute for Rational Software Architect +IMAGE= +DEFSELECTION=Yes +filegroup0=Docs +COMMENT= +INCLUDEINBUILD=Yes +filegroup1=eCute4RSA +INSTALLATION=ALWAYSOVERWRITE +COMPRESSIFSEPARATE=No +MISC= +ENCRYPT=No +DISK=ANYDISK +TARGETDIRCDROM= +PASSWORD= +TARGETHIDDEN=General Application Destination + |
|
From: Robert K. <kie...@us...> - 2005-04-08 08:35:13
|
Update of /cvsroot/sblim/ecute/InstallShield55/ecute/File Groups In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10131/InstallShield55/ecute/File Groups Modified Files: Jacob.fgl Default.fdf CMPITemplates.fgl Schema.fgl java classes.fgl qualifiersDefinition.fgl Added Files: Docs.fgl eCute4Rose.fgl eclipse link.fgl eCute4RSA.fgl Log Message: Update installation for RSA/RSM support Index: CMPITemplates.fgl =================================================================== RCS file: /cvsroot/sblim/ecute/InstallShield55/ecute/File Groups/CMPITemplates.fgl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- CMPITemplates.fgl 6 Jul 2004 13:15:56 -0000 1.1 +++ CMPITemplates.fgl 8 Apr 2005 08:34:27 -0000 1.2 @@ -1,9 +1,9 @@ -[DYNAMIC] -WILDCARD0=*.* -INCLUDESUBDIR=YES -FOLDER=D:\workspace\ecute\distribution\CMPITemplates - -[General] -Type=FILELIST -Version=1.10.000 - +[DYNAMIC] +WILDCARD0=*.* +INCLUDESUBDIR=YES +FOLDER=D:\ecute\distribution\CMPITemplates + +[General] +Type=FILELIST +Version=1.10.000 + Index: Schema.fgl =================================================================== RCS file: /cvsroot/sblim/ecute/InstallShield55/ecute/File Groups/Schema.fgl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Schema.fgl 6 Jul 2004 13:15:56 -0000 1.1 +++ Schema.fgl 8 Apr 2005 08:34:27 -0000 1.2 @@ -1,7 +1,7 @@ [DYNAMIC] WILDCARD0=*.* INCLUDESUBDIR=YES -FOLDER=D:\workspace\ecute\Frameworks +FOLDER=D:\ecute\distribution\Frameworks [General] Type=FILELIST --- NEW FILE: Docs.fgl --- [TopDir] file0=D:\ecute\distribution\User guide.pdf [General] Type=FILELIST Version=1.10.000 --- NEW FILE: eCute4Rose.fgl --- [TopDir] file0=D:\ecute\distribution\ecute.mnu file1=D:\ecute\distribution\runCheck.bat file2=D:\ecute\distribution\runEdit.bat file3=D:\ecute\distribution\runEntryPoint.bat file4=D:\ecute\distribution\runImportMOF.bat file5=D:\ecute\distribution\runExportMOF.bat file6=D:\ecute\distribution\ecute.cfg file7=D:\ecute\distribution\runGenerateProviders.bat file8=D:\ecute\distribution\executeProject.bat [General] Type=FILELIST Version=1.10.000 Index: Default.fdf =================================================================== RCS file: /cvsroot/sblim/ecute/InstallShield55/ecute/File Groups/Default.fdf,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Default.fdf 12 Jul 2004 22:08:10 -0000 1.2 +++ Default.fdf 8 Apr 2005 08:34:27 -0000 1.3 @@ -1,4 +1,19 @@ -[qualifiersDefinition] +[eCute4RSA] +SELFREGISTERING=No +HTTPLOCATION= +LANGUAGE= +OPERATINGSYSTEM= +FTPLOCATION= +FILETYPE=No +INFOTYPE=Standard +COMMENT= +COMPRESS=Yes +COMPRESSDLL= +LINKTYPE=Static Link +POTENTIALLY=No +MISC= + +[java classes] SELFREGISTERING=No HTTPLOCATION= LANGUAGE= @@ -14,14 +29,17 @@ MISC= [FileGroups] -group0=java classes -group1=qualifiersDefinition -group2=Schema -group3=Program files -group4=Jacob -group5=CMPITemplates +group0=qualifiersDefinition +group1=java classes +group2=eCute4RSA +group3=eclipse link +group4=Schema +group5=Docs +group6=eCute4Rose +group7=Jacob +group8=CMPITemplates -[java classes] +[qualifiersDefinition] SELFREGISTERING=No HTTPLOCATION= LANGUAGE= @@ -51,7 +69,37 @@ POTENTIALLY=No MISC= -[Program files] +[eclipse link] +SELFREGISTERING=No +HTTPLOCATION= +LANGUAGE= +OPERATINGSYSTEM= +FTPLOCATION= +FILETYPE=No +INFOTYPE=Standard +COMMENT= +COMPRESS=Yes +COMPRESSDLL= +LINKTYPE=Static Link +POTENTIALLY=No +MISC= + +[Docs] +SELFREGISTERING=No +HTTPLOCATION= +LANGUAGE= +OPERATINGSYSTEM= +FTPLOCATION= +FILETYPE=No +INFOTYPE=Standard +COMMENT= +COMPRESS=Yes +COMPRESSDLL= +LINKTYPE=Static Link +POTENTIALLY=No +MISC= + +[eCute4Rose] SELFREGISTERING=No HTTPLOCATION= LANGUAGE= Index: java classes.fgl =================================================================== RCS file: /cvsroot/sblim/ecute/InstallShield55/ecute/File Groups/java classes.fgl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- java classes.fgl 6 Jul 2004 13:15:56 -0000 1.1 +++ java classes.fgl 8 Apr 2005 08:34:27 -0000 1.2 @@ -1,5 +1,5 @@ [TopDir] -file0=D:\workspace\ecute\distribution\ecute.jar +file0=D:\ecute\distribution\ecute.jar [General] Type=FILELIST --- NEW FILE: eclipse link.fgl --- [eclipse] SubDir0=eclipse\links fulldirectory= [TopDir] SubDir0=eclipse [eclipse\links] file0=D:\ecute\distribution\eclipse\com.ibm.ecute.link fulldirectory= [General] Type=FILELIST Version=1.10.000 Index: qualifiersDefinition.fgl =================================================================== RCS file: /cvsroot/sblim/ecute/InstallShield55/ecute/File Groups/qualifiersDefinition.fgl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- qualifiersDefinition.fgl 6 Jul 2004 13:15:56 -0000 1.1 +++ qualifiersDefinition.fgl 8 Apr 2005 08:34:27 -0000 1.2 @@ -1,5 +1,5 @@ [TopDir] -file0=D:\workspace\ecute\distribution\QualifiersList.txt +file0=D:\ecute\distribution\QualifiersList.txt [General] Type=FILELIST --- NEW FILE: eCute4RSA.fgl --- [eclipse\plugins\com.ibm.ecute_1.0.0\icons\wizards] file0=D:\ecute\distribution\eclipse\plugins\com.ibm.ecute_1.0.0\icons\wizards\cimMOF.gif file1=D:\ecute\distribution\eclipse\plugins\com.ibm.ecute_1.0.0\icons\wizards\cimMOFExport.gif file2=D:\ecute\distribution\eclipse\plugins\com.ibm.ecute_1.0.0\icons\wizards\cimMOFImport.gif file3=D:\ecute\distribution\eclipse\plugins\com.ibm.ecute_1.0.0\icons\wizards\modelfile.gif file4=D:\ecute\distribution\eclipse\plugins\com.ibm.ecute_1.0.0\icons\wizards\package_obj.gif fulldirectory=D:\ecute\distribution\eclipse\plugins\com.ibm.ecute_1.0.0\icons\wizards [eclipse\plugins\com.ibm.ecute_1.0.0\icons] SubDir0=eclipse\plugins\com.ibm.ecute_1.0.0\icons\wizards fulldirectory=D:\ecute\distribution\eclipse\plugins\com.ibm.ecute_1.0.0\icons [eclipse\plugins\com.ibm.ecute_1.0.0\libraries] file0=D:\ecute\distribution\eclipse\plugins\com.ibm.ecute_1.0.0\libraries\CIMPrimitiveTypes.library.uml2 fulldirectory=D:\ecute\distribution\eclipse\plugins\com.ibm.ecute_1.0.0\libraries [eclipse\plugins] SubDir0=eclipse\plugins\com.ibm.ecute_1.0.0 fulldirectory= [eclipse] file0=D:\ecute\distribution\eclipse\.eclipseextension SubDir0=eclipse\plugins fulldirectory= [eclipse\plugins\com.ibm.ecute_1.0.0\rsaConfig] file0=D:\ecute\distribution\eclipse\plugins\com.ibm.ecute_1.0.0\rsaConfig\mofInput.config file1=D:\ecute\distribution\eclipse\plugins\com.ibm.ecute_1.0.0\rsaConfig\mofOutput.config fulldirectory=D:\ecute\distribution\eclipse\plugins\com.ibm.ecute_1.0.0\rsaConfig [eclipse\plugins\com.ibm.ecute_1.0.0\profiles] file0=D:\ecute\distribution\eclipse\plugins\com.ibm.ecute_1.0.0\profiles\CIM.profile.uml2 fulldirectory=D:\ecute\distribution\eclipse\plugins\com.ibm.ecute_1.0.0\profiles [TopDir] SubDir0=eclipse [eclipse\plugins\com.ibm.ecute_1.0.0\META-INF] file0=D:\ecute\distribution\eclipse\plugins\com.ibm.ecute_1.0.0\META-INF\MANIFEST.MF fulldirectory=D:\ecute\distribution\eclipse\plugins\com.ibm.ecute_1.0.0\META-INF [eclipse\plugins\com.ibm.ecute_1.0.0] file0=D:\ecute\distribution\eclipse\plugins\com.ibm.ecute_1.0.0\QualifiersList.txt file1=D:\ecute\distribution\eclipse\plugins\com.ibm.ecute_1.0.0\plugin.properties file2=D:\ecute\distribution\eclipse\plugins\com.ibm.ecute_1.0.0\plugin.xml file3=D:\ecute\distribution\ecute.jar SubDir0=eclipse\plugins\com.ibm.ecute_1.0.0\profiles SubDir1=eclipse\plugins\com.ibm.ecute_1.0.0\rsaConfig SubDir2=eclipse\plugins\com.ibm.ecute_1.0.0\icons SubDir3=eclipse\plugins\com.ibm.ecute_1.0.0\libraries fulldirectory= SubDir4=eclipse\plugins\com.ibm.ecute_1.0.0\META-INF [General] Type=FILELIST Version=1.10.000 Index: Jacob.fgl =================================================================== RCS file: /cvsroot/sblim/ecute/InstallShield55/ecute/File Groups/Jacob.fgl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Jacob.fgl 6 Jul 2004 13:15:56 -0000 1.1 +++ Jacob.fgl 8 Apr 2005 08:34:27 -0000 1.2 @@ -1,12 +1,12 @@ -[TopDir] -file0=D:\workspace\ecute\distribution\Download jacobBin_17.zip.url -SubDir0=jacob - -[jacob] -file0=D:\workspace\ecute\distribution\jacob\LICENSE.TXT -fulldirectory= - -[General] -Type=FILELIST -Version=1.10.000 - +[TopDir] +file0=D:\ecute\distribution\Download jacobBin_18.zip.url +SubDir0=jacob + +[jacob] +file0=d:\ecute\distribution\jacob\LICENSE.TXT +fulldirectory= + +[General] +Type=FILELIST +Version=1.10.000 + |
|
From: Robert K. <kie...@us...> - 2005-04-08 08:34:39
|
Update of /cvsroot/sblim/ecute/InstallShield55/ecute/Registry Entries In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10131/InstallShield55/ecute/Registry Entries Modified Files: Default.rge Log Message: Update installation for RSA/RSM support Index: Default.rge =================================================================== RCS file: /cvsroot/sblim/ecute/InstallShield55/ecute/Registry Entries/Default.rge,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Default.rge 6 Jul 2004 13:15:59 -0000 1.1 +++ Default.rge 8 Apr 2005 08:34:31 -0000 1.2 @@ -1,24 +1,35 @@ -[Registry Set-1:HKLM:SOFTWARE\Rational Software\Rose\AddIns\ecute] ----Comment---= -(Default)=S, -ToolName=S,PRODUCT_NAME -Active=S,Yes -Company=S,COMPANY_NAME -LanguageAddIn=S,No -Version=S,PRODUCT_VERSION -InstallDir=S,<TARGETDIR> -MenuFile=S,ecute.mnu -ToolDisplayName=S,PRODUCT_NAME - -[Registry Set-1] ----Comment---= ----FileGroup---=Program files -HKLM0=SOFTWARE\Rational Software\Rose\AddIns\ecute - -[Data] -Set0=Registry Set-1 - -[General] -Type=REGISTRYDATA -Version=1.00.000 - +[Registry Set-1:HKLM:SOFTWARE\Rational Software\Rose\AddIns\ecute] +---Comment---= +(Default)=S, +ToolName=S,PRODUCT_NAME +Active=S,Yes +Company=S,COMPANY_NAME +LanguageAddIn=S,No +Version=S,PRODUCT_VERSION +InstallDir=S,<TARGETDIR> +MenuFile=S,ecute.mnu +ToolDisplayName=S,PRODUCT_NAME + +[Registry Set-1] +---Comment---= +---FileGroup---=eCute4Rose +HKLM0=SOFTWARE\Rational Software\Rose\AddIns\ecute + +[Data] +Set0=Registry Set-1 +Set1=Registry Set-2 + +[Registry Set-2] +---Comment---= +---FileGroup---= +HKLM0=SOFTWARE\IBM\Ecute + +[Registry Set-2:HKLM:SOFTWARE\IBM\Ecute] +---Comment---= +(Default)=S, +InstallDir=S,<TARGETDIR> + +[General] +Type=REGISTRYDATA +Version=1.00.000 + |
|
From: Robert K. <kie...@us...> - 2005-04-08 08:34:39
|
Update of /cvsroot/sblim/ecute/InstallShield55/ecute/Text Substitutions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10131/InstallShield55/ecute/Text Substitutions Modified Files: Build.tsb Setup.tsb Log Message: Update installation for RSA/RSM support Index: Build.tsb =================================================================== RCS file: /cvsroot/sblim/ecute/InstallShield55/ecute/Text Substitutions/Build.tsb,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Build.tsb 6 Jul 2004 13:16:01 -0000 1.1 +++ Build.tsb 8 Apr 2005 08:34:30 -0000 1.2 @@ -1,31 +1,36 @@ -[<ISPROJECTDIR>] -Value= -KeyType=4 - -[<PROGRAMFILES>] -Value= -KeyType=4 - -[<WINSYSDIR>] -Value= -KeyType=4 - -[<COMMONFILES>] -Value= -KeyType=4 - -[<WINDIR>] -Value= -KeyType=4 - -[Data] -Key0=<PROGRAMFILES> -Key1=<COMMONFILES> -Key2=<WINDIR> -Key3=<WINSYSDIR> -Key4=<ISPROJECTDIR> - -[General] -Type=TEXTSUB -Version=1.20.000 - +[<ISPROJECTDIR>] +KeyType=4 +Value= + +[<PROGRAMFILES>] +KeyType=4 +Value= + +[<WINSYSDIR>] +KeyType=4 +Value= + +[<COMMONFILES>] +KeyType=4 +Value= + +[<WINDIR>] +KeyType=4 +Value= + +[<ECUTE-WORKSPACE-DIR>] +KeyType=3 +Value=E:\My Documents\IBM\RAS-WS\ecute + +[Data] +Key0=<PROGRAMFILES> +Key1=<COMMONFILES> +Key2=<WINDIR> +Key3=<WINSYSDIR> +Key4=<ISPROJECTDIR> +Key5=<ECUTE-WORKSPACE-DIR> + +[General] +Type=TEXTSUB +Version=1.20.000 + Index: Setup.tsb =================================================================== RCS file: /cvsroot/sblim/ecute/InstallShield55/ecute/Text Substitutions/Setup.tsb,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Setup.tsb 6 Jul 2004 13:16:01 -0000 1.1 +++ Setup.tsb 8 Apr 2005 08:34:30 -0000 1.2 @@ -1,86 +1,91 @@ -[<SRCDIR>] -Value= -KeyType=4 - -[<HKUS>] -Value= -KeyType=4 - -[<HKCR>] -Value= -KeyType=4 - -[<PROGRAMFILES>] -Value= -KeyType=4 - -[<TARGETDIR>] -Value= -KeyType=4 - -[<WINSYSDIR>] -Value= -KeyType=4 - -[<COMMONFILES>] -Value= -KeyType=4 - -[<WINDIR>] -Value= -KeyType=4 - -[Data] -Key0=<PROGRAMFILES> -Key1=<COMMONFILES> -Key2=<WINDIR> -Key3=<WINSYSDIR> -Key4=<TARGETDIR> -Key5=<SUPPORTDIR> -Key10=<HKDD> -Key6=<SRCDIR> -Key11=<HKUS> -Key7=<HKLM> -Key12=<HKCR> -Key8=<HKCU> -Key13=<SHELL_OBJECT_FOLDER> -Key9=<HKCC> -Key14=<UNINST> -Key15=<RoseDir> - -[<UNINST>] -Value= -KeyType=4 - -[<SUPPORTDIR>] -Value= -KeyType=4 - -[<SHELL_OBJECT_FOLDER>] -Value= -KeyType=4 - -[General] -Type=TEXTSUB -Version=1.10.000 - -[<HKLM>] -Value= -KeyType=4 - -[<HKCU>] -Value= -KeyType=4 - -[<RoseDir>] -Value= -KeyType=3 - -[<HKCC>] -Value= -KeyType=4 - -[<HKDD>] -Value= -KeyType=4 - +[<HKCR>] +KeyType=4 +Value= + +[<HKUS>] +KeyType=4 +Value= + +[<SRCDIR>] +KeyType=4 +Value= + +[<PROGRAMFILES>] +KeyType=4 +Value= + +[<TARGETDIR>] +KeyType=4 +Value= + +[<WINSYSDIR>] +KeyType=4 +Value= + +[<COMMONFILES>] +KeyType=4 +Value= + +[<WINDIR>] +KeyType=4 +Value= + +[Data] +Key0=<PROGRAMFILES> +Key1=<COMMONFILES> +Key2=<WINDIR> +Key3=<WINSYSDIR> +Key4=<TARGETDIR> +Key10=<HKDD> +Key5=<SUPPORTDIR> +Key11=<HKUS> +Key6=<SRCDIR> +Key12=<HKCR> +Key7=<HKLM> +Key13=<SHELL_OBJECT_FOLDER> +Key8=<HKCU> +Key14=<UNINST> +Key9=<HKCC> +Key15=<RoseDir> +Key16=<RSADir> + +[<UNINST>] +KeyType=4 +Value= + +[<SHELL_OBJECT_FOLDER>] +KeyType=4 +Value= + +[<SUPPORTDIR>] +KeyType=4 +Value= + +[General] +Type=TEXTSUB +Version=1.10.000 + +[<HKCU>] +KeyType=4 +Value= + +[<HKLM>] +KeyType=4 +Value= + +[<RSADir>] +Value= +KeyType=3 + +[<HKDD>] +KeyType=4 +Value= + +[<HKCC>] +KeyType=4 +Value= + +[<RoseDir>] +KeyType=3 +Value= + |
|
From: Robert K. <kie...@us...> - 2005-04-08 08:34:39
|
Update of /cvsroot/sblim/ecute/InstallShield55/ecute/Media/Default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10131/InstallShield55/ecute/Media/Default Modified Files: default.mda Log Message: Update installation for RSA/RSM support Index: default.mda =================================================================== RCS file: /cvsroot/sblim/ecute/InstallShield55/ecute/Media/Default/default.mda,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- default.mda 12 Jul 2004 22:08:12 -0000 1.2 +++ default.mda 8 Apr 2005 08:34:30 -0000 1.3 @@ -12,7 +12,7 @@ MEDIATYPE=PFTW DATAASFILES=No BUILDTYPE=Full -BuildLocation=C:\My Installations\Ecute\Media\New Media +BuildLocation=E:\My Documents\IBM\RAS-WS\ecute\InstallShield55\ecute\Media\Default BREAKBYTOPCOMPONENT=No REFRESH_DATAFILES=Yes REFRESH_SPLASH=Yes @@ -32,8 +32,12 @@ WIN32SENABLE=No [DataAsFilesComponents] -Program Files=No -Jacob=No +Rose Plugin\Templates=No +Rose Plugin=No +RSA Plugin\RSA Link=No +Rose Frameworks=No +RSA Plugin\Templates=No +RSA Plugin=No [InstallDateInfo] TYPE=BUILDTIME @@ -53,6 +57,6 @@ PRODUCTCATEGORY=Development Tool APPLICATIONNAME=Ecute COMPANYNAME=IBM -VERSION=1.00.000 +VERSION=2.1-alpha3 INFO= |
|
From: Robert K. <kie...@us...> - 2005-04-08 08:34:39
|
Update of /cvsroot/sblim/ecute/InstallShield55/ecute In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10131/InstallShield55/ecute Modified Files: ecute.ipr Added Files: Notes.txt Description.txt Ecute.pfw Log Message: Update installation for RSA/RSM support Index: ecute.ipr =================================================================== RCS file: /cvsroot/sblim/ecute/InstallShield55/ecute/ecute.ipr,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ecute.ipr 12 Jul 2004 22:08:12 -0000 1.2 +++ ecute.ipr 8 Apr 2005 08:34:30 -0000 1.3 @@ -12,6 +12,7 @@ set_dlldebug=No AppExe= DevEnvironment=Generic Windows +FreshBits=FALSE set_mif=No set_testmode=No Instructions=Instructions.txt @@ -21,10 +22,11 @@ Type=Software Development Application Author= HomeURL= -InstallRoot=D:\workspace\ecute\InstallShield55\ecute +InstallRoot=E:\My Documents\IBM\RAS-WS\ecute\InstallShield55\ecute +UpdateURL=http:// set_level=Level 3 InstallationGUID=8a73b06f-31be-450a-b11e-ba9d2779550c -Version=1.00.000 +Version=2.01.006 set_miffile=Status.mif set_args= set_maxerr=50 @@ -34,7 +36,7 @@ set_warnaserr=No Copyright= set_preproc= -Category= +Category=Accounting CurrentPlatform= set_compileb4build=Yes set_crc=Yes @@ -45,8 +47,12 @@ [MediaInfo] mediadata0=Default/Media\Default +mediadata1=New Media/Media\New Media [General] +PassData= +ReadOnly=N Type=INSTALLMAIN Version=1.20.000 +PassOn=N --- NEW FILE: Notes.txt --- --- NEW FILE: Description.txt --- --- NEW FILE: Ecute.pfw --- [PackageForTheWeb] Version=2.0 [Options] Title=Ecute Company=IBM CompanyEMail= BasePath=E:\My Documents\IBM\RAS-WS\ecute\InstallShield55\ecute\Media\Default\Disk Images ImportPath=D:\workspace\ecute\InstallShield55\ecute\Media\Default UseRTF=0 SaveFiles=0 SubFolders=1 ApplicationName=Ecute Description=eCute for Rational Rose and Rational Software Architect Comments= Notice=Copyright IBM Corporation 2005 Version=2.1-alpha6 OutputSpec=D:\ecute\Ecute4RSA-alpha6.exe GUIDs=0 Type=2 Compress=1 Sign=0 Transfer=0 Files=17 [Engine] Setup=Disk1\Setup.exe [Web Page] Generate=1 Template= MSClient= NClient= [Runtime] Welcome= License= Prompt= Password= DefaultPath= Language= WindowStyle=0 Options=18 Execute=Disk1\Setup.exe CmdLine=/SMS [Extension] Server= Calls=0 [Code Signing] CompanyURL= SpecFile= KeyFile= Method=0 ; ~~~~~~~~~~ File Section ~~~~~~~~~~~ [SubFolders] Count=1 Folder1=Disk1 [File 1] Name=DATA.TAG Path=E:\My Documents\IBM\RAS-WS\ecute\InstallShield55\ecute\Media\Default\Disk Images\Disk1\ Flags=1 Disk=0 [File 2] Name=data1.cab Path=E:\My Documents\IBM\RAS-WS\ecute\InstallShield55\ecute\Media\Default\Disk Images\Disk1\ Flags=2097153 Disk=0 [File 3] Name=data1.hdr Path=E:\My Documents\IBM\RAS-WS\ecute\InstallShield55\ecute\Media\Default\Disk Images\Disk1\ Flags=2097153 Disk=0 [File 4] Name=lang.dat Path=E:\My Documents\IBM\RAS-WS\ecute\InstallShield55\ecute\Media\Default\Disk Images\Disk1\ Flags=1 Disk=0 [File 5] Name=layout.bin Path=E:\My Documents\IBM\RAS-WS\ecute\InstallShield55\ecute\Media\Default\Disk Images\Disk1\ Flags=1 Disk=0 [File 6] Name=os.dat Path=E:\My Documents\IBM\RAS-WS\ecute\InstallShield55\ecute\Media\Default\Disk Images\Disk1\ Flags=1 Disk=0 [File 7] Name=Setup.exe Path=E:\My Documents\IBM\RAS-WS\ecute\InstallShield55\ecute\Media\Default\Disk Images\Disk1\ Flags=589825 Disk=0 [File 8] Name=SETUP.INI Path=E:\My Documents\IBM\RAS-WS\ecute\InstallShield55\ecute\Media\Default\Disk Images\Disk1\ Flags=1 Disk=0 [File 9] Name=setup.ins Path=E:\My Documents\IBM\RAS-WS\ecute\InstallShield55\ecute\Media\Default\Disk Images\Disk1\ Flags=1 Disk=0 [File 10] Name=setup.lid Path=E:\My Documents\IBM\RAS-WS\ecute\InstallShield55\ecute\Media\Default\Disk Images\Disk1\ Flags=1 Disk=0 [File 11] Name=_INST32I.EX_ Path=E:\My Documents\IBM\RAS-WS\ecute\InstallShield55\ecute\Media\Default\Disk Images\Disk1\ Flags=524289 Disk=0 [File 12] Name=_ISDel.exe Path=E:\My Documents\IBM\RAS-WS\ecute\InstallShield55\ecute\Media\Default\Disk Images\Disk1\ Flags=589825 Disk=0 [File 13] Name=_Setup.dll Path=E:\My Documents\IBM\RAS-WS\ecute\InstallShield55\ecute\Media\Default\Disk Images\Disk1\ Flags=655377 Disk=0 [File 14] Name=_sys1.cab Path=E:\My Documents\IBM\RAS-WS\ecute\InstallShield55\ecute\Media\Default\Disk Images\Disk1\ Flags=2097153 Disk=0 [File 15] Name=_sys1.hdr Path=E:\My Documents\IBM\RAS-WS\ecute\InstallShield55\ecute\Media\Default\Disk Images\Disk1\ Flags=2097153 Disk=0 [File 16] Name=_user1.cab Path=E:\My Documents\IBM\RAS-WS\ecute\InstallShield55\ecute\Media\Default\Disk Images\Disk1\ Flags=2097153 Disk=0 [File 17] Name=_user1.hdr Path=E:\My Documents\IBM\RAS-WS\ecute\InstallShield55\ecute\Media\Default\Disk Images\Disk1\ Flags=2097153 Disk=0 |
|
From: Robert K. <kie...@us...> - 2005-04-08 08:34:39
|
Update of /cvsroot/sblim/ecute/InstallShield55/ecute/String Tables/0009-English In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10131/InstallShield55/ecute/String Tables/0009-English Modified Files: value.shl Log Message: Update installation for RSA/RSM support Index: value.shl =================================================================== RCS file: /cvsroot/sblim/ecute/InstallShield55/ecute/String Tables/0009-English/value.shl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- value.shl 12 Jul 2004 22:08:12 -0000 1.2 +++ value.shl 8 Apr 2005 08:34:30 -0000 1.3 @@ -1,11 +1,11 @@ [Data] -TITLE_MAIN=Ecute for Rational Rose +TITLE_MAIN=Ecute for Rational Rose and Rational Software Architect ERROR_COMPONENT=Component: COMPANY_NAME=IBM COMPANY_NAME16=Company ERROR_FILEGROUP=File Group: ERROR_MOVEDATA=An error occurred during the move data process: %d -PRODUCT_VERSION=2.0 +PRODUCT_VERSION=2.1-alpha3 UNINST_KEY=Ecute TITLE_CAPTIONBAR=Ecute Setup PRODUCT_NAME16=Product |
|
From: Heidi N. <hei...@us...> - 2005-04-08 08:18:49
|
Update of /cvsroot/sblim/cmpi-base In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2202 Modified Files: OSBase_BaseBoard.c ChangeLog Log Message: bug# 1179049: switched value of Vendor and Model on PPC; fixed SerialNumber from 9 digits to 7 valid digits Index: OSBase_BaseBoard.c =================================================================== RCS file: /cvsroot/sblim/cmpi-base/OSBase_BaseBoard.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- OSBase_BaseBoard.c 24 Jan 2005 11:29:05 -0000 1.1 +++ OSBase_BaseBoard.c 8 Apr 2005 08:18:37 -0000 1.2 @@ -141,17 +141,17 @@ strncpy(data->vendor,buffer,strlen(buffer)-strlen(ptr)); ptr+=1; if( !(str=strchr(ptr,'-')) ) { - data->model = calloc(1,5); - strncpy(data->model,ptr,4); + data->type = calloc(1,5); + strncpy(data->type,ptr,4); ptr+=4; - data->type = calloc(1,strlen(ptr)+1); - strcpy(data->type,ptr); + data->model = calloc(1,strlen(ptr)+1); + strcpy(data->model,ptr); } else { - data->model = calloc(1,strlen(ptr)-strlen(str)+1); - strncpy(data->model,ptr,strlen(ptr)-strlen(str)); + data->type = calloc(1,strlen(ptr)-strlen(str)+1); + strncpy(data->type,ptr,strlen(ptr)-strlen(str)); str+=1; - data->type = calloc(1,strlen(str)+1); - strcpy(data->type,str); + data->model = calloc(1,strlen(str)+1); + strcpy(data->model,str); } } fclose(fhd); @@ -165,7 +165,7 @@ } else { ptr+=1; data->serialNumber = calloc(1,strlen(ptr)+1); - strcpy(data->serialNumber,ptr); + strcpy(data->serialNumber,ptr+2); /* +2 since 1st two chars are for something else(?) */ } fclose(fhd); } Index: ChangeLog =================================================================== RCS file: /cvsroot/sblim/cmpi-base/ChangeLog,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ChangeLog 6 Apr 2005 16:29:47 -0000 1.1 +++ ChangeLog 8 Apr 2005 08:18:37 -0000 1.2 @@ -63,5 +63,9 @@ * restructured init process for SBLIM tracing into a file * ported OperatingSystem's process indication of OperationalStatus to become a life-cycle indication +* bug# 1178575: fixed seg fault of OperatingSystem's + IndicationCleanup() +* bug# 1179049: switched BaseBoard's values of Vendor and Model on + PPC // =================================================================== |
|
From: Viktor M. <mih...@us...> - 2005-04-07 14:55:44
|
Update of /cvsroot/sblim/indication_helper In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10321 Modified Files: Makefile.am README configure.ac sblim-indication_helper.spec.in Added Files: autoconfiscate.sh Removed Files: autoconfiscate Log Message: Bug 1177177: Cleaned up some problems with certain make targets and brought in line with other SBLIM packages. --- autoconfiscate DELETED --- Index: README =================================================================== RCS file: /cvsroot/sblim/indication_helper/README,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- README 2 Feb 2005 19:06:51 -0000 1.1.1.1 +++ README 7 Apr 2005 14:55:33 -0000 1.2 @@ -6,7 +6,7 @@ CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. You can obtain a current copy of the Common Public License from - http://oss.software.ibm.com/developerworks/opensource/license-cpl.html + http://www.opensource.org/licenses/cpl1.0.php Author: Konrad Rzeszutek <ko...@us...> Date : 09/20/2004 @@ -20,12 +20,15 @@ --------------------------------------------------------- The following software is required to build indication_helper -autoconf >= 2.57 -automake >= 1.5 gcc >= 3.2.0 -cmpi header files >= ver 86 (These files are located in Pegasus and OpenWBEM - WBEM implementation) +cmpi header files >= ver 86 (These files are located in Pegasus + and OpenWBEM WBEM implementation and part of the + SBLIM cmpi-devel package) +If you build from CVS you also need +autoconf >= 2.57 +automake >= 1.5 +libtool (preferably >= 1.8.5) --------------------------------------------------------- BUILD / INSTALLATION @@ -33,7 +36,7 @@ First time to extract the code: run - ./bootstrap + ./autoconfiscate.sh This will generate all files needed to compile. @@ -69,7 +72,7 @@ --------------------------------------------------------- For more information please see the project webiste at -http://www-124.ibm.com/sblim/ +http://sblim.sourceforge.net Index: configure.ac =================================================================== RCS file: /cvsroot/sblim/indication_helper/configure.ac,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- configure.ac 28 Mar 2005 19:15:38 -0000 1.2 +++ configure.ac 7 Apr 2005 14:55:34 -0000 1.3 @@ -2,14 +2,12 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.53) -AC_INIT(sblim-indication_helper, 1.3, sbl...@ww...) -AM_INIT_AUTOMAKE(sblim-indication_helper, 1.3) +AC_INIT(SBLIM Indication Helper, 0.3, sbl...@ww...,sblim-indication_helper) +AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([ind_helper.c]) AM_CONFIG_HEADER(config.h) -VERSION=1.3 IND_HLP_PKG=sblim-indication_helper -AC_SUBST(VERSION) AC_SUBST(IND_HLP_PKG) # Checks for programs. @@ -17,7 +15,6 @@ AC_PROG_INSTALL AC_PROG_LN_S AC_PROG_MAKE_SET -AC_PROG_RANLIB AC_PROG_LIBTOOL AC_PATH_PROGS(RPM, rpmbuild) Index: Makefile.am =================================================================== RCS file: /cvsroot/sblim/indication_helper/Makefile.am,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- Makefile.am 2 Feb 2005 19:06:51 -0000 1.1.1.1 +++ Makefile.am 7 Apr 2005 14:55:33 -0000 1.2 @@ -1,13 +1,9 @@ -MAINTAINERCLEANFILES = Makefile.in - INCLUDES = -I$(top_srcdir) -AM_CFLAGS = @CFLAGS@ - RPMREL = @RPMREL@ RPM = @RPM@ RPMFLAGS = -ta -TARFILE = $(distdir).tar.gz +TARFILE = $(PACKAGE)-$(VERSION).tar.bz2 DESTDIR = RPMDIR =$(HOME)/rpms @@ -18,37 +14,13 @@ lib_LTLIBRARIES = libind_helper.la SUBDIRS = test -libind_helper_la_SOURCES = ind_helper.c +libind_helper_la_SOURCES = ind_helper.c libind_helper_la_LDFLAGS = @LIBPTHREAD@ include_HEADERS = $(top_srcdir)/ind_helper.h -EXTRA_DIST = $(shell find -name '*.h') \ - sblim-indication_helper.spec \ - examples/snmptrapd/test/CreateFilter01.rspgood \ - examples/snmptrapd/test/CreateFilter01.xml \ - examples/snmptrapd/test/CreateHandler01.rspgood \ - examples/snmptrapd/test/CreateHandler01.xml \ - examples/snmptrapd/test/CreateSubscription01.rspgood \ - examples/snmptrapd/test/CreateSubscription01.xml \ - examples/snmptrapd/test/DeleteFilter01.rspgood \ - examples/snmptrapd/test/DeleteFilter01.xml \ - examples/snmptrapd/test/DeleteHandler01.xml \ - examples/snmptrapd/test/DeleteSubscription01.xml \ - examples/snmptrapd/test/Makefile \ - examples/snmptrapd/test/NOTIFICATION-TEST-MIB.txt \ - examples/snmptrapd/test/result.rspgood \ - examples/snmptrapd/CIM_Event.mof \ - examples/snmptrapd/CIM_NetSNMPTrapIndication.mof \ - examples/snmptrapd/CMPI_data.c \ - examples/snmptrapd/CMPI_data.h \ - examples/snmptrapd/Makefile \ - examples/snmptrapd/Registration.mof \ - examples/snmptrapd/SNMP_data.c \ - examples/snmptrapd/SNMP_data.h \ - examples/snmptrapd/SNMPtoCIMProvider.c - +EXTRA_DIST = sblim-indication_helper.spec -rpm: dist +rpm: dist-bzip2 $(RPM) $(RPMFLAGS) $(TARFILE); --- NEW FILE: autoconfiscate.sh --- #!/bin/sh # # Script to setup autoconf/automake build environment. # Run this first to create the configure script # NO CHANGES SHOULD BE NECESSARY TO THIS FILE aclocal --force && autoheader --force && libtoolize --force && automake --add-missing --force-missing && autoconf --force && echo "You may now run ./configure" Index: sblim-indication_helper.spec.in =================================================================== RCS file: /cvsroot/sblim/indication_helper/sblim-indication_helper.spec.in,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- sblim-indication_helper.spec.in 2 Feb 2005 19:06:51 -0000 1.1.1.1 +++ sblim-indication_helper.spec.in 7 Apr 2005 14:55:34 -0000 1.2 @@ -11,22 +11,18 @@ # Author: Konrad Rzeszutek <ko...@us...> # Date : 09/20/2004 # -%define prefix /usr -Name: @IND_HLP_PKG@ -Summary: @IND_HLP_PKG@ - Indication helper library for CMPI providers +Name: @PACKAGE@ +Summary: @PACKAGE@ - Indication helper library for CMPI providers Version: @VERSION@ Release: 1 -Copyright: Common Public Licence http://oss.software.ibm.com/developerworks/opensource/license-cpl.html +Copyright: Common Public Licence 1.0 Group: System Management/Libraries Vendor: SBLIM Packager: Konrad Rzeszutek <ko...@us...> -Source: @IND_HLP_PKG@-@VERSION@.tar.gz -Buildroot: /var/tmp/@IND_HLP_PKG@-root -Summary: Library that provides SAForum's HPI -Group: Utilities -AutoReq: yes -Requires: libc.so.6 libpthread.so.0 +Source: @PACKAGE@-@VERSION@.tar.bz2 +Buildroot: /var/tmp/@PACKAGE@-root + %description This package contain developer library for helping out when writing CMPI providers. This library @@ -44,10 +40,10 @@ ################################################### %build ################################################### -./configure @ac_configure_args@ \ - --prefix=%{prefix} +%configure + make -make test + ################################################### %install ################################################### @@ -65,7 +61,6 @@ ################################################### %defattr(-,root,root) %doc README COPYING ChangeLog TODO -%doc examples/ %{_includedir} %{_libdir}/lib* @@ -77,5 +72,5 @@ then rm -rf $RPM_BUILD_ROOT fi -rm -rf $RPM_BUILD_DIR/@IND_HLP_PKG@-@VERSION@ +rm -rf $RPM_BUILD_DIR/@PACKAGE@-@VERSION@ |
|
From: Viktor M. <mih...@us...> - 2005-04-07 14:55:43
|
Update of /cvsroot/sblim/indication_helper/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10321/test Modified Files: Makefile.am Log Message: Bug 1177177: Cleaned up some problems with certain make targets and brought in line with other SBLIM packages. Index: Makefile.am =================================================================== RCS file: /cvsroot/sblim/indication_helper/test/Makefile.am,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- Makefile.am 2 Feb 2005 19:06:51 -0000 1.1.1.1 +++ Makefile.am 7 Apr 2005 14:55:34 -0000 1.2 @@ -1,5 +1,4 @@ -MAINTAINERCLEANFILES = Makefile.in -AM_CFLAGS = @CFLAGS@ +AM_LDFLAGS = -L$(top_builddir) INCLUDES = -I$(top_srcdir) @@ -23,34 +22,34 @@ Test_reg_pollfnc_SOURCES = Test_reg_pollfnc.c -Test_reg_pollfnc_LDFLAGS = -lpthread -lind_helper +Test_reg_pollfnc_LDADD = -lind_helper Test_reg_pollfnc2_SOURCES = Test_reg_pollfnc2.c -Test_reg_pollfnc2_LDFLAGS = -Xlinker -R $(top_srcdir) -L$(top_srcdir) -lpthread -lind_helper +Test_reg_pollfnc2_LDADD = -lind_helper Test_reg_pollfnc3_SOURCES = Test_reg_pollfnc3.c -Test_reg_pollfnc3_LDFLAGS = -lpthread -lind_helper +Test_reg_pollfnc3_LDADD = -lind_helper Test_reg_pollfnc3_threaded_SOURCES = Test_reg_pollfnc3_threaded.c -Test_reg_pollfnc3_threaded_LDFLAGS = -lpthread -lind_helper +Test_reg_pollfnc3_threaded_LDADD = -lind_helper Test_all_functions_SOURCES = Test_all_functions.c -Test_all_functions_LDFLAGS = -lpthread -lind_helper +Test_all_functions_LDADD = -lind_helper Test_addProperty_SOURCES = Test_addProperty.c -Test_addProperty_LDFLAGS = -lpthread -lind_helper +Test_addProperty_LDADD = -lind_helper Test_setProperties_SOURCES = Test_setProperties.c -Test_setProperties_LDFLAGS = -lpthread -lind_helper +Test_setProperties_LDADD = -lind_helper Test_setProperties_d_SOURCES = Test_setProperties_d.c -Test_setProperties_d_LDFLAGS = -lpthread -lind_helper +Test_setProperties_d_LDADD = -lind_helper Test_regProperties_SOURCES = Test_regProperties.c -Test_regProperties_LDFLAGS = -lpthread -lind_helper +Test_regProperties_LDADD = -lind_helper Test_genIndication_SOURCES = Test_genIndication.c -Test_genIndication_LDFLAGS = -lpthread -lind_helper +Test_genIndication_LDADD = -lind_helper Test_genIndication_fail_SOURCES = Test_genIndication_fail.c -Test_genIndication_fail_LDFLAGS = -lpthread -lind_helper +Test_genIndication_fail_LDADD = -lind_helper |
|
From: Heidi N. <hei...@us...> - 2005-04-07 14:26:56
|
Update of /cvsroot/sblim/cmpi-base In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26287 Modified Files: cmpiOSBase_OperatingSystemProvider.c Log Message: Bug 1178575: fixed seg fault of IndicationCleanup() Index: cmpiOSBase_OperatingSystemProvider.c =================================================================== RCS file: /cvsroot/sblim/cmpi-base/cmpiOSBase_OperatingSystemProvider.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- cmpiOSBase_OperatingSystemProvider.c 6 Apr 2005 15:43:16 -0000 1.12 +++ cmpiOSBase_OperatingSystemProvider.c 7 Apr 2005 14:26:34 -0000 1.13 @@ -574,8 +574,8 @@ CMPIContext * ctx) { _OSBASE_TRACE(1,("--- %s CMPI IndicationCleanup() called",_ClassName)); - CMRelease(sourceInstance); - CMRelease(previousInstance); + if(sourceInstance) { CMRelease(sourceInstance); } + if(previousInstance) { CMRelease(previousInstance); } ind_shutdown(); ind_inited = 0; ind_enabled = 0; |
|
From: Heidi N. <hei...@us...> - 2005-04-07 12:40:42
|
Update of /cvsroot/sblim/cmpi-base In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29101 Modified Files: README Log Message: fixed configure sample for locally installed openPegasus Index: README =================================================================== RCS file: /cvsroot/sblim/cmpi-base/README,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- README 6 Apr 2005 16:44:46 -0000 1.9 +++ README 7 Apr 2005 12:40:21 -0000 1.10 @@ -40,11 +40,14 @@ Package Contents ---------------- -./README This file -./*.h Header Files -./*.c Provider Code -./mof/ Schema file(s) -./test/ Configuration files for SBLIM TestSuite +./README This file +./README.INDICATION README for Indication Support +./*.h Header Files +./*.c Provider Code +./mof/ Schema file(s) +./test/ Configuration files for SBLIM TestSuite +./test/indication Sample Filter, Handler and Subscription to + test the Indication Support @@ -75,6 +78,7 @@ Building cmpi-base .................. + This package is now GNU autotool enabled, refer to the file named INSTALL for generic instructions. @@ -96,8 +100,9 @@ For instance, in order to configure for a locally installed Pegasus you can issue the following command: -./configure CIMSERVER=pegasus PROVIDERDIR=$PEGASUS_HOME/provider \ - --libdir=$PEGASUS_HOME/lib +./configure CIMSERVER=pegasus PROVIDERDIR=$PEGASUS_HOME/lib + + Load Schema into CIMOM's repository |
|
From: Viktor M. <mih...@us...> - 2005-04-06 16:45:07
|
Update of /cvsroot/sblim/cmpi-base In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30006 Modified Files: README Log Message: Adapted build instructions to new build process. Index: README =================================================================== RCS file: /cvsroot/sblim/cmpi-base/README,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- README 3 Feb 2005 18:19:34 -0000 1.8 +++ README 6 Apr 2005 16:44:46 -0000 1.9 @@ -75,20 +75,30 @@ Building cmpi-base .................. -In order to compile and install cmpi-base instrumentation, -the path to the CMPI header files and the library path to -libCMPIAdapter.so needs to be added to the search path. -This is configured by editing the "setting.cmpi" file. Once -all the pathes are configured, do : -- make -- make install -> copy all shared libraries to the library - path of the CIMOM; copy some header files - to the inlcude path (necessary if other - instrumentation packages use tool functions - of cmpi-base) +This package is now GNU autotool enabled, refer to the file +named INSTALL for generic instructions. + +The generated configure script tries to determine where the CMPI header files +are located. For this purpose it searches a set of well-known locations. +The "canonical" location is /usr/include/cmpi or /usr/local/include/cmpi, +depending on how configure is invoked. + +Further, configure "determines" where providers are to be installed. Actually, +there's no detection logic. The provider directory will always be +/usr/lib/cmpi or /usr/local/lib/cmpi. If a CIM server requires a particular +directory this can be selected by specifying the PROVIDERDIR variable. + +And finally, configure tries to find out which CIM server type is being used. +This is necessary in order to select the appropriate schema and provider +registration technique. If the CIM server is not or incorrectly identified, +it is possible to specify it via the CIMSERVER variable. +Supported values are pegasus, sfcb, openwbem and sniacimom. + +For instance, in order to configure for a locally installed Pegasus you can +issue the following command: +./configure CIMSERVER=pegasus PROVIDERDIR=$PEGASUS_HOME/provider \ + --libdir=$PEGASUS_HOME/lib -- make clean -> to delete all shared libs in this source - directory Load Schema into CIMOM's repository ................................... @@ -96,7 +106,7 @@ with Pegasus : .............. The loading and registering of the classes/associations and -their provider is done during the "make install" process. +their provider is done during the "make postinstall". with OpenCimom/SNIA CIMOM : ........................... @@ -185,10 +195,3 @@ How to set up and drive the test is described in the README file of the test sub directory. - - - - - - - |
|
From: Viktor M. <mih...@us...> - 2005-04-06 16:29:58
|
Update of /cvsroot/sblim/cmpi-base In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24952 Added Files: AUTHORS COPYING ChangeLog Makefile.am NEWS acinclude.m4 autoconfiscate.sh configure.ac provider-register.sh sblim-cmpi-base.spec.in Removed Files: CHANGE.LOG license.html makefile platform.sh setting.cmpi Log Message: Bug 1177872: Autoconfiscate the cmpi-base package. --- NEW FILE: ChangeLog --- // =================================================================== // new in version 1.2.3 : * update to Pegasus' CIMOMINC path in setting.cmpi * added three properties to OperatingSystem : - CodeSet - LanguageEdition - DefaultPageSize * support for standalone build (RPM) // ================================================================== // new in version 1.2.4 : * fixed algorithm to retrieve Version of Linux_OperatingSystem * Processor instrumentation ported to GENERIC and X86_64 hardware platform * test script accepts userID and password // =================================================================== // new in version 1.3 : * support for property list filter on EnumInstances and GetInstance // =================================================================== // new in version 1.4 : * moved library dmiinfo from cmpi-smbios package to cmpi-base (needed for data gathering for Linux_BaseBoard) * added class Linux_BaseBoard * added association Linux_CSBaseBoard * enabled Indication Interface for Linux_OperatingSystem (with no functionality !) // =================================================================== // new in version 1.4.1 : * implemented Indication support for Linux_OperatingSystem property OperationalStatus - default disabled by -DNOEVENTS -> see README.IDICATION for more information // =================================================================== // new in version 1.4.2 : * fixed retrieval of LPARID on Power // =================================================================== // new in version 1.4.3 : * bug# 1155823: fixed retrieval of OperatingSystem's TotalVirtualMemorySize, FreeVirtualMemory, TotalVisibleMemorySize, FreePhysicalMemory, SizeStoredInPagingFiles and FreeSpaceInPagingFiles for kernel 2.6 * bug# 1155834: fixed OperatingSystem's InstallDate for Fedora * added sample subscriptions to test/indication directory * updated README.INDICATION with better description and sample for openPegasus * restructured init process for SBLIM tracing into a file * ported OperatingSystem's process indication of OperationalStatus to become a life-cycle indication // =================================================================== --- NEW FILE: sblim-cmpi-base.spec.in --- # # $Id: sblim-cmpi-base.spec.in,v 1.1 2005/04/06 16:29:47 mihajlov Exp $ # # Package spec for @PACKAGE@ # BuildRoot: /var/tmp/buildroot Summary: Sample CMPI Provider Name: @PACKAGE_TARNAME@ Version: @PACKAGE_VERSION@ Release: @CIMSERVER@ Group: Systems Management/Base License: Common Public License 1.0 Source0: http://prdownloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2 BuildRequires: cmpi-devel Requires: cimserver %Description Standards Based Linux Instrumentation Base Providers %Package devel Summary: SBLIM Base Instrumentation Header Development Files Group: Systems Management/Base Requires: %{name} = %{version} %Description devel SBLIM Base Provider Development Package %prep %setup -n %{name}-%{version} export PATCH_GET=0 #%patch0 -p0 %build %configure make %clean if [ `id -ur` != 0 ] then # paranoia check rm -rf $RPM_BUILD_ROOT fi %install if [ `id -ur` != 0 ] then # paranoia check rm -rf $RPM_BUILD_ROOT fi make DESTDIR=$RPM_BUILD_ROOT install # remove unused libtool files rm -f $RPM_BUILD_ROOT/%{_libdir}/*a rm -f $RPM_BUILD_ROOT/%{_libdir}/cmpi/*a %post # Register Schema and Provider - this is higly provider specific %if "@LINDHELP@" != "" %define SCHEMA %{_datadir}/%{name}/Linux_Base.mof %{_datadir}/%{name}/Linux_BaseIndication.mof %define REGISTRATION_pegasus %{_datadir}/%{name}/Linux_BaseRegistration.mof %{_datadir}/%{name}/Linux_BaseIndicationReg.mof %define REGISTRATION_sfcb %{_datadir}/%{name}/Linux_Base.sfcb.reg %{_datadir}/%{name}/Linux_BaseIndication.sfcb.reg %else %define SCHEMA %{_datadir}/%{name}/Linux_Base.mof %define REGISTRATION_pegasus %{_datadir}/%{name}/Linux_BaseRegistration.mof %define REGISTRATION_sfcb %{_datadir}/%{name}/Linux_Base.sfcb.reg %endif %{_datadir}/%{name}/provider-register.sh -t @CIMSERVER@ \ -s %{SCHEMA} > /dev/null %{_datadir}/%{name}/provider-register.sh -t @CIMSERVER@ \ -r %{REGISTRATION_@CIMSERVER@} > /dev/null /sbin/ldconfig %postun /sbin/ldconfig %files %defattr(-,root,root) %{_datadir}/%{name} %{_datadir}/doc/%{name}-%{version} %{_libdir}/*.so* %{_libdir}/cmpi/*.so* %files devel %defattr(-,root,root) %{_includedir} --- CHANGE.LOG DELETED --- --- setting.cmpi DELETED --- --- makefile DELETED --- --- NEW FILE: configure.ac --- # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) AC_INIT(SBLIM BaseOS Providers Base, 1.4.2am, hei...@de...,sblim-cmpi-base) AC_CONFIG_SRCDIR([OSBase_Common.c]) AC_CONFIG_HEADER([config.h]) AM_INIT_AUTOMAKE AC_CANONICAL_HOST case $host_cpu in i*86) HW=INTEL;; s390) HW=S390;; ppc*) HW=PPC;; x86_64) HW=X86_64;; ia64) HW=IA64;; **) HW=GENERIC;; esac # Configuration Arguments AC_ARG_VAR([PROVIDERDIR],[the directory where the CMPI providers will be installed.]) AC_ARG_VAR([CIMSERVER],[the target CIM server (pegasus|sfcb|openwbem|sniacimom).]) # Checks for programs. AC_PROG_CC AC_PROG_INSTALL AC_PROG_LIBTOOL # Checks for libraries. AC_CHECK_LIB([ind_helper], [ind_start], [LINDHELP=-lind_helper], [LINDHELP=]) AC_SUBST(LINDHELP) # Check for required CMPI header files (defined in acinclude.m4) CHECK_CMPI # Check for required libraries (defined in acinclude.m4) CHECK_PROVIDERDIR # Check for CIM Server (defined in acinclude.m4) CHECK_CIMSERVER # Checks for header files. AC_HEADER_DIRENT AC_HEADER_STDC AC_HEADER_SYS_WAIT AC_CHECK_HEADERS([fcntl.h langinfo.h limits.h malloc.h stdlib.h string.h sys/time.h unistd.h]) AC_CHECK_HEADER([ind_helper.h],[EVENTFLAGS=],[EVENTFLAGS=-DNOEVENTS],[]) # Checks for typedefs, structures, and compiler characteristics. AC_C_CONST AC_C_INLINE AC_TYPE_MODE_T AC_TYPE_OFF_T AC_TYPE_SIZE_T AC_HEADER_TIME AC_STRUCT_TM # Checks for library functions. AC_FUNC_CLOSEDIR_VOID AC_FUNC_FORK AC_FUNC_MALLOC AC_FUNC_MEMCMP AC_FUNC_MKTIME AC_FUNC_MMAP AC_FUNC_REALLOC AC_FUNC_STRFTIME AC_CHECK_FUNCS([gethostname getpagesize gettimeofday memset munmap nl_langinfo strcasecmp strchr strdup strerror strrchr strstr uname]) AC_CONFIG_FILES([Makefile sblim-cmpi-base.spec]) AM_CONDITIONAL(NOEVENTS,[test x"$EVENTFLAGS" != x]) # Extend CPPFLAGS CPPFLAGS="$CPPFLAGS -D$HW $EVENTFLAGS" if test x"$EVENTFLAGS" == x; then INDICATION_SUPPORT=Enabled else INDICATION_SUPPORT=Disabled fi # Display configuration options echo "-------------------------------------------------------" echo "Configuration for $PACKAGE complete." echo "" echo "The following configuration options have been selected:" echo "CIMSERVER: " $CIMSERVER echo "PROVIDERDIR: " $PROVIDERDIR echo "CPPFLAGS:" $CPPFLAGS echo "Indication Support" $INDICATION_SUPPORT echo "-------------------------------------------------------" AC_OUTPUT echo "You may now run make" --- NEW FILE: acinclude.m4 --- dnl dnl $Id: acinclude.m4,v 1.1 2005/04/06 16:29:47 mihajlov Exp $ dnl dnl dnl (C) Copyright IBM Corp. 2004, 2005 dnl dnl THIS FILE IS PROVIDED UNDER THE TERMS OF THE COMMON PUBLIC LICENSE dnl ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE dnl CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. dnl dnl You can obtain a current copy of the Common Public License from dnl http://www.opensource.org/licenses/cpl1.0.php dnl dnl Author: Konrad Rzeszutek <ko...@us...> dnl Contributors: Viktor Mihajlovski <mih...@de...> dnl Date : 09/20/2004 dnl dnl dnl CHECK_CMPI: Check for CMPI headers and set the CPPFLAGS dnl with the -I<directory> dnl dnl CHECK_PEGASUS_2_3_2: Check for Pegasus 2.3.2 and set dnl the HAVE_PEGASUS_2_3_2 dnl flag dnl AC_DEFUN([CHECK_PEGASUS_2_3_2], [ AC_MSG_CHECKING(for Pegasus 2.3.2) test_CIMSERVER=`cimserver -v` if test "$test_CIMSERVER" == "2.3.2"; then AC_MSG_RESULT(yes) AC_DEFINE_UNQUOTED(HAVE_PEGASUS_2_3_2,1,[Defined to 1 if Pegasus 2.3.2 is used]) else AC_MSG_RESULT(no) fi ] ) dnl dnl CHECK_PEGASUS_2_4: Check for Pegasus 2.4 and set the dnl the -DPEGASUS_USE_EXPERIMENTAL_INTERFACES flag dnl AC_DEFUN([CHECK_PEGASUS_2_4], [ AC_MSG_CHECKING(for Pegasus 2.4) test_CIMSERVER=`cimserver -v` if test "$test_CIMSERVER" == "2.4"; then AC_MSG_RESULT(yes) CPPFLAGS="$CPPFLAGS -DPEGASUS_USE_EXPERIMENTAL_INTERFACES" AC_DEFINE_UNQUOTED(HAVE_PEGASUS_2_4,1,[Defined to 1 if Pegasus 2.4 is used]) else AC_MSG_RESULT(no) fi ] ) dnl dnl Helper functions dnl AC_DEFUN([_CHECK_CMPI], [ AC_MSG_CHECKING($1) AC_TRY_LINK( [ #include <cmpimacs.h> #include <cmpidt.h> #include <cmpift.h> ], [ CMPIBroker broker; CMPIStatus status = {CMPI_RC_OK, NULL}; CMPIString *s = CMNewString(&broker, "TEST", &status); ], [ have_CMPI=yes dnl AC_MSG_RESULT(yes) ], [ dnl AC_MSG_RESULT(no) ]) ]) dnl dnl The main function to check for CMPI headers dnl Modifies the CPPFLAGS with the right include directory and sets dnl the 'have_CMPI' to either 'no' or 'yes' dnl AC_DEFUN([CHECK_CMPI], [ AC_MSG_CHECKING(for CMPI headers) dnl Check just with the standard include paths _CHECK_CMPI(standard) if test "$have_CMPI" == "yes"; then dnl The standard include paths worked. AC_MSG_RESULT(yes) else CMPI_CPP_FLAGS="$CPPFLAGS" _DIRS_="/usr/include/cmpi \ /usr/local/include/cmpi \ $PEGASUS_ROOT/src/Pegasus/Provider/CMPI \ /opt/tog-pegasus/include/Pegasus/Provider/CMPI \ /usr/include/Pegasus/Provider/CMPI \ /usr/include/openwbem \ /usr/sniacimom/include" for _DIR_ in $_DIRS_ do _cppflags=$CPPFLAGS _include_CMPI="$_DIR_" CPPFLAGS="$CPPFLAGS -I$_include_CMPI" _CHECK_CMPI($_DIR_) if test "$have_CMPI" == "yes"; then dnl Found it AC_MSG_RESULT(yes) dnl Save the new -I parameter CMPI_CPP_FLAGS="$CPPFLAGS" break fi CPPFLAGS=$_cppflags done fi CPPFLAGS="$CMPI_CPP_FLAGS" if test "$have_CMPI" == "no"; then AC_MSG_ERROR(no. Sorry cannot find CMPI headers files.) fi ] ) dnl dnl The check for the CMPI provider directory dnl Sets the PROVIDERDIR variable. dnl AC_DEFUN([CHECK_PROVIDERDIR], [ AC_MSG_CHECKING(for CMPI provider directory) _DIRS="$libdir/cmpi" for _dir in $_DIRS do AC_MSG_CHECKING( $_dir ) if test -d $_dir ; then dnl Found it AC_MSG_RESULT(yes) if test x"$PROVIDERDIR" == x ; then PROVIDERDIR=$_dir fi break fi done if test x"$PROVIDERDIR" == x ; then PROVIDERDIR="$libdir"/cmpi AC_MSG_RESULT(implied: $PROVIDERDIR) fi ] ) dnl dnl The "check" for the CIM server type dnl Sets the CIMSERVER variable. dnl AC_DEFUN([CHECK_CIMSERVER], [ AC_MSG_CHECKING(for CIM servers) _SERVERS="sfcbd cimserver owcimomd" for _name in $_SERVERS do AC_MSG_CHECKING( $_name ) which $_name > /dev/null 2>&1 if test $? == 0 ; then dnl Found it AC_MSG_RESULT(yes) if test x"$CIMSERVER" == x ; then case $_name in sfcBroker) CIMSERVER=sfcb;; cimserver) CIMSERVER=pegasus;; owcimomd) CIMSERVER=openwbem;; esac fi break; fi done if test x"$CIMSERVER" == x ; then CIMSERVER=sfcb AC_MSG_RESULT(implied: $CIMSERVER) fi ] ) --- license.html DELETED --- --- NEW FILE: Makefile.am --- # $Id: Makefile.am,v 1.1 2005/04/06 16:29:47 mihajlov Exp $ # ================================================================== # (C) Copyright IBM Corp. 2005 # # THIS FILE IS PROVIDED UNDER THE TERMS OF THE COMMON PUBLIC LICENSE # ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE # CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. # # You can obtain a current copy of the Common Public License from # http://www.opensource.org/licenses/cpl1.0.php # # Author: Viktor Mihajlovski <mih...@de...> # Contributors: Dr. Gareth S. Bestor <bes...@us...> # Description: Automake input file for OS Base Providers # ================================================================== # SBLIM Include Directory sblimincdir = $(includedir)/sblim # Start from an empty extra distribution file list EXTRA_DIST= # docdir defines where the documentation goes docdir=$(datadir)/doc/$(PACKAGE)-$(VERSION) # # Automake instructions for documentation # doc_DATA=README AUTHORS COPYING # ADD EXTRA DOC FILES IF PRESENT doc_DATA+=README.INDICATION DEBUG EXTRA_DIST+=README.INDICATION DEBUG # providerdir defines where provider libraries will be installed (@PROVIDERDIR@ is set by the configure script). providerdir = @PROVIDERDIR@ # # Automake instructions for main dir # # OSBase CMPI provider libraries provider_LTLIBRARIES = libcmpiOSBase_ComputerSystemProvider.la \ libcmpiOSBase_OperatingSystemProvider.la \ libcmpiOSBase_UnixProcessProvider.la \ libcmpiOSBase_ProcessorProvider.la \ libcmpiOSBase_BaseBoardProvider.la \ libcmpiOSBase_RunningOSProvider.la \ libcmpiOSBase_OSProcessProvider.la \ libcmpiOSBase_CSProcessorProvider.la \ libcmpiOSBase_CSBaseBoardProvider.la # Computer System libcmpiOSBase_ComputerSystemProvider_la_SOURCES = \ cmpiOSBase_ComputerSystemProvider.c \ cmpiOSBase_ComputerSystem.c \ OSBase_ComputerSystem.c libcmpiOSBase_ComputerSystemProvider_la_LIBADD = -lcmpiOSBase_Common # Operating System libcmpiOSBase_OperatingSystemProvider_la_SOURCES = \ cmpiOSBase_OperatingSystemProvider.c \ cmpiOSBase_OperatingSystem.c \ OSBase_OperatingSystem.c libcmpiOSBase_OperatingSystemProvider_la_LIBADD = -lcmpiOSBase_Common \ -ldmiinfo @LINDHELP@ # This gcc/ld specific flag is ugly - need to check in configure libcmpiOSBase_OperatingSystemProvider_la_LDFLAGS = -Wc,-nostartfiles # Unix Process libcmpiOSBase_UnixProcessProvider_la_SOURCES = \ cmpiOSBase_UnixProcessProvider.c \ cmpiOSBase_UnixProcess.c \ OSBase_UnixProcess.c libcmpiOSBase_UnixProcessProvider_la_LIBADD = -lcmpiOSBase_Common # Processor libcmpiOSBase_ProcessorProvider_la_SOURCES = \ cmpiOSBase_ProcessorProvider.c \ cmpiOSBase_Processor.c \ OSBase_Processor.c libcmpiOSBase_ProcessorProvider_la_LIBADD = -lcmpiOSBase_Common # Base Board libcmpiOSBase_BaseBoardProvider_la_SOURCES = \ cmpiOSBase_BaseBoardProvider.c \ cmpiOSBase_BaseBoard.c \ OSBase_BaseBoard.c libcmpiOSBase_BaseBoardProvider_la_LIBADD = -lcmpiOSBase_Common -ldmiinfo libcmpiOSBase_RunningOSProvider_la_SOURCES = cmpiOSBase_RunningOSProvider.c libcmpiOSBase_RunningOSProvider_la_LIBADD = -lcmpiOSBase_Common libcmpiOSBase_OSProcessProvider_la_SOURCES = cmpiOSBase_OSProcessProvider.c libcmpiOSBase_OSProcessProvider_la_LIBADD = -lcmpiOSBase_Common libcmpiOSBase_CSProcessorProvider_la_SOURCES = cmpiOSBase_CSProcessorProvider.c libcmpiOSBase_CSProcessorProvider_la_LIBADD = -lcmpiOSBase_Common libcmpiOSBase_CSBaseBoardProvider_la_SOURCES = cmpiOSBase_CSBaseBoardProvider.c libcmpiOSBase_CSBaseBoardProvider_la_LIBADD = -lcmpiOSBase_Common # OSBase support utility libraries lib_LTLIBRARIES = libcmpiOSBase_Common.la libdmiinfo.la libcmpiOSBase_Common_la_SOURCES=OSBase_Common.c cmpiOSBase_Common.c # This gcc/ld specific flag is ugly - need to check in configure libcmpiOSBase_Common_la_LDFLAGS = -Wc,-nostartfiles libdmiinfo_la_SOURCES=dmiinfo.c dmiinfo.h dmifind.h # DMI layer test program (not installed) noinst_PROGRAMS = dmitest dmitest_SOURCES = dmitest.c dmitest_LDADD = -ldmiinfo # Installable Header Files sbliminc_HEADERS = OSBase_Common.h # Non-Installable Header Files noinst_HEADERS = OSBase_ComputerSystem.h \ OSBase_OperatingSystem.h \ OSBase_UnixProcess.h \ OSBase_Processor.h \ OSBase_BaseBoard.h \ cmpiOSBase_Util.h \ cmpiOSBase_Common.h \ cmpiOSBase_ComputerSystem.h \ cmpiOSBase_OperatingSystem.h \ cmpiOSBase_UnixProcess.h \ cmpiOSBase_Processor.h \ cmpiOSBase_BaseBoard.h # We must explicity add the RPM spec file to the distribution package EXTRA_DIST+=$(PACKAGE).spec # # Automake instructions for ./mof subdir # if NOEVENTS SCHEMAS=mof/Linux_Base.mof REGISTRATIONS.pegasus=mof/Linux_BaseRegistration.mof REGISTRATIONS.sfcb=mof/Linux_Base.sfcb.reg REGISTRATIONS.openwbem= REGISTRATIONS.sniacimom= else SCHEMAS=mof/Linux_Base.mof mof/Linux_BaseIndication.mof REGISTRATIONS.pegasus=mof/Linux_BaseRegistration.mof \ mof/Linux_BaseIndicationReg.mof REGISTRATIONS.sfcb=mof/Linux_Base.sfcb.reg mof/Linux_BaseIndication.sfcb.reg REGISTRATIONS.openwbem= REGISTRATIONS.sniacimom= endif REGISTRATIONS=$(REGISTRATIONS.pegasus) \ $(REGISTRATIONS.sfcb) \ $(REGISTRATIONS.openwbem) \ $(REGISTRATIONS.sniacimom) # We must explicity add all the schema files to the distribution package pkgdata_DATA=$(SCHEMAS) $(REGISTRATIONS) pkgdata_SCRIPTS=provider-register.sh EXTRA_DIST+=mof $(pkgdata_SCRIPTS) # Register the provider(s) and class definition(s) to the current CIM server/CIMOM postinstall: test x"$(SCHEMAS)" != x && \ sh provider-register.sh -t @CIMSERVER@ -s $(SCHEMAS) test x"$(REGISTRATIONS.@CIMSERVER@)" != x && \ sh provider-register.sh -t @CIMSERVER@ -r $(REGISTRATIONS.@CIMSERVER@) dist-hook: test -d "$(distdir)" && rm -rf `find $(distdir) -type d -name CVS` --- NEW FILE: autoconfiscate.sh --- #!/bin/sh # # Script to setup autoconf/automake build environment. # Run this first to create the configure script aclocal --force && autoheader --force && libtoolize --force && automake --add-missing --force-missing && autoconf --force && echo "You may now run ./configure" --- NEW FILE: COPYING --- Common Public License Version 1.0 THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. 1. DEFINITIONS "Contribution" means: a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and b) in the case of each subsequent Contributor: i) changes to the Program, and ii) additions to the Program; where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program. "Contributor" means any person or entity that distributes the Program. "Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program. "Program" means the Contributions distributed in accordance with this Agreement. "Recipient" means anyone who receives the Program under this Agreement, including all Contributors. 2. GRANT OF RIGHTS a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form. b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder. c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program. d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement. 3. REQUIREMENTS A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that: a) it complies with the terms and conditions of this Agreement; and b) its license agreement: i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose; ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits; iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange. When the Program is made available in source code form: a) it must be made available under this Agreement; and b) a copy of this Agreement must be included with each copy of the Program. Contributors may not remove or alter any copyright notices contained within the Program. Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution. 4. COMMERCIAL DISTRIBUTION Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense. For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages. 5. NO WARRANTY EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement, including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations. 6. DISCLAIMER OF LIABILITY EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. 7. GENERAL If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. If Recipient institutes patent litigation against a Contributor with respect to a patent applicable to software (including a cross-claim or counterclaim in a lawsuit), then any patent licenses granted by that Contributor to such Recipient under this Agreement shall terminate as of the date such litigation is filed. In addition, if Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed. All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive. Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. IBM is the initial Agreement Steward. IBM may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved. This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation. --- platform.sh DELETED --- --- NEW FILE: NEWS --- --- NEW FILE: AUTHORS --- The cmpi-base provider package was originally written by Heidi Neumann <hei...@de...>. --- NEW FILE: provider-register.sh --- #!/bin/sh # $Id: provider-register.sh,v 1.1 2005/04/06 16:29:47 mihajlov Exp $ # ================================================================== # (C) Copyright IBM Corp. 2005 # # THIS FILE IS PROVIDED UNDER THE TERMS OF THE COMMON PUBLIC LICENSE # ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE # CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. # # You can obtain a current copy of the Common Public License from # http://www.opensource.org/licenses/cpl1.0.php # # Author: Viktor Mihajlovski <mih...@de...> # Contributors: # Description: Script to install class definitions (MOFs) and registration data # for a variety of supported CIMOMs # ================================================================== function pegasus_install() { if ps -C cimserver > /dev/null 2>&1 then CIMMOF=cimmof state=active else CIMMOF=cimmofl state=inactive fi if test $1 == mofs then NAMESPACE=root/cimv2 action="Installing Schemas" else if test $1 == regs then NAMESPACE=root/PG_Interop action="Registering Providers" else echo "Invalid install mode " $1 return 1 fi fi shift echo $action with $state cimserver $CIMMOF -n $NAMESPACE $* } function sfcb_install() { if test $1 == mofs then action="Staging Schemas" shift params="$*" else if test $1 == regs then action="Staging Provider Registration -- rebuild repository and restart sfcb!" shift params="-r $*" else echo "Invalid install mode " $1 return 1 fi fi echo $action sfcbstage $params } function usage() { echo "usage: $0 [-h] -t <cimserver> [ -s mof ... | -r regfile ... ]" } args=`getopt ht:r:s: $*` if [ $? != 0 ] then usage $0 exit 1 fi set -- $args while [ -n "$1" ] do case $1 in -h) help=1; shift; break;; -t) cimserver=$2; shift 2;; -s) mofs=$2; shift 2;; -r) regs=$2; shift 2;; --) shift; break;; **) break;; esac done if [ "$help" == "1" ] then usage echo -e "\t-h display help message" echo -e "\t-t specify cimserver type (pegasus|sfcb|openwbem|sniacimom)" echo -e "\t-s specify schema mofs" echo -e "\t-r specify registration files" echo echo Use this command install schema mofs or register provider echo CIM Server Type is required, schema and registration files are echo mutually exclusive. exit 0 fi if test x$cimserver == x then usage $0 exit 1 fi if test x"$mofs" == x && test x"$regs" == x then usage $0 exit 1 fi if test x"$mofs" != x && test x"$regs" != x then usage $0 exit 1 fi if test x"$mofs" != x then mode=mofs mofs="$mofs $*" else if test x"$regs" != x then mode=regs regs="$regs $*" fi fi case $cimserver in pegasus) pegasus_install $mode $mofs $regs;; sfcb) sfcb_install $mode $mofs $regs;; openwbem) echo openwbem not yet supported && exit 1 ;; sniacimom) echo sniacimom not yet supported && exit 1 ;; **) echo "Invalid CIM Server Type " $cimserver && exit 1;; esac |
|
From: Viktor M. <mih...@us...> - 2005-04-06 16:29:57
|
Update of /cvsroot/sblim/cmpi-base/mof In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24952/mof Added Files: Linux_Base.sfcb.reg Linux_BaseIndication.sfcb.reg Removed Files: makefile.pegasus makefile.standalone Log Message: Bug 1177872: Autoconfiscate the cmpi-base package. --- NEW FILE: Linux_Base.sfcb.reg --- [Linux_Processor] provider: OSBase_ProcessorProvider location: cmpiOSBase_ProcessorProvider type: instance namespace: root/cimv2 # [Linux_UnixProcess] provider: OSBase_UnixProcessProvider location: cmpiOSBase_UnixProcessProvider type: instance namespace: root/cimv2 # [Linux_ComputerSystem] provider: OSBase_ComputerSystemProvider location: cmpiOSBase_ComputerSystemProvider type: instance namespace: root/cimv2 # [Linux_OperatingSystem] provider: OSBase_OperatingSystemProvider location: cmpiOSBase_OperatingSystemProvider type: instance namespace: root/cimv2 # [Linux_BaseBoard] provider: OSBase_BaseBoardProvider location: cmpiOSBase_BaseBoardProvider type: instance namespace: root/cimv2 # [Linux_RunningOS] provider: OSBase_RunningOSProvider location: cmpiOSBase_RunningOSProvider type: instance association namespace: root/cimv2 # [Linux_OSProcess] provider: OSBase_OSProcessProvider location: cmpiOSBase_OSProcessProvider type: instance association namespace: root/cimv2 # [Linux_CSProcessor] provider: OSBase_CSProcessorProvider location: cmpiOSBase_CSProcessorProvider type: instance association namespace: root/cimv2 # [Linux_CSBaseBoard] provider: OSBase_CSBaseBoardProvider location: cmpiOSBase_CSBaseBoardProvider type: instance association namespace: root/cimv2 --- makefile.standalone DELETED --- --- makefile.pegasus DELETED --- --- NEW FILE: Linux_BaseIndication.sfcb.reg --- [Linux_OperatingSystem] provider: OSBase_OperatingSystemProvider location: cmpiOSBase_OperatingSystemProvider type: instance indication namespace: root/cimv2 |
|
From: Viktor M. <mih...@us...> - 2005-04-06 16:29:56
|
Update of /cvsroot/sblim/cmpi-base/contrib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24952/contrib Removed Files: SuSEconfig.sblim-cmpi-base sblim-cmpi-base.spec Log Message: Bug 1177872: Autoconfiscate the cmpi-base package. --- SuSEconfig.sblim-cmpi-base DELETED --- --- sblim-cmpi-base.spec DELETED --- |
|
From: Heidi N. <hei...@us...> - 2005-04-06 15:43:26
|
Update of /cvsroot/sblim/cmpi-base In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12058 Modified Files: CHANGE.LOG README.INDICATION cmpiOSBase_OperatingSystem.c cmpiOSBase_OperatingSystemProvider.c Log Message: ported OperatingSystem'S process indication of OperationalStatus to become a life-cycle indication Index: cmpiOSBase_OperatingSystemProvider.c =================================================================== RCS file: /cvsroot/sblim/cmpi-base/cmpiOSBase_OperatingSystemProvider.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- cmpiOSBase_OperatingSystemProvider.c 3 Feb 2005 18:19:34 -0000 1.11 +++ cmpiOSBase_OperatingSystemProvider.c 6 Apr 2005 15:43:16 -0000 1.12 @@ -374,7 +374,7 @@ #ifndef NOEVENTS -#define INDCLASSNAME "Linux_OperatingSystemIndication" +#define INDCLASSNAME "CIM_InstModification" #define INDNAMESPACE "root/cimv2" #define IND_NUMBER_OF_DYNAMIC_PROPERTIES 5 @@ -384,6 +384,10 @@ static int ind_OperationalStatus = 2; +static CMPIInstance *sourceInstance = NULL; +static CMPIInstance *previousInstance = NULL; + + IndErrorT CIM_Indication_IndicationIdentifier(CMPIData *v) { CMPIString *str; @@ -391,7 +395,7 @@ _OSBASE_TRACE(1,("--- %s CIM_Indication_IndicationIdentifier() called",_ClassName)); - str = CMNewString(_broker,_ClassName, &rc); + str = CMNewString(_broker,INDCLASSNAME,&rc); v->type = CMPI_string; v->value.string = str; v->state = CMPI_goodValue; @@ -429,44 +433,57 @@ return IND_OK; } -IndErrorT Linux_OperatingSystemIndication_Name(CMPIData *v) +IndErrorT CIM_InstModification_SourceInstance(CMPIData *v) { - CMPIString *str = NULL; CMPIStatus rc; - _OSBASE_TRACE(1,("--- %s Linux_OperatingSystemIndication_Name() called",_ClassName)); + _OSBASE_TRACE(1,("--- %s CIM_InstModification_SourceInstance() called",_ClassName)); - str = CMNewString(_broker,get_system_name(), &rc); - v->type = CMPI_string; - v->value.string = str; + v->type = CMPI_instance; + v->value.inst = CMClone(sourceInstance,&rc); v->state = CMPI_goodValue; return IND_OK; } -IndErrorT Linux_OperatingSystemIndication_OperationalStatus(CMPIData *v) +IndErrorT CIM_InstModification_PreviousInstance(CMPIData *v) { - CMPIString *str = NULL; CMPIStatus rc; - _OSBASE_TRACE(1,("--- %s Linux_OperatingSystemIndication_OperationalStatus() called",_ClassName)); + _OSBASE_TRACE(1,("--- %s CIM_InstModification_PreviousInstance() called",_ClassName)); - if(ind_OperationalStatus==2) { str = CMNewString(_broker,"OK", &rc); } - if(ind_OperationalStatus==4) { str = CMNewString(_broker,"Stressed", &rc); } - - v->type = CMPI_string; - v->value.string = str; + v->type = CMPI_instance; + v->value.inst = CMClone(previousInstance,&rc); v->state = CMPI_goodValue; return IND_OK; } + IndErrorT check(CMPIData *v) { + CMPIObjectPath *cop = NULL; + CMPIStatus rc; + _OSBASE_TRACE(1,("--- %s check() called",_ClassName)); /* call function to check OperationalStatus */ ind_new = check_OperationalStatus(&ind_OperationalStatus); + if(ind_new!=0) + _OSBASE_TRACE(2,("--- %s check(): Event occured",_ClassName)); + + if(previousInstance) { + CMRelease(previousInstance); + previousInstance=NULL; + } + if(sourceInstance) { + previousInstance = CMClone(sourceInstance,&rc); + CMRelease(sourceInstance); + sourceInstance=NULL; + } + + cop = CMNewObjectPath( _broker,INDNAMESPACE,_ClassName,&rc); + sourceInstance = CMClone(_makeInst_OperatingSystem(_broker,NULL,cop,NULL,&rc),&rc); v->state = CMPI_goodValue; v->type = CMPI_uint16; @@ -483,8 +500,8 @@ {"IndicationIdentifier", "CorrelatedIndications", "IndicationTime", - "Name", - "OperationalStatus" + "SourceInstance", + "PreviousInstance" }; /* The list of property functions */ @@ -492,20 +509,27 @@ {CIM_Indication_IndicationIdentifier, CIM_Indication_CorrelatedIndications, CIM_Indication_IndicationTime, - Linux_OperatingSystemIndication_Name, - Linux_OperatingSystemIndication_OperationalStatus + CIM_InstModification_SourceInstance, + CIM_InstModification_PreviousInstance }; static void ind_init(CMPIContext *ctx) { + CMPIObjectPath *cop = NULL; + CMPIStatus rc; + if (ind_inited==0) { _OSBASE_TRACE(1,("--- %s ind_init() called",_ClassName)); - + + cop = CMNewObjectPath( _broker,INDNAMESPACE,_ClassName,&rc); + sourceInstance = CMClone(_makeInst_OperatingSystem(_broker,NULL,cop,NULL,&rc),&rc); + /* register the broker and context */ if(ind_reg(_broker, ctx) != IND_OK) { _OSBASE_TRACE(1,("--- %s ind_init() failed",_ClassName)); + CMRelease(sourceInstance); return; } @@ -515,6 +539,7 @@ check, 10) != IND_OK) { _OSBASE_TRACE(1,("--- %s ind_init() failed: register poll function",_ClassName)); + CMRelease(sourceInstance); return; } @@ -524,6 +549,7 @@ Linux_OperatingSystemIndication_DYNAMIC_FUNCTIONS, IND_NUMBER_OF_DYNAMIC_PROPERTIES) != IND_OK) { _OSBASE_TRACE(1,("--- %s ind_init() failed: register functions of dynamic properties",_ClassName)); + CMRelease(sourceInstance); return; } @@ -532,6 +558,7 @@ INDCLASSNAME, INDCLASSNAME) != IND_OK) { _OSBASE_TRACE(1,("--- %s ind_init() failed: set connection between poll function and dynamic properties",_ClassName)); + CMRelease(sourceInstance); return; } @@ -547,6 +574,8 @@ CMPIContext * ctx) { _OSBASE_TRACE(1,("--- %s CMPI IndicationCleanup() called",_ClassName)); + CMRelease(sourceInstance); + CMRelease(previousInstance); ind_shutdown(); ind_inited = 0; ind_enabled = 0; @@ -631,7 +660,7 @@ if (strcasecmp(indType,INDCLASSNAME)==0) { if(ind_unreg_select(INDNAMESPACE, INDCLASSNAME, filter) == IND_OK) { - _OSBASE_TRACE(1,("--- %s CMPI ActivateFilter() exited: filter deactivated",_ClassName)); + _OSBASE_TRACE(1,("--- %s CMPI DeActivateFilter() exited: filter deactivated",_ClassName)); CMReturn(CMPI_RC_OK); } } Index: CHANGE.LOG =================================================================== RCS file: /cvsroot/sblim/cmpi-base/CHANGE.LOG,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- CHANGE.LOG 6 Apr 2005 15:17:27 -0000 1.13 +++ CHANGE.LOG 6 Apr 2005 15:43:16 -0000 1.14 @@ -61,5 +61,7 @@ * updated README.INDICATION with better description and sample for openPegasus * restructured init process for SBLIM tracing into a file +* ported OperatingSystem's process indication of OperationalStatus + to become a life-cycle indication // =================================================================== Index: README.INDICATION =================================================================== RCS file: /cvsroot/sblim/cmpi-base/README.INDICATION,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- README.INDICATION 17 Mar 2005 08:39:53 -0000 1.2 +++ README.INDICATION 6 Apr 2005 15:43:16 -0000 1.3 @@ -28,11 +28,9 @@ - install the SBLIM package indication_helper. Please follow the instructions in the package. - remove -DNOEVENTS from the CFLAGS (makefile) -- enable the class definition of Linux_OperatingSystemIndication in the - mof/Linux_Base.mof file - for PEGASUS: - edit mof/makefile.pegasus to enable the registration of the Indication - class and provider + class and provider (SimpleDisplayConsumerR.mof, Linux_BaseIndicationReg.mof) - now build the cmpi-base package as described in the README Index: cmpiOSBase_OperatingSystem.c =================================================================== RCS file: /cvsroot/sblim/cmpi-base/cmpiOSBase_OperatingSystem.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- cmpiOSBase_OperatingSystem.c 3 Feb 2005 18:19:34 -0000 1.14 +++ cmpiOSBase_OperatingSystem.c 6 Apr 2005 15:43:16 -0000 1.15 @@ -145,9 +145,9 @@ unsigned long user, system, nice, idle; FILE * fcpuinfo = fopen("/proc/stat","r"); if (cps && fcpuinfo) { - fscanf(fcpuinfo,"%*s %ld %ld %ld %ld",&user,&system,&nice,&idle); + fscanf(fcpuinfo,"%*s %ld %ld %ld %ld",&user,&nice,&system,&idle); fclose(fcpuinfo); - cps->total=user+system+nice+idle; + cps->total=user+system+idle; cps->cpu=cps->total - idle; return 0; } @@ -172,6 +172,9 @@ CMPIArray * opstat = NULL; unsigned short status = 2; /* Enabled */ unsigned short opstatval = 2; /* 2 ... OK ; 4 ... Stressed */ +#ifndef NOEVENTS + int opval = 2; +#endif #endif _OSBASE_TRACE(2,("--- _makeOS() called")); @@ -221,7 +224,7 @@ free(keys); /* calculate cpu percentage */ - if(getcpu(&cs) == 0) { pctcpu = 100*cs.cpu/cs.total; } + if(getcpu(&cs) == 0) { pctcpu = (100*cs.cpu)/cs.total; } CMSetProperty( ci, "CSCreationClassName", CSCreationClassName, CMPI_chars ); CMSetProperty( ci, "CSName", get_system_name(), CMPI_chars ); @@ -306,7 +309,12 @@ goto exit; } else { +#ifndef NOEVENTS + check_OperationalStatus(&opval); + opstatval = opval; +#else if( pctcpu > 90 ) { opstatval = 4; } +#endif CMSetArrayElementAt(opstat,0,(CMPIValue*)&(opstatval),CMPI_uint16); CMSetProperty( ci, "OperationalStatus", (CMPIValue*)&(opstat), CMPI_uint16A); } @@ -336,7 +344,9 @@ if(getcpu(&cs) == 0) { pctcpu = 100*cs.cpu/cs.total; + _OSBASE_TRACE(2,("--- _check_OperationalStatus value : %d",pctcpu)); if(pctcpu>=90 && *OperationalStatus!=4) { + // if(pctcpu>=10 && *OperationalStatus!=4) { *OperationalStatus = 4; return 1; } |
|
From: Heidi N. <hei...@us...> - 2005-04-06 15:43:25
|
Update of /cvsroot/sblim/cmpi-base/mof In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12058/mof Modified Files: Linux_BaseIndicationReg.mof Log Message: ported OperatingSystem'S process indication of OperationalStatus to become a life-cycle indication Index: Linux_BaseIndicationReg.mof =================================================================== RCS file: /cvsroot/sblim/cmpi-base/mof/Linux_BaseIndicationReg.mof,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Linux_BaseIndicationReg.mof 17 Mar 2005 08:39:54 -0000 1.1 +++ Linux_BaseIndicationReg.mof 6 Apr 2005 15:43:16 -0000 1.2 @@ -23,7 +23,8 @@ #pragma namespace ("root/PG_InterOp") // =================================================================== -// Linux_OperatingSystemIndication +// Linux_OperatingSystem +// - CIM_InstModification // =================================================================== @@ -35,9 +36,30 @@ ProviderName = "OSBase_OperatingSystemProvider"; CapabilityID = "2"; //Name of the CIM class as defined in the mof - ClassName = "Linux_OperatingSystemIndication"; + ClassName = "CIM_InstModification"; Namespaces = {"root/cimv2"}; ProviderType = { 4 }; // Indication SupportedProperties = NULL; // All properties SupportedMethods = NULL; // All methods }; + + +// =================================================================== +// Linux_OperatingSystemIndication +// =================================================================== + + +//instance of PG_ProviderCapabilities +//{ +// //The provider module as defined in PG_ProviderModule +// ProviderModuleName = "OSBase_OperatingSystemProviderModule"; +// //The provider name as defined in PG_Provider +// ProviderName = "OSBase_OperatingSystemProvider"; +// CapabilityID = "2"; +// //Name of the CIM class as defined in the mof +// ClassName = "Linux_OperatingSystemIndication"; +// Namespaces = {"root/cimv2"}; +// ProviderType = { 4 }; // Indication +// SupportedProperties = NULL; // All properties +// SupportedMethods = NULL; // All methods +//}; |
|
From: Heidi N. <hei...@us...> - 2005-04-06 15:17:46
|
Update of /cvsroot/sblim/cmpi-base In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4020 Modified Files: CHANGE.LOG OSBase_Common.c Log Message: restructured init process for SBLIM tracing into a file Index: OSBase_Common.c =================================================================== RCS file: /cvsroot/sblim/cmpi-base/OSBase_Common.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- OSBase_Common.c 23 Feb 2005 13:01:26 -0000 1.12 +++ OSBase_Common.c 6 Apr 2005 15:17:33 -0000 1.13 @@ -48,41 +48,70 @@ /* ---------------------------------------------------------------------------*/ -int _debug = 0; -char * _SBLIM_TRACE_FILE = NULL; +int _debug = 0; +int _SBLIM_TRACE_ENABLED = 0; +int _SBLIM_TRACE_FILE_ENABLED = 0; +char * _SBLIM_TRACE_FILE = NULL; -/* initialization routine */ -void _init() { +void _init_trace_level() { - char * var = NULL; - char * err = NULL; - FILE * ferr = NULL; + char *var = NULL; + + if(_SBLIM_TRACE_ENABLED == 1) return; var = getenv("SBLIM_TRACE"); - if( var != NULL ) { + if(var != NULL) { _debug = atoi(var); + fprintf(stderr,"SBLIM TRACE LEVEL: %i\n",_debug); + _SBLIM_TRACE_ENABLED = 1; } else { _debug = 0; } - - err = getenv("SBLIM_TRACE_FILE"); - if( err != NULL ) { - if( ( ((ferr=fopen(err,"a")) == NULL) || fclose(ferr) ) ) { - fprintf(stderr,"Couldn't create trace file\n"); + + return; +} + +void _init_trace_file() { + + char *var = NULL; + FILE *fhd = NULL; + + if(_SBLIM_TRACE_FILE_ENABLED == 1) return; + + var = getenv("SBLIM_TRACE_FILE"); + if( var != NULL ) { + if( ( ((fhd=fopen(var,"a")) == NULL) || fclose(fhd) ) ) { + fprintf(stderr,"Couldn't open/create trace file: %s\n",var); return; } - _SBLIM_TRACE_FILE = strdup(err); + _SBLIM_TRACE_FILE = strdup(var); + fprintf(stderr,"SBLIM TRACE FILE created: %s\n",_SBLIM_TRACE_FILE); + _SBLIM_TRACE_FILE_ENABLED = 1; } else { - if(_SBLIM_TRACE_FILE) free(_SBLIM_TRACE_FILE); - _SBLIM_TRACE_FILE = NULL ; + _SBLIM_TRACE_FILE_ENABLED = 0; + _SBLIM_TRACE_FILE = NULL; } + return; +} + +/* initialization routine */ +void _init() { + _init_trace_level(); + _init_trace_file(); + return; } /* deinitialization routine */ void _fini() { free ( CIM_HOST_NAME ); free ( CIM_OS_NAME ); - if(_SBLIM_TRACE_FILE) free(_SBLIM_TRACE_FILE); + _debug = 0; + _SBLIM_TRACE_ENABLED = 0; + _SBLIM_TRACE_FILE_ENABLED = 0; + if(_SBLIM_TRACE_FILE) { + free(_SBLIM_TRACE_FILE); + _SBLIM_TRACE_FILE = NULL; + } } /* ---------------------------------------------------------------------------*/ @@ -526,14 +555,9 @@ char * tm = NULL; FILE * ferr = NULL; - if( (_SBLIM_TRACE_FILE != NULL) ) { - if( (ferr=fopen(_SBLIM_TRACE_FILE,"a")) == NULL ) { - fprintf(stderr,"Couldn't open trace file"); - return; - } - } - else { ferr = stderr; } - + _init_trace_level(); + _init_trace_file(); + if( gettimeofday( &tv, &tz) == 0 ) { sec = tv.tv_sec + (tz.tz_minuteswest*-1*60); tm = (char*)malloc(20); @@ -541,11 +565,26 @@ if( gmtime_r( &sec , &cttm) != NULL ) { strftime(tm,20,"%m/%d/%Y %H:%M:%S",&cttm); } + } + + if( (_SBLIM_TRACE_FILE != NULL) ) { + if( (ferr=fopen(_SBLIM_TRACE_FILE,"a")) == NULL ) { + perror("perror: Couldn't open/create trace file %s\n"); + if(tm) + fprintf(stderr,"[%s] Couldn't open/create trace file %s\n",tm,_SBLIM_TRACE_FILE); + else + fprintf(stderr,"Couldn't open/create trace file %s\n",_SBLIM_TRACE_FILE); + return; + } + } + else { ferr = stderr; } + + if(tm) { fprintf(ferr,"[%i] [%s] --- %s(%i) : %s\n", level, tm, file, line, msg); } else { fprintf(ferr,"[%i] --- %s(%i) : %s\n", level, file, line, msg); - } + } if( (_SBLIM_TRACE_FILE != NULL) ) { fclose(ferr); Index: CHANGE.LOG =================================================================== RCS file: /cvsroot/sblim/cmpi-base/CHANGE.LOG,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- CHANGE.LOG 17 Mar 2005 08:39:53 -0000 1.12 +++ CHANGE.LOG 6 Apr 2005 15:17:27 -0000 1.13 @@ -60,5 +60,6 @@ * added sample subscriptions to test/indication directory * updated README.INDICATION with better description and sample for openPegasus +* restructured init process for SBLIM tracing into a file // =================================================================== |
|
From: Viktor M. <mih...@us...> - 2005-04-05 13:20:04
|
Update of /cvsroot/sblim/cmpi-samples/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21981/src Removed Files: CWS_Directory.c CWS_DirectoryContainsFile.c CWS_FileUtils.c CWS_FileUtils.h CWS_PlainFile.c Log Message: Erroneously imported stuff removed. --- CWS_FileUtils.h DELETED --- --- CWS_DirectoryContainsFile.c DELETED --- --- CWS_Directory.c DELETED --- --- CWS_PlainFile.c DELETED --- --- CWS_FileUtils.c DELETED --- |
|
From: Viktor M. <mih...@us...> - 2005-04-05 13:20:04
|
Update of /cvsroot/sblim/cmpi-samples/src/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21981/src/util Removed Files: cwstest.c cwsutil.c cwsutil.h Log Message: Erroneously imported stuff removed. --- cwsutil.c DELETED --- --- cwsutil.h DELETED --- --- cwstest.c DELETED --- |
|
From: Viktor M. <mih...@us...> - 2005-04-05 13:20:04
|
Update of /cvsroot/sblim/cmpi-samples/schema In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21981/schema Removed Files: CWS_FAD.PegasusReg.mof CWS_FAD.mof CWS_FAD.sfcb.reg Log Message: Erroneously imported stuff removed. --- CWS_FAD.sfcb.reg DELETED --- --- CWS_FAD.mof DELETED --- --- CWS_FAD.PegasusReg.mof DELETED --- |
|
From: Viktor M. <mih...@us...> - 2005-04-05 13:20:04
|
Update of /cvsroot/sblim/cmpi-samples/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21981/doc Removed Files: rpmbuild.txt Log Message: Erroneously imported stuff removed. --- rpmbuild.txt DELETED --- |
|
From: Viktor M. <mih...@us...> - 2005-04-05 13:20:03
|
Update of /cvsroot/sblim/cmpi-samples In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21981 Removed Files: AUTHORS COPYING ChangeLog Makefile.am NEWS README acinclude.m4 autoconfiscate.sh configure.ac provider-register.sh sblim-cmpi-fad.spec.in Log Message: Erroneously imported stuff removed. --- ChangeLog DELETED --- --- acinclude.m4 DELETED --- --- configure.ac DELETED --- --- Makefile.am DELETED --- --- autoconfiscate.sh DELETED --- --- COPYING DELETED --- --- AUTHORS DELETED --- --- README DELETED --- --- NEWS DELETED --- --- provider-register.sh DELETED --- --- sblim-cmpi-fad.spec.in DELETED --- |
