[pkg-java] r2635 - trunk/eclipse/debian
Author: doko
Date: 2006-10-22 09:43:45 + (Sun, 22 Oct 2006)
New Revision: 2635
Modified:
trunk/eclipse/debian/rules
Log:
- bind number of cpus used to the avail mem
Modified: trunk/eclipse/debian/rules
===
--- trunk/eclipse/debian/rules 2006-10-22 02:44:34 UTC (rev 2634)
+++ trunk/eclipse/debian/rules 2006-10-22 09:43:45 UTC (rev 2635)
@@ -37,7 +37,7 @@
endif
ifeq ($(enable_native),yes)
-AVAIL_CPUS := $(shell getconf _NPROCESSORS_ONLN 2/dev/null || echo 1)
+AVAIL_CPUS := $(shell n=$$(getconf _NPROCESSORS_ONLN 2/dev/null || echo
1); awk -v n=$$n '/^MemTotal:/ { n2=int($$2/196608); if (n2n) n=n2; print n}'
/proc/meminfo)
ifneq ($(AVAIL_CPUS),1)
AOT_MAKEFLAGS = -j$(AVAIL_CPUS)
export AOT_MAKEFLAGS
___
pkg-java-commits mailing list
pkg-java-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
[pkg-java] r2636 - in trunk/eclipse/debian: . extra patches
Author: tashiro-guest
Date: 2006-10-22 10:15:59 + (Sun, 22 Oct 2006)
New Revision: 2636
Added:
trunk/eclipse/debian/patches/eclipse-nativepresentation.dpatch
Removed:
trunk/eclipse/debian/patches/eclipse-navtivepresentation.dpatch
Modified:
trunk/eclipse/debian/extra/eclipse.sh
trunk/eclipse/debian/extra/package-links.txt
trunk/eclipse/debian/rules
Log:
The lib prefix to the package-links.txt links.
Ensure that the directories exist before.
Converted native presentation patch to 3.2
Show error dialog only if the mozilla/firefox wasn't found.
Modified: trunk/eclipse/debian/extra/eclipse.sh
===
--- trunk/eclipse/debian/extra/eclipse.sh 2006-10-22 09:43:45 UTC (rev
2635)
+++ trunk/eclipse/debian/extra/eclipse.sh 2006-10-22 10:15:59 UTC (rev
2636)
@@ -137,12 +137,13 @@
export MOZILLA_FIVE_HOME=/usr/lib/mozilla-firefox
elif [ -e /usr/lib/mozilla/libgtkembedmoz.so ]; then
export MOZILLA_FIVE_HOME=/usr/lib/mozilla
+else
+$DIALOG \
+--warning \
+--title=Integrated browser support not working \
+--text=This Eclipse build doesn't have support for the integrated
browser.
+[ $? -eq 0 ] || exit 1
fi
-$DIALOG \
---warning \
---title=Integrated browser support not working \
---text=This Eclipse build doesn't have support for the integrated
browser.
- [ $? -eq 0 ] || exit 1
# libraries from the mozilla choosen take precedence
LD_LIBRARY_PATH=$MOZILLA_FIVE_HOME${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
Modified: trunk/eclipse/debian/extra/package-links.txt
===
--- trunk/eclipse/debian/extra/package-links.txt2006-10-22 09:43:45 UTC
(rev 2635)
+++ trunk/eclipse/debian/extra/package-links.txt2006-10-22 10:15:59 UTC
(rev 2636)
@@ -1,25 +1,25 @@
-/usr/share/tomcat5.5/server/lib/tomcat-coyote.jar
org.eclipse.tomcat_5.5.17/tomcat-coyote.jar
-/usr/share/tomcat5.5/common/lib/servlet-api.jar
org.eclipse.tomcat_5.5.17/servlet.jar
-/usr/share/java/commons-collections.jar
org.eclipse.tomcat_5.5.17/commons-collections.jar
-/usr/share/tomcat5.5/bin/bootstrap.jar
org.eclipse.tomcat_5.5.17/bootstrap.jar
-/usr/share/tomcat5.5/server/lib/tomcat-http.jar
org.eclipse.tomcat_5.5.17/tomcat-http.jar
-/usr/share/java/commons-modeler.jar
org.eclipse.tomcat_5.5.17/commons-modeler.jar
-/usr/share/java/commons-logging-api.jar
org.eclipse.tomcat_5.5.17/commons-logging-api.jar
-/usr/share/java/commons-beanutils.jar
org.eclipse.tomcat_5.5.17/commons-beanutils.jar
-/usr/share/tomcat5.5/server/lib/tomcat-util.jar
org.eclipse.tomcat_5.5.17/tomcat-util.jar
-/usr/share/tomcat5.5/server/lib/servlets-invoker.jar
org.eclipse.tomcat_5.5.17/servlets-invoker.jar
-/usr/share/java/commons-digester.jar
org.eclipse.tomcat_5.5.17/commons-digester.jar
-/usr/share/tomcat5.5/common/lib/jasper-runtime.jar
org.eclipse.tomcat_5.5.17/jasper-runtime.jar
-/usr/share/tomcat5.5/server/lib/servlets-default.jar
org.eclipse.tomcat_5.5.17/servlets-default.jar
-/usr/share/tomcat5.5/common/lib/naming-factory.jar
org.eclipse.tomcat_5.5.17/naming-factory.jar
-/usr/share/tomcat5.5/server/lib/catalina.jar
org.eclipse.tomcat_5.5.17/catalina.jar
-/usr/share/tomcat5.5/server/lib/catalina-optional.jar
org.eclipse.tomcat_5.5.17/catalina-optional.jar
-/usr/share/java/mx4j.jar
org.eclipse.tomcat_5.5.17/mx4j-impl.jar
-/usr/share/java/mx4j.jar
org.eclipse.tomcat_5.5.17/mx4j-jmx.jar
-/usr/share/tomcat5.5/common/lib/naming-resources.jar
org.eclipse.tomcat_5.5.17/naming-resources.jar
-/usr/share/tomcat5.5/common/lib/jasper-compiler.jar
org.eclipse.tomcat_5.5.17/jasper-compiler.jar
-/usr/share/tomcat5.5/common/lib/jsp-api.jar
org.eclipse.tomcat_5.5.17/jsp-api.jar
-/usr/share/java/commons-el.jar
org.eclipse.tomcat_5.5.17/commons-el.jar
+/usr/share/tomcat5.5/server/lib/tomcat-coyote.jar
org.eclipse.tomcat_5.5.17/lib/tomcat-coyote.jar
+/usr/share/tomcat5.5/common/lib/servlet-api.jar
org.eclipse.tomcat_5.5.17/lib/servlet.jar
+/usr/share/java/commons-collections.jar
org.eclipse.tomcat_5.5.17/lib/commons-collections.jar
+/usr/share/tomcat5.5/bin/bootstrap.jar
org.eclipse.tomcat_5.5.17/lib/bootstrap.jar
+/usr/share/tomcat5.5/server/lib/tomcat-http.jar
org.eclipse.tomcat_5.5.17/lib/tomcat-http.jar
+/usr/share/java/commons-modeler.jar
org.eclipse.tomcat_5.5.17/lib/commons-modeler.jar
+/usr/share/java/commons-logging-api.jar
org.eclipse.tomcat_5.5.17/lib/commons-logging-api.jar
+/usr/share/java/commons-beanutils.jar
org.eclipse.tomcat_5.5.17/lib/commons-beanutils.jar
+/usr/share/tomcat5.5/server/lib/tomcat-util.jar
[pkg-java] r2637 - trunk/eclipse/debian
Author: tashiro-guest Date: 2006-10-22 10:30:49 + (Sun, 22 Oct 2006) New Revision: 2637 Modified: trunk/eclipse/debian/changelog Log: Added changes to changelog Modified: trunk/eclipse/debian/changelog === --- trunk/eclipse/debian/changelog 2006-10-22 10:15:59 UTC (rev 2636) +++ trunk/eclipse/debian/changelog 2006-10-22 10:30:49 UTC (rev 2637) @@ -65,6 +65,12 @@ [ Vladimir Lapacek ] * Build jsch as a eclipse plugin. + [ Stephan Michels ] + * Added lib prefix to the links of the tomcat plugin in package-links.txt + * Ensured that the directories exist before links were created + * Converted native presentation patch to 3.2 + * Show error dialog only if the mozilla/firefox wasn't found. + -- Matthias Klose [EMAIL PROTECTED] Sun, 22 Oct 2006 04:25:47 +0200 eclipse (3.1.2-3) experimental; urgency=low ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
[pkg-java] r2638 - trunk/eclipse/debian
Author: doko Date: 2006-10-22 11:30:06 + (Sun, 22 Oct 2006) New Revision: 2638 Modified: trunk/eclipse/debian/rules Log: - fix syntax error Modified: trunk/eclipse/debian/rules === --- trunk/eclipse/debian/rules 2006-10-22 10:30:49 UTC (rev 2637) +++ trunk/eclipse/debian/rules 2006-10-22 11:30:06 UTC (rev 2638) @@ -468,15 +468,15 @@ ifeq ($(with_tomcat),yes) cat $(EXTRA)/package-links.txt | while read FROM TO; do \ - if [ ! -d $$FROM $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/$$(dirname $$TO) ]; then \ - mkdir -p $$FROM $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/$$(dirname $$TO); \ + if [ ! -d $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/$$(dirname $$TO) ]; then \ + mkdir -p $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/$$(dirname $$TO); \ fi; \ ln -sf $$FROM $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/$$TO; \ done else cat $(EXTRA)/package-links.txt | grep -v tomcat | while read FROM TO; do \ - if [ ! -d $$FROM $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/$$(dirname $$TO) ]; then \ - mkdir -p $$FROM $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/$$(dirname $$TO); \ + if [ ! -d $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/$$(dirname $$TO) ]; then \ + mkdir -p $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/$$(dirname $$TO); \ fi; \ ln -sf $$FROM $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/$$TO; \ done ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
[pkg-java] r2639 - trunk/eclipse/debian/extra
Author: tashiro-guest Date: 2006-10-22 15:39:36 + (Sun, 22 Oct 2006) New Revision: 2639 Modified: trunk/eclipse/debian/extra/package-links.txt Log: Create link lib/servlet-api.jar instead of lib/servlet.jar Modified: trunk/eclipse/debian/extra/package-links.txt === --- trunk/eclipse/debian/extra/package-links.txt2006-10-22 11:30:06 UTC (rev 2638) +++ trunk/eclipse/debian/extra/package-links.txt2006-10-22 15:39:36 UTC (rev 2639) @@ -1,43 +1,44 @@ /usr/share/tomcat5.5/server/lib/tomcat-coyote.jar org.eclipse.tomcat_5.5.17/lib/tomcat-coyote.jar -/usr/share/tomcat5.5/common/lib/servlet-api.jar org.eclipse.tomcat_5.5.17/lib/servlet.jar -/usr/share/java/commons-collections.jar org.eclipse.tomcat_5.5.17/lib/commons-collections.jar +/usr/share/tomcat5.5/common/lib/servlet-api.jar org.eclipse.tomcat_5.5.17/lib/servlet-api.jar +/usr/share/tomcat5.5/server/lib/servlets-invoker.jar org.eclipse.tomcat_5.5.17/lib/servlets-invoker.jar +/usr/share/java/commons-collections.jar org.eclipse.tomcat_5.5.17/lib/commons-collections.jar /usr/share/tomcat5.5/bin/bootstrap.jar org.eclipse.tomcat_5.5.17/lib/bootstrap.jar -/usr/share/tomcat5.5/server/lib/tomcat-http.jar org.eclipse.tomcat_5.5.17/lib/tomcat-http.jar -/usr/share/java/commons-modeler.jar org.eclipse.tomcat_5.5.17/lib/commons-modeler.jar -/usr/share/java/commons-logging-api.jar org.eclipse.tomcat_5.5.17/lib/commons-logging-api.jar -/usr/share/java/commons-beanutils.jar org.eclipse.tomcat_5.5.17/lib/commons-beanutils.jar +/usr/share/tomcat5.5/server/lib/tomcat-http.jar org.eclipse.tomcat_5.5.17/lib/tomcat-http.jar +/usr/share/java/commons-modeler.jar org.eclipse.tomcat_5.5.17/lib/commons-modeler.jar +/usr/share/java/commons-logging-api.jar org.eclipse.tomcat_5.5.17/lib/commons-logging-api.jar +/usr/share/java/commons-beanutils.jar org.eclipse.tomcat_5.5.17/lib/commons-beanutils.jar /usr/share/tomcat5.5/server/lib/tomcat-util.jar org.eclipse.tomcat_5.5.17/lib/tomcat-util.jar /usr/share/tomcat5.5/server/lib/servlets-invoker.jar org.eclipse.tomcat_5.5.17/lib/servlets-invoker.jar -/usr/share/java/commons-digester.jar org.eclipse.tomcat_5.5.17/lib/commons-digester.jar +/usr/share/java/commons-digester.jar org.eclipse.tomcat_5.5.17/lib/commons-digester.jar /usr/share/tomcat5.5/common/lib/jasper-runtime.jar org.eclipse.tomcat_5.5.17/lib/jasper-runtime.jar /usr/share/tomcat5.5/server/lib/servlets-default.jar org.eclipse.tomcat_5.5.17/lib/servlets-default.jar /usr/share/tomcat5.5/common/lib/naming-factory.jar org.eclipse.tomcat_5.5.17/lib/naming-factory.jar /usr/share/tomcat5.5/server/lib/catalina.jar org.eclipse.tomcat_5.5.17/lib/catalina.jar /usr/share/tomcat5.5/server/lib/catalina-optional.jar org.eclipse.tomcat_5.5.17/lib/catalina-optional.jar -/usr/share/java/mx4j.jar org.eclipse.tomcat_5.5.17/lib/mx4j-impl.jar -/usr/share/java/mx4j.jar org.eclipse.tomcat_5.5.17/lib/mx4j-jmx.jar +/usr/share/java/mx4j.jar org.eclipse.tomcat_5.5.17/lib/mx4j-impl.jar +/usr/share/java/mx4j.jar org.eclipse.tomcat_5.5.17/lib/mx4j-jmx.jar /usr/share/tomcat5.5/common/lib/naming-resources.jar org.eclipse.tomcat_5.5.17/lib/naming-resources.jar /usr/share/tomcat5.5/common/lib/jasper-compiler.jar org.eclipse.tomcat_5.5.17/lib/jasper-compiler.jar /usr/share/tomcat5.5/common/lib/jsp-api.jar org.eclipse.tomcat_5.5.17/lib/jsp-api.jar -/usr/share/java/commons-el.jar org.eclipse.tomcat_5.5.17/lib/commons-el.jar -/usr/share/ant/lib/ant-apache-log4j.jar org.apache.ant_1.6.5/lib/ant-apache-log4j.jar -/usr/share/ant/lib/ant-apache-resolver.jar org.apache.ant_1.6.5/lib/ant-apache-resolver.jar -/usr/share/ant/lib/ant-commons-logging.jar org.apache.ant_1.6.5/lib/ant-commons-logging.jar -/usr/share/ant/lib/ant-nodeps.jar org.apache.ant_1.6.5/lib/ant-nodeps.jar -/usr/share/ant/lib/ant-javamail.jar org.apache.ant_1.6.5/lib/ant-javamail.jar -/usr/share/ant/lib/ant-jsch.jar org.apache.ant_1.6.5/lib/ant-jsch.jar -/usr/share/ant/lib/ant-apache-bsf.jar org.apache.ant_1.6.5/lib/ant-apache-bsf.jar -/usr/share/ant/lib/ant-apache-regexp.jar org.apache.ant_1.6.5/lib/ant-apache-regexp.jar -/usr/share/ant/lib/ant-apache-oro.jar org.apache.ant_1.6.5/lib/ant-apache-oro.jar -/usr/share/ant/lib/ant-antlr.jar org.apache.ant_1.6.5/lib/ant-antlr.jar -/usr/share/ant/lib/ant-jdepend.jar org.apache.ant_1.6.5/lib/ant-jdepend.jar -/usr/share/ant/lib/ant-junit.jar
[pkg-java] r2641 - trunk/eclipse/debian
Author: doko
Date: 2006-10-22 16:20:13 + (Sun, 22 Oct 2006)
New Revision: 2641
Modified:
trunk/eclipse/debian/rules
Log:
- reenable native gcj build
Modified: trunk/eclipse/debian/rules
===
--- trunk/eclipse/debian/rules 2006-10-22 15:53:06 UTC (rev 2640)
+++ trunk/eclipse/debian/rules 2006-10-22 16:20:13 UTC (rev 2641)
@@ -35,7 +35,6 @@
enable_native=yes
ECLIPSE_PLATFORM=$(DEB_HOST_ARCH)
endif
-enable_native=no
ifeq ($(enable_native),yes)
AVAIL_CPUS := $(shell n=$$(getconf _NPROCESSORS_ONLN 2/dev/null || echo
1); awk -v n=$$n '/^MemTotal:/ { n2=int($$2/196608); if (n2n) n=n2; print n}'
/proc/meminfo)
___
pkg-java-commits mailing list
pkg-java-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
[pkg-java] r2642 - trunk
Author: vladimir-guest Date: 2006-10-22 16:57:57 + (Sun, 22 Oct 2006) New Revision: 2642 Added: trunk/eclipse-pydev/ Log: Creating eclipse-pydev package directory ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
[pkg-java] r2644 - in trunk/eclipse/debian: . patches
Author: tashiro-guest
Date: 2006-10-22 19:18:54 + (Sun, 22 Oct 2006)
New Revision: 2644
Modified:
trunk/eclipse/debian/changelog
trunk/eclipse/debian/patches/eclipse-updatehomedir.dpatch
trunk/eclipse/debian/rules
Log:
Updated updatehomedir patch from Fedora's repository
Modified: trunk/eclipse/debian/changelog
===
--- trunk/eclipse/debian/changelog 2006-10-22 19:01:04 UTC (rev 2643)
+++ trunk/eclipse/debian/changelog 2006-10-22 19:18:54 UTC (rev 2644)
@@ -71,6 +71,7 @@
* Ensured that the directories exist before links were created
* Converted native presentation patch to 3.2
* Show error dialog only if the mozilla/firefox wasn't found.
+ * Updated updatehomedir patch from Fedora's repository
-- Matthias Klose [EMAIL PROTECTED] Sun, 22 Oct 2006 04:25:47 +0200
Modified: trunk/eclipse/debian/patches/eclipse-updatehomedir.dpatch
===
--- trunk/eclipse/debian/patches/eclipse-updatehomedir.dpatch 2006-10-22
19:01:04 UTC (rev 2643)
+++ trunk/eclipse/debian/patches/eclipse-updatehomedir.dpatch 2006-10-22
19:18:54 UTC (rev 2644)
@@ -23,111 +23,227 @@
exit 0
@DPATCH@
-diff -P -r -u
../source-tree.orig/plugins/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/ModeSelectionPage.java
source-tree/plugins/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/ModeSelectionPage.java
../source-tree.orig/plugins/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/ModeSelectionPage.java
2005-09-20 12:06:46.0 +0200
-+++
source-tree/plugins/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/ModeSelectionPage.java
2005-09-20 14:18:57.0 +0200
-@@ -10,6 +10,7 @@
+diff -r -N -u
source-tree.orig/plugins/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConfiguredSite.java
source-tree/plugins/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConfiguredSite.java
+---
source-tree.orig/plugins/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConfiguredSite.java
2006-10-22 19:59:44.0 +0200
source-tree/plugins/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConfiguredSite.java
2006-10-22 20:11:31.0 +0200
+@@ -35,6 +35,7 @@
+ import org.eclipse.core.runtime.IProgressMonitor;
+ import org.eclipse.core.runtime.IStatus;
+ import org.eclipse.core.runtime.MultiStatus;
++import org.eclipse.core.runtime.Platform;
+ import org.eclipse.osgi.util.NLS;
+ import org.eclipse.update.configuration.IActivity;
+ import org.eclipse.update.configuration.IConfiguredSite;
+@@ -803,7 +804,9 @@
+ }
+ } else {
+ File container = getSiteContaining(file);
+- if (container != null) {
++ // allow the install location to pass even though it
looks like this
++ // site is contained in another site
++ if (container != null
!siteLocation.equals(Platform.getInstallLocation().getURL().getFile())) {
+ verifyStatus = createStatus(IStatus.ERROR,
NLS.bind(Messages.ConfiguredSite_ContainedInAnotherSite, (new String[] {
container.getAbsolutePath() })), null);
+ return verifyStatus;
+ }
+diff -r -N -u
source-tree.orig/plugins/org.eclipse.update.core/src/org/eclipse/update/internal/search/OptionalFeatureSearchCategory.java
source-tree/plugins/org.eclipse.update.core/src/org/eclipse/update/internal/search/OptionalFeatureSearchCategory.java
+---
source-tree.orig/plugins/org.eclipse.update.core/src/org/eclipse/update/internal/search/OptionalFeatureSearchCategory.java
2006-10-22 19:59:44.0 +0200
source-tree/plugins/org.eclipse.update.core/src/org/eclipse/update/internal/search/OptionalFeatureSearchCategory.java
2006-10-22 20:11:31.0 +0200
+@@ -76,6 +76,13 @@
+ public IQueryUpdateSiteAdapter getQuerySearchSite() {
+ return null;
+ }
++
++ /* (non-Javadoc)
++ * @see
org.eclipse.update.internal.ui.search.ISearchQuery#getFeature()
++ */
++ public IFeature getFeature() {
++ return null;
++ }
+ }
+
+ public void addVersionedIdentifier(VersionedIdentifier vid) {
+diff -r -N -u
source-tree.orig/plugins/org.eclipse.update.core/src/org/eclipse/update/internal/search/SiteSearchCategory.java
source-tree/plugins/org.eclipse.update.core/src/org/eclipse/update/internal/search/SiteSearchCategory.java
+---
source-tree.orig/plugins/org.eclipse.update.core/src/org/eclipse/update/internal/search/SiteSearchCategory.java
2006-10-22 19:59:44.0 +0200
[pkg-java] r2646 - trunk/eclipse-pydev
Author: vladimir-guest
Date: 2006-10-22 19:26:10 + (Sun, 22 Oct 2006)
New Revision: 2646
Removed:
trunk/eclipse-pydev/README.Debian
trunk/eclipse-pydev/aot-compile
trunk/eclipse-pydev/changelog
trunk/eclipse-pydev/compat
trunk/eclipse-pydev/control
trunk/eclipse-pydev/copyright
trunk/eclipse-pydev/eclipse-pydev-gcj.postinst
trunk/eclipse-pydev/eclipse-pydev-gcj.postrm
trunk/eclipse-pydev/eclipse-pydev.install
trunk/eclipse-pydev/patches/
trunk/eclipse-pydev/rules
Log:
reorganize the eclipse-pydev folders
Deleted: trunk/eclipse-pydev/README.Debian
===
--- trunk/eclipse-pydev/README.Debian 2006-10-22 19:23:59 UTC (rev 2645)
+++ trunk/eclipse-pydev/README.Debian 2006-10-22 19:26:10 UTC (rev 2646)
@@ -1,6 +0,0 @@
-eclipse-pydev for Ubuntu
-
-
-Since Ubuntu uses GCJ-4.1 to compile java code, the sources had to be
backported to use Java 1.4.
-
- -- Vladimir Lapacek [EMAIL PROTECTED], Sun, 11 Dec 2005 20:32:14 -0700
Deleted: trunk/eclipse-pydev/aot-compile
===
--- trunk/eclipse-pydev/aot-compile 2006-10-22 19:23:59 UTC (rev 2645)
+++ trunk/eclipse-pydev/aot-compile 2006-10-22 19:26:10 UTC (rev 2646)
@@ -1,210 +0,0 @@
-#!/usr/bin/env python
-
-import copy
-import os
-import string
-import sys
-import zipfile
-
-GCJ = /usr/bin/gcj-4.1
-GCJFLAGS = [ -O2, -fPIC, -findirect-dispatch, -fjni]
-LDFLAGS = [-Wl,-Bsymbolic]
-
-class Error(Exception):
-pass
-
-class JarFile(zipfile.ZipFile):
-def isSubsetOf(self, other):
-Returns True if identical copies of all classes in this
-jarfile exist in the other.
-for other_item in other.infolist():
-if not other_item.filename.endswith(.class):
-continue
-try:
-self_item = self.getinfo(other_item.filename)
-except KeyError:
-return False
-if self_item.CRC != other_item.CRC:
-return False
-return True
-
-def numClasses(self):
-Return the number of classfiles within this jarfile.
-return len([
-item for item in self.namelist() if item.endswith(.class)])
-
-def classPrefix(self):
-Return the longest prefix common to all classes.
-return os.path.commonprefix([
-item for item in self.namelist() if item.endswith(.class)])
-
-def strip_exclusions(jars, exclusions):
-Remove user-excluded jars from the list. We're really strict
-about this to ensure that dead options don't get left in
-specfiles.
-jars = copy.copy(jars)
-for exclusion in exclusions:
-for jar in jars:
-if jar.filename == exclusion:
-jars.remove(jar)
-break
-else:
-raise Error, %s: file does not exist or is not a jar % exclusion
-return jars
-
-def weed_jars(jars):
-Remove any jarfiles that are completely contained within
-another. This is more common than you'd think, and we only
-need one nativified copy of each class after all.
-jars = copy.copy(jars)
-while True:
-for jar1 in jars:
-for jar2 in jars:
-if jar1 is jar2:
-continue
-if jar1.isSubsetOf(jar2):
-msg = subsetted %s % jar2.filename
-if jar2.isSubsetOf(jar1):
-msg += (identical)
-warn(msg)
-jars.remove(jar2)
-break
-else:
-continue
-break
-else:
-break
-continue
-return jars
-
-def set_basenames(jars):
-Ensure that each jarfile has a different basename.
-names = {}
-for jar in jars:
-name = os.path.basename(jar.filename)
-if not names.has_key(name):
-names[name] = []
-names[name].append(jar)
-for name, set in names.items():
-if len(set) == 1:
-set[0].basename = name
-continue
-# prefix the jar filenames to make them unique
-# XXX will not work in most cases -- needs generalising
-set = [(jar.filename.split(os.sep), jar) for jar in set]
-minlen = min([len(bits) for bits, jar in set])
-set = [(bits[-minlen:], jar) for bits, jar in set]
-bits = apply(zip, [bits for bits, jar in set])
-while True:
-row = bits[-2]
-for bit in row[1:]:
-if bit != row[0]:
-break
-else:
-del bits[-2]
-continue
-break
-set = zip(
-[_.join(name) for name in apply(zip, bits[-2:])],
-[jar for bits, jar in set])
-for name, jar in set:
-warn(building %s as %s % (jar.filename, name))
-
