Changeset 924

Timestamp:

Feb 4, 2014, 8:36:53 PM (11 years ago)

Author:

alloc

Message:

Updated to 2.17:

• Made the download dialog a bit wider for longer mod names
• Updated XmlTools invocation to XmlTools2

Location:

java/installer2/src/net/oni2/aeinstaller

Files:

• AEInstaller.properties (modified) (1 diff)
• backend/oni/XMLTools.java (modified) (3 diffs)
• backend/oni/management/Installer.java (modified) (2 diffs)
• gui/downloadwindow/Downloader.java (modified) (1 diff)

java/installer2/src/net/oni2/aeinstaller/AEInstaller.properties

@@ -1 +1 @@
 appname=AE Installer 2
-appversion=.16
+appversion=.17

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

@@ -7 +7 @@
 import net.oni2.aeinstaller.backend.CaseInsensitiveFile;
 import net.oni2.aeinstaller.backend.Paths;
+import net.oni2.platformtools.PlatformInformation;
 import net.oni2.platformtools.applicationinvoker.ApplicationInvoker;
 import net.oni2.platformtools.applicationinvoker.ApplicationInvocationResult;
@@ -18 +19 @@
 
         /**
-         * Patch the given XML file with the given patch
+         * Patch the XML files in the path with the patches in the other path
          * 
-         * @param patch
-         *            Patchfile
-         * @param source
-         *            File to patch
+         * @param folderWithPatches
+         *            Path containing patches to apply
+         * @param folderWithXml
+         *            Path containing XML files to patch
          * 
          * @return XMLTools output
          */
-        public static ApplicationInvocationResult patch(File patch, File source) {
+        public static ApplicationInvocationResult patch(File folderWithPatches,
+                        File folderWithXml) {
                 Vector<String> params = new Vector<String>();
-                // xmlTools.exe patchfile -filename:PATCH -forceinfiles:TOPATCH
-                params.add("patchfile");
-                params.add("-filename:" + patch.getPath());
-                if (source != null)
-                        params.add("-forceinfiles:" + source.getPath());
+                // xmlTools.exe --patch-files PATCH --force-target-files TOPATCH
+                params.add("--patch-files "
+                                + new File(folderWithPatches, "*.oni-patch").getPath());
+                params.add("--use-patch-filename " + folderWithXml.getPath());
                 ApplicationInvocationResult res = null;
                 try {
-                        res = ApplicationInvoker.executeAndWait(EExeType.DOTNET, null,
+                        res = ApplicationInvoker.executeAndWait(EExeType.OSBINARY, null,
                                         getProgramFile(), params, false);
                 } catch (IOException e) {
@@ -49 +50 @@
                 File toolsPath = CaseInsensitiveFile.getCaseInsensitiveFile(
                                 Paths.getEditionBasePath(), "Tools");
-                return CaseInsensitiveFile.getCaseInsensitiveFile(toolsPath,
-                                "xmlTools.exe");
+                File xmlToolsPath = CaseInsensitiveFile.getCaseInsensitiveFile(
+                                toolsPath, "XmlTools");
+                switch (PlatformInformation.getPlatform()) {
+                        case WIN:
+                                return CaseInsensitiveFile.getCaseInsensitiveFile(xmlToolsPath,
+                                                "XmlTools.exe");
+                        case LINUX:
+                        case MACOS:
+                                return CaseInsensitiveFile.getCaseInsensitiveFile(xmlToolsPath,
+                                                "XmlTools");
+                        default:
+                }
+                return null;
         }
 }

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

@@ -7 +7 @@
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.PrintWriter;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -480 +479 @@
                         log.logAppOutput(res, true);
 
-                        // 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();
-                                patternWildcard = patternWildcard.substring(0,
-                                                patternWildcard.indexOf(".oni-patch"));
-                                patternWildcard = patternWildcard + ".xml";
-                                patternWildcard = patternWildcard.replace('-', '*');
-                                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);
-                        log.logAppOutput(res, false);
+                        // Apply patches in levelFolderXML
+                        File lastFolder = null;
+                        for (File f : patches.get(level)) {
+                                File pathOfPatch = f.getParentFile();
+                                if (!pathOfPatch.equals(lastFolder)) {
+                                        lastFolder = pathOfPatch;
+
+                                        res = XMLTools.patch(pathOfPatch, levelFolderXML);
+                                        log.logAppOutput(res, false);
+                                }
+                        }
 
                         // Create .oni files from XML

java/installer2/src/net/oni2/aeinstaller/gui/downloadwindow/Downloader.java

@@ -64 +64 @@
 
                 setResizable(false);
-                setSize(500, (int) getSize().getHeight());
+                setSize(600, (int) getSize().getHeight());
 
                 if (dependencies != null)