diff options
| author | Johannes Dahlström <johannesd@vaadin.com> | 2014-02-13 16:54:11 +0200 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2014-02-24 15:26:43 +0000 |
| commit | be827f80efab4f8ed0762fea3d54dab9b6296f91 (patch) | |
| tree | d515b815e76a2e1c91673049d3178bdc5367c5de | |
| parent | badf9f27dac3457c797a07bb383a6f30088c336b (diff) | |
| download | vaadin-framework-be827f80efab4f8ed0762fea3d54dab9b6296f91.tar.gz vaadin-framework-be827f80efab4f8ed0762fea3d54dab9b6296f91.zip | |
Enable on-the-fly SASS compilation in OSGi (#10307)
* Add proper Import-Package directives to theme-compiler
* Require-Bundle theme-compiler in server bundle
Change-Id: I7dec20c04eac92271b8adf0b1e23c573f1b06a29
| -rw-r--r-- | server/build.xml | 2 | ||||
| -rw-r--r-- | theme-compiler/build.xml | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/server/build.xml b/server/build.xml index 98ee2342cf..ad377584b9 100644 --- a/server/build.xml +++ b/server/build.xml @@ -24,7 +24,7 @@ <target name="jar"> <property name="server.osgi.import" value="javax.servlet;version="2.4.0",javax.servlet.http;version="2.4.0",javax.validation;version="1.0.0.GA";resolution:=optional,org.jsoup;version="1.6.3",org.jsoup.parser;version="1.6.3",org.jsoup.nodes;version="1.6.3",org.jsoup.helper;version="1.6.3",org.jsoup.safety;version="1.6.3",org.json;version="0.0.20080701"" /> - <property name="server.osgi.require" value="com.vaadin.shared;bundle-version="${vaadin.version}",com.vaadin.push;bundle-version="${vaadin.version}";resolution:=optional" /> + <property name="server.osgi.require" value="com.vaadin.shared;bundle-version="${vaadin.version}",com.vaadin.push;bundle-version="${vaadin.version}";resolution:=optional,com.vaadin.theme-compiler;bundle-version="${vaadin.version}";resolution:=optional" /> <antcall target="common.jar"> <param name="require-bundle" value="${server.osgi.require}" /> <param name="import-package" value="${server.osgi.import}" /> diff --git a/theme-compiler/build.xml b/theme-compiler/build.xml index 03d0531a68..576b402ff4 100644 --- a/theme-compiler/build.xml +++ b/theme-compiler/build.xml @@ -53,6 +53,7 @@ <target name="jar" depends="parser"> <antcall target="common.jar"> + <param name="import-package" value="org.apache.commons.jexl2;version="2.1.1",org.w3c.css.sac;version="1.3",org.w3c.flute.parser;version="1.3.0.gg2",org.w3c.flute.parser.selectors;version="1.3.0.gg2",org.w3c.flute.util;version="1.3.0.gg2"" /> <reference torefid="extra.jar.includes" refid="empty.reference" /> </antcall> </target> |