Merge branch 'next-rebranding' into master-merge

CMakeLists.txt

@@ -1,5 +1,5 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
-PROJECT(Starbuck)
+PROJECT(Ripple)
 
 
 # -----------------------------------------------------------------------------
@@ -42,13 +42,13 @@ ENDIF ()
 # Default target names (can be overrriden in Options${PORT}.cmake file)
 # -----------------------------------------------------------------------------
 SET(WebKit_LIBRARY_NAME WebKit)
-SET(STARBUCKLIBRARY_LIBRARY_NAME StarbuckLibrary)
+SET(RIPPLELIBRARY_LIBRARY_NAME RippleLibrary)
 
 
 # -----------------------------------------------------------------------------
 # Default library types (can be overrriden in Options${PORT}.cmake file)
 # -----------------------------------------------------------------------------
-SET(STARBUCKLIBRARY_LIBRARY_TYPE STATIC)
+SET(RIPPLELIBRARY_LIBRARY_TYPE STATIC)
 
 # -----------------------------------------------------------------------------
 # Port-specific options
@@ -63,17 +63,17 @@ SET(CMAKE_SOURCE_DIR ${CMAKE_SRC})
 # Add module directories
 # -----------------------------------------------------------------------------
 #ADD_SUBDIRECTORY(IPC)
-ADD_SUBDIRECTORY(StarbuckLibrary)
-ADD_SUBDIRECTORY(Starbuck)
+ADD_SUBDIRECTORY(RippleLibrary)
+ADD_SUBDIRECTORY(Ripple)
 #ADD_SUBDIRECTORY(TestFramework)
 
 
-ADD_DEPENDENCIES(Starbuck
-    ${STARBUCKLIBRARY_LIBRARY_NAME} 
+ADD_DEPENDENCIES(Ripple
+    ${RIPPLELIBRARY_LIBRARY_NAME} 
 )
 
 #ADD_DEPENDENCIES(TestFramework
-#    ${STARBUCKLIBRARY_LIBRARY_NAME} 
+#    ${RIPPLELIBRARY_LIBRARY_NAME} 
 #    ${IPC_LIBRARY_NAME} 
 #    ${WebKit_LIBRARY_NAME}
 #)

MacBundle.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-echo Cleaning up Starbuck.app
-cd build/bin/Starbuck.app/Contents/MacOS
+echo Cleaning up Ripple.app
+cd build/bin/Ripple.app/Contents/MacOS
 
 echo Moving libpng
 cp /Library/Frameworks/libpng.framework/Versions/1.4.5/libpng ../Frameworks/libpng.framework/Versions/1.4.5/
@@ -20,4 +20,4 @@ install_name_tool -change libAmanithVG_SRE.dylib @executable_path/../MacOS/libAm
 install_name_tool -change libEGL_AM.dylib @executable_path/../MacOS/libEGL_AM.dylib libEGL_AM.dylib
 
 
-echo Done cleaning up Starbuck.app
+echo Done cleaning up Ripple.app

README.md

@@ -31,7 +31,7 @@ You can also find associated reference material for the Ripple tool as well as c
 # Windows (QtWebKit)
 * Make sure Qt 4.7.3 is setup on your system and configured properly.
 * Use the provided qmake projects to compile.
-* Once compiled add reference to custom QtWebKit in Starbuck project.
+* Once compiled add reference to custom QtWebKit in Ripple project.
 
 # Windows (framework only)
 * Create a build directory in your root folder (mkdir build).
@@ -43,7 +43,7 @@ You can also find associated reference material for the Ripple tool as well as c
 * Be sure you have all the necessary packages to build: libqt4-dev, libxrender-dev, libsqlite3-dev
 * Run qmake in root folder.
 * make
-* Copy custom lib.so files into Starbuck folder to be linked.
+* Copy custom lib.so files into Ripple folder to be linked.
 
 # Linux (Ubuntu) (framework only)
 * Be sure you have all the necessary packages to build: cmake, libqt4-dev

Ripple/CMakeLists.txt

@@ -0,0 +1,70 @@
+find_package(Qt4 COMPONENTS QtCore QtGui QtXml QtSql QtNetwork QtWebKit QtOpenGL REQUIRED)
+include(${QT_USE_FILE})
+
+SET(RIPPLE_INCLUDE_DIRECTORIES
+    "${CMAKE_BINARY_DIR}"
+    "${CMAKE_SOURCE_DIR}"
+    "${CMAKE_SOURCE_DIR}/RippleLibrary"
+    "${CMAKE_CURRENT_SOURCE_DIR}"
+    )
+
+LIST(APPEND RIPPLE_HEADERS
+    stdafx.h
+    )
+
+LIST(APPEND RIPPLE_SOURCES
+    main.cpp
+    ripple.cpp
+    stdafx.cpp
+    )
+
+set(RIPPLE_MOC_HEADERS
+    ripple.h   
+    )
+
+QT4_WRAP_CPP(RIPPLE_MOC_SRCS ${RIPPLE_MOC_HEADERS})
+
+LIST(APPEND RIPPLE_SOURCES ${RIPPLE_HEADERS} )
+LIST(APPEND RIPPLE_SOURCES ${RIPPLE_MOC_HEADERS} )
+LIST(APPEND RIPPLE_SOURCES ${RIPPLE_MOC_SRCS} )
+
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+include_directories(${RIPPLE_INCLUDE_DIRECTORIES})
+include_directories(${QT_INCLUDE_DIR})
+
+set(RIPPLE_LIBRARIES
+    ${RIPPLELIBRARY_LIBRARY_NAME}
+    )
+
+IF (WTF_OS_MAC_OS_X)
+
+
+SET(MAC_BUNDLE_RESOURCES "Ripple.icns")
+SET_SOURCE_FILES_PROPERTIES(
+      "Ripple.icns"
+       PROPERTIES
+       MACOSX_PACKAGE_LOCATION Resources
+      )
+
+    SET( MACOSX_BUNDLE_ICON_FILE Ripple.icns )
+
+    ADD_EXECUTABLE(Ripple MACOSX_BUNDLE ${RIPPLE_SOURCES} ${MAC_BUNDLE_RESOURCES})
+
+    SET(LIBS ${RIPPLE_LIBRARIES} )
+
+    SET(DIRS ${QT_BINARY_DIR} ${CMAKE_BINARY_DIR}/bin)
+
+    SET(APPS ${CMAKE_BINARY_DIR}/bin/Ripple.app)
+
+ELSEIF (WTF_OS_WINDOWS)
+	ADD_EXECUTABLE(Ripple WIN32 ${RIPPLE_SOURCES} Ripple.rc)
+ELSE ()
+    ADD_EXECUTABLE(Ripple ${RIPPLE_SOURCES})
+ENDIF()
+
+SET_TARGET_PROPERTIES(Ripple PROPERTIES OUTPUT_NAME Ripple)
+
+TARGET_LINK_LIBRARIES(Ripple ${RIPPLE_LIBRARIES} ${QT_LIBRARIES} ${optionalLibs})
+
+INSTALL(TARGETS Ripple DESTINATION ${CMAKE_BINARY_DIR}/bin)
+

Ripple/Ripple.rc

@@ -0,0 +1,2 @@
+IDI_ICON1		ICON		DISCARDABLE	"Ripple.ico"
+

Starbuck/generateQtSource.xml → Ripple/generateQtSource.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<project name="Starbuck Qt Source Generation" basedir="." default="generateSources">
+<project name="Ripple Qt Source Generation" basedir="." default="generateSources">
 	<property name="generatedFiles" value="${basedir}\GeneratedFiles"/>
 	<property name="searchString" value="Q_OBJECT"/>
 
@@ -33,11 +33,11 @@
 		</apply>
 
 		<!-- Generate qrc source file for Qt resources -->
-		<echo message="Generating qrc_starbuck.cpp..."/>
+		<echo message="Generating qrc_ripple.cpp..."/>
 		<exec executable="rcc.exe">
-			<arg line="-name starbuck"/>
-			<arg path="${basedir}\starbuck.qrc"/>
-			<arg line="-o ${generatedFiles}\qrc_starbuck.cpp"/>
+			<arg line="-name ripple"/>
+			<arg path="${basedir}\ripple.qrc"/>
+			<arg line="-o ${generatedFiles}\qrc_ripple.cpp"/>
 		</exec>
 	</target>
 </project>

Starbuck/main.cpp → Ripple/main.cpp

@@ -15,15 +15,15 @@
 */
 
 #include "stdafx.h"
-#include "starbuck.h"
+#include "ripple.h"
 #include <QtGui/QApplication>
 #include "RemoteDebugger.h"
 #ifdef Q_WS_WIN
 #include <windows.h>
 #include <tchar.h>
 #endif
 
-using namespace BlackBerry::Starbuck;
+using namespace BlackBerry::Ripple;
 
 
 void write(const char * msg, QString type)
@@ -109,7 +109,7 @@ int main(int argc, char *argv[])
     }
     else
     {
-        Starbuck *mainWin = new Starbuck;
+        Ripple *mainWin = new Ripple;
         mainWin->show();
     }
     return app.exec();

Starbuck/starbuck.cpp → Ripple/ripple.cpp

@@ -15,21 +15,21 @@
 */
 
 #include "stdafx.h"
-#include "starbuck.h"
+#include "ripple.h"
 #include "BuildServerManager.h"
 #include <QGLWidget>
 #include "ScrollHandler.h"
 
-using namespace BlackBerry::Starbuck;
+using namespace BlackBerry::Ripple;
 
-const int Starbuck::PROGRESS_BAR_HEIGHT = 23;
+const int Ripple::PROGRESS_BAR_HEIGHT = 23;
 
-Starbuck::Starbuck(QWidget *parent, Qt::WFlags flags) : QMainWindow(parent, flags)
+Ripple::Ripple(QWidget *parent, Qt::WFlags flags) : QMainWindow(parent, flags)
 {
     init();
 }
 
-Starbuck::~Starbuck()
+Ripple::~Ripple()
 {
     if (_config != NULL)
     delete _config;
@@ -41,7 +41,7 @@ Starbuck::~Starbuck()
     delete webViewInternal;
 }
 
-void Starbuck::init(void)
+void Ripple::init(void)
 {
     _config = ConfigData::getInstance();
     setAttribute(Qt::WA_DeleteOnClose);
@@ -131,7 +131,7 @@ void Starbuck::init(void)
 
 }
 
-void Starbuck::closeEvent(QCloseEvent *event)
+void Ripple::closeEvent(QCloseEvent *event)
 {
     _config->windowPosition(pos());
     if (this->windowState() != Qt::WindowMaximized)
@@ -142,14 +142,14 @@ void Starbuck::closeEvent(QCloseEvent *event)
     BuildServerManager::getInstance()->stop();
 }
 
-void Starbuck::registerAPIs()
+void Ripple::registerAPIs()
 {
     //register StageWebViewMsgHandler as JS object named stagewebview
     QWebFrame* frame = webViewInternal->qtStageWebView()->page()->mainFrame();
     frame->addToJavaScriptWindowObject(QString("stagewebview"), m_pStageViewHandler);
 }
 
-void Starbuck::resizeEvent(QResizeEvent * e )
+void Ripple::resizeEvent(QResizeEvent * e )
 {
     QRect vRect(QPoint(0, 0), size());
     webViewInternal->scene()->setSceneRect(vRect);
@@ -158,7 +158,7 @@ void Starbuck::resizeEvent(QResizeEvent * e )
     e->accept();
 }
 
-void Starbuck::urlChanged(QUrl &url)
+void Ripple::urlChanged(QUrl &url)
 {
 
 }

Starbuck/starbuck.h → Ripple/ripple.h

@@ -14,8 +14,8 @@
 * limitations under the License.
 */
 
-#ifndef STARBUCK_H
-#define STARBUCK_H
+#ifndef RIPPLE_H
+#define RIPPLE_H
 
 #include <QMainWindow>
 #include <QWebPage>
@@ -26,19 +26,19 @@
 #include "StageViewMsgHandler.h"
 #include "QtStageWebView.h"
 
-using namespace BlackBerry::Starbuck::IPCChannel;
+using namespace BlackBerry::Ripple::IPCChannel;
 
 namespace BlackBerry 
 {
-  namespace Starbuck 
+  namespace Ripple 
   {
-    class Starbuck : public QMainWindow
+    class Ripple : public QMainWindow
     {
         Q_OBJECT
 
     public:
-      Starbuck(QWidget *parent = 0, Qt::WFlags flags = 0);
-      ~Starbuck();
+      Ripple(QWidget *parent = 0, Qt::WFlags flags = 0);
+      ~Ripple();
 
     protected:
         void closeEvent(QCloseEvent *event);
@@ -61,4 +61,4 @@ namespace BlackBerry
     };
   }
 }
-#endif // STARBUCK_H
+#endif // RIPPLE_H

Starbuck/starbuck.pro → Ripple/ripple.pro

@@ -3,20 +3,20 @@
 ######################################################################
 
 TEMPLATE = app
-TARGET = starbuck 
+TARGET = ripple 
 DEPENDPATH += .
 INCLUDEPATH += .
 
 # Specify that we're looking for the IPC.  Realistically, this should be put
 # in some configuration file
 INCLUDEPATH += ../build ../IPC
 
-LIBS += -L../build -lipc -lstarbucklibrary
+LIBS += -L../build -lipc -lripplelibrary
 
 # Required QT modules
 QT += webkit network xml
 
 # Input
-HEADERS += application.h starbuck.h ../StarbuckLibrary/*.h
-SOURCES += application.cpp main.cpp starbuck.cpp
-RESOURCES += starbuck.qrc
+HEADERS += application.h ripple.h ../RippleLibrary/*.h
+SOURCES += application.cpp main.cpp ripple.cpp
+RESOURCES += ripple.qrc

RippleLibrary/CMakeLists.txt

@@ -0,0 +1,52 @@
+find_package(Qt4 COMPONENTS QtCore QtGui QtXml QtSql QtNetwork QtWebKit REQUIRED)
+include(${QT_USE_FILE})
+
+SET(RIPPLELIBRARY_INCLUDE_DIRECTORIES
+    "${CMAKE_BINARY_DIR}"
+    "${CMAKE_CURRENT_SOURCE_DIR}"
+)
+
+LIST(APPEND RIPPLELIBRARY_HEADERS
+    stdafx.h
+    ConfigData.h
+    PortScanner.h
+    RemoteDebugger.h
+)
+
+LIST(APPEND RIPPLELIBRARY_SOURCES
+    stdafx.cpp
+    ConfigData.cpp
+    QtStageWebView.cpp
+    StageViewMsgHandler.cpp
+    stdafx.cpp
+    RequestObject.cpp
+    BuildServerManager.cpp
+    PortScanner.cpp
+    ScrollHandler.cpp
+    RemoteDebugger.cpp
+)
+
+SET(RIPPLELIBRARY_MOC_HEADERS
+    QtStageWebView.h
+    StageViewMsgHandler.h
+    RequestObject.h
+    BuildServerManager.h
+    ScrollHandler.h
+    RemoteDebugger.h
+)
+
+QT4_WRAP_CPP(RIPPLELIBRARY_MOC_SRCS ${RIPPLELIBRARY_MOC_HEADERS})
+
+LIST(APPEND RIPPLELIBRARY_SOURCES ${RIPPLELIBRARY_HEADERS})
+LIST(APPEND RIPPLELIBRARY_SOURCES ${RIPPLELIBRARY_MOC_HEADERS})
+LIST(APPEND RIPPLELIBRARY_SOURCES ${RIPPLELIBRARY_MOC_SRCS})
+
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+include_directories(${RIPPLELIBRARY_INCLUDE_DIRECTORIES})
+include_directories(${QT_INCLUDE_DIR})
+
+ADD_LIBRARY(RippleLibrary ${RIPPLELIBRARY_SOURCES})
+TARGET_LINK_LIBRARIES(RippleLibrary ${QT_LIBRARIES} ${optionalLibs})
+
+INSTALL(TARGETS RippleLibrary DESTINATION ${CMAKE_BINARY_DIR}/bin)
+