Sfoglia il codice sorgente

Add "done" message to package command

Billy Barrow 6 mesi fa
parent
commit
8ffba3fff2
1 ha cambiato i file con 8 aggiunte e 52 eliminazioni
  1. 8 52
      src/cli/Manifest.vala

+ 8 - 52
src/cli/Manifest.vala

@@ -305,57 +305,13 @@ private int package() {
         printerr("Manifest does not specify an acquire script, assuming we have everything we need already and packaging.\n");
     }
 
-    var proc = new Subprocess.newv(new string[] { "tar", "-cJf", @"../$(manifest.name)-$(manifest.version).usmc", "."}, SubprocessFlags.INHERIT_FDS);
-    return proc.wait_check() ? 0 : 254;
-
-    //  var parent_working_dir = GLib.File.new_for_path (".");
-
-    //  // Create the tar.gz archive named according the the first argument.
-    //  Archive.Write archive = new Archive.Write ();
-    //  archive.add_filter_xz();
-    //  archive.set_format_pax_restricted ();
-    //  archive.open_filename (@"../$(manifest.name)-$(manifest.version).usmc");
-
-    //  var files = new Invercargill.Fifo<string>();
-    //  Invercargill.directory(".").iterate(d => files.push(d));
-
-    //  // Add all the other arguments into the archive
-    //  foreach (var path in files) {
-    //      var file = GLib.File.new_for_path (path);
-    //      try {
-    //          GLib.FileInfo file_info = file.query_info (GLib.FileAttribute.STANDARD_SIZE, GLib.FileQueryInfoFlags.NONE);
-    //          FileInputStream input_stream = file.read ();
-    //          DataInputStream data_input_stream = new DataInputStream (input_stream);
-
-    //          // Add an entry to the archive
-    //          Archive.Entry entry = new Archive.Entry ();
-    //          entry.set_pathname (parent_working_dir.get_relative_path (file));
-    //          entry.set_size ((Archive.int64_t)file_info.get_size ());
-    //          entry.set_filetype ((uint)Posix.S_IFREG);
-    //          entry.set_perm (0644);
-    //          if (archive.write_header (entry) != Archive.Result.OK) {
-    //              critical ("Error writing '%s': %s (%d)", file.get_path (), archive.error_string (), archive.errno ());
-    //              continue;
-    //          }
-
-    //          // Add the actual content of the file
-    //          size_t bytes_read;
-    //          uint8[] buffer = new uint8[64];
-    //          while (data_input_stream.read_all (buffer, out bytes_read)) {
-    //              if (bytes_read <= 0) {
-    //                  break;
-    //              }
-
-    //              archive.write_data(buffer[:bytes_read]);
-    //          }
-    //      } catch (Error e) {
-    //          critical (e.message);
-    //      }
-    //  }
-
-    //  if (archive.close () != Archive.Result.OK) {
-    //      error ("Error : %s (%d)", archive.error_string (), archive.errno ());
-    //  }
+    var output = @"../$(manifest.name)-$(manifest.version).usmc";
+    var proc = new Subprocess.newv(new string[] { "tar", "-cJf", output, "."}, SubprocessFlags.INHERIT_FDS);
+    var result = proc.wait_check() ? 0 : 254;
 
-    return 0;
+    if(result == 0) {
+        printerr(@"Wrote package to path \"$(output)\"\n");
+    }
+
+    return result;
 }