diff options
author | Mat Booth | 2016-03-04 18:26:47 +0000 |
---|---|---|
committer | Mat Booth | 2016-04-18 17:40:18 +0000 |
commit | a2498e76be84e0435005bb504ede4a6d9490b04d (patch) | |
tree | e697edf8ba3e48653e0b1afb8c5a5c02b32cc953 | |
parent | d40359cd541c521122c962a23be90d8490deea83 (diff) | |
download | org.eclipse.linuxtools.eclipse-build-a2498e76be84e0435005bb504ede4a6d9490b04d.tar.gz org.eclipse.linuxtools.eclipse-build-a2498e76be84e0435005bb504ede4a6d9490b04d.tar.xz org.eclipse.linuxtools.eclipse-build-a2498e76be84e0435005bb504ede4a6d9490b04d.zip |
No longer need to manually symlink JDT and PDE external deps
Change-Id: Ibdb529fbfefbe4c90b1887c1b958b87b2a3b4bef
Signed-off-by: Mat Booth <mat.booth@redhat.com>
Reviewed-on: https://git.eclipse.org/r/70893
-rwxr-xr-x | dependencies/replace_platform_plugins_with_symlinks.sh | 12 | ||||
-rwxr-xr-x | utils/move_JDT_PDE_to_dropins.sh | 57 |
2 files changed, 0 insertions, 69 deletions
diff --git a/dependencies/replace_platform_plugins_with_symlinks.sh b/dependencies/replace_platform_plugins_with_symlinks.sh index ef91cd9..36788c4 100755 --- a/dependencies/replace_platform_plugins_with_symlinks.sh +++ b/dependencies/replace_platform_plugins_with_symlinks.sh @@ -74,16 +74,4 @@ pushd $1 _symlink org.w3c.css.sac_ sac.jar _symlink org.w3c.dom.svg_ xml-commons-apis-ext.jar popd - - # Remove and symlink all duplicate jars in the jdt feature - pushd dropins/jdt/plugins - _symlink org.hamcrest.core_ hamcrest/core.jar - _symlink org.junit_4 junit.jar - popd - - # Remove and symlink all duplicate jars in the pde feature - pushd dropins/sdk/plugins - _symlink org.objectweb.asm_ objectweb-asm/asm.jar - _symlink org.objectweb.asm.tree_ objectweb-asm/asm-tree.jar - popd popd diff --git a/utils/move_JDT_PDE_to_dropins.sh b/utils/move_JDT_PDE_to_dropins.sh deleted file mode 100755 index 86b3c7a..0000000 --- a/utils/move_JDT_PDE_to_dropins.sh +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/bash -x - -# JDT and PDE are built as update sites. -# The procedure of moving them to dropins is following: -# -# Copy Eclipse installation -# Install JDT or PDE into it -# Copy the difference into dropins -# -# This must go this way to initialize all the plugins. -# -# Arguments: -# 1: path to the location of the materialised IDE product -# 2: path to a repository that contains the plug-ins -# 3: the IDs of the plug-ins that should be moved to dropins -# -# Base Eclipse installation is required to not have plug-ins installed. - -LOCATION="${1}" -REPO="${2}" -PLUGINS="${3}" - -pushd ${LOCATION} - -backup_dir=eclipse - -for p in $PLUGINS ; do - - # Take a backup of the installation - old_dir="$backup_dir" - backup_dir="$backup_dir-$p" - cp -rf $old_dir $backup_dir - - # Install plug-in into backup dir - pushd $backup_dir - ./eclipse -application org.eclipse.equinox.p2.director -noSplash \ - -repository file:/${REPO} \ - -installIU org.eclipse.${p}.feature.group - popd - - # Get the difference and copy all files into plug-in directory - mkdir -p $p/plugins $p/features - for i in $(ls $backup_dir/features) ; do - if [ ! -e $old_dir/features/$i ] ; then - cp -pr $backup_dir/features/$i $p/features - fi - done - for i in $(ls $backup_dir/plugins) ; do - if [ ! -e $old_dir/plugins/$i ] ; then - cp -pr $backup_dir/plugins/$i $p/plugins - fi - done -done - -# Move all plug-ins into dropins -cp -pr $PLUGINS eclipse/dropins -popd
\ No newline at end of file |