[vidalia-svn] r4025: Use ditto to strip the architectures we don't want from the (in vidalia/trunk: . cmake)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2009-08-11 13:44:30 -0400 (Tue, 11 Aug 2009)
New Revision: 4025

Modified:
   vidalia/trunk/CHANGELOG
   vidalia/trunk/cmake/VidaliaMacros.cmake
Log:


Use ditto to strip the architectures we don't want from the Qt frameworks
installed into the app bundle with dist-osx, dist-osx-bundle and
dist-osx-split-bundle. This way we can ship a 'thin' binary without having
to rebuild Qt.


Modified: vidalia/trunk/CHANGELOG
===================================================================
--- vidalia/trunk/CHANGELOG	2009-08-10 15:26:40 UTC (rev 4024)
+++ vidalia/trunk/CHANGELOG	2009-08-11 17:44:30 UTC (rev 4025)
@@ -2,6 +2,9 @@
   o When the user clicks "Browse" in the Advanced settings page to locate
     a new torrc, set the initial directory shown in the file dialog to the
     current location of the user's torrc. (Ticket #505)
+  o Use 'ditto' to strip the architectures we don't want from the Qt
+    frameworks installed into the app bundle with the dist-osx,
+    dist-osx-bundle and dist-osx-split-bundle build targets.
 
 
 0.2.1   03-Aug-2009

Modified: vidalia/trunk/cmake/VidaliaMacros.cmake
===================================================================
--- vidalia/trunk/cmake/VidaliaMacros.cmake	2009-08-10 15:26:40 UTC (rev 4024)
+++ vidalia/trunk/cmake/VidaliaMacros.cmake	2009-08-11 17:44:30 UTC (rev 4025)
@@ -206,13 +206,18 @@
       "NAME;TARGET;LIBRARY;APP_BUNDLE;DEPENDS_FRAMEWORKS;DEPENDS_LIBRARIES" ""
       ${ARGN}
     )
- 
+    set(ditto_ARGS "--rsrc")
+    foreach (it ${CMAKE_OSX_ARCHITECTURES})
+      set(ditto_ARGS ${ditto_ARGS} --arch ${it})
+    endforeach(it)
+
     set(framework "${INSTALL_QT4_FRAMEWORK_NAME}.framework/Versions/4")
     set(outdir "${INSTALL_QT4_FRAMEWORK_APP_BUNDLE}/Contents/Frameworks/${framework}")
     get_filename_component(libname "${INSTALL_QT4_FRAMEWORK_LIBRARY}" NAME)
     add_custom_command(TARGET ${INSTALL_QT4_FRAMEWORK_TARGET}
       COMMAND ${CMAKE_COMMAND} -E make_directory ${outdir}
-      COMMAND ${CMAKE_COMMAND} -E copy ${INSTALL_QT4_FRAMEWORK_LIBRARY} ${outdir}/
+      COMMAND ditto ${ditto_ARGS}
+        ${INSTALL_QT4_FRAMEWORK_LIBRARY} ${outdir}/
       COMMAND install_name_tool -id
         @executable_path/../Frameworks/${framework}/${libname} ${outdir}/${libname}
     )
@@ -233,12 +238,17 @@
       "TARGET;LIBRARY;APP_BUNDLE;DEPENDS_FRAMEWORKS;DEPENDS_LIBRARIES" ""
       ${ARGN}
     )
+    set(ditto_ARGS "--rsrc")
+    foreach (it ${CMAKE_OSX_ARCHITECTURES})
+      set(ditto_ARGS ${ditto_ARGS} --arch ${it})
+    endforeach(it)
 
     set(outdir "${INSTALL_DYLIB_APP_BUNDLE}/Contents/MacOS/lib/")
     get_filename_component(libname "${INSTALL_DYLIB_LIBRARY}" NAME)
     add_custom_command(TARGET ${INSTALL_DYLIB_TARGET}
       COMMAND ${CMAKE_COMMAND} -E make_directory ${outdir}
-      COMMAND ${CMAKE_COMMAND} -E copy ${INSTALL_DYLIB_LIBRARY} ${outdir}/
+      COMMAND ditto  ${ditto_ARGS} 
+        ${INSTALL_DYLIB_LIBRARY} ${outdir}/
       COMMAND install_name_tool -id @executable_path/lib/${libname}
     )
     vidalia_install_name_tool(${outir}/${libname}