Merge with develop

code/ryzom/tools/client/ryzom_installer/CMakeLists.txt

@@ -51,3 +51,7 @@ IF(WITH_PCH)
 ENDIF()
 
 INSTALL(TARGETS ryzom_installer_qt RUNTIME DESTINATION ${RYZOM_GAMES_PREFIX} COMPONENT client)
+
+IF(UNIX AND NOT APPLE)
+  INSTALL(FILES res/ryzom_installer.png DESTINATION ${RYZOM_SHARE_PREFIX} COMPONENT client)
+ENDIF()

code/ryzom/tools/client/ryzom_installer/res/resources.qrc

@@ -7,5 +7,6 @@
     </qresource>
     <qresource prefix="/templates">
         <file>template.desktop</file>
+        <file>ryzom_installer.ini</file>
     </qresource>
 </RCC>

code/ryzom/tools/client/ryzom_installer/res/ryzom_installer.ini

@@ -0,0 +1,61 @@
+version=1
+
+[common]
+installation_directory=
+
+[product]
+name=Ryzom
+publisher="Winch Gate Property Limited"
+url_about=http://ryzom.com/?lang=$LANG
+url_help=http://app.ryzom.com/app_forum/index.php?page=topic/view/22047/1&post149889=$LANG#1
+comments=Science-fantasy MMORPG
+
+[servers]
+size=2
+
+[server_0]
+id=ryzom_live
+name=Atys
+display_url="http://app.ryzom.com/app_releasenotes/index.php?lang=$LANG"
+data_download_url="http://downloads.sourceforge.net/project/ryzom/ryzom_live_data.7z?r=&ts=$TIMESTAMP"
+data_download_filename=ryzom_live_data.7z
+data_compressed_size=1500000000
+data_uncompressed_size=10000000000
+client_download_url="http://downloads.sourceforge.net/project/ryzom/ryzom_live_client_$ARCH.zip?r=&ts=$TIMESTAMP"
+client_download_filename=ryzom_live_client_$ARCH.zip
+client_filename_windows=ryzom_client_r.exe
+client_filename_osx=Ryzom.app/Contents/MacOS/Ryzom
+client_filename_linux=ryzom_client
+client_filename_old_windows=client_ryzom_rd.exe
+configuration_filename_windows=ryzom_configuration_qt_r.exe
+configuration_filename_osx=Ryzom.app/Contents/MacOS/RyzomConfiguration
+configuration_filename_linux=ryzom_configuration_qt
+installer_filename_windows=ryzom_installer_qt_r.exe
+installer_filename_osx=RyzomInstaller.app/Contents/MacOS/RyzomInstaller
+installer_filename_linux=ryzom_installer_qt
+comments=
+
+[server_1]
+id=ryzom_dev
+name=Yubo
+display_url="http://app.ryzom.com/app_releasenotes/index.php?lang=$LANG"
+data_download_url="http://downloads.sourceforge.net/project/ryzom/ryzom_live_data.7z?r=&ts=$TIMESTAMP"
+data_download_filename=ryzom_live_data.7z
+data_compressed_size=1500000000
+data_uncompressed_size=10000000000
+client_download_url="http://downloads.sourceforge.net/project/ryzom/ryzom_live_client_$ARCH.zip?r=&ts=$TIMESTAMP"
+client_download_filename=ryzom_live_client_$ARCH.zip
+client_filename_windows=ryzom_client_r.exe
+client_filename_osx=Ryzom.app/Contents/MacOS/Ryzom
+client_filename_linux=ryzom_client
+client_filename_old_windows=client_ryzom_rd.exe
+configuration_filename_windows=ryzom_configuration_qt_r.exe
+configuration_filename_osx=Ryzom.app/Contents/MacOS/RyzomConfiguration
+configuration_filename_linux=ryzom_configuration_qt
+installer_filename_windows=ryzom_installer_qt_r.exe
+installer_filename_osx=RyzomInstaller.app/Contents/MacOS/RyzomInstaller
+installer_filename_linux=ryzom_installer_qt
+comments=Test server
+
+[profiles]
+size=0

code/ryzom/tools/client/ryzom_installer/src/configfile.cpp

@@ -142,30 +142,19 @@ void CProfile::updateShortcuts() const
 
 CConfigFile *CConfigFile::s_instance = NULL;
 
-CConfigFile::CConfigFile(QObject *parent):QObject(parent), m_defaultServerIndex(0), m_defaultProfileIndex(0), m_use64BitsClient(false), m_shouldUninstallOldClient(true)
+CConfigFile::CConfigFile(QObject *parent):QObject(parent), m_version(-1),
+	m_defaultServerIndex(0), m_defaultProfileIndex(0), m_use64BitsClient(false), m_shouldUninstallOldClient(true)
 {
 	s_instance = this;
 
 	// only keep language ISO 639 code
 	m_language = QLocale::system().name().left(2);
 
-	// it won't be found if run with uninstall flag, but since we already have a local installer.ini...
+	// default config file in included in resources
-	QString configFile = getCurrentDirectory() + "/installer.ini";
+	m_defaultConfigPath = ":/templates/ryzom_installer.ini";
-
-	if (!QFile::exists(configFile))
-	{
-		configFile = QApplication::applicationDirPath() + "/installer.ini";
-
-		if (!QFile::exists(configFile))
-		{
-			configFile.clear();
-		}
-	}
-
-	m_defaultConfigPath = configFile;
 
 	// the config file we'll write
-	m_configPath = QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + "/installer.ini";
+	m_configPath = QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + "/ryzom_installer.ini";
 }
 
 CConfigFile::~CConfigFile()
@@ -175,13 +164,30 @@ CConfigFile::~CConfigFile()
 
 bool CConfigFile::load()
 {
-	return load(m_configPath) || load(m_defaultConfigPath);
+	// load default values
+	return load(m_defaultConfigPath) || load(m_configPath);
 }
 
 bool CConfigFile::load(const QString &filename)
 {
+	if (!QFile::exists(filename)) return false;
+
 	QSettings settings(filename, QSettings::IniFormat);
 
+	int defaultVersion = m_version;
+	int currentVersion = settings.value("version", 0).toInt();
+
+	bool useDefaultValues = defaultVersion > currentVersion;
+
+	// set default version from default config
+	if (defaultVersion == -1) m_version = currentVersion;
+
+	if (useDefaultValues)
+	{
+		// TODO: make a backup of custom installer.ini
+	}
+
+	// custom choices, always keep them
 	settings.beginGroup("common");
 	m_language = settings.value("language", m_language).toString();
 	m_srcDirectory = settings.value("source_directory").toString();
@@ -190,58 +196,62 @@ bool CConfigFile::load(const QString &filename)
 	m_shouldUninstallOldClient = settings.value("should_uninstall_old_client", true).toBool();
 	settings.endGroup();
 
-	settings.beginGroup("product");
+	if (!useDefaultValues)
-	m_productName = settings.value("name").toString();
-	m_productPublisher = settings.value("publisher").toString();
-	m_productAboutUrl = settings.value("url_about").toString();
-	m_productUpdateUrl = settings.value("url_update").toString();
-	m_productHelpUrl = settings.value("url_help").toString();
-	m_productComments = settings.value("comments").toString();
-	settings.endGroup();
-
-	settings.beginGroup("servers");
-	int serversCount = settings.value("size").toInt();
-	m_defaultServerIndex = settings.value("default").toInt();
-	settings.endGroup();
-	
-	m_servers.resize(serversCount);
-
-	for(int i = 0; i < serversCount; ++i)
 	{
-		CServer &server = m_servers[i];
+		settings.beginGroup("product");
-
+		m_productName = settings.value("name").toString();
-		settings.beginGroup(QString("server_%1").arg(i));
+		m_productPublisher = settings.value("publisher").toString();
-
+		m_productAboutUrl = settings.value("url_about").toString();
-		server.id = settings.value("id").toString();
+		m_productUpdateUrl = settings.value("url_update").toString();
-		server.name = settings.value("name").toString();
+		m_productHelpUrl = settings.value("url_help").toString();
-		server.displayUrl = settings.value("display_url").toString();
+		m_productComments = settings.value("comments").toString();
-		server.dataDownloadUrl = settings.value("data_download_url").toString();
-		server.dataDownloadFilename = settings.value("data_download_filename").toString();
-		server.dataCompressedSize = settings.value("data_compressed_size").toULongLong();
-		server.dataUncompressedSize = settings.value("data_uncompressed_size").toULongLong();
-		server.clientDownloadUrl = settings.value("client_download_url").toString();
-		server.clientDownloadFilename = settings.value("client_download_filename").toString();
-#if defined(Q_OS_WIN)
-		server.clientFilename = settings.value("client_filename_windows").toString();
-		server.clientFilenameOld = settings.value("client_filename_old_windows").toString();
-		server.configurationFilename = settings.value("configuration_filename_windows").toString();
-		server.installerFilename = settings.value("installer_filename_windows").toString();
-#elif defined(Q_OS_MAC)
-		server.clientFilename = settings.value("client_filename_osx").toString();
-		server.clientFilenameOld = settings.value("client_filename_old_osx").toString();
-		server.configurationFilename = settings.value("configuration_filename_osx").toString();
-		server.installerFilename = settings.value("installer_filename_osx").toString();
-#else
-		server.clientFilename = settings.value("client_filename_linux").toString();
-		server.clientFilenameOld = settings.value("client_filename_old_linux").toString();
-		server.configurationFilename = settings.value("configuration_filename_linux").toString();
-		server.installerFilename = settings.value("installer_filename_linux").toString();
-#endif
-		server.comments = settings.value("comments").toString();
-
 		settings.endGroup();
+
+		settings.beginGroup("servers");
+		int serversCount = settings.value("size").toInt();
+		m_defaultServerIndex = settings.value("default").toInt();
+		settings.endGroup();
+
+		m_servers.resize(serversCount);
+
+		for (int i = 0; i < serversCount; ++i)
+		{
+			CServer &server = m_servers[i];
+
+			settings.beginGroup(QString("server_%1").arg(i));
+
+			server.id = settings.value("id").toString();
+			server.name = settings.value("name").toString();
+			server.displayUrl = settings.value("display_url").toString();
+			server.dataDownloadUrl = settings.value("data_download_url").toString();
+			server.dataDownloadFilename = settings.value("data_download_filename").toString();
+			server.dataCompressedSize = settings.value("data_compressed_size").toULongLong();
+			server.dataUncompressedSize = settings.value("data_uncompressed_size").toULongLong();
+			server.clientDownloadUrl = settings.value("client_download_url").toString();
+			server.clientDownloadFilename = settings.value("client_download_filename").toString();
+#if defined(Q_OS_WIN)
+			server.clientFilename = settings.value("client_filename_windows").toString();
+			server.clientFilenameOld = settings.value("client_filename_old_windows").toString();
+			server.configurationFilename = settings.value("configuration_filename_windows").toString();
+			server.installerFilename = settings.value("installer_filename_windows").toString();
+#elif defined(Q_OS_MAC)
+			server.clientFilename = settings.value("client_filename_osx").toString();
+			server.clientFilenameOld = settings.value("client_filename_old_osx").toString();
+			server.configurationFilename = settings.value("configuration_filename_osx").toString();
+			server.installerFilename = settings.value("installer_filename_osx").toString();
+#else
+			server.clientFilename = settings.value("client_filename_linux").toString();
+			server.clientFilenameOld = settings.value("client_filename_old_linux").toString();
+			server.configurationFilename = settings.value("configuration_filename_linux").toString();
+			server.installerFilename = settings.value("installer_filename_linux").toString();
+#endif
+			server.comments = settings.value("comments").toString();
+
+			settings.endGroup();
+		}
 	}
 
+	// custom choices, always keep them
 	settings.beginGroup("profiles");
 	int profilesCounts = settings.value("size").toInt();
 	m_defaultProfileIndex = settings.value("default").toInt();
@@ -274,6 +284,8 @@ bool CConfigFile::save() const
 {
 	QSettings settings(m_configPath, QSettings::IniFormat);
 
+	settings.setValue("version", m_version);
+
 	settings.beginGroup("common");
 	settings.setValue("language", m_language);
 	settings.setValue("source_directory", m_srcDirectory);
@@ -641,9 +653,11 @@ QString CConfigFile::getOldInstallationLanguage()
 	QSettings settings("HKEY_LOCAL_MACHINE\\Software\\Nevrax\\Ryzom", QSettings::NativeFormat);
 #endif
 
-	if (settings.contains("Language"))
+	QString key = "Language";
+
+	if (settings.contains(key))
 	{
-		QString languageCode = settings.value("Language").toString();
+		QString languageCode = settings.value(key).toString();
 
 		// 1036 = French (France), 1033 = English (USA), 1031 = German
 		if (languageCode == "1036") return "fr";
@@ -659,16 +673,18 @@ QString CConfigFile::getNewInstallationLanguage()
 {
 #if defined(Q_OS_WIN)
 	// NSIS new official installer
-#ifdef Q_OS_WIN64
+	QSettings settings("HKEY_CURRENT_USER\\Software\\Winch Gate\\Ryzom", QSettings::NativeFormat);
-	// use WOW6432Node in 64 bits (64 bits OS and 64 bits Installer) because Ryzom old installer was in 32 bits
-	QSettings settings("HKEY_LOCAL_MACHINE\\Software\\WOW6432Node\\Nevrax\\Ryzom", QSettings::NativeFormat);
-#else
-	QSettings settings("HKEY_LOCAL_MACHINE\\Software\\Nevrax\\Ryzom", QSettings::NativeFormat);
-#endif
 
-	if (settings.contains("Ryzom Install Path"))
+	QString key = "Language";
+
+	if (settings.contains(key))
 	{
-		return QDir::fromNativeSeparators(settings.value("Ryzom Install Path").toString());
+		QString languageCode = settings.value(key).toString();
+
+		// 1036 = French (France), 1033 = English (USA), 1031 = German
+		if (languageCode == "1036") return "fr";
+		if (languageCode == "1031") return "de";
+		if (languageCode == "1033") return "en";
 	}
 #endif
 
@@ -677,6 +693,19 @@ QString CConfigFile::getNewInstallationLanguage()
 
 QString CConfigFile::getNewInstallationDirectory()
 {
+#if defined(Q_OS_WIN)
+	// NSIS new official installer
+	QSettings settings("HKEY_CURRENT_USER\\Software\\Winch Gate\\Ryzom", QSettings::NativeFormat);
+
+	QString key = "Ryzom Install Path";
+
+	if (settings.contains(key))
+	{
+		return QDir::fromNativeSeparators(settings.value(key).toString());
+	}
+#endif
+
+	// default location
 	return QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation);
 }
 
@@ -805,7 +834,7 @@ bool CConfigFile::shouldCreateMenuShortcut() const
 
 QString CConfigFile::getInstallerFullPath() const
 {
-	return QApplication::applicationFilePath();
+	return QApplication::applicationDirPath();
 }
 
 QString CConfigFile::getInstallerMenuLinkFullPath() const
@@ -817,6 +846,51 @@ QString CConfigFile::getInstallerMenuLinkFullPath() const
 #endif
 }
 
+QStringList CConfigFile::getInstallerRequiredFiles() const
+{
+	// list of all files required by installer (and its executable too)
+	QStringList files;
+
+#ifdef Q_OS_WIN
+
+	// VC++ runtimes
+#if _MSC_VER == 1900
+	// VC++ 2015
+	files << "msvcp140.dll";
+	files << "msvcr140.dll";
+#elif _MSC_VER == 1800
+	// VC++ 2013
+	files << "msvcp120.dll";
+	files << "msvcr120.dll";
+#elif _MSC_VER == 1700
+	// VC++ 2012
+	files << "msvcp110.dll";
+	files << "msvcr110.dll";
+#elif _MSC_VER == 1600
+	// VC++ 2010
+	files << "msvcp100.dll";
+	files << "msvcr100.dll";
+#elif _MSC_VER == 1500
+	// VC++ 2008
+	files << "msvcp90.dll";
+	files << "msvcr90.dll";
+#else
+	// unsupported compiler
+#endif
+
+#elif defined(Q_OS_MAC)
+	// TODO: for OS X
+#else
+	// icon under Linux
+	files << "ryzom_installer.png";
+#endif
+
+	// include current executable
+	files << QFileInfo(QApplication::applicationFilePath()).fileName();
+
+	return files;
+}
+
 QString CConfigFile::getSrcServerClientBNPFullPath() const
 {
 	return QString("%1/unpack/exedll_%2.bnp").arg(getSrcServerDirectory()).arg(getClientArch());

code/ryzom/tools/client/ryzom_installer/src/configfile.h

@@ -181,6 +181,8 @@ public:
 	QString getInstallerFullPath() const;
 	QString getInstallerMenuLinkFullPath() const;
 
+	QStringList getInstallerRequiredFiles() const;
+
 	QString getSrcServerClientBNPFullPath() const;
 
 	OperationStep getInstallNextStep() const;
@@ -194,6 +196,7 @@ public:
 	QString getProductComments() const;
 
 private:
+	int m_version;
 	int m_defaultServerIndex;
 	int m_defaultProfileIndex;
 

code/ryzom/tools/client/ryzom_installer/src/main.cpp

@@ -47,6 +47,39 @@
 	#define new DEBUG_NEW
 #endif
 
+// copy all specified files from current directory to destination directory
+bool copyInstallerFiles(const QStringList &files, const QString &destination)
+{
+	QString path = QApplication::applicationDirPath();
+
+	foreach(const QString &file, files)
+	{
+		// convert to absolute path
+		QString srcPath = path + "/" + file;
+		QString dstPath = destination + "/" + file;
+
+		if (QFile::exists(srcPath))
+		{
+			if (QFile::exists(dstPath))
+			{
+				if (!QFile::remove(dstPath))
+				{
+					qDebug() << "Unable to delete" << dstPath;
+				}
+			}
+
+			if (!QFile::copy(srcPath, dstPath))
+			{
+				qDebug() << "Unable to copy" << srcPath << "to" << dstPath;
+
+				return false;
+			}
+		}
+	}
+
+	return true;
+}
+
 int main(int argc, char *argv[])
 {
 #if defined(_MSC_VER) && defined(_DEBUG)
@@ -115,7 +148,7 @@ int main(int argc, char *argv[])
 		if (QApplication::applicationDirPath() != tempPath)
 		{
 			// copy installer and required files to TEMP directory
-			if (copyInstallerExecutable(tempPath))
+			if (copyInstallerFiles(config.getInstallerRequiredFiles(), tempPath))
 			{
 				QString tempFile = tempPath + "/" + QFileInfo(QApplication::applicationFilePath()).fileName();
 

code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp

@@ -715,13 +715,8 @@ void COperationDialog::copyInstaller()
 
 		if (!QFile::exists(newInstallerFullPath))
 		{
-			QStringList filter;
-			filter << "msvcp100.dll";
-			filter << "msvcr100.dll";
-			filter << "ryzom_installer.png";
-
 			CFilesCopier copier(this);
-			copier.setIncludeFilter(filter);
+			copier.setIncludeFilter(config->getInstallerRequiredFiles());
 			copier.addFile(oldInstallerFullPath);
 			copier.setSourceDirectory(config->getSrcServerDirectory().isEmpty() ? QApplication::applicationDirPath():config->getSrcServerDirectory());
 			copier.setDestinationDirectory(config->getInstallationDirectory());
@@ -1123,8 +1118,6 @@ void COperationDialog::deleteComponentsInstaller()
 
 	CConfigFile *config = CConfigFile::getInstance();
 
-	// TODO: delete installer
-
 	deleteAddRemoveEntry();
 
 	// delete menu
@@ -1137,7 +1130,22 @@ void COperationDialog::deleteComponentsInstaller()
 		dir.removeRecursively();
 	}
 
-	// TODO:
+	path = config->getInstallerFullPath();
+	QStringList files = config->getInstallerRequiredFiles();
+
+	foreach(const QString &file, files)
+	{
+		QString fullPath = path + "/" + file;
+
+		// delete file
+		if (!QFile::remove(fullPath))
+		{
+#ifdef Q_OS_WIN32
+			// under Windows, a running executable is locked, so we need to delete it later
+			MoveFileExW(qToWide(QDir::toNativeSeparators(fullPath)), NULL, MOVEFILE_DELAY_UNTIL_REBOOT);
+#endif
+		}
+	}
 
 	// reset it once it's done
 	m_removeComponents.installer = false;

code/ryzom/tools/client/ryzom_installer/src/utils.cpp

@@ -239,52 +239,3 @@ bool resolveLink(const QWidget &window, const QString &pathLink, QString &pathOb
 }
 
 #endif
-
-bool copyInstallerExecutable(const QString &destination)
-{
-	QString path = QApplication::applicationDirPath();
-
-	QStringList files;
-#ifdef Q_OS_WIN
-
-	// VC++ runtimes
-#if _MSC_VER == 1900
-	files << "msvcp140.dll";
-	files << "msvcr140.dll";
-#else _MSC_VER == 1600
-	files << "msvcp100.dll";
-	files << "msvcr100.dll";
-#endif
-
-#else
-#endif
-
-	files << QFileInfo(QApplication::applicationFilePath()).fileName();
-
-	foreach(const QString &file, files)
-	{
-		// convert to absolute path
-		QString srcPath = path + "/" + file;
-		QString dstPath = destination + "/" + file;
-
-		if (QFile::exists(srcPath))
-		{
-			if (QFile::exists(dstPath))
-			{
-				if (!QFile::remove(dstPath))
-				{
-					qDebug() << "Unable to delete" << dstPath;
-				}
-			}
-
-			if (!QFile::copy(srcPath, dstPath))
-			{
-				qDebug() << "Unable to copy" << srcPath << "to" << dstPath;
-
-				return false;
-			}
-		}
-	}
-
-	return true;
-}

code/ryzom/tools/client/ryzom_installer/src/utils.h

@@ -51,6 +51,4 @@ wchar_t* qToWide(const QString &str);
 bool createLink(const QString &link, const QString &name, const QString &executable, const QString &arguments, const QString &icon, const QString &workingDir);
 bool resolveLink(const QWidget &window, const QString &pathLink, QString &pathObj);
 
-bool copyInstallerExecutable(const QString &destination);
-
 #endif