commit decd763df1b0909010b07fa648fb65208030d706 Author: Tomás Touceda chiiph@torproject.org Date: Sat Oct 29 14:43:46 2011 -0300

Several changes in the pkg/osx CMakeLists file

- Remove polipo parts - Remove torbutton parts - Add QtScript qt dependency --- pkg/osx/CMakeLists.txt | 50 +++++++++++++++-------------------------------- 1 files changed, 16 insertions(+), 34 deletions(-)

diff --git a/pkg/osx/CMakeLists.txt b/pkg/osx/CMakeLists.txt index e757864..66e33e4 100644 --- a/pkg/osx/CMakeLists.txt +++ b/pkg/osx/CMakeLists.txt @@ -1,12 +1,12 @@ ## ## $Id$ -## +## ## This file is part of Vidalia, and is subject to the license terms in the -## LICENSE file, found in the top level directory of this distribution. If +## LICENSE file, found in the top level directory of this distribution. If ## you did not receive the LICENSE file with this file, you may obtain it ## from the Vidalia source package distributed by the Vidalia Project at -## http://www.torproject.org/projects/vidalia.html. No part of Vidalia, -## including this file, may be copied, modified, propagated, or distributed +## http://www.torproject.org/projects/vidalia.html. No part of Vidalia, +## including this file, may be copied, modified, propagated, or distributed ## except according to the terms described in the LICENSE file. ##

@@ -38,6 +38,12 @@ if (QT_USE_FRAMEWORKS) APP_BUNDLE ${VIDALIA_APP_BUNDLE_ROOT} DEPENDS_FRAMEWORKS ${QtCore} ) + vidalia_install_qt4_framework(QtScript + TARGET dist-osx-libraries NAME QtScript + LIBRARY ${QT_QTSCRIPT_LIBRARY_RELEASE}/QtScript + APP_BUNDLE ${VIDALIA_APP_BUNDLE_ROOT} + DEPENDS_FRAMEWORKS ${QtCore} + ) vidalia_install_name_tool(${VIDALIA_EXECUTABLE} TARGET dist-osx-libraries FRAMEWORKS ${QtCore} ${QtGui} ${QtNetwork} ${QtXml} @@ -49,12 +55,6 @@ if (QT_USE_FRAMEWORKS) APP_BUNDLE ${VIDALIA_APP_BUNDLE_ROOT} DEPENDS_FRAMEWORKS ${QtCore} ${QtGui} ) - vidalia_install_qt4_framework(QtScript - TARGET dist-osx-libraries NAME QtScript - LIBRARY ${QT_QTSCRIPT_LIBRARY_RELEASE}/QtScript - APP_BUNDLE ${VIDALIA_APP_BUNDLE_ROOT} - DEPENDS_FRAMEWORKS ${QtCore} - ) vidalia_install_qt4_framework(QtDBus TARGET dist-osx-libraries NAME QtDBus LIBRARY ${QT_QTDBUS_LIBRARY_RELEASE}/QtDBus @@ -118,10 +118,8 @@ add_custom_target(dist-osx ) add_dependencies(dist-osx dist-osx-libraries)

-if (TOR_SOURCE_DIR AND POLIPO_SOURCE_DIR AND TORBUTTON_XPI) +if (TOR_SOURCE_DIR) get_filename_component(TOR_SOURCE_DIR ${TOR_SOURCE_DIR} ABSOLUTE) - get_filename_component(POLIPO_SOURCE_DIR ${POLIPO_SOURCE_DIR} ABSOLUTE) - get_filename_component(TORBUTTON_XPI ${TORBUTTON_XPI} ABSOLUTE)

## Determine Tor's version string used to build the .dmg filename vidalia_get_tor_version(TOR_VERSION "${TOR_SOURCE_DIR}/src/or/tor") @@ -131,21 +129,8 @@ if (TOR_SOURCE_DIR AND POLIPO_SOURCE_DIR AND TORBUTTON_XPI) message(FATAL_ERROR "Unable to determine version of ${TOR_SOURCE_DIR}/src/or/tor") endif(TOR_VERSION)

- ## Configure the Torbutton installation script file - get_filename_component(TORBUTTON_XPI_FILENAME ${TORBUTTON_XPI} NAME) - configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/InstallTorbutton.scpt.in - ${CMAKE_CURRENT_BINARY_DIR}/InstallTorbutton.scpt - ) - set(bundle_DMG "vidalia-bundle-${TOR_VERSION}-${VERSION}-${DMG_ARCH}.dmg") add_custom_target(dist-osx-bundle - COMMAND osacompile - -o "${CMAKE_CURRENT_BINARY_DIR}/Install Torbutton for Firefox.app" - ${CMAKE_CURRENT_BINARY_DIR}/InstallTorbutton.scpt - COMMAND ${CMAKE_COMMAND} -E copy - ${TORBUTTON_XPI} - "${CMAKE_CURRENT_BINARY_DIR}/Install Torbutton for Firefox.app/" COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/pkg-dmg --source ${VIDALIA_APP_BUNDLE_ROOT} --target ${Vidalia_BINARY_DIR}/${bundle_DMG} @@ -169,36 +154,33 @@ if (TOR_SOURCE_DIR AND POLIPO_SOURCE_DIR AND TORBUTTON_XPI) --copy ${TOR_SOURCE_DIR}/src/tools/tor-resolve:/Vidalia.app/Contents/MacOS/ --copy ${TOR_SOURCE_DIR}/src/config/geoip:/Vidalia.app/share/tor/ --copy ${TOR_SOURCE_DIR}/src/config/torrc.sample:/Vidalia.app/Contents/Resources/ - --copy ${POLIPO_SOURCE_DIR}/polipo:/Vidalia.app/Contents/MacOS/ - --copy ${CMAKE_CURRENT_SOURCE_DIR}/polipo.conf:/Vidalia.app/Contents/Resources/ - --copy "${CMAKE_CURRENT_BINARY_DIR}/Install Torbutton for Firefox.app:/" COMMENT "Creating ${bundle_DMG}" VERBATIM ) add_dependencies(dist-osx-bundle dist-osx-libraries)

add_custom_target(dist-osx-split-bundle - COMMAND hdiutil segment -segmentSize 1.5m + COMMAND hdiutil segment -segmentSize 1.5m -o "${Vidalia_BINARY_DIR}/split-${bundle_DMG}" "${Vidalia_BINARY_DIR}/${bundle_DMG}" COMMENT "Creating split-${bundle_DMG}" VERBATIM ) add_dependencies(dist-osx-split-bundle dist-osx-bundle) -else(TOR_SOURCE_DIR AND POLIPO_SOURCE_DIR AND TORBUTTON_XPI) +else(TOR_SOURCE_DIR) message("-- Skipping dist-osx-bundle build target") add_custom_target(dist-osx-bundle COMMAND ${CMAKE_COMMAND} -E echo "!! The dist-osx-bundle target is not configured." COMMAND ${CMAKE_COMMAND} -E echo - "!! You must set the -DTOR_SOURCE_DIR,-DPOLIPO_SOURCE_DIR and -DTORBUTTON_XPI CMake variables." + "!! You must set the -DTOR_SOURCE_DIR CMake variables." COMMAND ${CMAKE_COMMAND} -E echo "!! Quitting." ) add_custom_target(dist-osx-split-bundle COMMAND ${CMAKE_COMMAND} -E echo "!! The dist-osx-split-bundle target is not configured. Quitting." COMMAND ${CMAKE_COMMAND} -E echo - "!! You must set the -DTOR_SOURCE_DIR, -DPOLIPO_SOURCE_DIR and -DTORBUTTON_XPI CMake variables." + "!! You must set the -DTOR_SOURCE_DIR CMake variables." COMMAND ${CMAKE_COMMAND} -E echo "!! Quitting." ) -endif(TOR_SOURCE_DIR AND POLIPO_SOURCE_DIR AND TORBUTTON_XPI) +endif(TOR_SOURCE_DIR)