Revision: 1585
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=1585&view=rev
Author: rorthomas
Date: 2011-01-18 14:29:47 +0000 (Tue, 18 Jan 2011)
Log Message:
-----------
renamed everything to updater
Modified Paths:
--------------
trunk/source/installer/ConfigManager.cpp
trunk/source/installer/wizard.cpp
trunk/source/installer/wthread.cpp
Modified: trunk/source/installer/ConfigManager.cpp
===================================================================
--- trunk/source/installer/ConfigManager.cpp 2011-01-18 13:24:21 UTC (rev
1584)
+++ trunk/source/installer/ConfigManager.cpp 2011-01-18 14:29:47 UTC (rev
1585)
@@ -239,6 +239,7 @@
void ConfigManager::installRuntime()
{
+ // obsolete
wxMessageBox(wxT("Will now install DirectX. Please click ok to
continue"), _T("directx"), wxICON_INFORMATION | wxOK);
executeBinary(wxT("dxwebsetup.exe"));
wxMessageBox(wxT("Please wait until the DirectX installation is done
and click ok to continue"), _T("directx"), wxICON_INFORMATION | wxOK);
@@ -325,7 +326,7 @@
createShortcut(workingDirectory + wxT("servergui.exe"),
workingDirectory, startmenuDir + wxT("\\Multiplayer Server.lnk"), wxT("start
Rigs of Rods multiplayer server"));
createShortcut(workingDirectory +
wxT("Things_you_can_do_in_Rigs_of_Rods.pdf"), workingDirectory, startmenuDir +
wxT("\\Manual.lnk"), wxT("open the RoR Manual"));
createShortcut(workingDirectory + wxT("keysheet.pdf"),
workingDirectory, startmenuDir + wxT("\\Keysheet.lnk"), wxT("open the RoR Key
Overview"));
- createShortcut(workingDirectory + wxT("installer.exe"),
workingDirectory, startmenuDir + wxT("\\Installer (update or uninstall).lnk"),
wxT("open the Installer with which you can update or uninstall RoR."));
+ createShortcut(workingDirectory + wxT("updater.exe"),
workingDirectory, startmenuDir + wxT("\\Updater.lnk"), wxT("open the Updater
with which you can update or uninstall RoR."));
}
#endif // OGRE_PLATFORM
}
@@ -370,13 +371,13 @@
sprintf(url_tmp, API_CHINSTALLER, ourHash.c_str(), platform_str,
INSTALLER_VERSION);
WsyncDownload *wsdl = new WsyncDownload();
- LOG("checking for installer updates...\n");
- wsdl->setDownloadMessage(_T("checking for installer updates"));
+ LOG("checking for updates...\n");
+ wsdl->setDownloadMessage(_T("checking for updates"));
std::vector< std::vector< std::string > > list;
int res = wsdl->downloadConfigFile(API_SERVER, std::string(url_tmp),
list, true);
if(!res && list.size()>0 && list[0].size()>0)
{
- LOG("installer check update result: %s\n", list[0][0].c_str());
+ LOG("update check result: %s\n", list[0][0].c_str());
if(list[0][0] == std::string("ok"))
{
// no updates
Modified: trunk/source/installer/wizard.cpp
===================================================================
--- trunk/source/installer/wizard.cpp 2011-01-18 13:24:21 UTC (rev 1584)
+++ trunk/source/installer/wizard.cpp 2011-01-18 14:29:47 UTC (rev 1585)
@@ -131,7 +131,7 @@
#if wxCHECK_VERSION(2, 9, 0)
{ wxCMD_LINE_SWITCH, ("h"), ("help"), ("displays help on the command
line parameters"), wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP },
{ wxCMD_LINE_SWITCH, ("n"), ("noupdate"), ("ignore available updates"),
wxCMD_LINE_VAL_NONE },
- { wxCMD_LINE_SWITCH, ("d"), ("hash"), ("put installer hash into
clipboard"), wxCMD_LINE_VAL_NONE },
+ { wxCMD_LINE_SWITCH, ("d"), ("hash"), ("put updater hash into
clipboard"), wxCMD_LINE_VAL_NONE },
#else
{ wxCMD_LINE_SWITCH, wxT("h"), wxT("help"), wxT("displays help on
the command line parameters"), wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP },
#endif //wxCHECK_VERSION
@@ -201,8 +201,8 @@
autoUpdateEnabled(_autoUpdateEnabled)
{
// first thing to do: remove old installer file if possible
- if(boost::filesystem::exists("installer.exe.old"))
- boost::filesystem::remove("installer.exe.old");
+ if(boost::filesystem::exists("updater.exe.old"))
+ boost::filesystem::remove("updater.exe.old");
// now continue with normal startup
new ConfigManager();
@@ -720,11 +720,11 @@
setControlEnable(wizard, wxID_CANCEL, false);
#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
chk_configurator->SetValue(true);
- if(CONFIG->getPersistentConfig(wxT("installer.run_configurator")) ==
wxT("no"))
+ if(CONFIG->getPersistentConfig(wxT("updater.run_configurator")) ==
wxT("no"))
chk_configurator->SetValue(false);
chk_changelog->SetValue(true);
- if(CONFIG->getPersistentConfig(wxT("installer.view_changelog")) ==
wxT("no"))
+ if(CONFIG->getPersistentConfig(wxT("updater.view_changelog")) ==
wxT("no"))
chk_changelog->SetValue(false);
#endif // OGRE_PLATFORM
@@ -736,8 +736,8 @@
if(!forward) return false;
#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
// do last things
- CONFIG->setPersistentConfig(wxT("installer.run_configurator"),
chk_configurator->IsChecked()?wxT("yes"):wxT("no"));
- CONFIG->setPersistentConfig(wxT("installer.view_changelog"),
chk_changelog->IsChecked()?wxT("yes"):wxT("no"));
+ CONFIG->setPersistentConfig(wxT("updater.run_configurator"),
chk_configurator->IsChecked()?wxT("yes"):wxT("no"));
+ CONFIG->setPersistentConfig(wxT("updater.view_changelog"),
chk_changelog->IsChecked()?wxT("yes"):wxT("no"));
CONFIG->updateUserConfigs();
CONFIG->associateFileTypes();
Modified: trunk/source/installer/wthread.cpp
===================================================================
--- trunk/source/installer/wthread.cpp 2011-01-18 13:24:21 UTC (rev 1584)
+++ trunk/source/installer/wthread.cpp 2011-01-18 14:29:47 UTC (rev 1585)
@@ -519,7 +519,7 @@
bool updateInstaller = false;
for(std::vector<Fileentry>::iterator
itf=changedFiles.begin();itf!=changedFiles.end();itf++)
{
- if(itf->filename == "/installer.exe")
+ if(itf->filename == "/updater.exe")
{
LOG("* will be updating the installer\n");
updateInstaller=true;
@@ -528,22 +528,22 @@
}
if(updateInstaller)
{
- path installer_from = ipath / "installer.exe";
- path installer_to = ipath / "installer.exe.old";
+ path installer_from = ipath / "updater.exe";
+ path installer_to = ipath / "updater.exe.old";
if(exists(installer_from))
{
try
{
if(boost::filesystem::exists(installer_to))
{
- // we dont need the old installer,
remove it.
+ // we dont need the old updater, remove
it.
WsyncDownload::tryRemoveFile(installer_to);
}
- LOG("trying to rename installer from %s to
%s\n", installer_from.string().c_str(), installer_to.string().c_str());
+ LOG("trying to rename updater from %s to %s\n",
installer_from.string().c_str(), installer_to.string().c_str());
boost::filesystem::rename(installer_from,
installer_to);
} catch (std::exception& e)
{
- LOG("error while renaming installer: %s\n",
std::string(e.what()).c_str());
+ LOG("error while renaming updater: %s\n",
std::string(e.what()).c_str());
}
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand
malware threats, the impact they can have on your business, and how you
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Rigsofrods-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/rigsofrods-devel
