rhodes 3.1.0.beta.2 → 3.1.0.beta.3

data/platform/shared/qt/rhodes/rhodes.pro

@@ -1,133 +1,134 @@
-QT += core gui network webkit
-
-TARGET = RhoSimulator
-TEMPLATE = app
-
-CONFIG += warn_on
-
-INCLUDEPATH += ../..\
-../../ruby\
-../../ruby/include
-
-macx {
-  ICON = resources/rho.icns
-  DESTDIR = ../../../osx/bin/RhoSimulator
-  MOC_DIR = ../../../osx/bin/RhoSimulator/generated_files
-  UI_DIR = ../../../osx/bin/RhoSimulator/generated_files
-  OBJECTS_DIR = ../../../osx/bin/RhoSimulator/tmp
-  RCC_DIR =  ../../../osx/bin/RhoSimulator/resources
-  LIBS += -lcurl
-  # LIBS += -L../../../osx/bin/curl -lcurl
-  LIBS += -L../../../osx/bin/rubylib -lrubylib
-  LIBS += -L../../../osx/bin/rholib -lrholib
-  LIBS += -L../../../osx/bin/sqlite3 -lsqlite3
-  LIBS += -L../../../osx/bin/syncengine -lsyncengine
-  PRE_TARGETDEPS += ../../../osx/bin/rubylib/librubylib.a\
-../../../osx/bin/rholib/librholib.a\
-../../../osx/bin/sqlite3/libsqlite3.a\
-../../../osx/bin/syncengine/libsyncengine.a
-}
-
-win32 {
-  CONFIG += embed_manifest_exe
-  DESTDIR = ../../../win32/bin/RhoSimulator
-  MOC_DIR = ../../../win32/bin/RhoSimulator/generated_files
-  UI_DIR = ../../../win32/bin/RhoSimulator/generated_files
-  OBJECTS_DIR = ../../../win32/bin/RhoSimulator/tmp
-  RCC_DIR =  ../../../win32/bin/RhoSimulator/resources
-  HEADERS += ../../../wm/rhodes/rho/net/NetRequestImpl.h\
-impl/RhoThreadImpl.h
-  SOURCES += ../../../wm/rhodes/rho/net/NetRequestImpl.cpp
-  INCLUDEPATH += ../../../wm/rhodes\
-../../wtl80/include
-  DEFINES -= _UNICODE
-  DEFINES += _NDEBUG NDEBUG WIN32 _WINDOWS UNICODE QT_LARGEFILE_SUPPORT QT_NO_DEBUG QT_CORE_LIB QT_GUI_LIB QT_WEBKIT_LIB _CRT_SECURE_NO_WARNINGS _CRT_NON_CONFORMING_SWPRINTFS
-  LIBS += ../../../win32/bin/rubylib/rubylib.lib\
-../../../win32/bin/rholib/rholib.lib\
-../../../win32/bin/sqlite3/sqlite3.lib\
-../../../win32/bin/syncengine/syncengine.lib\
-wininet.lib comsuppwd.lib ws2_32.lib Crypt32.lib gdiplus.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib
-  PRE_TARGETDEPS += ../../../win32/bin/rubylib/rubylib.lib\
-../../../win32/bin/rholib/rholib.lib\
-../../../win32/bin/sqlite3/sqlite3.lib\
-../../../win32/bin/syncengine/syncengine.lib
-}
-
-unix:!macx {
-  DESTDIR = ../../../linux/bin/RhoSimulator
-  MOC_DIR = ../../../linux/bin/RhoSimulator/generated_files
-  UI_DIR = ../../../linux/bin/RhoSimulator/generated_files
-  OBJECTS_DIR = ../../../linux/bin/RhoSimulator/tmp
-  RCC_DIR =  ../../../linux/bin/RhoSimulator/resources
-  # INCLUDEPATH += ../../curl/include
-  LIBS += -lcurl
-  # LIBS += -L../../../osx/bin/curl -lcurl
-  LIBS += -L../../../linux/bin/rubylib -lrubylib
-  LIBS += -L../../../linux/bin/rholib -lrholib
-  LIBS += -L../../../linux/bin/sqlite3 -lsqlite3
-  LIBS += -L../../../linux/bin/syncengine -lsyncengine
-  PRE_TARGETDEPS += ../../../linux/bin/curl/libcurl.a\
-../../../linux/bin/rubylib/librubylib.a\
-../../../linux/bin/rholib/librholib.a\
-../../../linux/bin/sqlite3/libsqlite3.a\
-../../../linux/bin/syncengine/libsyncengine.a
-}
-
-DEFINES += RHODES_EMULATOR=1
-
-!win32 {
-  QMAKE_CFLAGS_WARN_ON += -Wno-extra -Wno-unused -Wno-sign-compare -Wno-format -Wno-parentheses
-  QMAKE_CXXFLAGS_WARN_ON += -Wno-extra -Wno-unused -Wno-sign-compare -Wno-format -Wno-parentheses
-}
-win32 {
-  QMAKE_CFLAGS_WARN_ON += /wd4996 /wd4100
-  QMAKE_CXXFLAGS_WARN_ON += /wd4996 /wd4100
-  QMAKE_CFLAGS_RELEASE += /O2
-  QMAKE_CXXFLAGS_RELEASE += /O2
-}
-
-HEADERS += ExternalWebView.h\
-MainWindowCallback.h\
-QtMainWindow.h\
-QtNativeTabBar.h\
-QtWebInspector.h\
-impl/RhoClassFactoryImpl.h\
-impl/MainWindowImpl.h\
-impl/NativeToolbarImpl.h\
-impl/NativeTabbarImpl.h\
-../../rubyext/NativeToolbarExt.h\
-DateTimeDialog.h\
-impl/DateTimePickerImpl.h\
-impl/AlertImpl.h
-
-SOURCES += main.cpp\
-ExternalWebView.cpp\
-QtMainWindow.cpp\
-QtNativeTabBar.cpp\
-QtWebInspector.cpp\
-impl/AlertImpl.cpp\
-impl/BluetoothImpl.cpp\
-impl/CalendarImpl.cpp\
-impl/CameraImpl.cpp\
-impl/DateTimePickerImpl.cpp\
-impl/GeoLocationImpl.cpp\
-impl/MapViewImpl.cpp\
-impl/NativeToolbarImpl.cpp\
-impl/PhonebookImpl.cpp\
-impl/RhoClassFactoryImpl.cpp\
-impl/RhodesImpl.cpp\
-impl/RhoFileImpl.cpp\
-impl/RhoNativeViewManagerImpl.cpp\
-impl/RhoThreadImpl.cpp\
-impl/RingtoneManagerImpl.cpp\
-impl/SignatureImpl.cpp\
-impl/SystemImpl.cpp\
-impl/WebViewImpl.cpp\
-impl/MainWindowImpl.cpp\
-impl/NativeTabbarImpl.cpp\
-DateTimeDialog.cpp
-
-FORMS += ExternalWebView.ui\
-QtMainWindow.ui\
-QtWebInspector.ui\
-DateTimeDialog.ui
+QT += core gui network webkit
+
+TARGET = RhoSimulator
+TEMPLATE = app
+
+CONFIG += warn_on
+
+INCLUDEPATH += ../..\
+../../ruby\
+../../ruby/include
+
+macx {
+  ICON = resources/rho.icns
+  DESTDIR = ../../../osx/bin/RhoSimulator
+  MOC_DIR = ../../../osx/bin/RhoSimulator/generated_files
+  UI_DIR = ../../../osx/bin/RhoSimulator/generated_files
+  OBJECTS_DIR = ../../../osx/bin/RhoSimulator/tmp
+  RCC_DIR =  ../../../osx/bin/RhoSimulator/resources
+  LIBS += -lcurl
+  # LIBS += -L../../../osx/bin/curl -lcurl
+  LIBS += -L../../../osx/bin/rubylib -lrubylib
+  LIBS += -L../../../osx/bin/rholib -lrholib
+  LIBS += -L../../../osx/bin/sqlite3 -lsqlite3
+  LIBS += -L../../../osx/bin/syncengine -lsyncengine
+  PRE_TARGETDEPS += ../../../osx/bin/rubylib/librubylib.a\
+../../../osx/bin/rholib/librholib.a\
+../../../osx/bin/sqlite3/libsqlite3.a\
+../../../osx/bin/syncengine/libsyncengine.a
+}
+
+win32 {
+  CONFIG += embed_manifest_exe
+  DESTDIR = ../../../win32/bin/RhoSimulator
+  MOC_DIR = ../../../win32/bin/RhoSimulator/generated_files
+  UI_DIR = ../../../win32/bin/RhoSimulator/generated_files
+  OBJECTS_DIR = ../../../win32/bin/RhoSimulator/tmp
+  RCC_DIR =  ../../../win32/bin/RhoSimulator/resources
+  HEADERS += ../../../wm/rhodes/rho/net/NetRequestImpl.h\
+impl/RhoThreadImpl.h
+  SOURCES += ../../../wm/rhodes/rho/net/NetRequestImpl.cpp
+  INCLUDEPATH += ../../../wm/rhodes\
+../../wtl80/include
+  DEFINES -= _UNICODE
+  DEFINES += _NDEBUG NDEBUG WIN32 _WINDOWS UNICODE QT_LARGEFILE_SUPPORT QT_NO_DEBUG QT_CORE_LIB QT_GUI_LIB QT_WEBKIT_LIB _CRT_SECURE_NO_WARNINGS _CRT_NON_CONFORMING_SWPRINTFS
+  LIBS += ../../../win32/bin/rubylib/rubylib.lib\
+../../../win32/bin/rholib/rholib.lib\
+../../../win32/bin/sqlite3/sqlite3.lib\
+../../../win32/bin/syncengine/syncengine.lib\
+wininet.lib comsuppwd.lib ws2_32.lib Crypt32.lib gdiplus.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib
+  PRE_TARGETDEPS += ../../../win32/bin/rubylib/rubylib.lib\
+../../../win32/bin/rholib/rholib.lib\
+../../../win32/bin/sqlite3/sqlite3.lib\
+../../../win32/bin/syncengine/syncengine.lib
+}
+
+unix:!macx {
+  DESTDIR = ../../../linux/bin/RhoSimulator
+  MOC_DIR = ../../../linux/bin/RhoSimulator/generated_files
+  UI_DIR = ../../../linux/bin/RhoSimulator/generated_files
+  OBJECTS_DIR = ../../../linux/bin/RhoSimulator/tmp
+  RCC_DIR =  ../../../linux/bin/RhoSimulator/resources
+  # INCLUDEPATH += ../../curl/include
+  LIBS += -lcurl
+  # LIBS += -L../../../osx/bin/curl -lcurl
+  LIBS += -L../../../linux/bin/rubylib -lrubylib
+  LIBS += -L../../../linux/bin/rholib -lrholib
+  LIBS += -L../../../linux/bin/sqlite3 -lsqlite3
+  LIBS += -L../../../linux/bin/syncengine -lsyncengine
+  PRE_TARGETDEPS += ../../../linux/bin/curl/libcurl.a\
+../../../linux/bin/rubylib/librubylib.a\
+../../../linux/bin/rholib/librholib.a\
+../../../linux/bin/sqlite3/libsqlite3.a\
+../../../linux/bin/syncengine/libsyncengine.a
+}
+
+DEFINES += RHODES_EMULATOR=1
+
+!win32 {
+  QMAKE_CFLAGS_WARN_ON += -Wno-extra -Wno-unused -Wno-sign-compare -Wno-format -Wno-parentheses
+  QMAKE_CXXFLAGS_WARN_ON += -Wno-extra -Wno-unused -Wno-sign-compare -Wno-format -Wno-parentheses
+}
+win32 {
+  QMAKE_CFLAGS_WARN_ON += /wd4996 /wd4100
+  QMAKE_CXXFLAGS_WARN_ON += /wd4996 /wd4100
+  QMAKE_CFLAGS_RELEASE += /O2
+  QMAKE_CXXFLAGS_RELEASE += /O2
+}
+
+HEADERS += ExternalWebView.h\
+MainWindowCallback.h\
+QtMainWindow.h\
+QtNativeTabBar.h\
+QtWebInspector.h\
+impl/RhoClassFactoryImpl.h\
+impl/MainWindowImpl.h\
+impl/NativeToolbarImpl.h\
+impl/NativeTabbarImpl.h\
+../../rubyext/NativeToolbarExt.h\
+DateTimeDialog.h\
+impl/DateTimePickerImpl.h\
+impl/AlertImpl.h\
+RhoSimulator.h
+
+SOURCES += main.cpp\
+ExternalWebView.cpp\
+QtMainWindow.cpp\
+QtNativeTabBar.cpp\
+QtWebInspector.cpp\
+impl/AlertImpl.cpp\
+impl/BluetoothImpl.cpp\
+impl/CalendarImpl.cpp\
+impl/CameraImpl.cpp\
+impl/DateTimePickerImpl.cpp\
+impl/GeoLocationImpl.cpp\
+impl/MapViewImpl.cpp\
+impl/NativeToolbarImpl.cpp\
+impl/PhonebookImpl.cpp\
+impl/RhoClassFactoryImpl.cpp\
+impl/RhodesImpl.cpp\
+impl/RhoFileImpl.cpp\
+impl/RhoNativeViewManagerImpl.cpp\
+impl/RhoThreadImpl.cpp\
+impl/RingtoneManagerImpl.cpp\
+impl/SignatureImpl.cpp\
+impl/SystemImpl.cpp\
+impl/WebViewImpl.cpp\
+impl/MainWindowImpl.cpp\
+impl/NativeTabbarImpl.cpp\
+DateTimeDialog.cpp
+
+FORMS += ExternalWebView.ui\
+QtMainWindow.ui\
+QtWebInspector.ui\
+DateTimeDialog.ui

data/platform/shared/ruby/Android.mk

@@ -0,0 +1,118 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE    := ruby
+LOCAL_SRC_FILES := \
+    array.c \
+    bignum.c \
+    blockinlining.c \
+    class.c \
+    compar.c \
+    compile.c \
+    complex.c \
+    cont.c \
+    debug.c \
+    dir.c \
+    dln.c \
+    dmyencoding.c \
+    dmyext.c \
+    enc/ascii.c \
+    enc/unicode.c \
+    enc/us_ascii.c \
+    enc/utf_8.c \
+    enum.c \
+    enumerator.c \
+    error.c \
+    eval.c \
+    ext/alert/alert_wrap.c \
+    ext/asynchttp/asynchttp_wrap.c \
+    ext/bluetooth/bluetooth_wrap.c \
+    ext/nativeviewmanager/nativeviewmanager_wrap.c \
+    ext/calendar/calendar_wrap.c \
+    ext/calendar/event_wrap.c \
+    ext/camera/camera_wrap.c \
+    ext/datetimepicker/datetimepicker_wrap.c \
+    ext/geolocation/geolocation_wrap.c \
+    ext/mapview/mapview_wrap.c \
+    ext/nativebar/nativebar_wrap.c \
+    ext/navbar/navbar_wrap.c \
+    ext/phonebook/phonebook_wrap.c \
+    ext/rho/extensions.c \
+    ext/rho/rhoruby.c \
+    ext/rho/rhosupport.c \
+    ext/rhoconf/rhoconf_wrap.c \
+    ext/ringtones/ringtones_wrap.c \
+    ext/signature/signature_wrap.c \
+    ext/socket/socket.c \
+    ext/sqlite3_api/sqlite3_api_wrap.c \
+    ext/stringio/stringio.c \
+    ext/strscan/strscan.c \
+    ext/syncengine/syncengine_wrap.c \
+    ext/system/system_wrap.c \
+    ext/webview/webview_wrap.c \
+    file.c \
+    gc.c \
+    generated/parse.c \
+    hash.c \
+    inits.c \
+    io.c \
+    iseq.c \
+    load.c \
+    marshal.c \
+    math.c \
+    miniprelude.c \
+    missing/acosh.c \
+    missing/cbrt.c \
+    missing/crypt.c \
+    missing/dup2.c \
+    missing/erf.c \
+    missing/hypot.c \
+    missing/lgamma_r.c \
+    missing/stdlib.c \
+    missing/strlcat.c \
+    missing/strlcpy.c \
+    missing/tgamma.c \
+    newline.c \
+    numeric.c \
+    object.c \
+    pack.c \
+    proc.c \
+    process.c \
+    random.c \
+    range.c \
+    rational.c \
+    re.c \
+    regcomp.c \
+    regenc.c \
+    regerror.c \
+    regexec.c \
+    regparse.c \
+    regsyntax.c \
+    ruby.c \
+    safe.c \
+    signal.c \
+    sprintf.c \
+    st.c \
+    strftime.c \
+    string.c \
+    struct.c \
+    thread.c \
+    time.c \
+    transcode.c \
+    util.c \
+    variable.c \
+    version.c \
+    vm.c \
+    vm_dump.c
+
+LOCAL_C_INCLUDES := \
+    $(LOCAL_PATH)/include \
+    $(LOCAL_PATH)/linux \
+    $(LOCAL_PATH)/generated \
+    $(LOCAL_PATH) \
+    $(SHARED_PATH_INC) \
+    $(SHARED_PATH_INC)/sqlite
+    
+
+include $(BUILD_STATIC_LIBRARY)

data/platform/shared/rubyext/Android.mk

@@ -0,0 +1,15 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE    := rhorubyext
+LOCAL_SRC_FILES := \
+    GeoLocation.cpp \
+    RhoAppAdapter.cpp \
+    System.cpp
+LOCAL_C_INCLUDES := \
+    $(SHARED_PATH_INC) \
+    $(SHARED_PATH_INC)/ruby/include \
+    $(SHARED_PATH_INC)/ruby/linux
+
+include $(BUILD_STATIC_LIBRARY)

data/platform/shared/sqlite/Android.mk

@@ -0,0 +1,9 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE    := sqlite
+LOCAL_SRC_FILES := sqlite3.c
+LOCAL_C_INCLUDES := $(LOCAL_PATH) $(SHARED_PATH_INC)
+
+include $(BUILD_STATIC_LIBRARY)

data/platform/shared/statistic/Android.mk

@@ -0,0 +1,9 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE    := rhostat
+LOCAL_SRC_FILES := RhoProfiler.cpp
+LOCAL_C_INCLUDES := $(SHARED_PATH_INC)
+
+include $(BUILD_STATIC_LIBRARY)

data/platform/shared/sync/Android.mk

@@ -0,0 +1,14 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE    := rhoconnect
+LOCAL_SRC_FILES := \
+    ClientRegister.cpp \
+    SyncEngine.cpp \
+    SyncNotify.cpp \
+    SyncSource.cpp \
+    SyncThread.cpp
+LOCAL_C_INCLUDES := $(LOCAL_PATH) $(SHARED_PATH_INC) $(SHARED_PATH_INC)/sqlite
+
+include $(BUILD_STATIC_LIBRARY)

data/platform/shared/unzip/Android.mk

@@ -0,0 +1,9 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE    := unzip
+LOCAL_SRC_FILES := unzip.cpp
+LOCAL_C_INCLUDES := $(SHARED_PATH_INC)
+
+include $(BUILD_STATIC_LIBRARY)