summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Overholt2011-12-12 14:42:29 (EST)
committerAlexander Kurtakov2011-12-16 08:46:32 (EST)
commitbce5247ae7dcbb9d7741bccc43f75244815dd369 (patch)
tree9ca7c3a3a1863bd617a4f35b94c07b91a2d342b4
parentf3a334f06fdab6056ad27bcb542be3bec10ce607 (diff)
downloadorg.eclipse.linuxtools.eclipse-build-bce5247ae7dcbb9d7741bccc43f75244815dd369.zip
org.eclipse.linuxtools.eclipse-build-bce5247ae7dcbb9d7741bccc43f75244815dd369.tar.gz
org.eclipse.linuxtools.eclipse-build-bce5247ae7dcbb9d7741bccc43f75244815dd369.tar.bz2
Bug 363027: Please add license feature to eclipse-build
Apply patch from Andrew Robinson to add the common license feature to the Eclipse SDK builds used by Linux Distributions. Also make this feature usable by features built using pdebuild.sh.
-rw-r--r--eclipse-build-config/productFiles/sdk/sdk.product1
-rw-r--r--eclipse-build-feature/feature.xml4
-rw-r--r--eclipse-build/build.xml3
-rw-r--r--eclipse-build/patches/nonRelativeLicense.patch20
-rwxr-xr-xeclipse-build/pdebuild/eclipse-copy-platform.sh25
5 files changed, 51 insertions, 2 deletions
diff --git a/eclipse-build-config/productFiles/sdk/sdk.product b/eclipse-build-config/productFiles/sdk/sdk.product
index c33946d..ab98d89 100644
--- a/eclipse-build-config/productFiles/sdk/sdk.product
+++ b/eclipse-build-config/productFiles/sdk/sdk.product
@@ -162,6 +162,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
<feature id="org.eclipse.sdk"/>
<feature id="org.eclipse.equinox.p2.user.ui"/>
<feature id="org.eclipse.rcp.configuration"/>
+ <feature id="org.eclipse.license"/>
</features>
<configurations>
diff --git a/eclipse-build-feature/feature.xml b/eclipse-build-feature/feature.xml
index 2129124..b495521 100644
--- a/eclipse-build-feature/feature.xml
+++ b/eclipse-build-feature/feature.xml
@@ -10,6 +10,10 @@
<includes
id="org.eclipse.sdk"
version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.license"
+ version="0.0.0"/>
<includes
id="org.eclipse.equinox.executable"
diff --git a/eclipse-build/build.xml b/eclipse-build/build.xml
index 9e6eda8..fdc3281 100644
--- a/eclipse-build/build.xml
+++ b/eclipse-build/build.xml
@@ -339,6 +339,7 @@
<patch patchfile="${basedir}/patches/eclipse-equinox-http-jetty.patch" dir="${buildDirectory}" strip="0" />
<patch patchfile="${basedir}/patches/eclipse-equinox-http-servlet.patch" dir="${buildDirectory}" strip="0" />
<patch patchfile="${basedir}/patches/eclipse-help-feature.patch" dir="${buildDirectory}" strip="0" />
+ <patch patchfile="${basedir}/patches/nonRelativeLicense.patch" dir="${buildDirectory}" strip="0" />
<echo file="patch-stamp" />
</target>
@@ -1189,7 +1190,7 @@
<!-- Install SDK -->
<property name="sdkInstallation" value="${provisionDir}.sdk"/>
<antcall target="provision.installed">
- <param name="p2.director.installIU" value="org.eclipse.sdk.feature.group" />
+ <param name="p2.director.installIU" value="org.eclipse.sdk.feature.group,org.eclipse.license.feature.group" />
<param name="profileName" value="PlatformProfile" />
</antcall>
<!-- rename the entire SDK installation -->
diff --git a/eclipse-build/patches/nonRelativeLicense.patch b/eclipse-build/patches/nonRelativeLicense.patch
new file mode 100644
index 0000000..34815ea
--- /dev/null
+++ b/eclipse-build/patches/nonRelativeLicense.patch
@@ -0,0 +1,20 @@
+--- plugins/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/FeatureBuildScriptGenerator.java 2011-11-02 12:30:11.000000000 -0400
++++ plugins/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/FeatureBuildScriptGenerator.java 2011-12-08 16:44:16.169816674 -0500
+@@ -336,7 +336,7 @@
+ script.println(" buildResultFolder=\"" + featureTemp + "\""); //$NON-NLS-1$ //$NON-NLS-2$
+ script.println(" baseDirectory=\"${basedir}\""); //$NON-NLS-1$
+ if (getLicenseFeature() != null) {
+- IPath licenseLocation = Utils.makeRelative(new Path(getLicenseFeatureRootLocation()), new Path(featureRootLocation));
++ IPath licenseLocation = new Path(getLicenseFeatureRootLocation());
+ String licensePath = licenseLocation.isAbsolute() ? licenseLocation.toString() : "${basedir}/" + licenseLocation.toString(); //$NON-NLS-1$
+ script.println(" licenseDirectory=\"" + licensePath + "\""); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+@@ -419,7 +419,7 @@
+ return;
+ }
+
+- IPath licenseLocation = Utils.makeRelative(new Path(getLicenseFeatureRootLocation()), new Path(featureRootLocation));
++ IPath licenseLocation = new Path(getLicenseFeatureRootLocation());
+ String licensePath = licenseLocation.isAbsolute() ? licenseLocation.toString() : "${basedir}/" + licenseLocation.toString(); //$NON-NLS-1$
+
+ if (printCopy) {
diff --git a/eclipse-build/pdebuild/eclipse-copy-platform.sh b/eclipse-build/pdebuild/eclipse-copy-platform.sh
index c8485ba..e0169e1 100755
--- a/eclipse-build/pdebuild/eclipse-copy-platform.sh
+++ b/eclipse-build/pdebuild/eclipse-copy-platform.sh
@@ -73,5 +73,28 @@ if [ $# -gt 0 ]; then
done
done
fi
-
+for p in $(ls -d $eclipse/dropins/jdt/plugins/*); do
+ plugin=$(basename $p)
+ [ ! -e $where/plugins/$plugin ] && ln -s $eclipse/dropins/jdt/plugins/$plugin $where/plugins/$plugin
+done
+for f in $(ls -d $eclipse/dropins/jdt/features/*); do
+ feature=$(basename $f)
+ [ ! -e $where/features/$feature ] && ln -s $eclipse/dropins/jdt/features/$feature $where/features/$feature
+done
+for p in $(ls -d $eclipse/dropins/sdk/plugins/*); do
+ plugin=$(basename $p)
+ [ ! -e $where/plugins/$plugin ] && ln -s $eclipse/dropins/sdk/plugins/$plugin $where/plugins/$plugin
+done
+for f in $(ls -d $eclipse/dropins/sdk/features/*); do
+ feature=$(basename $f)
+ [ ! -e $where/features/$feature ] && ln -s $eclipse/dropins/sdk/features/$feature $where/features/$feature
+done
+for p in $(ls -d $eclipse/plugins/*); do
+ plugin=$(basename $p)
+ [ ! -e $where/plugins/$plugin ] && ln -s $eclipse/plugins/$plugin $where/plugins/$plugin
+done
+for f in $(ls -d $eclipse/features/*); do
+ feature=$(basename $f)
+ [ ! -e $where/features/$feature ] && ln -s $eclipse/features/$feature $where/features/$feature
+done
# Code after this point is automatically created by eclipse.spec.