[SCM] eclipse - Powerful IDE written in java - Debian package. branch, upstream, updated. 5f855421b7aa582abbc6ca61914d2574b0d3af15
Benjamin Drung
bdrung-guest at alioth.debian.org
Fri Feb 26 19:41:07 UTC 2010
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "eclipse - Powerful IDE written in java - Debian package.".
The branch, upstream has been updated
via 5f855421b7aa582abbc6ca61914d2574b0d3af15 (commit)
via 44bc3267d36d994a38fa3c2b80f2d0c5e1181406 (commit)
from 0944fc2adfce5db80783f927d352779944f2f038 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 10 +++++
build.xml | 40 ++++++++++++++++++-
buildSDKSource.sh | 5 +-
.../com.ibm.icu.base.source_4.0.1.v20090822.jar | Bin 490 -> 0 bytes
.../plugins/com.ibm.icu.source_4.0.1.v20090822.jar | Bin 483 -> 0 bytes
...com.jcraft.jsch.source_0.1.41.v200903070017.jar | Bin 486 -> 0 bytes
...avax.servlet.jsp.source_2.0.0.v200806031607.jar | Bin 485 -> 0 bytes
.../javax.servlet.source_2.5.0.v200806031605.jar | Bin 481 -> 0 bytes
.../org.apache.ant.source_1.7.1.v20090120-1145.jar | Bin 635 -> 0 bytes
...e.commons.codec.source_1.3.0.v20080530-1600.jar | Bin 493 -> 0 bytes
...pache.commons.el.source_1.0.0.v200806031608.jar | Bin 490 -> 0 bytes
...mons.httpclient.source_3.1.0.v20080605-1935.jar | Bin 497 -> 0 bytes
....commons.logging.source_1.0.4.v200904062259.jar | Bin 494 -> 0 bytes
...g.apache.jasper.source_5.5.17.v200903231320.jar | Bin 486 -> 0 bytes
...lucene.analysis.source_1.9.1.v20080530-1600.jar | Bin 495 -> 0 bytes
....hamcrest.core.source_1.1.0.v20090501071000.jar | Bin 502 -> 0 bytes
.../org.junit.source_3.8.2.v20090203-1005.jar | Bin 492 -> 0 bytes
...ay.jetty.server.source_6.1.15.v200905151201.jar | Bin 492 -> 0 bytes
...tbay.jetty.util.source_6.1.15.v200905182336.jar | Bin 493 -> 0 bytes
...rg.objectweb.asm.source_3.1.0.v200803061910.jar | Bin 486 -> 0 bytes
.../linuxtools/eclipsebuild/SymlinkOSGiJars.java | 33 ++++++++++++++--
21 files changed, 78 insertions(+), 10 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 53a461e..cb57379 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
2010-02-26 Andrew Overholt <overholt at redhat.com>
+ * task-src/org/eclipse/linuxtools/eclipsebuild/SymlinkOSGiJars.java
+ (execute): Don't assume location of dependency manifests. Create symlink
+ filenames based on Bundle-SymbolicName_Bundle-Version when keepOrigNames
+ is false (used at installation time).
+ * build.xml: Remove old system JAR files before re-symlinking in
+ installation.
+ * buildSDKSource.sh: Remove more binaries (Benjamin Drung, bug #303447).
+
+2010-02-26 Andrew Overholt <overholt at redhat.com>
+
Bug #280688
* dependencies.properties: Update Debian/Ubuntu locations (Benjamin Drung).
diff --git a/build.xml b/build.xml
index a3a9b8b..15efcfe 100644
--- a/build.xml
+++ b/build.xml
@@ -290,7 +290,8 @@
<target name="symlinkDeps" depends="applyPatches,defineTasks" unless="symlinks.complete">
<symlinkOSGiJars dependencies="${basedir}/dependencies.properties"
- topLevelDir="${buildDirectory}/plugins"/>
+ topLevelDir="${buildDirectory}/plugins"
+ manifests="${basedir}/dependencyManifests"/>
<symlinkNonOSGiJars dependencies="${basedir}/nonosgidependencies.properties"
topLevelDir="${buildDirectory}/plugins"/>
<!-- If we leave these and symlink the JARs only, we get "you tampered
@@ -607,11 +608,44 @@
</fileset>
</copy>
+ <!-- Delete system JARs that have been copied over as their symlink target names -->
+ <delete>
+ <fileset dir="${buildDirectory}/installation/plugins" includes="com.ibm.icu*" />
+ <fileset dir="${buildDirectory}/installation/plugins" includes="com.jcraft.jsch*" />
+ <fileset dir="${buildDirectory}/installation/plugins" includes="javax.servlet*" />
+ <fileset dir="${buildDirectory}/installation/plugins" includes="javax.servlet.jsp*" />
+ <fileset dir="${buildDirectory}/installation/plugins" includes="org.apache.commons.codec*" />
+ <fileset dir="${buildDirectory}/installation/plugins" includes="org.apache.commons.el*" />
+ <fileset dir="${buildDirectory}/installation/plugins" includes="org.apache.commons.httpclient*" />
+ <fileset dir="${buildDirectory}/installation/plugins" includes="org.apache.commons.logging*" />
+ <fileset dir="${buildDirectory}/installation/plugins" includes="org.apache.jasper*" />
+ <fileset dir="${buildDirectory}/installation/plugins" includes="org.apache.lucene*" />
+ <fileset dir="${buildDirectory}/installation/plugins" includes="org.apache.lucene.analysis*" />
+ <fileset dir="${buildDirectory}/installation/plugins" includes="org.hamcrest.core*" />
+ <fileset dir="${buildDirectory}/installation/plugins" includes="org.mortbay.jetty.server*" />
+ <fileset dir="${buildDirectory}/installation/plugins" includes="org.mortbay.jetty.util*" />
+ <fileset dir="${buildDirectory}/installation/plugins" includes="org.objectweb.asm*" />
+ <fileset dir="${buildDirectory}/installation/plugins" includes="org.sat4j.core*" />
+ <fileset dir="${buildDirectory}/installation/plugins" includes="org.sat4j.pb*" />
+ </delete>
+
<symlinkOSGiJars dependencies="${basedir}/dependencies.properties"
- topLevelDir="${buildDirectory}/installation/plugins"/>
+ topLevelDir="${buildDirectory}/installation/plugins"
+ manifests="${basedir}/dependencyManifests"
+ keepOrigNames="false"/>
<symlinkNonOSGiJars dependencies="${basedir}/nonosgidependencies.properties"
topLevelDir="${buildDirectory}/installation/plugins"/>
-
+
+ <!-- FIXME the junit4 bundle has no qualifier at build time but does
+ at install time. Watch out for other distros with different
+ locations of junit4's system JAR.
+ -->
+ <delete dir="${buildDirectory}/installation/plugins/org.junit4" />
+ <delete file="${buildDirectory}/installation/plugins/org.junit4_4.5.0.v20090824/junit.jar" />
+
+ <symlink link="${buildDirectory}/installation/plugins/org.junit4_4.5.0.v20090824/junit.jar"
+ resource="/usr/share/java/junit4.jar" />
+
<echo file="provision.sdk-stamp" />
</target>
diff --git a/buildSDKSource.sh b/buildSDKSource.sh
index 8fa0445..2367c2d 100755
--- a/buildSDKSource.sh
+++ b/buildSDKSource.sh
@@ -6,8 +6,8 @@ set -e
baseDir=$(pwd)
workDirectory=
-buildID="vM20100210-0800"
-mapsTag="M20100210-0800"
+buildID="vM20100211-1343"
+mapsTag="M20100211-1343"
equinoxTag=R3_5_1
baseBuilder=
eclipseBuilder=
@@ -197,6 +197,7 @@ find -depth -name CVS -exec rm -rf {} \;
# Remove prebuilt binaries
find \( -name '*.exe' -o -name '*.dll' \) -delete
+find \( -name '*.jnilib' -o -name '*.sl' \) -delete
find \( -name '*.a' -o -name '*.so' -o -name '*.so.2' \) -delete
find features/org.eclipse.equinox.executable -name eclipse -delete
diff --git a/eclipse/plugins/com.ibm.icu.base.source_4.0.1.v20090822.jar b/eclipse/plugins/com.ibm.icu.base.source_4.0.1.v20090822.jar
deleted file mode 100644
index 2805d4e..0000000
Binary files a/eclipse/plugins/com.ibm.icu.base.source_4.0.1.v20090822.jar and /dev/null differ
diff --git a/eclipse/plugins/com.ibm.icu.source_4.0.1.v20090822.jar b/eclipse/plugins/com.ibm.icu.source_4.0.1.v20090822.jar
deleted file mode 100644
index 469e939..0000000
Binary files a/eclipse/plugins/com.ibm.icu.source_4.0.1.v20090822.jar and /dev/null differ
diff --git a/eclipse/plugins/com.jcraft.jsch.source_0.1.41.v200903070017.jar b/eclipse/plugins/com.jcraft.jsch.source_0.1.41.v200903070017.jar
deleted file mode 100644
index 31d9127..0000000
Binary files a/eclipse/plugins/com.jcraft.jsch.source_0.1.41.v200903070017.jar and /dev/null differ
diff --git a/eclipse/plugins/javax.servlet.jsp.source_2.0.0.v200806031607.jar b/eclipse/plugins/javax.servlet.jsp.source_2.0.0.v200806031607.jar
deleted file mode 100644
index 3d1033d..0000000
Binary files a/eclipse/plugins/javax.servlet.jsp.source_2.0.0.v200806031607.jar and /dev/null differ
diff --git a/eclipse/plugins/javax.servlet.source_2.5.0.v200806031605.jar b/eclipse/plugins/javax.servlet.source_2.5.0.v200806031605.jar
deleted file mode 100644
index 597d8f2..0000000
Binary files a/eclipse/plugins/javax.servlet.source_2.5.0.v200806031605.jar and /dev/null differ
diff --git a/eclipse/plugins/org.apache.ant.source_1.7.1.v20090120-1145.jar b/eclipse/plugins/org.apache.ant.source_1.7.1.v20090120-1145.jar
deleted file mode 100644
index 95ab00a..0000000
Binary files a/eclipse/plugins/org.apache.ant.source_1.7.1.v20090120-1145.jar and /dev/null differ
diff --git a/eclipse/plugins/org.apache.commons.codec.source_1.3.0.v20080530-1600.jar b/eclipse/plugins/org.apache.commons.codec.source_1.3.0.v20080530-1600.jar
deleted file mode 100644
index 18e736a..0000000
Binary files a/eclipse/plugins/org.apache.commons.codec.source_1.3.0.v20080530-1600.jar and /dev/null differ
diff --git a/eclipse/plugins/org.apache.commons.el.source_1.0.0.v200806031608.jar b/eclipse/plugins/org.apache.commons.el.source_1.0.0.v200806031608.jar
deleted file mode 100644
index c308b22..0000000
Binary files a/eclipse/plugins/org.apache.commons.el.source_1.0.0.v200806031608.jar and /dev/null differ
diff --git a/eclipse/plugins/org.apache.commons.httpclient.source_3.1.0.v20080605-1935.jar b/eclipse/plugins/org.apache.commons.httpclient.source_3.1.0.v20080605-1935.jar
deleted file mode 100644
index 8896958..0000000
Binary files a/eclipse/plugins/org.apache.commons.httpclient.source_3.1.0.v20080605-1935.jar and /dev/null differ
diff --git a/eclipse/plugins/org.apache.commons.logging.source_1.0.4.v200904062259.jar b/eclipse/plugins/org.apache.commons.logging.source_1.0.4.v200904062259.jar
deleted file mode 100644
index 5834a1c..0000000
Binary files a/eclipse/plugins/org.apache.commons.logging.source_1.0.4.v200904062259.jar and /dev/null differ
diff --git a/eclipse/plugins/org.apache.jasper.source_5.5.17.v200903231320.jar b/eclipse/plugins/org.apache.jasper.source_5.5.17.v200903231320.jar
deleted file mode 100644
index 1cf3966..0000000
Binary files a/eclipse/plugins/org.apache.jasper.source_5.5.17.v200903231320.jar and /dev/null differ
diff --git a/eclipse/plugins/org.apache.lucene.analysis.source_1.9.1.v20080530-1600.jar b/eclipse/plugins/org.apache.lucene.analysis.source_1.9.1.v20080530-1600.jar
deleted file mode 100644
index 04a7403..0000000
Binary files a/eclipse/plugins/org.apache.lucene.analysis.source_1.9.1.v20080530-1600.jar and /dev/null differ
diff --git a/eclipse/plugins/org.hamcrest.core.source_1.1.0.v20090501071000.jar b/eclipse/plugins/org.hamcrest.core.source_1.1.0.v20090501071000.jar
deleted file mode 100644
index 787526a..0000000
Binary files a/eclipse/plugins/org.hamcrest.core.source_1.1.0.v20090501071000.jar and /dev/null differ
diff --git a/eclipse/plugins/org.junit.source_3.8.2.v20090203-1005.jar b/eclipse/plugins/org.junit.source_3.8.2.v20090203-1005.jar
deleted file mode 100644
index 68e05ac..0000000
Binary files a/eclipse/plugins/org.junit.source_3.8.2.v20090203-1005.jar and /dev/null differ
diff --git a/eclipse/plugins/org.mortbay.jetty.server.source_6.1.15.v200905151201.jar b/eclipse/plugins/org.mortbay.jetty.server.source_6.1.15.v200905151201.jar
deleted file mode 100644
index f5c04c0..0000000
Binary files a/eclipse/plugins/org.mortbay.jetty.server.source_6.1.15.v200905151201.jar and /dev/null differ
diff --git a/eclipse/plugins/org.mortbay.jetty.util.source_6.1.15.v200905182336.jar b/eclipse/plugins/org.mortbay.jetty.util.source_6.1.15.v200905182336.jar
deleted file mode 100644
index 28940fc..0000000
Binary files a/eclipse/plugins/org.mortbay.jetty.util.source_6.1.15.v200905182336.jar and /dev/null differ
diff --git a/eclipse/plugins/org.objectweb.asm.source_3.1.0.v200803061910.jar b/eclipse/plugins/org.objectweb.asm.source_3.1.0.v200803061910.jar
deleted file mode 100644
index ce16d96..0000000
Binary files a/eclipse/plugins/org.objectweb.asm.source_3.1.0.v200803061910.jar and /dev/null differ
diff --git a/task-src/org/eclipse/linuxtools/eclipsebuild/SymlinkOSGiJars.java b/task-src/org/eclipse/linuxtools/eclipsebuild/SymlinkOSGiJars.java
index 4c6fb0b..b96db9e 100644
--- a/task-src/org/eclipse/linuxtools/eclipsebuild/SymlinkOSGiJars.java
+++ b/task-src/org/eclipse/linuxtools/eclipsebuild/SymlinkOSGiJars.java
@@ -29,11 +29,12 @@ import org.apache.tools.ant.taskdefs.optional.unix.Symlink;
public class SymlinkOSGiJars extends Task {
- private String origManifestsDir = "dependencyManifests/";
private String[] importantManifestEntries = { "Bundle-SymbolicName", "Bundle-Version", "Export-Package" };
private Properties dependencies;
private String topLevelDir;
+ private String manifestsDir;
+ private boolean keepOrigNames = true;
// Main method for ant task
public void execute() throws BuildException {
@@ -42,13 +43,15 @@ public class SymlinkOSGiJars extends Task {
// Binary MANIFEST.MF
String origLocation = (String) jarIter.next();
- String origManifestFile = origManifestsDir + origLocation + "/META-INF/MANIFEST.MF";
+ String origManifestFile = manifestsDir + "/" + origLocation + "/META-INF/MANIFEST.MF";
Attributes origAttributes = getAttributesFromManifest(origManifestFile);
// System MANIFEST.MF
String systemLocations = (String) dependencies.get(origLocation);
String[] systemLocationList = systemLocations.split(":");
File matchedJar = null;
+ String matchedJarBundleNameVersion = "";
+ Attributes systemAttributes = null;
for (int i = 0; i < systemLocationList.length; i++) {
boolean isAMatch = true;
File systemFile = new File(systemLocationList[i]);
@@ -59,7 +62,7 @@ public class SymlinkOSGiJars extends Task {
try {
systemJarFile = new JarFile(systemFile);
Manifest systemManifest = systemJarFile.getManifest();
- Attributes systemAttributes = systemManifest.getMainAttributes();
+ systemAttributes = systemManifest.getMainAttributes();
for (int j = 0; j < importantManifestEntries.length; j++) {
String attributeToCheck = importantManifestEntries[j];
String origAttribute = (String) origAttributes.getValue(attributeToCheck);
@@ -119,6 +122,13 @@ public class SymlinkOSGiJars extends Task {
}
if (isAMatch) {
matchedJar = systemFile;
+ String matchedJarBundleName =
+ systemAttributes.getValue("Bundle-SymbolicName");
+ matchedJarBundleName =
+ matchedJarBundleName.replace("; singleton:=true", "");
+ matchedJarBundleNameVersion =
+ matchedJarBundleName
+ + "_" + systemAttributes.getValue("Bundle-Version");
break;
}
}
@@ -137,7 +147,6 @@ public class SymlinkOSGiJars extends Task {
+ attemptedLocations);
}
- log("Going to symlink " + origLocation + " to " + matchedJar.getAbsolutePath(), Project.MSG_DEBUG);
// First, delete any existing symlink
Delete d = new Delete();
@@ -148,7 +157,13 @@ public class SymlinkOSGiJars extends Task {
// Then make the actual symlink
Symlink s = new Symlink();
s.init();
- s.setLink(topLevelDir + "/" + origLocation);
+ if (keepOrigNames) {
+ log("Going to symlink " + origLocation + " to " + matchedJar.getAbsolutePath(), Project.MSG_DEBUG);
+ s.setLink(topLevelDir + "/" + origLocation);
+ } else {
+ log("Going to symlink " + matchedJarBundleNameVersion + ".jar" + " to " + matchedJar.getAbsolutePath(), Project.MSG_DEBUG);
+ s.setLink(topLevelDir + "/" + matchedJarBundleNameVersion + ".jar");
+ }
s.setResource(matchedJar.getAbsolutePath());
s.execute();
}
@@ -187,4 +202,12 @@ public class SymlinkOSGiJars extends Task {
public void setTopleveldir(String topLevelDir) {
this.topLevelDir = topLevelDir;
}
+
+ public void setManifests(String manifests) {
+ this.manifestsDir = manifests;
+ }
+
+ public void setKeeporignames(boolean keeporignames) {
+ this.keepOrigNames = keeporignames;
+ }
}
hooks/post-receive
--
eclipse - Powerful IDE written in java - Debian package.
More information about the pkg-java-commits
mailing list