Changeset 565

Timestamp:

Jun 1, 2010, 3:13:59 PM (14 years ago)

Author:

iritscen

Message:

Fixing (hopefully) update bug stemming from extra return characters (\r) messing up string comparisons.
Converting #defined installer version global to static string just to be safe (what was I thinking?).

Location:

AE/Installer/trunk/source

Files:

• about.cpp (modified) (1 diff)
• globals.h (modified) (4 diffs)
• installer.cpp (modified) (10 diffs)
• main_window.cpp (modified) (1 diff)

AE/Installer/trunk/source/about.cpp

@@ -112 +112 @@
         
         string aboutText = "AE Installer v";
-        aboutText = aboutText + INSTALLER_VERSION;
+        aboutText = aboutText + gInstallerVersion;
         aboutText = aboutText + "\nby Gumby and Iritscen\n\n" +
                                                         "AE Credits:\n" +

AE/Installer/trunk/source/globals.h

@@ -40 +40 @@
 using namespace std;
 
-//#pragma mark DEFINES
-#define INSTALLER_VERSION                "1.1" // only place in source we need to change this
 #define UPDATE_LOG_READ_ERR             -1
 #define UPDATE_INST_REPL_ERR    -2
@@ -51 +49 @@
 #define UPDATE_CONT_UPD                  4
 #define UPDATE_PKG_AVAIL                 5
-//#pragma mark STRUCTS
+
 struct ModPackage
 {
@@ -91 +89 @@
 };
 
-
-//#pragma mark PROTOTYPES
 void recompileAll(vector<string>);
 int globalizeData(void);
@@ -106 +102 @@
 void copy_directory(const path &from_dir_ph, const path &to_dir_ph);
 void copy(const path &from_file_ph, const path &to_file_ph);
+
+static string gInstallerVersion = "1.11"; // only place in source we need to change this

AE/Installer/trunk/source/installer.cpp

@@ -25 +25 @@
 using namespace boost::posix_time;
 
-// externs declared in installer.h
 string strInstallCfg = "../GameDataFolder/Add.cfg";
 string strEUFN = "Edition"; // GetUpdateStatus() may set this to "Edition-patch" later, but this is the assumed name of the new Edition folder in Updates/
@@ -349 +348 @@
                         {
                                 package = fileToModPackage(file, dir_itr->path().filename());
-                                if (package.installerVersion.compare(INSTALLER_VERSION) < 1)  // if mod requires newer version of the Installer, we won't add it to the list
+                                
+                                if (package.installerVersion.compare(gInstallerVersion) < 1)  // if mod requires newer version of the Installer, we won't add it to the list
                                 {
 #ifdef WIN32
@@ -375 +375 @@
 {       
         ModPackage package;
-        string line;
         const string AEInstallVersion = "AEInstallVersion"; // used for comparing to the current token...
         const string NameOfMod = "NameOfMod";
@@ -393 +392 @@
         while (!file.eof())
         {
-                getline(file,line);
-                vector<string> tokens; 
+                string line;
+                getline(file, line);
+                vector<string> tokens;
                 vector<string>::iterator iter;
                 tokenize(line, tokens);
                 if (tokens.capacity() >= 3)
                 {
+                        for (int a = 0; a < tokens.size(); a++)
+                                StripNewlines(&tokens.at(a));
                         iter = tokens.begin();
-
+                        
                         if (!AEInstallVersion.compare(*iter))
                         {
@@ -942 +944 @@
                                         {
                                                 readingInstallerVersion = false;
-                                                string installerVersion = INSTALLER_VERSION;
-                                                if (installerVersion.compare(*iter)) // then the shell script-powered replacement failed
+                                                if (gInstallerVersion.compare(*iter)) // then the shell script-powered replacement failed
                                                         return UPDATE_INST_REPL_ERR;
                                                 else
@@ -957 +958 @@
                                                                 ptime startTime(second_clock::local_time());
                                                                 string strStartTime = to_simple_string(startTime);
-                                                                string newUpdateLine = installerVersion + " on " + strStartTime;
+                                                                string newUpdateLine = gInstallerVersion + " on " + strStartTime;
                                                                 for (int a = 0; a < lines.capacity() - 2; a++) // if there were even lines in the log before this at all
                                                                 {
@@ -987 +988 @@
                 {
                         string strNewInstallerPath = "../updates/" + strEUFN + "/install/" + strInstallerName;
-                        string installerVersion = INSTALLER_VERSION;
-                        if (updateAE->InstallerVersion.compare(installerVersion) >= 1)
+                        if (updateAE->InstallerVersion.compare(gInstallerVersion) >= 1)
                         {
                                 if (exists(strNewInstallerPath))
@@ -1030 +1030 @@
                                                 if (updatePackage.modStringVersion > installedPackage.modStringVersion)
                                                 {
-                                                        if (updatePackage.installerVersion <= INSTALLER_VERSION)
+                                                        if (updatePackage.installerVersion.compare(gInstallerVersion) < 1)
                                                                 return UPDATE_PKG_AVAIL;
                                                 }
@@ -1617 +1617 @@
                                 if (updatePackage.modStringVersion > installedPackage.modStringVersion)
                                 {
-                                        if (updatePackage.installerVersion <= INSTALLER_VERSION)
+                                        if (updatePackage.installerVersion.compare(gInstallerVersion) < 1)
                                         {
                                                 if(exists(strPathToPackages +  "/" + updatePackage.modStringName)) {
@@ -1690 +1690 @@
 /* StripNewlines() gets rids of any linebreaks that come from text returned by getline(); \
 |  getline() should be stripping those out, but Windows CR/LF files seem to be sneaking   |
-\  some extra return characters into strings in the ReadInstallInfoCfg() function.               */
+\  some extra return characters into strings.                                                                                    */
 void StripNewlines(string *theLine)
 {

AE/Installer/trunk/source/main_window.cpp

@@ -289 +289 @@
     StatusArea->SetName(_T("StatusArea"));
     StatusArea->SetFieldsCount(1);
-        string versionText = "AE Installer v" + (string)INSTALLER_VERSION;
+        string versionText = "AE Installer v" + gInstallerVersion;
     StatusArea->SetStatusText(versionText.c_str(), 0);
     itemBoxSizer2->Add(StatusArea, 0, wxGROW|wxALL, 0);