Changeset 1710


Ignore:
Timestamp:
03/27/14 11:12:52 (5 years ago)
Author:
rhyssmith
Message:

Adding raptor-ica v1.0.1 MSI sources

Location:
raptor-distribution/MSIs/raptor-ica/trunk
Files:
3 added
3 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • raptor-distribution/MSIs/raptor-ica/trunk/frag-ica-libdir.wxs

    r1708 r1710  
    1 <?xml version="1.0" encoding="utf-8"?> 
     1<?xml version="1.0" encoding="utf-8"?> 
    22<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> 
    33    <Fragment> 
     
    223223                    <File Id="filC6ADFA475B56ADA4686C48EB66DD23DA" KeyPath="yes" Source="source\ica\lib\quartz-1.8.0.jar" /> 
    224224                </Component> 
    225                 <Component Id="cmpAFFB05AFCA4EFEBE073821A9A66EC316" Guid="*"> 
    226                     <File Id="fil08A348553008B3AD572A2D490525F229" KeyPath="yes" Source="source\ica\lib\raptor-client-1.0.0.jar" /> 
    227                 </Component> 
    228                 <Component Id="cmp43E854E22FB3C09152C735765E8ED11D" Guid="*"> 
    229                     <File Id="fil120F66CCE0E7926C667C84C9E72B1C84" KeyPath="yes" Source="source\ica\lib\raptor-information-model-1.0.0.jar" /> 
    230                 </Component> 
    231                 <Component Id="cmp47F4D5C42F54762FAAB490D70CA30713" Guid="*"> 
    232                     <File Id="filF15E190A5F98B4ACBC84731D14E92B62" KeyPath="yes" Source="source\ica\lib\raptor-parse-1.0.0.jar" /> 
     225                <Component Id="cmpAE7E1F5D5BA8EBAB728D7B298DA3A9FA" Guid="*"> 
     226                    <File Id="filED433C98F453186F447B2064918136C7" KeyPath="yes" Source="source\ica\lib\raptor-client-1.0.1.jar" /> 
     227                </Component> 
     228                <Component Id="cmpFE4A446AD36FB18A406E18535D7B03CC" Guid="*"> 
     229                    <File Id="fil60E332CF4EA3B7D4C58A0470B9307DA4" KeyPath="yes" Source="source\ica\lib\raptor-information-model-1.0.1.jar" /> 
     230                </Component> 
     231                <Component Id="cmpD0BF86E59D3B2FF9EDC380D7A14263F1" Guid="*"> 
     232                    <File Id="filFF76721AE9E570F34D35DF3B814DF530" KeyPath="yes" Source="source\ica\lib\raptor-parse-1.0.1.jar" /> 
    233233                </Component> 
    234234                <Component Id="cmp1DCB33D11ECE7FCD8E620951F799DCEA" Guid="*"> 
     
    430430            <ComponentRef Id="cmp0E2501CD4945D223098710C9EE25A00D" /> 
    431431            <ComponentRef Id="cmp944386478C8DFCB6B3E65989A6E14344" /> 
    432             <ComponentRef Id="cmpAFFB05AFCA4EFEBE073821A9A66EC316" /> 
    433             <ComponentRef Id="cmp43E854E22FB3C09152C735765E8ED11D" /> 
    434             <ComponentRef Id="cmp47F4D5C42F54762FAAB490D70CA30713" /> 
     432            <ComponentRef Id="cmpAE7E1F5D5BA8EBAB728D7B298DA3A9FA" /> 
     433            <ComponentRef Id="cmpFE4A446AD36FB18A406E18535D7B03CC" /> 
     434            <ComponentRef Id="cmpD0BF86E59D3B2FF9EDC380D7A14263F1" /> 
    435435            <ComponentRef Id="cmp1DCB33D11ECE7FCD8E620951F799DCEA" /> 
    436436            <ComponentRef Id="cmp752158F35F65FEF6A6161B006F66C8A1" /> 
  • raptor-distribution/MSIs/raptor-ica/trunk/raptor-ica.wxs

    r1708 r1710  
    22<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'> 
    33 
    4     <Product Id='56580800-516c-4659-85aa-4e855a2c73e4' 
     4    <Product Id='ba27b0d6-ad54-4755-866f-395b17eb2a91' 
    55      Name='Raptor ICA' 
    66      UpgradeCode='e5f71481-37a7-44ac-b315-7285a97561b4' 
     
    88      Language='1033'  
    99      Codepage='1252' 
    10       Version='1.0.0'> 
     10      Version='1.0.1'> 
    1111 
    1212        <Package Id='*' 
    1313          Description='Raptor ICA' 
    14           Comments='Raptor ICA v1.0.0' 
     14          Comments='Raptor ICA v1.0.1' 
    1515          Manufacturer='Cardiff University' 
    1616          InstallerVersion='301' 
     
    3636        <!-- Embeds all source into a single .cab file in the MSI --> 
    3737        <Media Id='1' Cabinet='Product.cab' EmbedCab='yes' /> 
     38 
     39 
     40 
     41        <!-- 
     42            ##################################### 
     43            # Figure out what the MSI is doing... 
     44            ##################################### 
     45        --> 
     46 
     47        <CustomAction Id='SetInstalling' Property='Installing' Value='true' />  
     48        <CustomAction Id='SetUpgrading' Property='Upgrading' Value='true' />  
     49        <CustomAction Id='SetUninstalling' Property='Uninstalling' Value='true' /> 
     50 
     51        <InstallExecuteSequence> 
     52            <Custom Action='SetInstalling' After='FindRelatedProducts'><![CDATA[NOT Installed AND NOT WIX_UPGRADE_DETECTED <>""]]></Custom>  
     53            <Custom Action='SetUpgrading' After='SetInstalling'><![CDATA[WIX_UPGRADE_DETECTED <>""]]></Custom>  
     54            <Custom Action='SetUninstalling' After='SetUpgrading'><![CDATA[(REMOVE="feaRaptorIca,Complete" OR REMOVE="ALL") AND NOT Upgrading]]></Custom> 
     55        </InstallExecuteSequence> 
     56 
     57        <InstallUISequence>  
     58            <Custom Action='SetInstalling' After='FindRelatedProducts'><![CDATA[NOT Installed AND NOT WIX_UPGRADE_DETECTED <>""]]></Custom>  
     59            <Custom Action='SetUpgrading' After='SetInstalling'><![CDATA[WIX_UPGRADE_DETECTED <>""]]></Custom>  
     60            <Custom Action='SetUninstalling' After='SetUpgrading'><![CDATA[(REMOVE="feaRaptorIca,Complete" OR REMOVE="ALL") AND NOT Upgrading]]></Custom> 
     61        </InstallUISequence> 
    3862 
    3963 
     
    109133 
    110134        <Feature Id='Complete' 
    111           Title='Raptor ICA v1.0.0' 
     135          Title='Raptor ICA v1.0.1' 
    112136          Description='The complete package for the Raptor ICA.' 
    113137          Display='expand' 
     
    115139          ConfigurableDirectory='RAPTORDIR'> 
    116140 
    117             <Feature Id='feaRaptorIca' Title='Raptor ICA v1.0.0' Description='Raptor ICA v1.0.0' Level='1' AllowAdvertise='no' Absent='disallow'> 
     141            <Feature Id='feaRaptorIca' Title='Raptor ICA v1.0.1' Description='Raptor ICA v1.0.1' Level='1' AllowAdvertise='no' Absent='disallow'> 
    118142                <ComponentGroupRef Id='cgrRaptorIcaRoot' /> 
    119143                <ComponentGroupRef Id='cgrRaptorIcaBin' /> 
     
    144168        <CustomAction Id='RestartIcaService' FileKey='filRaptorIcaBinIcaBat' ExeCommand='restart' /> 
    145169 
     170        <!-- Horrible hack. When upgrading, the restarting happens twice. So this stops it happening the first time... --> 
     171        <CustomAction Id='SetAlreadyRun' Property='AlreadyRun' Value='true' />  
     172 
    146173 
    147174        <!-- When installing, install service and start it --> 
    148175        <InstallExecuteSequence> 
    149             <Custom Action='InstallIcaService' After='InstallFinalize'>NOT Installed</Custom> 
    150             <Custom Action='StartIcaService' After='InstallFinalize'>NOT Installed</Custom> 
     176            <Custom Action='InstallIcaService' After='RunKeytoolExportIcaPublicKey'>Installing</Custom> 
     177            <Custom Action='StartIcaService' After='InstallIcaService'>Installing</Custom> 
    151178        </InstallExecuteSequence> 
    152179 
    153180        <!-- When uninstalling, uninstall service (automagically stops it first) --> 
    154181        <InstallExecuteSequence> 
    155             <Custom Action='UninstallIcaService' After='UnpublishFeatures'>Installed AND NOT UPGRADINGPRODUCTCODE</Custom> 
     182            <Custom Action='StopIcaService' After='UnpublishFeatures'>Uninstalling</Custom> 
     183            <Custom Action='UninstallIcaService' After='StopIcaService'>Uninstalling</Custom> 
    156184        </InstallExecuteSequence> 
    157185 
    158186        <!-- When upgrading, restart service --> 
    159187        <InstallExecuteSequence> 
    160             <Custom Action='RestartIcaService' Before='UnpublishFeatures'>Installed AND UPGRADINGPRODUCTCODE</Custom> 
     188            <Custom Action='RestartIcaService' After='StartServices'>Upgrading AND AlreadyRun</Custom> 
     189            <Custom Action='SetAlreadyRun' After='RestartIcaService'>Upgrading</Custom> 
    161190        </InstallExecuteSequence> 
    162191 
     
    182211        <InstallExecuteSequence> 
    183212            <Custom Action='SetKeytoolPath' After='AppSearch'>JAVA_HOME</Custom> 
    184             <Custom Action='RunKeytoolCreateIcaPrivateKey' After='InstallFinalize'>JAVA_HOME And Not Installed</Custom> 
    185             <Custom Action='RunKeytoolExportIcaPublicKey' After='InstallFinalize'>JAVA_HOME And Not Installed</Custom> 
     213            <Custom Action='RunKeytoolCreateIcaPrivateKey' After='InstallFinalize'>JAVA_HOME And Installing</Custom> 
     214            <Custom Action='RunKeytoolExportIcaPublicKey' After='RunKeytoolCreateIcaPrivateKey'>JAVA_HOME And Installing</Custom> 
    186215        </InstallExecuteSequence> 
    187216 
     
    225254            <DialogRef Id='RaptorMsiDlgIcaMetadata' /> 
    226255 
    227             <Publish Dialog='CustomizeDlg' Control='Next' Event='NewDialog' Value='RaptorMsiDlgIcaMetadata'>1</Publish> 
    228             <Publish Dialog='VerifyReadyDlg' Control='Back' Event='NewDialog' Value='RaptorMsiDlgIcaMetadata'>1</Publish> 
     256            <Publish Dialog='CustomizeDlg' Control='Next' Event='NewDialog' Value='RaptorMsiDlgIcaMetadata'>Installing</Publish> 
     257            <Publish Dialog='VerifyReadyDlg' Control='Back' Event='NewDialog' Value='RaptorMsiDlgIcaMetadata'>Installing</Publish> 
    229258        </UI> 
    230259 
  • raptor-distribution/MSIs/raptor-ica/trunk/source/ica/bin/raptoricad

    r1706 r1710  
    4949javaCommand="java"                                         # name of the Java launcher without the path 
    5050javaExe="$JAVA_HOME/bin/$javaCommand"                      # file name of the Java application launcher executable 
    51 javaArgs="-DconfigurationFiles=/opt/raptor/ica/conf/ -jar raptor-ica.jar -server -Xmx64M" 
     51javaArgs="-DconfigurationFiles=/opt/raptor/ica/conf/ -Xmx64M -jar raptor-ica.jar -server" 
    5252                                                           # arguments for Java launcher 
    5353javaCommandLine="$javaExe $javaArgs"                       # command line to start the Java service application 
Note: See TracChangeset for help on using the changeset viewer.