Changeset 653

Timestamp:

Jan 25, 2013, 3:57:36 PM (12 years ago)

Author:

alloc

Message:

AEI2 0.99g:

• Fixed MacOS launch
• Added version information to installation.log

Location:

AE/installer2/src/net/oni2/aeinstaller

Files:

• AEInstaller.properties (modified) (1 diff)
• AEInstaller2.java (modified) (3 diffs)
• backend/oni/Installer.java (modified) (7 diffs)

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

@@ -1 +1 @@
 appname=AE Installer 2
-appversion=0.99f
+appversion=0.99g

AE/installer2/src/net/oni2/aeinstaller/AEInstaller2.java

@@ -60 +60 @@
                         e.printStackTrace();
                 }
+        }
+        
+        private static void initBundles() {
+                File localesDir = new File(Paths.getInstallerPath(), "locales");
+                if (localesDir.isDirectory())
+                        addClassPath(localesDir);
+                imagesBundle = ResourceBundle.getBundle("net.oni2.aeinstaller.Images");
+                basicBundle = ResourceBundle
+                                .getBundle("net.oni2.aeinstaller.AEInstaller");
+                globalBundle = ResourceBundle
+                                .getBundle("net.oni2.aeinstaller.localization.Global");
         }
 
@@ -107 +118 @@
                         }
                 }
+                
+                initBundles();
 
                 if (Settings.getPlatform() == Platform.MACOS)
@@ -115 +128 @@
                 Settings.setDebug(debug);
                 Settings.getInstance().setNoCacheUpdateMode(noCacheUpdate);
-
-                File localesDir = new File(Paths.getInstallerPath(), "locales");
-                if (localesDir.isDirectory())
-                        addClassPath(localesDir);
-                imagesBundle = ResourceBundle.getBundle("net.oni2.aeinstaller.Images");
-                basicBundle = ResourceBundle
-                                .getBundle("net.oni2.aeinstaller.AEInstaller");
-                globalBundle = ResourceBundle
-                                .getBundle("net.oni2.aeinstaller.localization.Global");
 
                 SwingJavaBuilder.getConfig().addResourceBundle(imagesBundle);

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

@@ -213 +213 @@
                 }
 
+                File logFile = new File(Paths.getInstallerPath(), "Installation.log");
+                PrintWriter log = null;
+                try {
+                        log = new PrintWriter(logFile);
+                } catch (FileNotFoundException e) {
+                        e.printStackTrace();
+                }
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                Date start = new Date();
+                log.println("Installation of mods started at " + sdf.format(start));
+
+                log.println();
+                log.println("Installed tools:");
+                for (Package t : PackageManager.getInstance().getInstalledTools()) {
+                        log.println(String.format(" - %s (%s)", t.getName(), t.getVersion()));
+                }
+                log.println("Installing mods:");
+                for (Package m : mods) {
+                        log.println(String.format(" - %s (%s)", m.getName(), m.getVersion()));
+                }
+                log.println();
+
                 File installCfg = new File(Paths.getEditionGDF(), "installed_mods.xml");
                 PackageManager.getInstance().saveModSelection(installCfg, mods);
 
-                HashSet<Integer> unlockLevels = new HashSet<Integer>();
+                TreeSet<Integer> unlockLevels = new TreeSet<Integer>();
 
                 Vector<File> foldersOni = new Vector<File>();
@@ -243 +265 @@
                         }
                 }
-                combineBinaryFiles(foldersOni, listener);
-                combineBSLFolders(mods, listener);
-
-                copyVideos();
+                combineBinaryFiles(foldersOni, listener, log);
+                combineBSLFolders(mods, listener, log);
+
+                copyVideos(log);
 
                 if (unlockLevels.size() > 0) {
-                        unlockLevels(unlockLevels);
-                }
+                        unlockLevels(unlockLevels, log);
+                }
+
+                Date end = new Date();
+                log.println("Initialization ended at " + sdf.format(end));
+                log.println("Process took "
+                                + ((end.getTime() - start.getTime()) / 1000) + " seconds");
+                log.close();
         }
 
         private static void combineBSLFolders(TreeSet<Package> mods,
-                        InstallProgressListener listener) {
+                        InstallProgressListener listener, PrintWriter log) {
                 listener.installProgressUpdate(95, 100, "Installing BSL files");
+                log.println("Installing BSL files");
 
                 HashMap<EBSLInstallType, Vector<Package>> modsToInclude = new HashMap<EBSLInstallType, Vector<Package>>();
@@ -351 +380 @@
 
         private static void combineBinaryFiles(List<File> srcFoldersFiles,
-                        InstallProgressListener listener) {
+                        InstallProgressListener listener, PrintWriter log) {
                 TreeMap<String, Vector<File>> levels = new TreeMap<String, Vector<File>>();
 
@@ -379 +408 @@
                 totalSteps++;
 
-                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-
-                File logFile = new File(Paths.getInstallerPath(), "Installation.log");
-                PrintWriter log = null;
-                try {
-                        log = new PrintWriter(logFile);
-                } catch (FileNotFoundException e) {
-                        e.printStackTrace();
-                }
-
-                Date start = new Date();
-                log.println("Installation of mods started at " + sdf.format(start));
-
                 log.println("Importing levels");
                 for (String l : levels.keySet()) {
@@ -411 +427 @@
                         stepsDone++;
                 }
-
-                Date end = new Date();
-                log.println("Initialization ended at " + sdf.format(end));
-                log.println("Process took "
-                                + ((end.getTime() - start.getTime()) / 1000) + " seconds");
-                log.close();
-        }
-
-        private static void copyVideos() {
+        }
+
+        private static void copyVideos(PrintWriter log) {
                 if (Settings.getInstance().get("copyintro", false)) {
                         File src = new File(Paths.getVanillaGDF(), "intro.bik");
+                        log.println("Copying intro");
                         if (src.exists()) {
                                 try {
@@ -432 +443 @@
                 if (Settings.getInstance().get("copyoutro", true)) {
                         File src = new File(Paths.getVanillaGDF(), "outro.bik");
+                        log.println("Copying outro");
                         if (src.exists()) {
                                 try {
@@ -442 +454 @@
         }
 
-        private static void unlockLevels(HashSet<Integer> unlockLevels) {
+        private static void unlockLevels(TreeSet<Integer> unlockLevels,
+                        PrintWriter log) {
                 File dat = new File(Paths.getEditionBasePath(), "persist.dat");
+                log.println("Unlocking levels: " + unlockLevels.toString());
                 if (!dat.exists()) {
-                        InputStream is = AEInstaller2.class.getResourceAsStream("/net/oni2/aeinstaller/resources/persist.dat");
+                        InputStream is = AEInstaller2.class
+                                        .getResourceAsStream("/net/oni2/aeinstaller/resources/persist.dat");
                         try {
                                 FileUtils.copyInputStreamToFile(is, dat);