X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=packaging%2FMacSDK%2Fprofile.py;h=3ad4c05c8008d4f72cccf410e22233ea2e7dd7a0;hb=f99b88b812b42d7946ebc0217cbaf16d82ae3048;hp=ab1fc9df931da7b8a73a2e3c0cd4563e51225ed0;hpb=f367b437babbeb0ab45651e3fff7a4f80d7ee756;p=mono.git

diff --git a/packaging/MacSDK/profile.py b/packaging/MacSDK/profile.py
index ab1fc9df931..3ad4c05c800 100755
--- a/packaging/MacSDK/profile.py
+++ b/packaging/MacSDK/profile.py
@@ -100,7 +100,7 @@ class MonoReleaseProfile(DarwinProfile):
         self.env.set('PANGO_SYSCONFDIR', '%{staged_prefix}/etc')
         self.env.set('PANGO_LIBDIR', '%{staged_prefix}/lib')
         # self.env.set ('MONO_PATH', '%{staged_prefix}/lib/mono/4.0')
-        self.debug_info = ['gtk+', 'cairo',
+        self.debug_info = ['gtk+', 'cairo', 'glib',
                            'pango', 'mono', 'llvm', 'libgdiplus']
         self.cache_host = None
 
@@ -119,6 +119,8 @@ class MonoReleaseProfile(DarwinProfile):
             error('Prefix %s exists, and may interfere with the staged build. Please remove and try again.' % self.prefix)
 
         self.calculate_updateid()
+
+        self.mono_package.custom_version_str = self.FULL_VERSION
         trace(self.package_info('MDK'))
 
         self.dont_optimize = ['pixman']
@@ -134,14 +136,12 @@ class MonoReleaseProfile(DarwinProfile):
         self.verify_binaries()
 
         working = self.setup_working_dir()
-        uninstall_script = os.path.join(working, "uninstallMono.sh")
 
         # make the MDK
         self.apply_blacklist(working, 'mdk_blacklist.sh')
         self.make_updateinfo(working, self.MDK_GUID)
         mdk_pkg = self.run_pkgbuild(working, "MDK")
         title(mdk_pkg)
-        # self.make_dmg(mdk_dmg, title, mdk_pkg, uninstall_script)
 
         shutil.rmtree(working)
 
@@ -172,7 +172,6 @@ class MonoReleaseProfile(DarwinProfile):
 
     # creates and returns the path to a working directory containing:
     #   PKGROOT/ - this root will be bundled into the .pkg and extracted at /
-    #   uninstallMono.sh - copied onto the DMG
     #   Info{_sdk}.plist - used by packagemaker to make the installer
     #   resources/ - other resources used by packagemaker for the installer
     def setup_working_dir(self):
@@ -242,7 +241,7 @@ class MonoReleaseProfile(DarwinProfile):
     def run_pkgbuild(self, working_dir, package_type):
         print 'Running pkgbuild & productbuild...',
         info = self.package_info(package_type)
-        output = os.path.join(self.resource_path, info["filename"])
+        output = os.path.join(self.directory, info["filename"])
         identifier = "com.xamarin.mono-" + info["type"] + ".pkg"
         resources_dir = os.path.join(working_dir, "resources")
         distribution_xml = os.path.join(resources_dir, "distribution.xml")
@@ -281,6 +280,10 @@ class MonoReleaseProfile(DarwinProfile):
             working_dir, "PKGROOT", self.prefix[1:], "updateinfo")
         with open(updateinfo, "w") as updateinfo:
             updateinfo.write(guid + ' ' + self.updateid + "\n")
+        version_file = os.path.join(
+            working_dir, "PKGROOT", self.prefix[1:], "VERSION")
+        with open(version_file, "w") as version_file:
+            version_file.write(self.FULL_VERSION + "\n")
 
     def package_info(self, pkg_type):
         arch = self.bockbuild.cmd_options.arch
@@ -393,4 +396,4 @@ class MonoReleaseProfile(DarwinProfile):
 
         subprocess.call(['bash', '-c', path])
 
-MonoReleaseProfile()
\ No newline at end of file
+MonoReleaseProfile()