[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[vidalia-svn] r2561: Merge r2533 and r2536 from trunk to the upnp branch, so I ca (in vidalia: . branches/upnp branches/upnp/src branches/upnp/src/common branches/upnp/src/torcontrol branches/upnp/src/vidalia branches/upnp/src/vidalia/config branches/upnp/src/vidalia/log branches/upnp/src/vidalia/network)

To: vidalia-svn@xxxxxxxx
Subject: [vidalia-svn] r2561: Merge r2533 and r2536 from trunk to the upnp branch, so I ca (in vidalia: . branches/upnp branches/upnp/src branches/upnp/src/common branches/upnp/src/torcontrol branches/upnp/src/vidalia branches/upnp/src/vidalia/config branches/upnp/src/vidalia/log branches/upnp/src/vidalia/network)
From: edmanm@xxxxxxxxxxxxxxxxxxx
Date: Thu, 8 May 2008 19:30:26 -0400 (EDT)
Delivered-to: archiver@xxxxxxxx
Delivered-to: vidalia-svn-outgoing@xxxxxxxx
Delivered-to: vidalia-svn@xxxxxxxx
Delivery-date: Thu, 08 May 2008 19:30:33 -0400
Reply-to: vidalia-svn@xxxxxxxxxxxxx
Sender: owner-vidalia-svn@xxxxxxxxxxxxx

Author: edmanm
Date: 2008-05-08 19:30:26 -0400 (Thu, 08 May 2008)
New Revision: 2561

Added:
   vidalia/branches/upnp/src/common/
Removed:
   vidalia/branches/upnp/src/util/
Modified:
   vidalia/
   vidalia/branches/upnp/CMakeLists.txt
   vidalia/branches/upnp/src/CMakeLists.txt
   vidalia/branches/upnp/src/common/CMakeLists.txt
   vidalia/branches/upnp/src/common/file.cpp
   vidalia/branches/upnp/src/torcontrol/CMakeLists.txt
   vidalia/branches/upnp/src/vidalia/CMakeLists.txt
   vidalia/branches/upnp/src/vidalia/config/servicepage.cpp
   vidalia/branches/upnp/src/vidalia/log/messagelog.cpp
   vidalia/branches/upnp/src/vidalia/network/geoipresponse.cpp
   vidalia/branches/upnp/src/vidalia/network/routerdescriptorview.cpp
Log:
 r277@rae:  edmanm | 2008-05-08 19:28:16 -0400
 Merge r2533 and r2536 from trunk to the upnp branch, so I can build it on
 Leopard.



Property changes on: vidalia
___________________________________________________________________
 svk:merge ticket from /local/vidalia [r277] on 45a62a8a-8088-484c-baad-c7b3e776dd32

Modified: vidalia/branches/upnp/CMakeLists.txt
===================================================================
--- vidalia/branches/upnp/CMakeLists.txt	2008-05-08 23:30:24 UTC (rev 2560)
+++ vidalia/branches/upnp/CMakeLists.txt	2008-05-08 23:30:26 UTC (rev 2561)
@@ -67,10 +67,11 @@
 endif(USE_QSSLSOCKET)
 
 ## UPnP support is currently optional (disabled by default)
+
 option(USE_MINIUPNPC "Enable UPnP support using the MiniUPnPc library." OFF)
-if (USE_MINIUPNPC)
-  include(${CMAKE_SOURCE_DIR}/cmake/FindMiniUPnPc.cmake)
-endif(USE_MINIUPNPC)
+#if (USE_MINIUPNPC)
+#  include(${CMAKE_SOURCE_DIR}/cmake/FindMiniUPnPc.cmake)
+#endif(USE_MINIUPNPC)
 
 ## Check for system header files
 check_include_file("limits.h" HAVE_LIMITS_H)

Modified: vidalia/branches/upnp/src/CMakeLists.txt
===================================================================
--- vidalia/branches/upnp/src/CMakeLists.txt	2008-05-08 23:30:24 UTC (rev 2560)
+++ vidalia/branches/upnp/src/CMakeLists.txt	2008-05-08 23:30:26 UTC (rev 2561)
@@ -15,11 +15,11 @@
   ${QT_INCLUDES}
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/torcontrol
-  ${CMAKE_CURRENT_SOURCE_DIR}/util
+  ${CMAKE_CURRENT_SOURCE_DIR}/common
 )
 link_directories(
   ${CMAKE_CURRENT_BINARY_DIR}/torcontrol
-  ${CMAKE_CURRENT_BINARY_DIR}/util
+  ${CMAKE_CURRENT_BINARY_DIR}/common
 )
 
 if(MSVC)
@@ -35,6 +35,6 @@
 endif(WIN32)
 
 add_subdirectory(torcontrol)
-add_subdirectory(util)
+add_subdirectory(common)
 add_subdirectory(vidalia)
 

Copied: vidalia/branches/upnp/src/common (from rev 2528, vidalia/branches/upnp/src/util)

Modified: vidalia/branches/upnp/src/common/CMakeLists.txt
===================================================================
--- vidalia/branches/upnp/src/util/CMakeLists.txt	2008-04-17 18:12:32 UTC (rev 2528)
+++ vidalia/branches/upnp/src/common/CMakeLists.txt	2008-05-08 23:30:26 UTC (rev 2561)
@@ -11,7 +11,7 @@
 ##
 
 
-set(util_SRCS
+set(common_SRCS
   crypto.cpp
   file.cpp
   html.cpp
@@ -22,25 +22,25 @@
   torsocket.cpp
   zlibbytearray.cpp
 )
-qt4_wrap_cpp(util_SRCS torsocket.h)
+qt4_wrap_cpp(common_SRCS torsocket.h)
 
 
 if(USE_QSSLSOCKET)
-  set(util_SRCS ${util_SRCS} torsslsocket.cpp)
-  qt4_wrap_cpp(util_SRCS torsslsocket.h)
+  set(common_SRCS ${common_SRCS} torsslsocket.cpp)
+  qt4_wrap_cpp(common_SRCS torsslsocket.h)
 endif(USE_QSSLSOCKET)
 
 if(WIN32)
-  set(util_SRCS ${util_SRCS}
+  set(common_SRCS ${common_SRCS}
     win32.cpp
   )
 endif(WIN32)
 
 
-add_library(util STATIC ${util_SRCS})
-target_link_libraries(util ${QT_LIBRARIES})
+add_library(common STATIC ${common_SRCS})
+target_link_libraries(common ${QT_LIBRARIES})
 
 if(USE_QSSLSOCKET AND OPENSSL_LIBRARIES)
-  target_link_libraries(util ${OPENSSL_LIBRARIES})
+  target_link_libraries(common ${OPENSSL_LIBRARIES})
 endif(USE_QSSLSOCKET AND OPENSSL_LIBRARIES)
 

Modified: vidalia/branches/upnp/src/common/file.cpp
===================================================================
--- vidalia/branches/upnp/src/util/file.cpp	2008-04-17 18:12:32 UTC (rev 2528)
+++ vidalia/branches/upnp/src/common/file.cpp	2008-05-08 23:30:26 UTC (rev 2561)
@@ -20,7 +20,7 @@
 #include "file.h"
 
 #if defined(Q_OS_WIN32)
-#include <util/win32.h>
+#include "win32.h"
 #endif
 
 

Modified: vidalia/branches/upnp/src/torcontrol/CMakeLists.txt
===================================================================
--- vidalia/branches/upnp/src/torcontrol/CMakeLists.txt	2008-05-08 23:30:24 UTC (rev 2560)
+++ vidalia/branches/upnp/src/torcontrol/CMakeLists.txt	2008-05-08 23:30:26 UTC (rev 2561)
@@ -54,5 +54,5 @@
 
 
 add_library(torcontrol STATIC  ${torcontrol_SRCS})
-target_link_libraries(torcontrol ${QT_LIBRARIES} util)
+target_link_libraries(torcontrol ${QT_LIBRARIES} common)
 

Modified: vidalia/branches/upnp/src/vidalia/CMakeLists.txt
===================================================================
--- vidalia/branches/upnp/src/vidalia/CMakeLists.txt	2008-05-08 23:30:24 UTC (rev 2560)
+++ vidalia/branches/upnp/src/vidalia/CMakeLists.txt	2008-05-08 23:30:26 UTC (rev 2561)
@@ -255,8 +255,8 @@
 ## Link to the Qt libraries and other libraries built as a part of Vidalia
 target_link_libraries(${vidalia_BIN}
   ${QT_LIBRARIES}
+  common
   torcontrol
-  util
 )
 if (USE_MINIUPNPC)
   target_link_libraries(${vidalia_BIN} ${MINIUPNPC_LIBRARY})

Modified: vidalia/branches/upnp/src/vidalia/config/servicepage.cpp
===================================================================
--- vidalia/branches/upnp/src/vidalia/config/servicepage.cpp	2008-05-08 23:30:24 UTC (rev 2560)
+++ vidalia/branches/upnp/src/vidalia/config/servicepage.cpp	2008-05-08 23:30:26 UTC (rev 2561)
@@ -8,7 +8,7 @@
 **  terms described in the LICENSE file.
 */
 
-#include <util/stringutil.h>
+#include <stringutil.h>
 #include <vmessagebox.h>
 #include <qheaderview.h>
 #include <qclipboard.h>

Modified: vidalia/branches/upnp/src/vidalia/log/messagelog.cpp
===================================================================
--- vidalia/branches/upnp/src/vidalia/log/messagelog.cpp	2008-05-08 23:30:24 UTC (rev 2560)
+++ vidalia/branches/upnp/src/vidalia/log/messagelog.cpp	2008-05-08 23:30:26 UTC (rev 2561)
@@ -20,7 +20,7 @@
 #include <QMessageBox>
 #include <QClipboard>
 #include <vidalia.h>
-#include <util/html.h>
+#include <html.h>
 #include <vmessagebox.h>
 
 #include "messagelog.h"

Modified: vidalia/branches/upnp/src/vidalia/network/geoipresponse.cpp
===================================================================
--- vidalia/branches/upnp/src/vidalia/network/geoipresponse.cpp	2008-05-08 23:30:24 UTC (rev 2560)
+++ vidalia/branches/upnp/src/vidalia/network/geoipresponse.cpp	2008-05-08 23:30:26 UTC (rev 2561)
@@ -15,7 +15,7 @@
 */
 
 #include <QStringList>
-#include <util/zlibbytearray.h>
+#include <zlibbytearray.h>
 
 #include "geoipresponse.h"
 

Modified: vidalia/branches/upnp/src/vidalia/network/routerdescriptorview.cpp
===================================================================
--- vidalia/branches/upnp/src/vidalia/network/routerdescriptorview.cpp	2008-05-08 23:30:24 UTC (rev 2560)
+++ vidalia/branches/upnp/src/vidalia/network/routerdescriptorview.cpp	2008-05-08 23:30:26 UTC (rev 2561)
@@ -14,7 +14,7 @@
 ** \brief Formats and displays a router descriptor as HTML
 */
 
-#include <util/html.h>
+#include <html.h>
 #include "routerdescriptorview.h"
 
 #define DATE_FORMAT   "yyyy-MM-dd HH:mm:ss"

Prev by Author: [vidalia-svn] r2560: Trivial whitespace cleanup. (in vidalia: . trunk/src/vidalia/config)
Next by Author: [vidalia-svn] r2562: Add the miniupnpc 1.0 source to Vidalia's source tree and ad (in vidalia: . branches/upnp/src branches/upnp/src/miniupnpc)
Previous by thread: [vidalia-svn] r2560: Trivial whitespace cleanup. (in vidalia: . trunk/src/vidalia/config)
Next by thread: [vidalia-svn] r2562: Add the miniupnpc 1.0 source to Vidalia's source tree and ad (in vidalia: . branches/upnp/src branches/upnp/src/miniupnpc)
Index(es):
- Author
- Thread