buildSrc/images/src/main/java/org/openjdk/skara/gradle/images/LaunchersTask.java

*** 35,17 ***
--- 35,19 ---
  import java.util.Comparator;
  
  public class LaunchersTask extends DefaultTask {
      private Property<Path> toDir;
      private Property<String> os;
+     private Property<String> cpu;
      private MapProperty<String, String> launchers;
      private ListProperty<String> options;
  
      @Inject
      public LaunchersTask(ObjectFactory factory) {
          toDir = factory.property(Path.class);
          os = factory.property(String.class);
+         cpu = factory.property(String.class);
          launchers = factory.mapProperty(String.class, String.class);
          options = factory.listProperty(String.class);
      }
  
      @Input

*** 61,10 ***
--- 63,15 ---
      @Input
      Property<String> getOS() {
          return os;
      }
  
+     @Input
+     Property<String> getCPU() {
+         return cpu;
+     }
+ 
      @Input
      MapProperty<String, String> getLaunchers() {
          return launchers;
      }
  

*** 75,11 ***
                  .forEach(File::delete);
      }
  
      @TaskAction
      void generate() throws IOException {
!         var dest = toDir.get().resolve(os.get());
          if (Files.isDirectory(dest)) {
              clearDirectory(dest);
          }
          Files.createDirectories(dest);
          var optionString = String.join(" ", options.get());
--- 82,11 ---
                  .forEach(File::delete);
      }
  
      @TaskAction
      void generate() throws IOException {
!         var dest = toDir.get().resolve(os.get() + "-" + cpu.get());
          if (Files.isDirectory(dest)) {
              clearDirectory(dest);
          }
          Files.createDirectories(dest);
          var optionString = String.join(" ", options.get());