Changeset 730 for java/installer2
- Timestamp:
- Mar 21, 2013, 6:25:39 PM (12 years ago)
- Location:
- java/installer2
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
java/installer2/.classpath
r720 r730 3 3 <classpathentry kind="src" path="src"/> 4 4 <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> 5 <classpathentry kind="lib" path="/home/ci/Development/Oni/_Libraries/swingbuilder/betterbeansbinding-core-1.3.0.jar"/>6 <classpathentry kind="lib" path="/home/ci/Development/Oni/_Libraries/swingbuilder/betterbeansbinding-el-1.3.0.jar"/>7 <classpathentry kind="lib" path="/home/ci/Development/Oni/_Libraries/swingbuilder/betterbeansbinding-swingbinding-1.3.0.jar"/>8 <classpathentry kind="lib" path="/home/ci/Development/Oni/_Libraries/swingbuilder/commons-lang-2.4.jar"/>9 <classpathentry kind="lib" path="/home/ci/Development/Oni/_Libraries/swingbuilder/javabuilder-core-1.1.0.jar"/>10 <classpathentry kind="lib" path="/home/ci/Development/Oni/_Libraries/swingbuilder/javabuilder-swing-1.1.0.jar"/>11 <classpathentry kind="lib" path="/home/ci/Development/Oni/_Libraries/swingbuilder/jsr305-1.3.7.jar"/>12 <classpathentry kind="lib" path="/home/ci/Development/Oni/_Libraries/swingbuilder/miglayout-3.7.1.jar"/>13 <classpathentry kind="lib" path="/home/ci/Development/Oni/_Libraries/swingbuilder/slf4j-api-1.6.1.jar"/>14 <classpathentry kind="lib" path="/home/ci/Development/Oni/_Libraries/swingbuilder/slf4j-simple-1.6.1.jar"/>15 <classpathentry kind="lib" path="/home/ci/Development/Oni/_Libraries/swingbuilder/snakeyaml-1.7.jar"/>16 <classpathentry kind="lib" path="/home/ci/Development/Oni/_Libraries/JSON-java.jar"/>17 <classpathentry kind="lib" path="/home/ci/Development/Oni/_Libraries/httpclient/httpclient-4.2.2.jar"/>18 <classpathentry kind="lib" path="/home/ci/Development/Oni/_Libraries/httpclient/httpcore-4.2.2.jar"/>19 <classpathentry kind="lib" path="/home/ci/Development/Oni/_Libraries/httpclient/commons-logging-1.1.1.jar"/>20 <classpathentry kind="lib" path="/home/ci/Development/Oni/_Libraries/xstream-1.4.3.jar"/>21 <classpathentry kind="lib" path="/home/ci/Development/Oni/_Libraries/macify.jar"/>22 <classpathentry kind="lib" path="/home/ci/Development/Oni/_Libraries/commons-io-2.4.jar">23 <attributes>24 <attribute name="javadoc_location" value="jar:platform:/resource/OniJavaLibraries/commons-io-2.4-javadoc.jar!/"/>25 </attributes>26 </classpathentry>27 5 <classpathentry combineaccessrules="false" kind="src" path="/ProgramSettings"/> 28 6 <classpathentry combineaccessrules="false" kind="src" path="/PlatformTools"/> 7 <classpathentry kind="lib" path="/_ThirdPartyLibs/httpclient/commons-logging-1.1.1.jar"/> 8 <classpathentry kind="lib" path="/_ThirdPartyLibs/httpclient/httpclient-4.2.2.jar"/> 9 <classpathentry kind="lib" path="/_ThirdPartyLibs/httpclient/httpcore-4.2.2.jar"/> 10 <classpathentry kind="lib" path="/_ThirdPartyLibs/swingbuilder/betterbeansbinding-core-1.3.0.jar"/> 11 <classpathentry kind="lib" path="/_ThirdPartyLibs/swingbuilder/betterbeansbinding-el-1.3.0.jar"/> 12 <classpathentry kind="lib" path="/_ThirdPartyLibs/swingbuilder/betterbeansbinding-swingbinding-1.3.0.jar"/> 13 <classpathentry kind="lib" path="/_ThirdPartyLibs/swingbuilder/commons-lang-2.4.jar"/> 14 <classpathentry kind="lib" path="/_ThirdPartyLibs/swingbuilder/javabuilder-core-1.1.0.jar"/> 15 <classpathentry kind="lib" path="/_ThirdPartyLibs/swingbuilder/javabuilder-swing-1.1.0.jar"/> 16 <classpathentry kind="lib" path="/_ThirdPartyLibs/swingbuilder/jsr305-1.3.7.jar"/> 17 <classpathentry kind="lib" path="/_ThirdPartyLibs/swingbuilder/miglayout-3.7.1.jar"/> 18 <classpathentry kind="lib" path="/_ThirdPartyLibs/swingbuilder/slf4j-api-1.6.1.jar"/> 19 <classpathentry kind="lib" path="/_ThirdPartyLibs/swingbuilder/slf4j-simple-1.6.1.jar"/> 20 <classpathentry kind="lib" path="/_ThirdPartyLibs/swingbuilder/snakeyaml-1.7.jar"/> 21 <classpathentry kind="lib" path="/_ThirdPartyLibs/commons-io-2.4.jar"/> 22 <classpathentry kind="lib" path="/_ThirdPartyLibs/JSON-java.jar"/> 23 <classpathentry kind="lib" path="/_ThirdPartyLibs/macify.jar"/> 24 <classpathentry kind="lib" path="/_ThirdPartyLibs/xstream-1.4.3.jar"/> 25 <classpathentry combineaccessrules="false" kind="src" path="/SVNAccess"/> 29 26 <classpathentry kind="output" path="bin"/> 30 27 </classpath> -
java/installer2/locales/net/oni2/aeinstaller/localization/Global_de.properties
r658 r730 10 10 offlineModeStartup.title=Offline-Modus 11 11 offlineModeStartup.text=Es konnte keine Verbindung zum ModDepot hergestellt werden.\nAEI wird im Offline-Modus ausgeführt.\nAktualisierungen oder Downloads sind nicht möglich. 12 13 aeiUpdateAvailable.title=Aktualisierung verfügbar! 14 aeiUpdateAvailable.text=Eine Aktualisierung für den AEInstaller ist verfügbar.\nBitte jetzt mit einem Klick auf Ja updaten. -
java/installer2/src/net/oni2/aeinstaller/AEInstaller.properties
r720 r730 1 1 appname=AE Installer 2 2 appversion=0.99 v2 appversion=0.99w -
java/installer2/src/net/oni2/aeinstaller/AEInstaller2.java
r720 r730 32 32 import net.oni2.platformtools.PlatformInformation; 33 33 import net.oni2.platformtools.PlatformInformation.Platform; 34 import net.oni2.platformtools.applicationinvoker.ApplicationInvoker; 34 35 import net.oni2.platformtools.applicationinvoker.DotNet; 36 import net.oni2.platformtools.applicationinvoker.EExeType; 37 import net.oni2.svnaccess.SVN; 35 38 36 39 import org.javabuilders.swing.SwingJavaBuilder; … … 64 67 } 65 68 } 66 69 67 70 private static void initBundles() { 68 File localesDir = CaseInsensitiveFile.getCaseInsensitiveFile(Paths.getInstallerPath(), "locales"); 71 File localesDir = CaseInsensitiveFile.getCaseInsensitiveFile( 72 Paths.getInstallerPath(), "locales"); 69 73 if (localesDir.isDirectory()) 70 74 addClassPath(localesDir); … … 121 125 } 122 126 } 123 127 124 128 initBundles(); 125 129 … … 173 177 System.out.println("ValidPath: " + Installer.verifyRunningDirectory()); 174 178 System.out.println("Platform: " + PlatformInformation.getPlatform()); 175 System.out.println("Architect: " + PlatformInformation.getArchitecture()); 179 System.out.println("Architect: " 180 + PlatformInformation.getArchitecture()); 176 181 System.out.println(".NET: " + DotNet.isInstalled()); 177 182 System.out.println("OniSplit: " + OniSplit.isOniSplitInstalled()); … … 241 246 SettingsManager.getInstance().setOfflineMode(offline); 242 247 248 if (!offline) { 249 SVN svn = new SVN(); 250 try { 251 int x = svn.checkSVN("http://svn.aei.oni2.net", 252 new File(Paths.getPrefsPath(), "bin")); 253 if (x > 0) { 254 // Update available 255 int res = JOptionPane.showConfirmDialog(null, 256 globalBundle.getString("aeiUpdateAvailable.text"), 257 globalBundle.getString("aeiUpdateAvailable.title"), 258 JOptionPane.YES_NO_OPTION, 259 JOptionPane.INFORMATION_MESSAGE); 260 if (res == JOptionPane.YES_OPTION) { 261 File updater = new File(Paths.getInstallerPath(), 262 "AEInstaller2Updater.jar"); 263 ApplicationInvoker.execute(EExeType.JAR, null, updater, 264 null); 265 return; 266 } 267 } else if (x == 0) { 268 // Up to date 269 } else if (x < 0) { 270 // No WC at given path 271 } 272 } catch (Exception e) { 273 e.printStackTrace(); 274 } 275 } 276 243 277 SwingUtilities.invokeLater(new Runnable() { 244 278 public void run() { -
java/installer2/src/net/oni2/aeinstaller/backend/Paths.java
r720 r730 36 36 return new File(wd); 37 37 } else { 38 String jarPath = SettingsManager.class.getProtectionDomain()38 String jarPath = Paths.class.getProtectionDomain() 39 39 .getCodeSource().getLocation().getPath(); 40 40 String decodedPath = null; … … 44 44 e.printStackTrace(); 45 45 } 46 return new File(decodedPath).getParentFile() ;46 return new File(decodedPath).getParentFile().getParentFile(); 47 47 } 48 48 } -
java/installer2/src/net/oni2/aeinstaller/localization/Global.properties
r658 r730 10 10 offlineModeStartup.title=Offline mode 11 11 offlineModeStartup.text=Connection to the ModDepot could not be established.\nAEI will run in offline mode.\nUpdates or installation of mods not already downloaded will not be possible. 12 13 aeiUpdateAvailable.title=Update available! 14 aeiUpdateAvailable.text=An update for the AEInstaller is available.\nPlease update now by selecting Yes.
Note:
See TracChangeset
for help on using the changeset viewer.