1
0
mirror of https://github.com/mitb-archive/filebot synced 2024-11-11 11:55:03 -05:00

* properly setup everything for CLI when installing via MSI package

This commit is contained in:
Reinhard Pointner 2011-11-15 03:03:53 +00:00
parent 98fdd221ff
commit c7a2e602a4
4 changed files with 6 additions and 4 deletions

View File

@ -198,7 +198,7 @@
<property name="installer" location="${dir.dist}/FileBot_${version}_${arch}.msi" /> <property name="installer" location="${dir.dist}/FileBot_${version}_${arch}.msi" />
<exec executable="candle.exe" dir="${dir.installer}/msi" failonerror="true"> <exec executable="candle.exe" dir="${dir.installer}/msi" failonerror="true">
<arg line="filebot-wix.xml -out ${dir.dist}/msi.wixobj -arch ${arch} -dfatjar=${path.fatjar} -dmediainfo=${mediainfo}" /> <arg line="filebot-wix.xml -out ${dir.dist}/msi.wixobj -arch ${arch} -dreleaseversion=${version} -dfatjar=${path.fatjar} -dmediainfo=${mediainfo}" />
</exec> </exec>
<exec executable="light.exe" dir="${dir.installer}/msi" failonerror="true"> <exec executable="light.exe" dir="${dir.installer}/msi" failonerror="true">
<arg line="${dir.dist}/msi.wixobj -sval -ext WixUIExtension -out ${installer}" /> <arg line="${dir.dist}/msi.wixobj -sval -ext WixUIExtension -out ${installer}" />

View File

@ -1,6 +1,6 @@
<?xml version='1.0' encoding='windows-1252'?> <?xml version='1.0' encoding='windows-1252'?>
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'> <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
<Product Name='FileBot' Manufacturer='rednoah' Version='1.9.6' Id='C171FBBE-E471-4509-AA63-DB2FB61F778E' UpgradeCode='FD96D8C9-9194-4C7B-9DE7-9437D0F57330' Language='1033' Codepage='1252'> <Product Name='FileBot' Manufacturer='rednoah' Version='$(var.releaseversion)' Id='C171FBBE-E471-4509-AA63-DB2FB61F778E' UpgradeCode='FD96D8C9-9194-4C7B-9DE7-9437D0F57330' Language='1033' Codepage='1252'>
<Package Id='*' Keywords='Installer' Description="FileBot Installer" Manufacturer='rednoah' InstallerVersion='200' Languages='1033' Compressed='yes' SummaryCodepage='1252' /> <Package Id='*' Keywords='Installer' Description="FileBot Installer" Manufacturer='rednoah' InstallerVersion='200' Languages='1033' Compressed='yes' SummaryCodepage='1252' />
<Media Id='1' Cabinet='FileBot.cab' EmbedCab='yes' /> <Media Id='1' Cabinet='FileBot.cab' EmbedCab='yes' />
@ -10,7 +10,7 @@
<Directory Id='INSTALLDIR' Name='FileBot'> <Directory Id='INSTALLDIR' Name='FileBot'>
<Component Id='ApplicationStub' Guid='A7B21026-DA54-4AF8-9227-188565AB9C4E'> <Component Id='ApplicationStub' Guid='A7B21026-DA54-4AF8-9227-188565AB9C4E'>
<File Id='FileBot.exe' Name='FileBot.exe' Source='FileBot.exe' KeyPath='yes'> <File Id='FileBot.start.exe' Name='FileBot.start.exe' Source='FileBot.start.exe' KeyPath='yes'>
<Shortcut Id="programsLink" Directory="ProgramMenuDir" Name="FileBot" WorkingDirectory='INSTALLDIR' Icon="icon.ico" IconIndex="0" Advertise="yes" /> <Shortcut Id="programsLink" Directory="ProgramMenuDir" Name="FileBot" WorkingDirectory='INSTALLDIR' Icon="icon.ico" IconIndex="0" Advertise="yes" />
<Shortcut Id="desktopLink" Directory="DesktopFolder" Name="FileBot" WorkingDirectory='INSTALLDIR' Icon="icon.ico" IconIndex="0" Advertise="yes" /> <Shortcut Id="desktopLink" Directory="DesktopFolder" Name="FileBot" WorkingDirectory='INSTALLDIR' Icon="icon.ico" IconIndex="0" Advertise="yes" />
</File> </File>
@ -18,6 +18,7 @@
<Component Id='ApplicationStubCmd' Guid='D2B1A845-3B5C-4B59-B0D0-A4E80C173220'> <Component Id='ApplicationStubCmd' Guid='D2B1A845-3B5C-4B59-B0D0-A4E80C173220'>
<File Id='filebot.cmd' Name='filebot.cmd' Source='filebot.cmd' KeyPath='yes' /> <File Id='filebot.cmd' Name='filebot.cmd' Source='filebot.cmd' KeyPath='yes' />
<Environment Id="PATH" Name="PATH" Value="[INSTALLDIR]" Action="set" Part="last" Permanent="no" System="yes" />
</Component> </Component>
<Component Id='MainJar' Guid='9E365344-A00C-45DE-A2A4-266412C3D06E'> <Component Id='MainJar' Guid='9E365344-A00C-45DE-A2A4-266412C3D06E'>

View File

@ -1 +1,2 @@
java -Dapplication.deployment=msi -Xmx256m -jar FileBot.jar %* @ECHO OFF
java -Dapplication.deployment=msi -Xmx256m -jar "%~dp0FileBot.jar" %*