adium-1.4 2586:5f6c84420401: Fix compiling/universalizing libjso...

[commits at adium.im]

details:	http://hg.adium.im/adium-1.4/rev/5f6c84420401
revision:	2586:5f6c84420401
author:		Zachary West <zacw at adium.im>
date:		Wed Aug 19 19:02:12 2009 -0700

Fix compiling/universalizing libjson-glib.

diffs (37 lines):

diff -r 49e9f62a5292 -r 5f6c84420401 Utilities/dep-build-scripts/framework_maker/frameworkize.py
--- a/Utilities/dep-build-scripts/framework_maker/frameworkize.py	Thu Aug 20 11:02:19 2009 -0400
+++ b/Utilities/dep-build-scripts/framework_maker/frameworkize.py	Wed Aug 19 19:02:12 2009 -0700
@@ -40,9 +40,9 @@
     return (library_name, 'A')
   # Note: these styles are named after where I noticed them, not necessarily
   # where they originate. -RAF
-  regexes = [r'([A-Za-z0-9_-]*)-([0-9.]*)$', #apr style
-             r'([A-Za-z0-9_-]*[a-zA-Z])\.([0-9.]*)$', #gnu style
-             r'([A-Za-z0-9_-]*[a-zA-Z])([0-9.]*)$', #sqlite style
+  regexes = [r'([A-Za-z0-9_-]*)-([0-9\.]*)$', #apr style
+             r'([A-Za-z0-9_-]*[a-zA-Z])\.([0-9\.]*)$', #gnu style
+             r'([A-Za-z0-9_-]*[a-zA-Z])([0-9\.]*)$', #sqlite style
              ]
   for regex in regexes:
     match = re.match(regex, library_name)
diff -r 49e9f62a5292 -r 5f6c84420401 Utilities/dep-build-scripts/universalize.sh
--- a/Utilities/dep-build-scripts/universalize.sh	Thu Aug 20 11:02:19 2009 -0400
+++ b/Utilities/dep-build-scripts/universalize.sh	Wed Aug 19 19:02:12 2009 -0700
@@ -16,7 +16,7 @@
 MEANWHILE=libmeanwhile.1
 GADU=libgadu.3.7.0
 SASL=libsasl2.2
-JSONGLIB=libjson-glib-1.0.0
+JSONGLIB=libjson-glib-1.0
 
 # vv
 # I'm not sure what to do to universalize the vv libs, especially the gst-plugins
@@ -56,7 +56,7 @@
 touch libgthread-2.0.0/no_headers_here.txt
 
 mkdir libjson-glib-1.0.0 || true
-cp -R $TARGET_DIR_I386/include/json-glib-1.0/ $UNIVERSAL_DIR/include/libjson-glib-1.0.0/
+cp -R $TARGET_DIR_I386/include/json-glib-1.0/json-glib $UNIVERSAL_DIR/include/libjson-glib-1.0.0
 
 rm -rf $UNIVERSAL_DIR/include/$PURPLE_FOLDER
 cp -R $TARGET_DIR_I386/include/libpurple $UNIVERSAL_DIR/include/$PURPLE_FOLDER