Merge pull request #55 from olab-io/develop

Develop
olab-io · Jun 13, 2014 · 7b46ce2 · 7b46ce2
2 parents e828411 + 07d705b
commit 7b46ce2
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+- 0.1.3 (06-13-2014)
+    + Regression requires reengineering of WebSocketLoggerChannel.  Removed for now.
+    + Fixed auto release download link.  Now links to binary release if available.
+    + Updated build script.
+
 - 0.1.2 (06-13-2014)
     + Fix hang on quit https://github.com/olab-io/ofSketch/issues/52.
 

diff --git a/ofSketchApp/bin/data/DocumentRoot/js/ofSketch/ofSketch.js b/ofSketchApp/bin/data/DocumentRoot/js/ofSketch/ofSketch.js
@@ -48,10 +48,33 @@ $(document).ready( function()
             {
                 var downloadURL = latestRelease.zipball_url;
                 var htmlURL = latestRelease.html_url;
+                var assets = latestRelease.assets;
+
+                var target = systemInfo.version.target.toLowerCase();
+
+                var binaryURL = "";
+
+                for (var i = 0; i < assets.length; ++i) {
+                    var asset = assets[i]
+
+                    if (asset.name.indexOf(target) >= 0) {
+                        // Minor hack because direct access requires header use.
+                        // https://developer.github.com/v3/repos/releases/
+                        binaryURL = (htmlURL + "/" + asset.name).replace("tag", "download");
+                        break;
+                    }
+                }
+
+                // Attempt to feed a binary url directly if one is available.
+                if (binaryURL.length > 0)
+                {
+                    $('#remote-version-download-link').attr('href', binaryURL);
+                }
+                else
+                {
+                    $('#remote-version-download-link').attr('href', htmlURL);
+                }
 
-                // TODO: This needs an upgrade with more useful information and clickable links.
-                // alert("Your ofSketch Version is out of Date.  Please upgrade <a href=\"" + downloadURL +"\">here</a>");
-                $('#remote-version-download-link').attr('href', downloadURL);
                 $('.remote-version').text(remoteVersion);
                 $('.local-version').text(localVersion);
 

diff --git a/ofSketchApp/src/App.cpp b/ofSketchApp/src/App.cpp
@@ -57,9 +57,9 @@ App::App():
     server->getWebSocketRoute()->registerWebSocketEvents(this);
 
     // Set up websocket logger.
-    _loggerChannel = WebSocketLoggerChannel::makeShared();
-    _loggerChannel->setWebSocketRoute(server->getWebSocketRoute());
-    ofSetLoggerChannel(_loggerChannel);
+//    _loggerChannel = WebSocketLoggerChannel::makeShared();
+//    _loggerChannel->setWebSocketRoute(server->getWebSocketRoute());
+//    ofSetLoggerChannel(_loggerChannel);
 
     _logo.loadImage("media/openFrameworks.png");
     _font.loadFont(OF_TTF_SANS, 20);

diff --git a/ofSketchApp/src/App.h b/ofSketchApp/src/App.h
@@ -125,15 +125,15 @@ class App: public ofBaseApp
     {
         VERSION_MAJOR = 0,
         VERSION_MINOR = 1,
-        VERSION_PATCH = 2
+        VERSION_PATCH = 3
     };
 
     static const std::string VERSION_PRE_RELEASE;
 
 private:
     HTTP::BasicJSONRPCServer::SharedPtr server;
 
-    WebSocketLoggerChannel::SharedPtr _loggerChannel;
+//    WebSocketLoggerChannel::SharedPtr _loggerChannel;
 
     Poco::ThreadPool _threadPool;
     ProcessTaskQueue _taskQueue;

diff --git a/scripts/build_distro.sh b/scripts/build_distro.sh
@@ -6,6 +6,12 @@
 #
 # ./build_distro.sh osx 0.1.1 
 
+if [ $# -ne 2 ]
+  then
+    echo "SYSTEM and VERSION Arguments required."
+    exit 1
+fi
+
 # the current build system
 SYSTEM=$1