aboutsummaryrefslogtreecommitdiff
path: root/development
diff options
context:
space:
mode:
authorAndrew Clemons <andrew.clemons@gmail.com>2017-03-24 20:36:10 +0000
committerDavid Spencer <idlemoor@slackbuilds.org>2017-03-25 00:07:32 +0000
commited50d8f1c6a1cb17b581d31705b36fd2dce8a004 (patch)
tree4c906987e0ea9dcfb730936270b153810cea6f8d /development
parent143e052c02a5b8f6011ce7aa9945d5c436da89ea (diff)
development/eclim: Fixed jdt plugin not getting built.
Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
Diffstat (limited to 'development')
-rw-r--r--development/eclim/README2
-rw-r--r--development/eclim/eclim.SlackBuild19
2 files changed, 14 insertions, 7 deletions
diff --git a/development/eclim/README b/development/eclim/README
index 6b3005b4b07b..046479a8d3e4 100644
--- a/development/eclim/README
+++ b/development/eclim/README
@@ -14,4 +14,4 @@ or
ECLIPSE_HOME=/opt/eclipse-cpp ./eclim.SlackBuild
-apache-ant and Sphinx are only needed at build-time, not runtime. \ No newline at end of file
+apache-ant and Sphinx are only needed at build-time, not runtime.
diff --git a/development/eclim/eclim.SlackBuild b/development/eclim/eclim.SlackBuild
index ae479f22d41b..28844290d7fe 100644
--- a/development/eclim/eclim.SlackBuild
+++ b/development/eclim/eclim.SlackBuild
@@ -24,7 +24,7 @@
PRGNAM=eclim
VERSION=${VERSION:-2.6.0}
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-5}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -104,18 +104,25 @@ sed -i '/cacheDir=/d' build.xml
ECLIPSE_HOME=${ECLIPSE_HOME:-/opt/eclipse-java}
ECLIPSE_HOME=${ECLIPSE_HOME%/}
+# thanks to the archlinux maintainer (thanks to mikezackles)
+sed -i \
+ -e "s|File(getVariable('eclipse')|File('$ECLIPSE_HOME/'|g" \
+ -e 's|${user.home}/\.|${vim.files}/|g' \
+ -e '68,88d' \
+ ant/build.gant
+
ant build -Declipse.home=$ECLIPSE_HOME -Dvim.files=/usr/share/vim/vimfiles
mkdir -p $PKG/usr/share/vim/vimfiles
-
-ant docs vimdocs -Declipse.home=$ECLIPSE_HOME -Dvim.files=$PKG/usr/share/vim/vimfiles
-
mkdir -p $PKG$ECLIPSE_HOME
-ant deploy.eclipse -Declipse.home=$PKG$ECLIPSE_HOME -Dvim.files=$PKG/usr/share/vim/vimfiles
+ant docs vimdocs -Declipse.home=$ECLIPSE_HOME -Dvim.files=$PKG/usr/share/vim/vimfiles
+ant deploy -Declipse.home=$PKG$ECLIPSE_HOME -Dvim.files=$PKG/usr/share/vim/vimfiles
# tidy up
-sed -i "s#$PKG##" $PKG$ECLIPSE_HOME/plugins/org.eclim_$VERSION/bin/eclimd $PKG$ECLIPSE_HOME/plugins/org.eclim_$VERSION/plugin.properties
+sed -i "s#$PKG##" $PKG$ECLIPSE_HOME/plugins/org.eclim_$VERSION/bin/eclimd \
+ $PKG$ECLIPSE_HOME/plugins/org.eclim_$VERSION/plugin.properties \
+ $PKG/usr/share/vim/vimfiles/eclim/plugin/eclim.vim
sed -i "s#\${eclipse.home}#$ECLIPSE_HOME#" $PKG$ECLIPSE_HOME/plugins/org.eclim_$VERSION/bin/native/linux/eclimd $PKG$ECLIPSE_HOME/plugins/org.eclim_$VERSION/bin/native/linux/eclimd.desktop
find $PKG$ECLIPSE_HOME/plugins/org.eclim_$VERSION/nailgun \! -name ng -mindepth 1 -print0 | xargs -0 rm -rf
rm -rf build/doc/site/.doctrees