This is an automated email from the git hooks/post-receive script. xhaakon-guest pushed a commit to branch master in repository eclipse-wtp.
commit 1d32a694572a65bcab03ec2e0456df256c5fab8b Author: Jakub Adam <[email protected]> Date: Sat Sep 28 23:12:45 2013 +0200 Update Javascript parser regeneration in d/rules --- debian/changelog | 1 + debian/rules | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 034212b..37e38a3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ eclipse-wtp (3.5.1-1) UNRELEASED; urgency=low * Refreshed d/patches: - debian-custom-build.patch - regenerate-js-parser-resources.patch. + * Update Javascript parser regeneration in d/rules. -- Jakub Adam <[email protected]> Sat, 28 Sep 2013 21:52:30 +0200 diff --git a/debian/rules b/debian/rules index 3bc22a5..e0dcccf 100755 --- a/debian/rules +++ b/debian/rules @@ -64,16 +64,19 @@ override_jh_compilefeatures: jh_compilefeatures --build-opts="-DjavacTarget=1.5 -DjavacSource=1.5 \ -DbuildId=$(BUILD_ID) -DforceContextQualifier=$(BUILD_ID)"; -JSDT_CORE_JAR := eclipse-wtp-webtools/usr/share/eclipse/dropins/wtp-webtools/eclipse/plugins/org.eclipse.wst.jsdt.core_*.dist.jar +OSGI_JAR=$(shell ls /usr/lib/eclipse/plugins/org.eclipse.osgi_*.jar) +EQUINOX_COMMON_JAR=$(shell ls /usr/lib/eclipse/plugins/org.eclipse.equinox.common_*.jar) +ECLIPSE_CORE_RUNTIME_JAR=$(shell ls /usr/lib/eclipse/plugins/org.eclipse.core.runtime_*.jar) override_jh_installeclipse: jh_installeclipse + JSDT_CORE_JAR=`ls $$PWD/debian/eclipse-wtp-webtools/usr/share/eclipse/dropins/wtp-webtools/eclipse/plugins/org.eclipse.wst.jsdt.core_*.dist.jar`; \ cd debian/.eclipse-build/org.eclipse.wst.jsdt.core/grammar; \ - java -classpath ../../../$(JSDT_CORE_JAR) \ + java -classpath $(OSGI_JAR):$(EQUINOX_COMMON_JAR):$(ECLIPSE_CORE_RUNTIME_JAR):$$JSDT_CORE_JAR \ org.eclipse.wst.jsdt.internal.compiler.parser.UpdateParserFiles \ javadcl.java javahdr.java; \ mv parser*.rsc readableNames.properties ../src/org/eclipse/wst/jsdt/internal/compiler/parser/; \ cd ../src; \ - jar -uf ../../../$(JSDT_CORE_JAR) \ + jar -uf $$JSDT_CORE_JAR \ org/eclipse/wst/jsdt/internal/compiler/parser/parser*.rsc \ org/eclipse/wst/jsdt/internal/compiler/parser/readableNames.properties -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/eclipse-wtp.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
