[wx] Unreviewed build fix for Mac installation script.
authorkevino@webkit.org <kevino@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 14 Apr 2011 22:32:10 +0000 (22:32 +0000)
committerkevino@webkit.org <kevino@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 14 Apr 2011 22:32:10 +0000 (22:32 +0000)
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@83903 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/wx/packaging/build-mac-installer.py

index 981b86c..3d3d52b 100644 (file)
@@ -1,3 +1,9 @@
+2011-04-14  Kevin Ollivier  <kevino@theolliviers.com>
+
+        [wx] Unreviewed build fix for Mac installation script.
+
+        * wx/packaging/build-mac-installer.py:
+
 2011-04-14  Ojan Vafai  <ojan@chromium.org>
 
         Reviewed by Tony Chang.
 2011-04-14  Ojan Vafai  <ojan@chromium.org>
 
         Reviewed by Tony Chang.
index d0ef945..8231049 100644 (file)
@@ -70,7 +70,7 @@ if sys.platform.startswith("darwin"):
     wx_root = "/usr/local/lib/wxPython-unicode-%s" % wx.__version__
     sp_root = "%s/lib/python%s/site-packages" % (wx_root, py_version)
 sitepackages = "%s/wx-%s-mac-unicode/wx" % (sp_root, wx_version[:3])
     wx_root = "/usr/local/lib/wxPython-unicode-%s" % wx.__version__
     sp_root = "%s/lib/python%s/site-packages" % (wx_root, py_version)
 sitepackages = "%s/wx-%s-mac-unicode/wx" % (sp_root, wx_version[:3])
-prefix = wxroot + "/lib"
+prefix = wx_root + "/lib"
 
 def mac_update_dependencies(dylib, prefix):
     """
 
 def mac_update_dependencies(dylib, prefix):
     """
@@ -131,7 +131,7 @@ try:
             shutil.copy(afile, wxroot)
     
     if sys.platform.startswith("darwin"):
             shutil.copy(afile, wxroot)
     
     if sys.platform.startswith("darwin"):
-        dylib_path = os.path.join(wxpythonroot, "libwxwebkit.dylib")
+        dylib_path = os.path.join(wxroot, "libwxwebkit.dylib")
         os.system("install_name_tool -id %s %s" % (os.path.join(prefix, "libwxwebkit.dylib"), dylib_path))
         mac_update_dependencies(dylib_path, prefix)
         mac_update_dependencies(os.path.join(wxpythonroot, "_webview.so"), prefix)
         os.system("install_name_tool -id %s %s" % (os.path.join(prefix, "libwxwebkit.dylib"), dylib_path))
         mac_update_dependencies(dylib_path, prefix)
         mac_update_dependencies(os.path.join(wxpythonroot, "_webview.so"), prefix)
@@ -140,7 +140,7 @@ try:
         if not os.path.exists(demodir):
             os.makedirs(demodir)
             
         if not os.path.exists(demodir):
             os.makedirs(demodir)
             
-        shutil.copy(os.path.join(wxwk_root, "WebKit", "wx", "bindings", "python", "samples", "simple.py"), demodir)
+        shutil.copy(os.path.join(wxwk_root, "Source", "WebKit", "wx", "bindings", "python", "samples", "simple.py"), demodir)
         
         if os.path.exists(pkgname + ".pkg"):
             shutil.rmtree(pkgname + ".pkg")
         
         if os.path.exists(pkgname + ".pkg"):
             shutil.rmtree(pkgname + ".pkg")
@@ -152,7 +152,6 @@ try:
                     '--domain system',
                     '--root-volume-only',
                     '--root ' + installroot,
                     '--domain system',
                     '--root-volume-only',
                     '--root ' + installroot,
-                    '--resources %s/mac/resources' % script_dir,
                     '--verbose'
                     ]
     
                     '--verbose'
                     ]