adium-1.3 364:71396e87c772: Fix compiling/universalizing libjson...

[commits at adium.im]

details:	http://hg.adium.im/adium-1.3/rev/71396e87c772
revision:	364:71396e87c772
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 0f76645ae31d -r 71396e87c772 Utilities/dep-build-scripts/framework_maker/frameworkize.py
--- a/Utilities/dep-build-scripts/framework_maker/frameworkize.py	Wed Aug 19 21:44:17 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 0f76645ae31d -r 71396e87c772 Utilities/dep-build-scripts/universalize.sh
--- a/Utilities/dep-build-scripts/universalize.sh	Wed Aug 19 21:44:17 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
 
 PURPLE_VERSION=0.5.9
 
@@ -55,7 +55,7 @@
 touch libgthread-2.0.0/no_headers_here.txt
 
 mkdir libjson || true
-cp -R $TARGET_DIR_I386/include/json-glib-1.0/ $UNIVERSAL_DIR/include/libjson-glib/
+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