Updating to what was released at DevCon 2011 - Ripple 0.9 #79

Merged
merged 185 commits into from Oct 31, 2011
@jasondscott

No description provided.

@miwong

The installer antrun action has has the same build phase ("package") as the assembly action. I think that the order of actions within the same build phase is not guaranteed, so there's a risk we could build the installer before populating the installer resource directory. It might be better to change the build phase of the assembly action to "prepare-package".

pagey and others added some commits Aug 4, 2011
@pagey pagey Code cleanup dae8e59
@pagey pagey Merge pull request #2 from blackberry-webworks/next-unittest
Fixed unit tests
96cad64
@ronalag ronalag Replaced and script with maven plugin ff14e81
@pagey pagey Fixed wording of Qt cd11da3
@nukulb nukulb Merge pull request #1 from blackberry-webworks/next-installer
Added installer and configured maven to build installer
1507693
pagefault Fixed some compiler errors on linux 351e020
pagefault Fixed some compiler errors on linux 8eafce0
@pagey pagey We can now compile and run on Linux 2e92fbb
@pagey pagey Updated README with build instructions for Windows and Linux bc16cd4
@pagey pagey Some cleanup of source 34c4763
@pagey pagey Fixed a logic error in eventbus code 476d772
@pagey pagey Refactored some code for efficiency and maintainability 66cf4a0
@pagey pagey cherry-picking 8f3da4b for reload feature fb1bf80
@pagey pagey cherry-pick 0cf77ff for reload feature 0697331
@pagey pagey Fixed tab indent and also added a delay in testcase to wait for page …
…to load on a slow connection
7f58028
Michelle Wong Changed ConfigData to use config.ini to set up the application instead
of registry (Windows) or plist (Mac).  QSettings is still used, but it
is configured to use an INI file instead.  The config.ini file will be
saved in the same directory as the application (which, on a Mac, is
within the .app bundle).
145e384
@pagey pagey Merge pull request #4 from blackberry-webworks/next-reload
Implemented QtStageWebView reload method
7be2fef
@dbrgss dbrgss Merge pull request #5 from blackberry-webworks/next-configfile
Using config.ini instead of registry/plist
6d71075
@pagey pagey Checking in code for mac build c570c80
@pagey pagey Merge branch 'next' of https://github.com/blackberry-webworks/Ripple-…
…Framework into next
f97f614
Shiwei Tu added back the setUrl() before emit OnRequest. This line was lost whe…
…n code was moved from gitweb to github
82fbe46
tushw Merge pull request #8 from blackberry-webworks/next-bugfix-requestobj
added back the setUrl() before emit OnRequest. This line was lost when co
c1e66df
@nukulb nukulb Removed small browser. 8f343ab
@pagey pagey Fixed CMakeLists to add header files to generated solutions b31a9a4
@dbrgss dbrgss Merging CI changes from next-ci branch baefbaf
@dbrgss dbrgss Deleted installer files ac4042e
@pagey pagey Enable loading ripple ui from local file:/// url ba15a8a
@pagey pagey Oops, removed hardcoded path ef55765
Michelle Wong Disable web security so page can be loaded in iframe 9fd6ab6
Michelle Wong Resize the progress bar when resizing the application window 7022ede
@nukulb nukulb 1. Added connection time out for curl which is
    used to start build job on Mac
2.  Changed url argument for curl, use
    $JOB_NAME to compose the url
8f7f4f7
@nukulb nukulb All CI changes squashed together to provide easy merge into all branc…
…hes.
8f70f5b
Michelle Wong Changed where th config.ini file is saved on windows. Because the
installed Starbuck.exe will be in Program Files on a windows machine, we
can't save/modify config.ini there.  Instead, we will save the config
file in $APPDATA/Research in Motion/Ripple.

For the mac/linux, the config.ini should still be saved in the
application directory, as before.
4e255a4
Michelle Wong Changes to build in release mode and include release dll's c7ef736
@jackluo jackluo refactor build script to support SCM build 8dd9405
@dbrgss dbrgss Merge pull request #15 from blackberry-webworks/next-scm
SCM build support
64d7211
Michelle Wong Changing output name from Starbuck to Ripple (e.g. Ripple.exe, Ripple…
….app)
67fdcd0
@pagey pagey Merge pull request #16 from blackberry-webworks/next-outputname
Change output name to Ripple
d5c66f5
@pagey pagey Added port scanner utility and config option for build service d9a08de
@pagey pagey Fixed return type on findUsablePort() to return unsigned short for port 58a9356
@pagey pagey Cherry pick and merge bd93b69, fix some derpy code and allow applicat…
…ion storage to work when installed to a path with limited file permissions
eb848b2
Shiwei Tu added build server manager implementation 0b56d9b
Shiwei Tu Merge branch 'next' of https://github.com/blackberry-webworks/Ripple-…
…Framework into next
ebfdde9
Shiwei Tu fixed delete instance in stop() 2f02531
@pagey pagey Build service manager implementation on Windows and Mac f527893
@pagey pagey Merge changes and stuff 9a06064
@pagey pagey Fixed build issue and updated ini default settings 84597ce
Shiwei Tu exposed stagwebview.serverPort property to retrieve the port for Buil…
…d Server
7ef9d9a
@pagey pagey Implemented process management features of BuildServerManager bbe285d
@pagey pagey Launch build service on mac a3e9c90
@pagey pagey Fixed compile error on mac a0aecc4
@pagey pagey Fixed typo a2c87a8
@pagey pagey Fixed typo again.. compile now works e48c329
@pagey pagey Fixed compile error again 88efa98
@pagey pagey Detect pid of process on Mac fd8cd09
@pagey pagey Added comments e283c95
@pagey pagey Fixed build again 092d8fd
@pagey pagey Another compile fix, xcode is annoying 8a7c248
Shiwei Tu added default config.ini file ade58b7
@jackluo jackluo add config.ini into package 45f771c
Shiwei Tu add debug info 4f3cfdf
Shiwei Tu comment out check exiting process for Mac 7921154
Shiwei Tu add file log for qDebug() 23f60c8
Shiwei Tu Chun's fix of mac syntax error; fixed path problem 8a0739d
@pagey pagey Fixed Mac process detection 3e312bd
@pagey pagey Fixed a logic bug in windows version 9ce46a7
@pagey pagey Fixed process detection using pid instead of process name c8ba09a
@pagey pagey Build service should now start on Mac 2f8b74e
@pagey pagey Merge pull request #24 from blackberry-webworks/next-mks2022169
add config.ini into package
8bf927f
@pagey pagey index on next: 9ce46a7 Fixed a logic bug in windows version df3c5f1
@pagey pagey WIP on next: 9ce46a7 Fixed a logic bug in windows version 6bbdec8
@jackluo jackluo add config.ini into package 034c6d1
@pagey pagey Fixed process detection using pid instead of process name 673abcd
@pagey pagey Build service should now start on Mac 33431c4
@pagey pagey Build service now start/stopped with command line arguments b7f928c
@pagey pagey Merge branch 'next' of https://github.com/blackberry-webworks/Ripple-…
…Framework into next
62cf1aa
@pagey pagey Renamed -stop to -shutdown 969c760
@pagey pagey Default window to maximized size on first run. 36ea436
@pagey pagey Remove icons next to context menu items adcb263
@pagey pagey Removed console window from Windows version, implemented WinMain entr…
…y point
a397f2c
@pagey pagey Change default values in config.ini f10afd6
@pagey pagey Allow opening urls with file:/// protocol 45a10eb
@pagey pagey Increase offline storage quota to 512 mb 5ecf833
@pagey pagey Window now remembers position, size and state 13bdd25
@pagey pagey Default to maximized windows state on first run 98a192b
@pagey pagey Small code cleanup, removed some unneeded casting 7f3a20a
@pagey pagey Offline storage size is in bytes, not KB 58ab383
@pagey pagey Write log files to temp directory rather than installed path 29c4468
@pagey pagey index on next: 7f3a20a Small code cleanup, removed some unneeded casting 71f9c61
@pagey pagey WIP on next: 7f3a20a Small code cleanup, removed some unneeded casting f7cfc6d
@pagey pagey Write log files to temp directory rather than installed path 5c2c016
@pagey pagey Changed default URL for window content cfeefc4
@pagey pagey Adding scroll fix 209ba4a
@pagey pagey Merge changes 17b416f
@pagey pagey Updated scrolling fix 085a1fe
@pagey pagey Only enable WebGL and hardware accelerated composting on Qt 4.8 63983b5
@pagey pagey Fix saving window dimentions when window is maximized cf493ed
@pagey pagey Oops that should be reversed logic 9103f8c
@pagey pagey Disable web security 7935d54
@jackluo jackluo don't update qt environment for qt4.8 cbe9800
@pagey pagey Checking in QtGraphicsView code 438cc39
@pagey pagey Merge branch 'next' of https://github.com/blackberry-webworks/Ripple-…
…Framework into next-scrollfix

Conflicts:
	Starbuck/starbuck.cpp
287aa3c
@pagey pagey Cleaned up a lot of code 9dd224b
@pagey pagey Use smart viewport update for the time being ab88da8
@pagey pagey GLViewport now rendering page 914946a
@pagey pagey Re-enable hardware composting 90238a1
@pagey pagey Merge pull request #25 from blackberry-webworks/next-scrollfix
Enable hardware rendering
cce1eda
@jackluo jackluo bundle QtOpenGL4.dll in ripple 16de243
Jason Scott Adding the zoom factor for the webview to the javascript object 112b28d
@pagey pagey Merge pull request #26 from blackberry-webworks/next-zoom
Adding zoomFactor to the Javascript object
0a22c01
Shiwei Tu update the ui host site 025c1ef
Shiwei Tu change D to d 78cc19e
@pagey pagey Scroll handler now active on OpenGL target d81cb32
@pagey pagey Merge branch 'next' of https://github.com/blackberry-webworks/Ripple-…
…Framework into next
94f2acc
Shiwei Tu remove dash 1d58495
Shiwei Tu Merge branch 'next' of https://github.com/blackberry-webworks/Ripple-…
…Framework into next
34a0a11
Ken Wallis Changing path to "html5" 61515d2
@pagey pagey Added menu option to toggle hardware acceleration/webgl d934e2c
@pagey pagey Merge branch 'next' of https://github.com/blackberry-webworks/Ripple-…
…Framework into next
6d63073
@pagey pagey Small fix 0bbfca1
@pagey pagey Fix deadlock when scrolling with hardware acceleration enabled.
Fixes github issue #56
fae3647
@ndaversa

Do we want this URL here?

@gtanner

Hi,

Was reviewing some of this code and it looks to me like we've reverted back to the code that used to be there and did not work. Am I missing something?

67d4ee8

jackluo and others added some commits Oct 7, 2011
@jackluo jackluo run macdeployqt to bundle required runtime libraries on Mac 2bc6980
@jackluo jackluo Merge branch 'next' of https://github.com/blackberry-webworks/Ripple-…
…Framework into next
0c321ef
@pagey pagey New window resize code now resizes the scene as well as the container 46c7374
@pagey pagey Merge branch 'next' of https://github.com/blackberry-webworks/Ripple-…
…Framework into next
c2f5a8b
@jackluo jackluo update build script to include all .dll file under imageformats folde…
…r on Windows platform
52f3682
@pagey pagey Detect if system has OpenGL acceleration, if not disable WebGL and me…
…nu items
3c0b026
@pagey pagey Merge branch 'next' of https://github.com/blackberry-webworks/Ripple-…
…Framework into next
8ccc590
@kwhatmough kwhatmough Remove menu option to toggle hardware acceleration/webgl. Essentially…
… reverts d934e2 but leaves the two switches in the config data.
fcb8e3e
@pagey pagey Merge pull request #29 from kwhatmough/next
Remove menu option to toggle hardware acceleration/webgl.
5dcd4e6
Jason Scott Adding the windows icon for Ripple.exe c035aba
Ken Wallis enable WebGL by default 45f514c
Jason Scott Adding the mac icon and changing the cmake script to pick it up. 565bbba
@nukulb nukulb Merge pull request #30 from blackberry-webworks/next-icon
Added Windows and Mac Icons
Fixes blackberry/Ripple-Framework#26
679f0e8
@ndaversa ndaversa Attempting to get Remote Web Inspector going, currently shows up but not
populated.
c76c9df
@ndaversa ndaversa Overloaded the context menu to provide custom items (eg. web inspector) 4c0ab29
Shiwei Tu add remotedebugger window e83f881
@pagey pagey Change default UI style to a more compatible one with our rendering. 6e864ca
@pagey pagey Fixed window showing inspector content 6bb434a
@pagey pagey Lots of changes to get remote web inspector working a59dfb5
@pagey pagey More changes for remote inspector, now launches process when inspect …
…is clicked on the context menu. Port is currently hardcoded to 9292.
804188a
@pagey pagey Fixed left over instance of app when closing 05aab16
@pagey pagey Fixed crash hopefully when launching web inspector 4c248fe
Shiwei Tu fixed the path with spaces in windows 0408186
@pagey

argv[0]? Isn't that the exe name? We want the first parameter.

So you are both right.

On Windows obviously this must be true, however on OSX argv[0] is the process name.

I made the change locally and it fixes the web inspector not launching with the latest HEAD commit.

(cc @nukulb @kwallis)

The conversion code from lpCmdLine to argv should be updated to start the index at 1, not 0.

Open Source Projects member
@pagey
@ndaversa

I just did a build with this on OSX.

It seems that a second process loads for the web inspector, but no window ever shows up. Are you guys seeing the same behaviour?

@pagey @kwallis @tushw ?

If I roll back two commits ( @tushw's two changes ) then it works on OSX ...
4c248fe

So I am just wondering if this does spawn another browser?
What happens when that port is in use?
Does this require more permissions? (requires admin rights to run the process?)

My main concern that the starting up a remote inspector hack is transparent to the user so we can fix it quickly.

Also to pull out the big "Security" flag on this as we should probably let the user know that we are opening up their system to remote access (along with access to all of their code) while they use this app.

Gord,

It does spawn another instance of Ripple to show the inspector (as a separate process). It doesn't require any more privileges then we already needed (we launch build & deploy on a port as well).

If the port is taken we will randomize and find an open one.

As for security I think you are 100% right, we need to make note that we are doing this since the code would now be visible to anyone that knows your IP address and port that your remote inspector is running.

(cc @kwhatmough @kwallis @jasenk)

@ndaversa

@tushw I don't think this is the problem, see my other comment here ...
0408186#commitcomment-641921

On OSX the count should be 3 and the argv[1] and argv[2] should be used instead of [0] and [1] on windows.

@ndaversa

3 liner, nice :)

Low risk :)

Shiwei Tu and others added some commits Oct 10, 2011
Shiwei Tu reversed argc number check for Mac 8f3e4da
Ken Wallis Merge pull request #31 from blackberry-webworks/next-remoteInspector
Next remote inspector
a453665
Shiwei Tu do need quotation for Mac 1108f7b
epearson Renamed files to fix Linux build 78292a5
epearson Fixed Linux build, filenames are case-sensitive 9815b49
@pagey pagey Fix Linux build 9d76bcb
@pagey pagey Changed findUsuablePort to static member
Remote inspector now uses a random port if suggested port is in use
0a5c927
@pagey pagey Fixed a typo b6925d1
Jason Scott Changed Windows version to use local web inspector.
Changed windows version to use local web inspector

For windows version use local web inspector, mac still using remote.

Init the mac only objects to 0 and added check for null pointer

Fixed context menu to only show 'inspect' again
9c3ffd0
Ken Wallis Merge pull request #32 from blackberry-webworks/next-localWebInsForWi…
…nOnly

Changed windows version to use local web inspector
f95aa79
@pagey pagey Fixed a type error 7222397
Jason Scott Turning Local web inspector on for all platforms.
Not starting the new process for remote web inspector on mac
c0064a7
Ken Wallis Merge pull request #34 from blackberry-webworks/next-LocalWebInsForAll
Using local web inspector for all platforms
fac663c
Jason Scott Changing all names from Starbuck to Ripple dfcebc0
Jason Scott Merging next into master 08560b4
Jason Scott dist-ci.xml had merge problems 654fb49
Ken Wallis Merge pull request #38 from blackberry-webworks/master-merge
Merging Next into master as of  BB Ripple Framework 0.9.0 Bundle 14
2a1f423
Jason Scott Merge branch 'next-rebranding' into master-merge 396b954
Ken Wallis Merge pull request #40 from blackberry-webworks/master-merge
Renaming everything to Ripple
248260a
@jasondscott jasondscott merged commit ea0ea91 into blackberry:master Oct 31, 2011
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment