Changeset 1545

Timestamp:

2000-09-14T02:01:44+12:00 (24 years ago)

Author:

cs025

Message:

Improved logging of manifest items, tidied the handling of items with extended
paths in the manifest (logging creation of directories on the path); finally
removed some old garbage from gsinstall.cpp.

Location:

trunk/gsinstaller

Files:

• fileCopier.cpp (modified) (4 diffs)
• fileCopier.h (modified) (2 diffs)
• gsManifest.cpp (modified) (1 diff)
• gsManifest.h (modified) (1 diff)
• gsinstall.cpp (modified) (10 diffs)

trunk/gsinstaller/fileCopier.cpp

@@ -48 +48 @@
 }
 
+bool fileCopySet::ensureParent(FilePath &child, fileCopyMonitor *monitor)
+{ FilePath *parentName = child.parent();
+
+    // check for existence of parent
+    if (parentName->exists() == false)
+  { // ensure the grandparent exists
+    if (!this->ensureParent(*parentName, monitor))
+    { return false;
+    }
+
+    // create parent directory
+    _mkdir(parentName->cString());
+
+    // log the creation - we don't give a source - it's not needed for directories
+    if (monitor != NULL)
+    {   monitor->copiedDir(parentName->cString());
+    }
+  }
+    delete parentName;
+  return true;
+}
+
 /**
  * Copy a particular file to its destination
@@ -62 +84 @@
   destination = this->destination(file);
 
+  // ensure that the parent exists, as some install requirements are for files with
+  // directory paths which may not preexist
     FilePath destPath(destination);
-  FilePath *destDir = destPath.parent();
-  if (!destDir->ensureWriteablePath())
-  { delete destDir;
-    return false;
-  }
-  delete destDir;
+  this->ensureParent(destPath, monitor);
 
   // get read and write file handles
@@ -112 +131 @@
   if (monitor != NULL)
     {
-      monitor->copied(file->cString(), destination, false);
+      monitor->copiedFile(file->cString(), destination);
     }
   delete destination;
@@ -133 +152 @@
   if (file->isDirectory())
     {
-      // create directory
+      // get destination directory
       char *thisDestDir = this->destination(file);
-      _mkdir(thisDestDir);
-
-      // note amount of data copied
-      // this->copied += file->getRawFileSize();
-
-      // note for uninstall the action done
-      if (monitor != NULL)
-    {
-      monitor->copied(file->cString(), thisDestDir, true);
-    }
+      FilePath destPath(thisDestDir);
+
+      // create a directory if needsbe
+      if (destPath.exists() == false)
+      {
+        _mkdir(thisDestDir);
+
+          // note amount of data copied
+        // this->copied += file->getRawFileSize();
+
+          // note for uninstall the action done
+        if (monitor != NULL)
+            {
+                monitor->copiedDir(thisDestDir);
+            }
+      }
 
       // copy children

trunk/gsinstaller/fileCopier.h

@@ -9 +9 @@
 public:
   fileCopyMonitor() {};
-  virtual void copied(string from, string to, bool isDir) = 0;
+  virtual void copiedFile(string from, string to) = 0;
+  virtual void copiedDir(string dirName) = 0;
 };
 
@@ -25 +26 @@
   unsigned long getOriginalSize();
   unsigned long getCopiedSize(DiskSpace &space);
+  bool ensureParent(FilePath &child, fileCopyMonitor *monitor);
   bool copyFile(File *file, fileCopyMonitor *monitor, copyProgressBar &progressBar);
   void copy(File *file, fileCopyMonitor *monitor, copyProgressBar &progressBar);

trunk/gsinstaller/gsManifest.cpp

@@ -278 +278 @@
 }
 
-void gsManifest::copied(string from, string to, bool isDir)
-{
-  if (isDir)
-    {
-      this->logAction("Manifest.CreateDir", to);
-    }
-  else
-    {   
-      this->logAction("Manifest.CopyFile", from, to);
-    }
+void gsManifest::copiedFile(string from, string to)
+{ this->logAction("Manifest.CopyFile", from, to);
+}
+
+void gsManifest::copiedDir(string dirName)
+{ this->logAction("Manifest.CreateDir", dirName);
 }
 

trunk/gsinstaller/gsManifest.h

@@ -48 +48 @@
   bool selectCheckSpace();
   
-  void copied(string from, string to, bool isDir); // from fileCopyMonitor
+  void copiedFile(string from, string to); // from fileCopyMonitor
+  void copiedDir(string dirName); // from fileCopyMonitor
 };
 #endif;

trunk/gsinstaller/gsinstall.cpp

@@ -371 +371 @@
   // if we are not running in the Windows temporary directory, copy this exe
   // and the installation log to the temporary directory and run them there
+  MessageBox(0, tempPath.cString(), this->sourcePath->cString(), MB_OK);
   if (*this->sourcePath != tempPath)
     {
@@ -921 +922 @@
     case WM_USER:
       {
+    if (strstr(app_cmdLine, "-u") != NULL)
+      {
     // uninstall action
-    if (strstr(app_cmdLine, "-u") != NULL)
-      {
+
         // skip past the -u option itself
         char *at = strstr(app_cmdLine, "-u");
         at += strlen("-u");
-        
+
         // extract the log file path from the command line
         while (*at == ' ')
-          { 
+          {
         at ++;
           }
@@ -941 +943 @@
           {
           install.uninstall();
-          
+
           // close the log to write back all changes to the log; if the file
           // will be deleted, it must be closed; copying may also fail, so it's
           // safer to close it before doing either.
           install.closeLog();
-          
+
           // if the install is empty, terminate all final items (currently the
           // log and setup executables,
@@ -953 +955 @@
           // delete the log file
           DeleteFile(logPath.cString());
-          
+
           // get it's parent to find where the gssetup executable will be
           FilePath *logParent = logPath.parent();
@@ -973 +975 @@
     // install wizard
     else
-      { 
+      {
         GSInstall install(false);
         GSInstall_init_wizard(install);
@@ -1007 +1009 @@
       break;
       
+    case WM_USER + 1:
+    break;
+
     case WM_CLOSE:
       /*if (!file_ischanged || IDCANCEL != file_query(Window, file_name))*/
@@ -1038 +1043 @@
                 app_instance,
                 NULL);
-  
+
   ShowWindow(app_window, Show);
-  
+
   PostMessage(app_window, WM_USER, 0, 0L);
 }
 
 void WinClassInit(void)
-{ 
+{
   WNDCLASS Class;
 
@@ -1055 +1060 @@
   Class.lpszMenuName = NULL;
   Class.hbrBackground = (HBRUSH) (COLOR_APPWORKSPACE+1);
-  //Class.style = NULL;
   Class.style = 0;
   Class.cbClsExtra = 0;
   Class.cbWndExtra = 0;
   RegisterClass(&Class);
-  /*
-    Class.lpszClassName = "GSInstall:Splash";
-    Class.hInstance = app_instance;
-    Class.lpfnWndProc = (WNDPROC) splash_windproc;
-    Class.hCursor = LoadCursor(NULL, IDC_ARROW);
-    Class.hIcon = NULL;
-    Class.lpszMenuName = NULL;
-    Class.hbrBackground = (HBRUSH) (COLOR_WINDOW+1);
-    Class.style = NULL;
-    Class.cbClsExtra = 0;
-    Class.cbWndExtra = 0;
-    RegisterClass(&Class);*/
 }
 
@@ -1080 +1072 @@
 { 
   MSG msg;
-  // HACCEL accel;
 
   app_cmdLine = (char *) malloc(lstrlen(CmdLine) + 1);
@@ -1091 +1082 @@
       WinClassInit();
       InitCommonControls();
-      //    grbStatic_registerClass(Current);
-    }
-  
+    }
+
   /* -- init instance */
   GSInstall_init(Current, CmdShow);
-  
-  //  config_init("ReTreeval");
-
-  //  accel = LoadAccelerators(Current, "ReTreevalMenu");
 
   while (GetMessage(&msg, NULL, 0, 0))
     {
-      /*if (!TranslateAccelerator(app_window, accel, &msg))
-    { */
       TranslateMessage(&msg);
       DispatchMessage(&msg);
-      /*}*/
     }
   return (int) msg.wParam;