build/titanium_developer.py @@ -77,7 +77,7 @@ namespace ti { // Set license text string licenseText = app->GetLicenseText(); - if (licenseText.empty()) + if (licenseText.empty() || (!forceInstall && app->IsInstalled())) { ::ShowWindow(licenseTextBox , SW_HIDE); ::ShowWindow(licenseBlurb , SW_HIDE); @@ -104,7 +104,7 @@ namespace ti { } // Hide installation location controls when this isn't a full app installation - if (forceInstall || app->IsInstalled()) + if (!forceInstall && app->IsInstalled()) { ::ShowWindow(installLocationButton , SW_HIDE); ::ShowWindow(startMenuCheck , SW_HIDE); installation/net_installer/win32/installer-project/IntroDialog.cpp @@ -3,8 +3,10 @@ #include "Resource.h" #include <commctrl.h> #include <iostream> +#include "api/utils/utils.h" extern bool doInstall; +extern KrollUtils::SharedApplication app; namespace ti { @@ -50,7 +52,9 @@ namespace ti SendMessage(updateList, TVM_SETIMAGELIST, 0, (LPARAM)imageList); for (int i = 0; i < jobs.size(); i++) { - InsertUpdate(jobs[i]->name, jobs[i]->version); + if (jobs[i]->isUpdate) { + InsertUpdate(jobs[i]->name, jobs[i]->version); + } } Dialog::Initialize(window); installation/net_installer/win32/installer-project/UpdateDialog.cpp @@ -305,7 +305,7 @@ void ProcessUpdate(Progress *p, HINTERNET hINet) string path = "update-update.zip"; path = FileUtils::Join(temporaryPath.c_str(), path.c_str(), NULL); - // Figure out the path and destination + // Figure out the path and destination string intro = string("Downloading application update"); bool downloaded = DownloadURL(p, hINet, StringToWString(url), StringToWString(path), StringToWString(intro)); if (downloaded) @@ -451,7 +451,7 @@ bool HandleAllJobs(vector<ti::InstallJob*> jobs, Progress* p) ti::InstallJob *job = jobs[i]; p->SetLineText(3, "Downloading: " + job->url, true); - if (job->url == string("update")) + if (job->isUpdate) { ProcessUpdate(p, hINet); } @@ -634,9 +634,9 @@ int WINAPI WinMain( //printf("exePath=%s,basename=%s,appPath=%s",exePath.c_str(),FileUtils::Basename(exePath).c_str(),appPath.c_str()); - if (!exePath.empty() && FileUtils::Dirname(exePath) == appPath) { - updateDialog = true; - } + //if (!exePath.empty() && FileUtils::Dirname(exePath) == appPath) { + // updateDialog = true; + //} if (app.isNull()) { @@ -657,7 +657,10 @@ int WINAPI WinMain( jobs = ti::InstallJob::ReadJobs(jobsFile); if (!updateFile.empty()) { - jobs.push_back(new ti::InstallJob(true)); + ti::InstallJob* updateJob = new ti::InstallJob(true); + updateJob->name = app->name; + updateJob->version = app->version; + jobs.push_back(updateJob); } // Major WTF here, Redmond. installation/net_installer/win32/installer-project/main.cpp installation/net_installer/win32/installer-project/progress.aps @@ -1 +1 @@ -Subproject commit 58da1c32c565c5b2d9fb1f5fe12d36ae3115cd36 +Subproject commit 4f04f94c5f1247b87c4a5bda2731fd1e6446f5ef kroll @@ -9,6 +9,7 @@ #include <Poco/Path.h> #include <Poco/RunnableAdapter.h> #include <Poco/ScopedLock.h> +#include <Poco/PipeImpl.h> using Poco::RunnableAdapter; @@ -272,10 +273,17 @@ namespace ti void Process::ReadStdOut() { + char buffer[512]; while (this->running) { Poco::ScopedLock<Poco::Mutex> lock(outputBufferMutex); SharedValue result = Value::NewUndefined(); + /*Poco::PipeImpl* pipeImpl = reinterpret_cast<Poco::PipeImpl*>(this->outp); + + int bytesRead = pipeImpl->readBytes(buffer, 511); + buffer[bytesRead] = '\0'; + stdOutBuffer << buffer; + this->InvokeOnReadCallback(false);*/ this->out->Read(ValueList(), result); if (result->IsString()) modules/ti.Process/process.cpp @@ -14,6 +14,7 @@ #include <Poco/RunnableAdapter.h> #include <Poco/Mutex.h> #include <Poco/Condition.h> +#include <sstream> #include "pipe.h" #include "process_binding.h" modules/ti.Process/process.h installation/net_installer/win32/installer-project/new 28 c4e49ed06f23bc6d05e020f02b90d16de396c5b0 Marshall Culpepper mculpepper@appcelerator.org http://github.com/marshall/titanium/commit/c18ce1b1ea0f8961fec08a9316a216953a020029 c18ce1b1ea0f8961fec08a9316a216953a020029 2009-06-07T13:41:35-07:00 2009-06-07T13:41:35-07:00 fixes for compilation error in release for process, fixes for net installer, new titanium_developer launch script, removed accidentally uploaded file d851fb920397a5fe59beca442b516998298ef90d Marshall Culpepper mculpepper@appcelerator.org