From: <otm...@us...> - 2008-10-31 08:37:25
|
Revision: 5534 http://jython.svn.sourceforge.net/jython/?rev=5534&view=rev Author: otmarhumbel Date: 2008-10-31 08:37:16 +0000 (Fri, 31 Oct 2008) Log Message: ----------- revert that part of revision 5296 which deletes the /bin directory Revision Links: -------------- http://jython.svn.sourceforge.net/jython/?rev=5296&view=rev Modified Paths: -------------- trunk/installer/src/java/org/python/util/install/JarInstaller.java Modified: trunk/installer/src/java/org/python/util/install/JarInstaller.java =================================================================== --- trunk/installer/src/java/org/python/util/install/JarInstaller.java 2008-10-31 02:04:57 UTC (rev 5533) +++ trunk/installer/src/java/org/python/util/install/JarInstaller.java 2008-10-31 08:37:16 UTC (rev 5534) @@ -139,7 +139,6 @@ _progressListener.progressStartScripts(); StartScriptGenerator generator = new StartScriptGenerator(targetDirectory, javaHome); generator.generateStartScripts(); - StandalonePackager.emptyDirectory(new File(targetDirectory, "bin"), null); } else { _progressListener.progressStandalone(); File jythonJar = new File(targetDirectory, JYTHON_JAR); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <otm...@us...> - 2008-10-31 17:07:07
|
Revision: 5538 http://jython.svn.sourceforge.net/jython/?rev=5538&view=rev Author: otmarhumbel Date: 2008-10-31 17:07:03 +0000 (Fri, 31 Oct 2008) Log Message: ----------- first guess what os.py needs for a mimimum start of jython Modified Paths: -------------- trunk/installer/src/java/org/python/util/install/JarInstaller.java Modified: trunk/installer/src/java/org/python/util/install/JarInstaller.java =================================================================== --- trunk/installer/src/java/org/python/util/install/JarInstaller.java 2008-10-31 16:33:46 UTC (rev 5537) +++ trunk/installer/src/java/org/python/util/install/JarInstaller.java 2008-10-31 17:07:03 UTC (rev 5538) @@ -226,7 +226,9 @@ coreLibFiles.add("javapath.py"); coreLibFiles.add("jreload.py"); coreLibFiles.add("marshal.py"); + coreLibFiles.add("ntpath.py"); coreLibFiles.add("os.py"); + coreLibFiles.add("popen2.py"); coreLibFiles.add("posixpath.py"); coreLibFiles.add("random.py"); coreLibFiles.add("re.py"); @@ -238,6 +240,7 @@ coreLibFiles.add("sre_parse.py"); coreLibFiles.add("stat.py"); coreLibFiles.add("string.py"); + coreLibFiles.add("threading.py"); coreLibFiles.add("zipfile.py"); coreLibFiles.add("zlib.py"); return coreLibFiles; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <otm...@us...> - 2008-10-31 17:23:29
|
Revision: 5539 http://jython.svn.sourceforge.net/jython/?rev=5539&view=rev Author: otmarhumbel Date: 2008-10-31 17:23:18 +0000 (Fri, 31 Oct 2008) Log Message: ----------- UserDict.py is also needed for a mimimum start of jython (on Windows) Modified Paths: -------------- trunk/installer/src/java/org/python/util/install/JarInstaller.java Modified: trunk/installer/src/java/org/python/util/install/JarInstaller.java =================================================================== --- trunk/installer/src/java/org/python/util/install/JarInstaller.java 2008-10-31 17:07:03 UTC (rev 5538) +++ trunk/installer/src/java/org/python/util/install/JarInstaller.java 2008-10-31 17:23:18 UTC (rev 5539) @@ -241,6 +241,7 @@ coreLibFiles.add("stat.py"); coreLibFiles.add("string.py"); coreLibFiles.add("threading.py"); + coreLibFiles.add("UserDict.py"); coreLibFiles.add("zipfile.py"); coreLibFiles.add("zlib.py"); return coreLibFiles; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <otm...@us...> - 2008-11-27 22:17:45
|
Revision: 5649 http://jython.svn.sourceforge.net/jython/?rev=5649&view=rev Author: otmarhumbel Date: 2008-11-27 22:17:41 +0000 (Thu, 27 Nov 2008) Log Message: ----------- better approximation of the progress Modified Paths: -------------- trunk/installer/src/java/org/python/util/install/JarInstaller.java Modified: trunk/installer/src/java/org/python/util/install/JarInstaller.java =================================================================== --- trunk/installer/src/java/org/python/util/install/JarInstaller.java 2008-11-27 20:56:40 UTC (rev 5648) +++ trunk/installer/src/java/org/python/util/install/JarInstaller.java 2008-11-27 22:17:41 UTC (rev 5649) @@ -178,22 +178,22 @@ } private int approximateNumberOfEntries(InstallationType installationType) { - int numberOfEntries = 65; // core (minimum) + int numberOfEntries = 100; // core (minimum) if (installationType.installLibraryModules()) { if (installationType.isStandalone()) { - numberOfEntries += 240; + numberOfEntries += 480; } else { - numberOfEntries += 664; + numberOfEntries += 1260; } } if (installationType.installDemosAndExamples()) { - numberOfEntries += 44; + numberOfEntries += 50; } if (installationType.installDocumentation()) { - numberOfEntries += 209; + numberOfEntries += 185; } if (installationType.installSources()) { - numberOfEntries += 401; + numberOfEntries += 585; } return numberOfEntries; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <otm...@us...> - 2009-01-09 18:01:27
|
Revision: 5902 http://jython.svn.sourceforge.net/jython/?rev=5902&view=rev Author: otmarhumbel Date: 2009-01-09 18:01:13 +0000 (Fri, 09 Jan 2009) Log Message: ----------- let the progress indicator have some air to breathe Modified Paths: -------------- trunk/installer/src/java/org/python/util/install/JarInstaller.java Modified: trunk/installer/src/java/org/python/util/install/JarInstaller.java =================================================================== --- trunk/installer/src/java/org/python/util/install/JarInstaller.java 2009-01-09 17:31:07 UTC (rev 5901) +++ trunk/installer/src/java/org/python/util/install/JarInstaller.java 2009-01-09 18:01:13 UTC (rev 5902) @@ -178,22 +178,22 @@ } private int approximateNumberOfEntries(InstallationType installationType) { - int numberOfEntries = 100; // core (minimum) + int numberOfEntries = 150; // core (minimum) if (installationType.installLibraryModules()) { if (installationType.isStandalone()) { - numberOfEntries += 480; + numberOfEntries += 540; } else { - numberOfEntries += 1260; + numberOfEntries += 1300; } } if (installationType.installDemosAndExamples()) { - numberOfEntries += 50; + numberOfEntries += 60; } if (installationType.installDocumentation()) { - numberOfEntries += 185; + numberOfEntries += 250; } if (installationType.installSources()) { - numberOfEntries += 585; + numberOfEntries += 800; } return numberOfEntries; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <otm...@us...> - 2010-10-10 21:15:07
|
Revision: 7144 http://jython.svn.sourceforge.net/jython/?rev=7144&view=rev Author: otmarhumbel Date: 2010-10-10 21:15:01 +0000 (Sun, 10 Oct 2010) Log Message: ----------- adjust progress percentages Modified Paths: -------------- trunk/installer/src/java/org/python/util/install/JarInstaller.java Modified: trunk/installer/src/java/org/python/util/install/JarInstaller.java =================================================================== --- trunk/installer/src/java/org/python/util/install/JarInstaller.java 2010-10-10 11:36:05 UTC (rev 7143) +++ trunk/installer/src/java/org/python/util/install/JarInstaller.java 2010-10-10 21:15:01 UTC (rev 7144) @@ -95,7 +95,7 @@ // handle exclusion of directories Iterator<String> excludeDirsAsIterator = excludeDirs.iterator(); while (excludeDirsAsIterator.hasNext()) { - if (zipEntryName.startsWith((String)excludeDirsAsIterator.next() + if (zipEntryName.startsWith(excludeDirsAsIterator.next() + PATH_SEPARATOR)) { exclude = true; } @@ -178,22 +178,22 @@ } private int approximateNumberOfEntries(InstallationType installationType) { - int numberOfEntries = 150; // core (minimum) + int numberOfEntries = 200; // core (minimum) if (installationType.installLibraryModules()) { if (installationType.isStandalone()) { - numberOfEntries += 540; + numberOfEntries += 450; } else { numberOfEntries += 1300; } } if (installationType.installDemosAndExamples()) { - numberOfEntries += 60; + numberOfEntries += 70; } if (installationType.installDocumentation()) { - numberOfEntries += 250; + numberOfEntries += 500; } if (installationType.installSources()) { - numberOfEntries += 800; + numberOfEntries += 1000; } return numberOfEntries; } @@ -269,7 +269,7 @@ exclude = true; Iterator<String> coreLibFilesAsIterator = coreLibFiles.iterator(); while (coreLibFilesAsIterator.hasNext()) { - String coreFileName = (String)coreLibFilesAsIterator.next(); + String coreFileName = coreLibFilesAsIterator.next(); if (zipEntryName.endsWith(PATH_SEPARATOR + coreFileName)) { exclude = false; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |