Permalink
Browse files

this removes all torrent dependencies and replaces torrentwrapper wit…

…h a stand-in for pr-downloader
  • Loading branch information...
renefritze committed Oct 30, 2011
1 parent 390e93d commit 45bda6d8bed12a2613d4dca8219034ed02721ba5
Showing with 5,503 additions and 1,666 deletions.
  1. +49 −0 .gitignore.orig
  2. +1 −40 CMakeLists.txt
  3. +319 −0 CMakeLists.txt.orig
  4. +13 −0 branches.txt
  5. +11 −6 cmake/sources.list
  6. +244 −0 cmake/sources.list.orig
  7. +25 −27 src/{torrentlistctrl.cpp → downloader/downloadlistctrl.cpp}
  8. +3 −3 src/{torrentlistctrl.h → downloader/downloadlistctrl.h}
  9. 0 src/{ → downloader}/filelister/filelistctrl.cpp
  10. 0 src/{ → downloader}/filelister/filelistctrl.h
  11. 0 src/{ → downloader}/filelister/filelistdialog.cpp
  12. +0 −1 src/{ → downloader}/filelister/filelistdialog.h
  13. 0 src/{ → downloader}/filelister/filelistfilter.cpp
  14. 0 src/{ → downloader}/filelister/filelistfilter.h
  15. +1 −0 src/downloader/lib
  16. +53 −0 src/downloader/prdownloader.cpp
  17. +59 −0 src/downloader/prdownloader.h
  18. +3 −3 src/{torrentoptionspanel.cpp → downloadoptionspanel.cpp}
  19. 0 src/{torrentoptionspanel.h → downloadoptionspanel.h}
  20. +17 −63 src/{maintorrenttab.cpp → maindownloadtab.cpp}
  21. +2 −5 src/{maintorrenttab.h → maindownloadtab.h}
  22. +1 −1 src/mainoptionstab.cpp
  23. +1 −2 src/mainwindow.cpp
  24. +133 −0 src/prof.cpp
  25. +11 −0 src/qt/qml.local.pri
  26. +5 −0 src/qt/qml.local.pri.s44
  27. +163 −0 src/qt/qmlapplicationviewer.pri
  28. +257 −0 src/qt/sasi.pro.user.2.2pre5
  29. +257 −0 src/qt/sasi.pro.user.2.3pre1
  30. +286 −0 src/qt/sasi.pro.user.2.5pre1
  31. +1,002 −0 src/qt/simpleserverevents.cpp.orig
  32. +4 −0 src/qt/switch.local
  33. +0 −3 src/serverevents.cpp
  34. +1,032 −0 src/simpleinterface/simpleserverevents.cpp.orig
  35. +2 −0 src/sound/alure/.gitignore
  36. +0 −3 src/spring.cpp
  37. +1 −11 src/springlobbyapp.cpp
  38. +0 −709 src/torrentwrapper.cpp
  39. +0 −180 src/torrentwrapper.h
  40. +75 −42 src/ui.cpp
  41. +1,448 −0 src/ui.cpp.orig
  42. +0 −373 src/utils/downloader.cpp
  43. +0 −88 src/utils/downloader.h
  44. +0 −60 src/utils/plasmaresourceinfo.cpp
  45. +0 −46 src/utils/plasmaresourceinfo.h
  46. +4 −0 switch_build-dir
  47. +21 −0 upload.sh
View
@@ -0,0 +1,49 @@
.gitignore
build-*
build
bin
obj
springlobby.layout
springlobby.depend
*~
.cproject
.project
unitsync.log
doc/.gitignore
rpm/.gitignore
*.vcproj.*.user
*.suo
*.ncb
*.o
po/*
Makefile
Options.fbp
Updater.fbp
*.diff
config.h
doc/html/
doc/*
formbuilder.cpp
formbuilder.h
options.xrc
patch0.patch
remrampatch.diff
springlobby
springsettings
src/images/logo_xmas.svg
src/images/replay_icon.xpm
src/images/updater/
src/iunitsyncmap.cpp
src/sha1.c
src/sha1.h
test.txt
test/*
src/images/updater/*
*.fbp.bak
CMakeLists.txt.user*
src/qt-build/
<<<<<<< HEAD
moc_*.cpp
=======
attic/
>>>>>>> gitignore update
View
@@ -159,41 +159,6 @@ ELSE(WIN32)
LINK_LIBRARIES( ${CURL_LDFLAGS} )
INCLUDE_DIRECTORIES( ${CURL_INCLUDE_DIR} )
ENDIF(WIN32)
#----------------------------------------------------------------------------------------------------
# libtorrent-rasterbar dependency check
#----------------------------------------------------------------------------------------------------
IF( OPTION_TORRENT_SYSTEM )
IF( NOT WIN32)
SET ( LIBTORRENT_MIN_VERSION 0.14 )
pkg_check_modules( LIBTORRENT libtorrent-rasterbar>=${LIBTORRENT_MIN_VERSION} )
IF( LIBTORRENT_FOUND )
INCLUDE_DIRECTORIES( ${LIBTORRENT_INCLUDE_DIRS} )
LINK_LIBRARIES( ${LIBTORRENT_LIBRARIES} )
ADD_DEFINITIONS( ${LIBTORRENT_CFLAGS} )
ELSE()
MESSAGE( FATAL_ERROR "libtorrent-rasterbar library not found! Please install the package or toggle OPTION_TORRENT_SYSTEM to OFF")
ENDIF()
FIND_PACKAGE( Boost COMPONENTS system )
IF( Boost_FOUND )
link_directories( ${Boost_LIB_DIR} )
INCLUDE_DIRECTORIES( ${Boost_INCLUDE_DIR} )
SET( SL_BOOST_LIBS boost_system )
ELSE()
MESSAGE( FATAL_ERROR "boost library not found! Please install the package or toggle OPTION_TORRENT_SYSTEM to OFF")
ENDIF()
ELSE( NOT WIN32)
link_directories( ${boost_LIB_DIR} )
INCLUDE_DIRECTORIES( ${boost_INCLUDE_DIR} )
ADD_DEFINITIONS( -mthreads )
LINK_LIBRARIES( -mthreads torrent-rasterbar ${Boost_LIBRARIES} z ws2_32 mswsock )
ENDIF( NOT WIN32)
LIST( APPEND SLSharedWithSettings ${curlSRC} )
ADD_DEFINITIONS( -DTORRENT_DISABLE_GEO_IP )
ELSE( OPTION_TORRENT_SYSTEM )
ADD_DEFINITIONS( -DNO_TORRENT_SYSTEM )
ENDIF( OPTION_TORRENT_SYSTEM )
#----------------------------------------------------------------------------------------------------
# libnotify dependency check
@@ -230,10 +195,7 @@ IF(WIN32)
SET(StandAloneSettings ${StandAloneSettings} src/settings++/settings.rc)
ELSE(WIN32)
# If we don't build for windows, include some source code checks as pre-build step.
FIND_PROGRAM(AWKBIN awk)
IF(AWKBIN)
ADD_CUSTOM_TARGET(test_susynclib ALL COMMAND ${AWKBIN} -f tools/test-susynclib.awk src/springunitsynclib.cpp WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
ENDIF(AWKBIN)
ADD_CUSTOM_TARGET(test_susynclib ALL COMMAND tools/test-susynclib.awk src/springunitsynclib.cpp WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
ENDIF(WIN32)
#----------------------------------------------------------------------------------------------------
@@ -257,7 +219,6 @@ cmake_policy(SET CMP0006 OLD)
ADD_EXECUTABLE(springlobby WIN32 MACOSX_BUNDLE ${header} ${springlobbySrc} ${SettingsSrc} ${SLSharedWithSettings} ${springlobby_RC_FILE})
ADD_EXECUTABLE(springsettings WIN32 MACOSX_BUNDLE ${StandAloneSettings} ${SettingsSrc} ${SLSharedWithSettings} ${SpringSettings_RC_FILE} )
set_target_properties(springsettings PROPERTIES COMPILE_FLAGS -DSPRINGSETTINGS_STANDALONE )
#the updater needs to be build for windows only
IF(WIN32)
ADD_EXECUTABLE(springlobby_updater WIN32 MACOSX_BUNDLE ${updaterSrc} ${SLSharedWithSettings} ${updater_RC_FILE} )
Oops, something went wrong.

0 comments on commit 45bda6d

Please sign in to comment.