Changeset 744 for java/installer2/src/net/oni2/aeinstaller/backend/oni

Timestamp:

Mar 26, 2013, 1:22:47 PM (12 years ago)

Author:

alloc

Message:

AEI2 0.99w:

• Bottom part of main win made a bit tighter (less wasted space below/above)
• Use natural order for levels on initialization/installation (0, 1, 2, ..., 10 ... instead of 0, 1, 10, ...)
• Adapter patching to xmlTools >0.8b so it only spawns one instance of xmlTools per level

Location:

java/installer2/src/net/oni2/aeinstaller/backend/oni

Files:

• Installer.java (modified) (5 diffs)
• XMLTools.java (modified) (1 diff)

java/installer2/src/net/oni2/aeinstaller/backend/oni/Installer.java

@@ -314 +314 @@
                 }
 
-                TreeMap<String, Vector<File>> levels = new TreeMap<String, Vector<File>>(new NaturalOrderComparator());
+                TreeMap<String, Vector<File>> levels = new TreeMap<String, Vector<File>>(
+                                new NaturalOrderComparator());
                 for (File path : foldersOni) {
                         for (File levelF : path.listFiles()) {
@@ -479 +480 @@
                 tmpFolder.mkdir();
 
-                TreeMap<String, Vector<File>> patches = new TreeMap<String, Vector<File>>(new NaturalOrderComparator());
+                TreeMap<String, Vector<File>> patches = new TreeMap<String, Vector<File>>(
+                                new NaturalOrderComparator());
                 for (File patchFolder : patchFolders) {
                         for (File levelFolder : patchFolder.listFiles(dirFileFilter)) {
@@ -563 +565 @@
                         logAppOutput(res, log);
 
-                        // Apply patches in levelFolderXML
+                        // Create masterpatch file (containing calls to all individual
+                        // patches)
+                        File masterpatch = new File(levelFolderXML, "masterpatch.oni-patch");
+                        PrintWriter masterpatchWriter = null;
+                        try {
+                                masterpatchWriter = new PrintWriter(masterpatch);
+                        } catch (FileNotFoundException e) {
+                                e.printStackTrace();
+                        }
                         for (File patch : patches.get(level)) {
                                 String patternWildcard = patch.getName();
@@ -570 +580 @@
                                 patternWildcard = patternWildcard + ".xml";
                                 patternWildcard = patternWildcard.replace('-', '*');
-
-                                res = XMLTools.patch(patch, new File(levelFolderXML,
-                                                patternWildcard));
-                                logAppOutput(res, log);
-                        }
+                                File xmlFilePath = new File(levelFolderXML, patternWildcard);
+                                masterpatchWriter.println(String.format("@COMMAND patchfile -filename:\"%s\" -forceinfiles:\"%s\"", patch.getPath(), xmlFilePath.getPath()));
+                        }
+                        masterpatchWriter.close();
+                        // Apply patches through masterpatch in levelFolderXML
+                        res = XMLTools.patch(masterpatch, null);
+                        logAppOutput(res, log);
 
                         // Create .oni files from XML
@@ -749 +761 @@
 
                         log.println("Reimporting levels");
-                        TreeSet<File> initFolders = new TreeSet<File>(new NaturalOrderComparator());
+                        TreeSet<File> initFolders = new TreeSet<File>(
+                                        new NaturalOrderComparator());
                         for (File f : init.listFiles()) {
                                 initFolders.add(f);

java/installer2/src/net/oni2/aeinstaller/backend/oni/XMLTools.java

@@ -32 +32 @@
                 params.add("patchfile");
                 params.add("-filename:" + patch.getPath());
-                params.add("-forceinfiles:" + source.getPath());
+                if (source != null)
+                        params.add("-forceinfiles:" + source.getPath());
                 ApplicationInvocationResult res = null;
                 try {