Changeset 496

Timestamp:

Feb 22, 2010, 1:00:55 AM (15 years ago)

Author:

gumby

Message:

Windows fixes.

Location:

AE/Installer/trunk/source

Files:

• installer.cpp (modified) (7 diffs)
• replace_installer.bat (modified) (1 diff)

AE/Installer/trunk/source/installer.cpp

@@ -1143 +1143 @@
 #ifdef WIN32
         // TODO: Fill in Windows equivalent of code below :-3
+        popenCommand = "replace_installer.bat";
 #else
         // We can't just use '~' to mean "the home directory" because we need to check the path in C...
@@ -1164 +1165 @@
         file.close();
         file.clear();
+#ifdef WIN32
+        system(popenCommand.c_str());
+#else
         popen(popenCommand.c_str(), "r");
-        
+#endif
         return true; // returning 'true' tells the Installer to quit itself ASAP so it can be replaced by the process that is now running
 }
@@ -1196 +1200 @@
         // TODO: Fill in Windows equivalent of code below
 #ifdef WIN32
-        string strTrashDir = "%RECYCLE%";
+        string strTrashDir = "Trash\\";
 #else
         FILE *fUserName = NULL;
@@ -1241 +1245 @@
                 }
         }
-        
+#ifndef WIN32
         if (!*installerJustUpdated || needNewTrashDir) // prepare a new directory for deleted files to go to
         {
@@ -1249 +1253 @@
                 create_directory(strTrashDir);
         }
+#endif
         file.close();
         file.clear();
@@ -1324 +1329 @@
                                 aParentPath = aParentPath + "/";
                         }
+#ifndef WIN32
                         rename((path)("../" + thePath), (path)(strTrashDir + thePath));
+#else
+                        remove((path)("../" + thePath));
+#endif
                 }
         }
@@ -1347 +1356 @@
                                 if (iter1->modStringVersion > iter2->modStringVersion)
                                 {
+#ifndef WIN32
                                         rename((path)(strPathToPackages + iter2->modStringName), (path)(strTrashDir + iter2->modStringName));
+#else
+                                        remove((path)(strPathToPackages + iter2->modStringName));
+#endif
                                         rename((path)(strPathToEUFNPackages + iter1->modStringName), (path)(strPathToPackages + iter1->modStringName));
                                 }

AE/Installer/trunk/source/replace_installer.bat

@@ -1 @@
-SLEEP 1
-REM %~dp is the directory of the batch file
-if exist %~dp\AEInstaller.exe (
-        if exist %~dp\..\..\..\install\AEInstaller.exe (
-                DEL %1
+PING -n 1 127.0.0.1>nul
+cd "%~dp0" /D
+if exist AEInstaller.exe (
+        if exist .\..\..\..\install\AEInstaller.exe (
+                DEL .\..\..\..\install\AEInstaller.exe 
         )
-        else (
-                exit
-        )
-        MOVE %~dp/AEInstaller.exe  %~dp\..\..\..\install\
-        START %~dp\..\..\..\install\AEInstaller.exe
+
+        COPY AEInstaller.exe  .\..\..\..\install\
+        START ..\..\..\install\AEInstaller.exe
 )
-ELSE (
-        START %~dp\AEInstaller.exe
-)