Merge some more changes manually from other files for 1.0

2 files changed, 25 insertions, 1 deletions

diff --git a/packages/gstreamer-1.0-vs-templates.packages b/packages/gstreamer-1.0-vs-templates.packages
new file mode 100644
index 00000000..c6384bbb
--- /dev/null
+++ b/packages/gstreamer-1.0-vs-templates.packages
@@ -0,0 +1,20 @@
+# vi:si:et:sw=4:sts=4:ts=4:syntax=python

+# -*- Mode: Python -*-

+from cerbero.packages.wix import VSTemplatePackage

+

+

+class Package(VSTemplatePackage):

+

+    name = 'gstreamer-1.0-vs-templates'

+    shortdesc = 'GStreamer 1.0 VS templates'

+    longdesc = 'GStreamer 1.0 Visual Studio templates'

+    url = "http://gstreamer.freedesktop.org"

+    version = '1.0.7'

+    codename = 'Congo'

+    license = License.LGPL

+    vendor = 'GStreamer Project'

+    org = 'org.freedesktop.gstreamer'

+    uuid = '42b3ba90-bd6a-4d94-a40d-5f2adf7ce441'

+    vs_template_dir = 'share/vs/2010/gst-sdk-template'

+    vs_wizard_dir = 'share/vs/2010/wizard'

+    vs_template_name = 'GStreamer'

diff --git a/packages/gstreamer-1.0/gstreamer-1.0.package b/packages/gstreamer-1.0/gstreamer-1.0.package
index bbd331fd..018c7bd9 100644
--- a/packages/gstreamer-1.0/gstreamer-1.0.package
+++ b/packages/gstreamer-1.0/gstreamer-1.0.package
@@ -34,7 +34,10 @@ class SDKPackage(package.SDKPackage):
                ('gstreamer-1.0-capture', False, False),
               ]
     platform_packages = {
-            Platform.WINDOWS: [('vsintegration-1.0', True, False)],
+            Platform.WINDOWS: [
+                ('vsintegration-1.0', True, False),
+                ('gstreamer-1.0-vs-templates', True, False),
+                ],
             }
 
     install_dir = {
@@ -64,3 +67,4 @@ class SDKPackage(package.SDKPackage):
             self.packages = [ x for x in self.packages if x[0] not in p]
         if self.config.target_platform == Platform.IOS:
             self.resources_postinstall = 'post_install_ios'
+            self.user_resources = ['share/gst-sdk/tutorials/xcode iOS']