changeset 8:9491ac848af1 default tip

The pyxpcom library now uses @executable_path. Refined the Makefile more.
author Atul Varma <varmaa@toolness.com>
date Thu, 08 May 2008 11:01:04 -0700
parents b20f9031e475
children
files Makefile xpcom/src/SConscript
diffstat 2 files changed, 14 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Tue May 06 16:37:16 2008 -0700
+++ b/Makefile	Thu May 08 11:01:04 2008 -0700
@@ -1,4 +1,5 @@
-FIREFOX_BIN_DIR="/Applications/Firefox.app/Contents/MacOS"
+FIREFOX_BIN_DIR=/Applications/Firefox.app/Contents/MacOS
+FIREFOX_PROFILE_DIR=/Users/varmaa/firefox-profile
 
 install:
 	cp xpcom/src/libpyxpcom.dylib ${FIREFOX_BIN_DIR}
@@ -7,6 +8,8 @@
 	cp -R xpcom /Library/Python/2.5/site-packages
 	rm -f "${FIREFOX_BIN_DIR}/components/compreg.dat"
 	rm -f "${FIREFOX_BIN_DIR}/components/xpti.dat"
+	rm -f "${FIREFOX_PROFILE_DIR}/compreg.dat"
+	rm -f "${FIREFOX_PROFILE_DIR}/xpti.dat"
 
 uninstall:
 	rm -f ${FIREFOX_BIN_DIR}/libpyxpcom.dylib
--- a/xpcom/src/SConscript	Tue May 06 16:37:16 2008 -0700
+++ b/xpcom/src/SConscript	Thu May 08 11:01:04 2008 -0700
@@ -1,6 +1,8 @@
+import os
+
 Import("env")
 
-env.SharedLibrary(
+pyxpcom = env.SharedLibrary(
     source=["ErrorUtils.cpp",
             "PyGBase.cpp",
             "PyGModule.cpp",
@@ -30,6 +32,13 @@
     FRAMEWORKS=["Python"]
     )
 
+env.AddPostAction(
+    pyxpcom,
+    "install_name_tool -id @executable_path/%(libname)s %(lib)s" %
+    {"libname" : os.path.basename(pyxpcom[0].abspath),
+     "lib" : pyxpcom[0].abspath}
+    )
+
 loaderEnv = env.Copy()
 
 loaderEnv.Append(CPPPATH=[Dir(".")],