diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2013-04-17 15:19:26 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2013-04-22 08:35:45 +0200 |
| commit | 8a834311e75e388e2e6654734ece2e0a2862e181 (patch) | |
| tree | 8009d00f5deb36138227aa3cc6f3da078ad83d5e | |
| parent | 801a00c78beee796f26d55cbce2d2bc901254e4a (diff) | |
gstreamer-1.0: Some more package cleanups
| -rw-r--r-- | packages/gstreamer-1.0-sdk/gstreamer-1.0-sdk.package | 11 | ||||
| -rw-r--r-- | packages/gstreamer-1.0-sdk/installer.wxs | 47 |
2 files changed, 5 insertions, 53 deletions
diff --git a/packages/gstreamer-1.0-sdk/gstreamer-1.0-sdk.package b/packages/gstreamer-1.0-sdk/gstreamer-1.0-sdk.package index 40e3984..c4a7a4d 100644 --- a/packages/gstreamer-1.0-sdk/gstreamer-1.0-sdk.package +++ b/packages/gstreamer-1.0-sdk/gstreamer-1.0-sdk.package @@ -16,7 +16,6 @@ class SDKPackage(package.SDKPackage): vendor = "GStreamer Project" org = "com.gstreamer" ignore_package_prefix = True - resources_wix_installer = 'installer.wxs' packages =[ # (name, required, selected) ('gstreamer-1.0-core', True, True), @@ -39,10 +38,10 @@ class SDKPackage(package.SDKPackage): # } install_dir = { - Platform.WINDOWS: 'gstreamer-1.0-sdk', + Platform.WINDOWS: 'gstreamer-sdk', Platform.LINUX: '/opt/gstreamer-1.0-sdk/', - Platform.DARWIN: '/Library/Frameworks/GStreamer-1.0.framework/', - Platform.IOS: '/Library/Developer/GStreamer-1.0/iPhone.sdk'} + Platform.DARWIN: '/Library/Frameworks/GStreamer.framework/', + Platform.IOS: '/Library/Developer/GStreamer/iPhone.sdk'} root_env_var = 'GSTREAMER_SDK_ROOT_%(arch)s' wix_upgrade_code = { @@ -55,8 +54,8 @@ class SDKPackage(package.SDKPackage): Architecture.X86_64: 'c20a66dc-b249-4e6d-a68a-d0f836b2b3cf', }, } - osx_framework_library = ('GStreamer-1.0', 'lib/GStreamer-1.0') - ios_framework_library = ('GStreamer-1.0', 'lib/GStreamer-1.0') + osx_framework_library = ('GStreamer', 'lib/GStreamer') + ios_framework_library = ('GStreamer', 'lib/GStreamer') def prepare(self): diff --git a/packages/gstreamer-1.0-sdk/installer.wxs b/packages/gstreamer-1.0-sdk/installer.wxs deleted file mode 100644 index c4489c6..0000000 --- a/packages/gstreamer-1.0-sdk/installer.wxs +++ /dev/null @@ -1,47 +0,0 @@ -<?xml version="1.0" ?> -<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> - <?include $(sys.CURRENTDIR)\Config.wxi?> - <Product Id="$(var.ProductID)" Language="$(var.Language)" Manufacturer="$(var.Manufacturer)" - Name="$(var.ProductName)" UpgradeCode="$(var.UpgradeCode)" - Version="$(var.Version)"> - - <Package Comments="$(var.PackageComments)" Compressed="yes" - Description="$(var.Description)" InstallPrivileges="elevated" - Manufacturer="$(var.Manufacturer)"/> - - <Media Cabinet="product.cab" EmbedCab="yes" Id="1"/> - - <!-- Upgrades --> - <MajorUpgrade DowngradeErrorMessage="A later version of [ProductName] is already installed. Setup will now exit"/> - - <!-- Add/Remove Programs --> - <Property Id="ARPPRODUCTICON" Value="MainIcon" /> - <Property Id="ARPCONTACT" Value="$(var.Manufacturer)" /> - <Property Id="ARPURLINFOABOUT" Value="$(var.WebSiteName)" /> - <Property Id="ALLUSERS">1</Property> - - <!-- UI --> - <CustomAction Execute="firstSequence" Id="SetWixUIInstallDir" Property="WIXUI_INSTALLDIR" Value="INSTALLDIR"/> - <InstallUISequence> - <Custom Action="SetWixUIInstallDir" Before="CostInitialize"/> - </InstallUISequence> - <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR"/> - - <!-- Delete [INSTALLDIR]/2012.5 --> - <CustomAction Id="del_cmdline" Property="del_exec" Value='"[SystemFolder]cmd.exe" /c rmdir /Q /S "[INSTALLDIR]\2012.5"' /> - <CustomAction Id="del_exec" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Impersonate="no" Return="ignore" /> - <!-- Create link from [INSTALLDIR]/2012.5 to [INSTALLDIR]/0.10 --> - <CustomAction Id="link_cmdline" Property="link_exec" Value='"[SDKROOTDIR]bin\Elevate.exe" cmd.exe /c mklink /D "[INSTALLDIR]2012.5" "[INSTALLDIR]0.10"' /> - <CustomAction Id="link_exec" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Impersonate="yes" Return="ignore" /> - - <InstallExecuteSequence> - <Custom Action="del_cmdline" After="CostInitialize"/> - <Custom Action="link_cmdline" After="del_cmdline"/> - <Custom Action="del_exec" Before="InstallFinalize"/> - <Custom Action="link_exec" After="del_exec"/> - </InstallExecuteSequence> - - - <UIRef Id="WixUI_Mondo"/> - </Product> -</Wix> |