From 05590046250944360b9f68eafe365abe6c786aec Mon Sep 17 00:00:00 2001 From: Christopher Baker Date: Mon, 16 Jun 2014 19:35:44 -0500 Subject: [PATCH 01/13] Testing w/ OF 0.8.2-RC1. --- scripts/init_repo.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/init_repo.sh b/scripts/init_repo.sh index 0e730c2..16c0c3a 100755 --- a/scripts/init_repo.sh +++ b/scripts/init_repo.sh @@ -11,7 +11,7 @@ SCRIPTS_DIR=`pwd` OS=`./helpers/ostype.sh` # current of version -OF_VERSION="0.8.1" +OF_VERSION="0.8.2-RC1" # make the release file name. OF_RELEASE="of_v${OF_VERSION}_${OS}_release" From 9a3c3ca4006ddd5f7e999509eb7a082be3f627bd Mon Sep 17 00:00:00 2001 From: Christopher Baker Date: Mon, 16 Jun 2014 19:36:00 -0500 Subject: [PATCH 02/13] Remove "using namespace ofx" --- ofSketchApp/src/App.cpp | 46 +++++++++++++++++------------------ ofSketchApp/src/App.h | 53 +++++++++++++++++++---------------------- 2 files changed, 48 insertions(+), 51 deletions(-) diff --git a/ofSketchApp/src/App.cpp b/ofSketchApp/src/App.cpp index e7a76bc..bedf5a9 100644 --- a/ofSketchApp/src/App.cpp +++ b/ofSketchApp/src/App.cpp @@ -45,7 +45,7 @@ App::App(): ofLogNotice("App::App") << "Editor setting's projectDir: " << _editorSettings.getProjectDir(); _taskQueue.registerTaskEvents(this); - HTTP::BasicJSONRPCServerSettings settings; // TODO: load from file. + ofx::HTTP::BasicJSONRPCServerSettings settings; // TODO: load from file. settings.setBufferSize(1024 * 1024 * 3); // 3 MB settings.setPort(7890); server = ofx::HTTP::BasicJSONRPCServer::makeShared(settings); @@ -197,7 +197,7 @@ void App::mousePressed(int x, int y, int button) } -void App::loadProject(const void* pSender, JSONRPC::MethodArgs& args) +void App::loadProject(const void* pSender, ofx::JSONRPC::MethodArgs& args) { if (args.params.isMember("projectName")) { std::string projectName = args.params["projectName"].asString(); @@ -208,13 +208,13 @@ void App::loadProject(const void* pSender, JSONRPC::MethodArgs& args) } -void App::loadTemplateProject(const void* pSender, JSONRPC::MethodArgs& args) +void App::loadTemplateProject(const void* pSender, ofx::JSONRPC::MethodArgs& args) { _projectManager.loadTemplateProject(pSender, args); } -void App::saveProject(const void* pSender, JSONRPC::MethodArgs& args) +void App::saveProject(const void* pSender, ofx::JSONRPC::MethodArgs& args) { std::string projectName = args.params["projectData"]["projectFile"]["name"].asString(); @@ -227,7 +227,7 @@ void App::saveProject(const void* pSender, JSONRPC::MethodArgs& args) } -void App::createProject(const void* pSender, JSONRPC::MethodArgs& args) +void App::createProject(const void* pSender, ofx::JSONRPC::MethodArgs& args) { std::string projectName = args.params["projectName"].asString(); if (!_projectManager.projectExists(projectName)) { @@ -236,7 +236,7 @@ void App::createProject(const void* pSender, JSONRPC::MethodArgs& args) } -void App::deleteProject(const void* pSender, JSONRPC::MethodArgs& args) +void App::deleteProject(const void* pSender, ofx::JSONRPC::MethodArgs& args) { std::string projectName = args.params["projectName"].asString(); @@ -246,7 +246,7 @@ void App::deleteProject(const void* pSender, JSONRPC::MethodArgs& args) } -void App::renameProject(const void* pSender, JSONRPC::MethodArgs& args) +void App::renameProject(const void* pSender, ofx::JSONRPC::MethodArgs& args) { std::string projectName = args.params["projectName"].asString(); if (_projectManager.projectExists(projectName)) { @@ -256,7 +256,7 @@ void App::renameProject(const void* pSender, JSONRPC::MethodArgs& args) } -void App::createClass(const void* pSender, JSONRPC::MethodArgs& args) +void App::createClass(const void* pSender, ofx::JSONRPC::MethodArgs& args) { std::string projectName = args.params["projectName"].asString(); if (_projectManager.projectExists(projectName)) { @@ -269,7 +269,7 @@ void App::createClass(const void* pSender, JSONRPC::MethodArgs& args) } -void App::deleteClass(const void* pSender, JSONRPC::MethodArgs& args) +void App::deleteClass(const void* pSender, ofx::JSONRPC::MethodArgs& args) { std::string projectName = args.params["projectName"].asString(); if (_projectManager.projectExists(projectName)) { @@ -283,7 +283,7 @@ void App::deleteClass(const void* pSender, JSONRPC::MethodArgs& args) } -void App::renameClass(const void* pSender, JSONRPC::MethodArgs& args) +void App::renameClass(const void* pSender, ofx::JSONRPC::MethodArgs& args) { std::string projectName = args.params["projectName"].asString(); if (_projectManager.projectExists(projectName)) { @@ -299,7 +299,7 @@ void App::renameClass(const void* pSender, JSONRPC::MethodArgs& args) } -void App::runProject(const void* pSender, JSONRPC::MethodArgs& args) +void App::runProject(const void* pSender, ofx::JSONRPC::MethodArgs& args) { std::string projectName = args.params["projectName"].asString(); @@ -314,7 +314,7 @@ void App::runProject(const void* pSender, JSONRPC::MethodArgs& args) else args.error["message"] = "The requested project does not exist."; } -void App::compileProject(const void* pSender, JSONRPC::MethodArgs& args) +void App::compileProject(const void* pSender, ofx::JSONRPC::MethodArgs& args) { std::string projectName = args.params["projectName"].asString(); @@ -329,7 +329,7 @@ void App::compileProject(const void* pSender, JSONRPC::MethodArgs& args) else args.error["message"] = "The requested project does not exist."; } -void App::stop(const void* pSender, JSONRPC::MethodArgs& args) +void App::stop(const void* pSender, ofx::JSONRPC::MethodArgs& args) { if (args.params.isMember("taskId")) { @@ -345,19 +345,19 @@ void App::stop(const void* pSender, JSONRPC::MethodArgs& args) } -void App::getProjectList(const void* pSender, JSONRPC::MethodArgs& args) +void App::getProjectList(const void* pSender, ofx::JSONRPC::MethodArgs& args) { _projectManager.getProjectList(pSender, args); } -void App::loadEditorSettings(const void *pSender, JSONRPC::MethodArgs &args) +void App::loadEditorSettings(const void *pSender, ofx::JSONRPC::MethodArgs &args) { args.result = _editorSettings.getData(); } -bool App::onWebSocketOpenEvent(HTTP::WebSocketOpenEventArgs& args) +bool App::onWebSocketOpenEvent(ofx::HTTP::WebSocketOpenEventArgs& args) { ofLogVerbose("App::onWebSocketOpenEvent") << "Connection opened from: " << args.getConnectionRef().getClientAddress().toString(); @@ -424,7 +424,7 @@ bool App::onWebSocketOpenEvent(HTTP::WebSocketOpenEventArgs& args) } -bool App::onWebSocketCloseEvent(HTTP::WebSocketCloseEventArgs& args) +bool App::onWebSocketCloseEvent(ofx::HTTP::WebSocketCloseEventArgs& args) { std::stringstream ss; @@ -437,21 +437,21 @@ bool App::onWebSocketCloseEvent(HTTP::WebSocketCloseEventArgs& args) } -bool App::onWebSocketFrameReceivedEvent(HTTP::WebSocketFrameEventArgs& args) +bool App::onWebSocketFrameReceivedEvent(ofx::HTTP::WebSocketFrameEventArgs& args) { // ofLogVerbose("App::onWebSocketFrameReceivedEvent") << "Frame received from: " << args.getConnectionRef().getClientAddress().toString(); return false; // did not handle it } -bool App::onWebSocketFrameSentEvent(HTTP::WebSocketFrameEventArgs& args) +bool App::onWebSocketFrameSentEvent(ofx::HTTP::WebSocketFrameEventArgs& args) { // ofLogVerbose("App::onWebSocketFrameSentEvent") << "Frame sent to: " << args.getConnectionRef().getClientAddress().toString(); return false; // did not handle it } -bool App::onWebSocketErrorEvent(HTTP::WebSocketErrorEventArgs& args) +bool App::onWebSocketErrorEvent(ofx::HTTP::WebSocketErrorEventArgs& args) { ofLogError("App::onWebSocketErrorEvent") << "Stop: " << args.getError(); @@ -460,14 +460,14 @@ bool App::onWebSocketErrorEvent(HTTP::WebSocketErrorEventArgs& args) } -bool App::onHTTPPostEvent(HTTP::PostEventArgs& args) +bool App::onHTTPPostEvent(ofx::HTTP::PostEventArgs& args) { // ofLogNotice("ofApp::onHTTPPostEvent") << "Data: " << args.getBuffer().getText(); return false; } -bool App::onHTTPFormEvent(HTTP::PostFormEventArgs& args) +bool App::onHTTPFormEvent(ofx::HTTP::PostFormEventArgs& args) { // ofLogNotice("ofApp::onHTTPFormEvent") << ""; // HTTP::Utils::dumpNameValueCollection(args.getForm(), ofGetLogLevel()); @@ -475,7 +475,7 @@ bool App::onHTTPFormEvent(HTTP::PostFormEventArgs& args) } -bool App::onHTTPUploadEvent(HTTP::PostUploadEventArgs& args) +bool App::onHTTPUploadEvent(ofx::HTTP::PostUploadEventArgs& args) { // std::string stateString = ""; // diff --git a/ofSketchApp/src/App.h b/ofSketchApp/src/App.h index b5c4562..dbccc1f 100644 --- a/ofSketchApp/src/App.h +++ b/ofSketchApp/src/App.h @@ -45,9 +45,6 @@ #include "EditorSettings.h" -using namespace ofx; - - namespace of { namespace Sketch { @@ -65,30 +62,30 @@ class App: public ofBaseApp void mousePressed(int x, int y, int button); - void loadProject(const void* pSender, JSONRPC::MethodArgs& args); - void loadTemplateProject(const void* pSender, JSONRPC::MethodArgs& args); - void saveProject(const void* pSender, JSONRPC::MethodArgs& args); - void createProject(const void* pSender, JSONRPC::MethodArgs& args); - void deleteProject(const void* pSender, JSONRPC::MethodArgs& args); - void renameProject(const void* pSender, JSONRPC::MethodArgs& args); - void createClass(const void* pSender, JSONRPC::MethodArgs& args); - void deleteClass(const void* pSender, JSONRPC::MethodArgs& args); - void renameClass(const void* pSender, JSONRPC::MethodArgs& args); - void runProject(const void* pSender, JSONRPC::MethodArgs& args); - void compileProject(const void* pSender, JSONRPC::MethodArgs& args); - void stop(const void* pSender, JSONRPC::MethodArgs& args); - void getProjectList(const void* pSender, JSONRPC::MethodArgs& args); - void loadEditorSettings(const void* pSender, JSONRPC::MethodArgs& args); - - bool onWebSocketOpenEvent(HTTP::WebSocketOpenEventArgs& args); - bool onWebSocketCloseEvent(HTTP::WebSocketCloseEventArgs& args); - bool onWebSocketFrameReceivedEvent(HTTP::WebSocketFrameEventArgs& args); - bool onWebSocketFrameSentEvent(HTTP::WebSocketFrameEventArgs& args); - bool onWebSocketErrorEvent(HTTP::WebSocketErrorEventArgs& args); - - bool onHTTPPostEvent(HTTP::PostEventArgs& args); - bool onHTTPFormEvent(HTTP::PostFormEventArgs& args); - bool onHTTPUploadEvent(HTTP::PostUploadEventArgs& args); + void loadProject(const void* pSender, ofx::JSONRPC::MethodArgs& args); + void loadTemplateProject(const void* pSender, ofx::JSONRPC::MethodArgs& args); + void saveProject(const void* pSender, ofx::JSONRPC::MethodArgs& args); + void createProject(const void* pSender, ofx::JSONRPC::MethodArgs& args); + void deleteProject(const void* pSender, ofx::JSONRPC::MethodArgs& args); + void renameProject(const void* pSender, ofx::JSONRPC::MethodArgs& args); + void createClass(const void* pSender, ofx::JSONRPC::MethodArgs& args); + void deleteClass(const void* pSender, ofx::JSONRPC::MethodArgs& args); + void renameClass(const void* pSender, ofx::JSONRPC::MethodArgs& args); + void runProject(const void* pSender, ofx::JSONRPC::MethodArgs& args); + void compileProject(const void* pSender, ofx::JSONRPC::MethodArgs& args); + void stop(const void* pSender, ofx::JSONRPC::MethodArgs& args); + void getProjectList(const void* pSender, ofx::JSONRPC::MethodArgs& args); + void loadEditorSettings(const void* pSender, ofx::JSONRPC::MethodArgs& args); + + bool onWebSocketOpenEvent(ofx::HTTP::WebSocketOpenEventArgs& args); + bool onWebSocketCloseEvent(ofx::HTTP::WebSocketCloseEventArgs& args); + bool onWebSocketFrameReceivedEvent(ofx::HTTP::WebSocketFrameEventArgs& args); + bool onWebSocketFrameSentEvent(ofx::HTTP::WebSocketFrameEventArgs& args); + bool onWebSocketErrorEvent(ofx::HTTP::WebSocketErrorEventArgs& args); + + bool onHTTPPostEvent(ofx::HTTP::PostEventArgs& args); + bool onHTTPFormEvent(ofx::HTTP::PostFormEventArgs& args); + bool onHTTPUploadEvent(ofx::HTTP::PostUploadEventArgs& args); void onSSLServerVerificationError(Poco::Net::VerificationErrorArgs& args); void onSSLClientVerificationError(Poco::Net::VerificationErrorArgs& args); @@ -131,7 +128,7 @@ class App: public ofBaseApp static const std::string VERSION_PRE_RELEASE; private: - HTTP::BasicJSONRPCServer::SharedPtr server; + ofx::HTTP::BasicJSONRPCServer::SharedPtr server; // WebSocketLoggerChannel::SharedPtr _loggerChannel; From b6c8ffbbb831a09c45ff3d6bd1cbcc0151fd9a6b Mon Sep 17 00:00:00 2001 From: Christopher Baker Date: Mon, 16 Jun 2014 19:42:37 -0500 Subject: [PATCH 03/13] Formatting / Cleanup. --- ofSketchApp/src/ProjectManager.cpp | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/ofSketchApp/src/ProjectManager.cpp b/ofSketchApp/src/ProjectManager.cpp index 26efbee..3201247 100644 --- a/ofSketchApp/src/ProjectManager.cpp +++ b/ofSketchApp/src/ProjectManager.cpp @@ -113,7 +113,9 @@ const std::vector& ProjectManager::getProjects() const // // cout << "Connection opened from: " << evt.getConnectionRef().getClientAddress().toString() << endl; -void ProjectManager::getProjectList(const void* pSender, ofx::JSONRPC::MethodArgs& args) + +void ProjectManager::getProjectList(const void* pSender, + ofx::JSONRPC::MethodArgs& args) { Json::Value projectList; @@ -126,7 +128,8 @@ void ProjectManager::getProjectList(const void* pSender, ofx::JSONRPC::MethodArg } -void ProjectManager::loadProject(const void* pSender, ofx::JSONRPC::MethodArgs& args) +void ProjectManager::loadProject(const void* pSender, + ofx::JSONRPC::MethodArgs& args) { if (args.params.isMember("projectName")) { @@ -166,7 +169,8 @@ void ProjectManager::loadProject(const void* pSender, ofx::JSONRPC::MethodArgs& } -void ProjectManager::loadTemplateProject(const void *pSender, ofx::JSONRPC::MethodArgs &args) +void ProjectManager::loadTemplateProject(const void *pSender, + ofx::JSONRPC::MethodArgs &args) { if (!_templateProject.isLoaded()) { @@ -179,7 +183,8 @@ void ProjectManager::loadTemplateProject(const void *pSender, ofx::JSONRPC::Meth } -void ProjectManager::saveProject(const void* pSender, ofx::JSONRPC::MethodArgs& args) +void ProjectManager::saveProject(const void* pSender, + ofx::JSONRPC::MethodArgs& args) { if (args.params.isMember("projectData")) { @@ -199,7 +204,8 @@ void ProjectManager::saveProject(const void* pSender, ofx::JSONRPC::MethodArgs& else args.error = "A projectData object was not sent"; } -void ProjectManager::createProject(const void* pSender, ofx::JSONRPC::MethodArgs& args) +void ProjectManager::createProject(const void* pSender, + ofx::JSONRPC::MethodArgs& args) { Json::Value projectData = args.params["projectData"]; std::string projectName = args.params["projectData"]["projectFile"]["name"].asString(); @@ -215,7 +221,8 @@ void ProjectManager::createProject(const void* pSender, ofx::JSONRPC::MethodArgs ofLogNotice("Project::createProject") << "Created " << projectName << " project"; } -void ProjectManager::deleteProject(const void *pSender, ofx::JSONRPC::MethodArgs &args) +void ProjectManager::deleteProject(const void *pSender, + ofx::JSONRPC::MethodArgs &args) { std::string projectName = args.params["projectName"].asString(); Project& project = getProjectRef(projectName); From b8d160bf59358ae2cca8fc80a62f8dff28614341 Mon Sep 17 00:00:00 2001 From: Christopher Baker Date: Mon, 23 Jun 2014 20:21:47 -0500 Subject: [PATCH 04/13] Fix typo. --- ofSketchApp/src/App.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ofSketchApp/src/App.cpp b/ofSketchApp/src/App.cpp index bedf5a9..2e0f5d5 100644 --- a/ofSketchApp/src/App.cpp +++ b/ofSketchApp/src/App.cpp @@ -323,7 +323,7 @@ void App::compileProject(const void* pSender, ofx::JSONRPC::MethodArgs& args) ofLogNotice("App::compileProject") << "Compiling " << projectName << " project"; const Project& project = _projectManager.getProject(projectName); Poco::UUID taskId = _compiler.compile(project); - ofLogNotice("APP::compileProject") << "Task ID: " << taskId.toString(); + ofLogNotice("App::compileProject") << "Task ID: " << taskId.toString(); args.result = taskId.toString(); } else args.error["message"] = "The requested project does not exist."; From 0c7362268bce27aa62de781a8d2f63356b0ad0db Mon Sep 17 00:00:00 2001 From: Christopher Baker Date: Mon, 23 Jun 2014 20:53:15 -0500 Subject: [PATCH 05/13] Update plist. --- ofSketchApp/openFrameworks-Info.plist | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/ofSketchApp/openFrameworks-Info.plist b/ofSketchApp/openFrameworks-Info.plist index 8d64d2b..76d94dc 100644 --- a/ofSketchApp/openFrameworks-Info.plist +++ b/ofSketchApp/openFrameworks-Info.plist @@ -6,17 +6,21 @@ English CFBundleExecutable ${EXECUTABLE_NAME} + CFBundleIconFile + ${ICON} CFBundleIdentifier - cc.openFrameworks.ofapp + io.olab.ofSketch CFBundleInfoDictionaryVersion 6.0 CFBundlePackageType APPL + CFBundleShortVersionString + 0.1.5 CFBundleSignature ???? CFBundleVersion 1.0 - CFBundleIconFile - ${ICON} + LSApplicationCategoryType + public.app-category.developer-tools From 5c18403e5efe6ef403b590d805f0f00373147dd7 Mon Sep 17 00:00:00 2001 From: Christopher Baker Date: Mon, 23 Jun 2014 20:58:49 -0500 Subject: [PATCH 06/13] Bump init repo scripts for 0.8.2-RC2 --- scripts/init_repo.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/init_repo.sh b/scripts/init_repo.sh index 16c0c3a..e3e18a1 100755 --- a/scripts/init_repo.sh +++ b/scripts/init_repo.sh @@ -11,7 +11,7 @@ SCRIPTS_DIR=`pwd` OS=`./helpers/ostype.sh` # current of version -OF_VERSION="0.8.2-RC1" +OF_VERSION="0.8.2-RC2" # make the release file name. OF_RELEASE="of_v${OF_VERSION}_${OS}_release" From a820a63fe9dbcb87102504fbf80c531309a6ec6e Mon Sep 17 00:00:00 2001 From: Christopher Baker Date: Tue, 24 Jun 2014 00:18:22 -0500 Subject: [PATCH 07/13] Let's call it VERSION_SPECIAL. Seems to be more popular and flexible. --- ofSketchApp/src/App.cpp | 12 ++++++------ ofSketchApp/src/App.h | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ofSketchApp/src/App.cpp b/ofSketchApp/src/App.cpp index 2e0f5d5..aed05a6 100644 --- a/ofSketchApp/src/App.cpp +++ b/ofSketchApp/src/App.cpp @@ -31,7 +31,7 @@ namespace of { namespace Sketch { -const std::string App::VERSION_PRE_RELEASE = ""; +const std::string App::VERSION_SPECIAL = ""; App::App(): @@ -378,7 +378,7 @@ bool App::onWebSocketOpenEvent(ofx::HTTP::WebSocketOpenEventArgs& args) params["major"] = getVersionMajor(); params["minor"] = getVersionMinor(); params["patch"] = getVersionPatch(); - params["prerelease"] = getVersionPreRelease(); + params["special"] = getVersionSpecial(); params["target"] = toString(ofGetTargetPlatform()); json = App::toJSONMethod("Server", "version", params); @@ -658,9 +658,9 @@ std::string App::getVersion() ss << VERSION_MINOR << "."; ss << VERSION_PATCH; - if (!VERSION_PRE_RELEASE.empty()) + if (!VERSION_SPECIAL.empty()) { - ss << "-" << VERSION_PRE_RELEASE; + ss << "-" << VERSION_SPECIAL; } return ss.str(); @@ -684,9 +684,9 @@ int App::getVersionPatch() } -std::string App::getVersionPreRelease() +std::string App::getVersionSpecial() { - return VERSION_PRE_RELEASE; + return VERSION_SPECIAL; } diff --git a/ofSketchApp/src/App.h b/ofSketchApp/src/App.h index dbccc1f..1baba98 100644 --- a/ofSketchApp/src/App.h +++ b/ofSketchApp/src/App.h @@ -113,7 +113,7 @@ class App: public ofBaseApp static int getVersionMajor(); static int getVersionMinor(); static int getVersionPatch(); - static std::string getVersionPreRelease(); + static std::string getVersionSpecial(); // TODO: Move this. static std::string toString(ofTargetPlatform targetPlatform); @@ -125,7 +125,7 @@ class App: public ofBaseApp VERSION_PATCH = 5 }; - static const std::string VERSION_PRE_RELEASE; + static const std::string VERSION_SPECIAL; private: ofx::HTTP::BasicJSONRPCServer::SharedPtr server; From a5c01ed3954e34a8aa8ab8f2c447ce55f3d06b87 Mon Sep 17 00:00:00 2001 From: Christopher Baker Date: Tue, 24 Jun 2014 10:59:17 -0500 Subject: [PATCH 08/13] Added missing return value. --- ofSketchApp/src/ProcessTaskQueue.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ofSketchApp/src/ProcessTaskQueue.cpp b/ofSketchApp/src/ProcessTaskQueue.cpp index 8a5fc3e..71e1e47 100644 --- a/ofSketchApp/src/ProcessTaskQueue.cpp +++ b/ofSketchApp/src/ProcessTaskQueue.cpp @@ -62,6 +62,8 @@ bool ProcessTaskQueue::onTaskStarted(const ofx::TaskStartedEventArgs& args) // Add the task. tasks[task.uuid] = task; + + return false; } From adedf9ddfc1698640b4f163de58ae7660af4db41 Mon Sep 17 00:00:00 2001 From: Christopher Baker Date: Tue, 24 Jun 2014 10:59:27 -0500 Subject: [PATCH 09/13] Log exit code. --- ofSketchApp/src/BaseProcessTask.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ofSketchApp/src/BaseProcessTask.cpp b/ofSketchApp/src/BaseProcessTask.cpp index 06fd4a7..dff3005 100644 --- a/ofSketchApp/src/BaseProcessTask.cpp +++ b/ofSketchApp/src/BaseProcessTask.cpp @@ -28,6 +28,7 @@ #include "Poco/PipeStream.h" #include "Poco/Process.h" #include +#include "ofLog.h" namespace of { @@ -89,6 +90,8 @@ void BaseProcessTask::runTask() int exitCode = ph.wait(); + ofLogVerbose("BaseProcessTask::runTask") << "Exit with: " << exitCode; + } From 2b368968cab83e46a508275e578102493893696a Mon Sep 17 00:00:00 2001 From: Christopher Baker Date: Tue, 24 Jun 2014 11:02:28 -0500 Subject: [PATCH 10/13] Ignore access token. --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 28fcded..72db519 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,8 @@ raw/ releases/ +scripts/access_token.txt + *.mode1v3 # xcode From 24568015628d546aa6170d42692bfa4df1b11763 Mon Sep 17 00:00:00 2001 From: Christopher Baker Date: Fri, 27 Jun 2014 08:06:45 -0500 Subject: [PATCH 11/13] Update change log. --- CHANGELOG.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5cb1ce7..207df36 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ -- 0.1.6 (Pending) +- 0.1.7 (Pending) + +- 0.1.6 + + Now uses openFrameworks 0.8.2. + Add ARCHITECTURE.md document. + Updated README.md. + + Updates version naming scheme. + + Update ofSketch OSX App plist. + + Various bugfixes and source cleanup. - 0.1.5 (06-16-2014) + Server now sends available addons to client. From 0e3a7293fe7f0905e92b668230cfb526f6d7148d Mon Sep 17 00:00:00 2001 From: Christopher Baker Date: Fri, 27 Jun 2014 08:08:09 -0500 Subject: [PATCH 12/13] Version bump 0.1.6 --- ofSketchApp/src/App.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ofSketchApp/src/App.h b/ofSketchApp/src/App.h index 1baba98..0c4b378 100644 --- a/ofSketchApp/src/App.h +++ b/ofSketchApp/src/App.h @@ -122,7 +122,7 @@ class App: public ofBaseApp { VERSION_MAJOR = 0, VERSION_MINOR = 1, - VERSION_PATCH = 5 + VERSION_PATCH = 6 }; static const std::string VERSION_SPECIAL; From c6f30ac8faa3d75c44328ddb144510b11ee47e84 Mon Sep 17 00:00:00 2001 From: Christopher Baker Date: Fri, 27 Jun 2014 08:09:05 -0500 Subject: [PATCH 13/13] Update init scripts for 0.8.2. --- scripts/init_repo.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/init_repo.sh b/scripts/init_repo.sh index e3e18a1..c6c43d9 100755 --- a/scripts/init_repo.sh +++ b/scripts/init_repo.sh @@ -11,7 +11,7 @@ SCRIPTS_DIR=`pwd` OS=`./helpers/ostype.sh` # current of version -OF_VERSION="0.8.2-RC2" +OF_VERSION="0.8.2" # make the release file name. OF_RELEASE="of_v${OF_VERSION}_${OS}_release"