Skip to content

Commit

Permalink
LPS-67234 grab all required dependencies for theme building through i…
Browse files Browse the repository at this point in the history
…vy instead of relying on jars in liferay bundles because they don't exist in downloaded bundles.
  • Loading branch information
david-truong committed Sep 15, 2016
1 parent 24d6782 commit 43682b8
Show file tree
Hide file tree
Showing 12 changed files with 12 additions and 7 deletions.
10 changes: 5 additions & 5 deletions build-common.xml
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ Error-Prone was automatically installed. Please rerun your task.
<arg value="sass.compiler.class.name=${sass.compiler.class.name}" />
<arg value="sass.dir=/" />
<arg value="sass.docroot.dir=@{sass.docroot.dir}" />
<arg value="sass.portal.common.dir=${app.server.portal.dir}/html/css/common" />
<arg value="sass.portal.common.path=${sdk.dir}/dependencies/com.liferay.css.builder/lib/com.liferay.frontend.css.common.jar" />
</java>

<if>
Expand Down Expand Up @@ -2237,14 +2237,14 @@ Please find a solution that does not require portal-impl.jar.
<sequential>
<if>
<resourcecount count="1" when="eq">
<fileset dir="${module.framework.base.dir}/modules" includes="@{theme.jar.name}*.jar" />
<fileset dir="${sdk.dir}/dependencies/com.liferay.css.builder/lib" includes="@{theme.jar.name}*.jar" />
</resourcecount>
<then>
<property name="theme.tmp.dir" value="${sdk.dir}/tmp/@{theme.jar.name}" />

<pathconvert property="frontend.theme.web.jar.path">
<path>
<fileset dir="${module.framework.base.dir}/modules" includes="@{theme.jar.name}*.jar" />
<fileset dir="${sdk.dir}/dependencies/com.liferay.css.builder/lib" includes="@{theme.jar.name}*.jar" />
</path>
</pathconvert>

Expand All @@ -2253,7 +2253,7 @@ Please find a solution that does not require portal-impl.jar.
<if>
<not>
<uptodate
srcfile="${module.framework.base.dir}/modules/${frontend.theme.web.file}"
srcfile="${sdk.dir}/dependencies/com.liferay.css.builder/lib/${frontend.theme.web.file}"
targetfile="${theme.tmp.dir}"
/>
</not>
Expand Down Expand Up @@ -3219,4 +3219,4 @@ for (String path : paths) {
</outofdate>
</antelope:repeat>
</target>
</project>
</project>
7 changes: 6 additions & 1 deletion dependencies/com.liferay.css.builder/ivy.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@
</info>

<dependencies defaultconf="default">
<dependency name="com.liferay.css.builder" org="com.liferay" rev="1.0.13" />
<dependency name="com.liferay.css.builder" org="com.liferay" rev="1.0.20" />
<dependency name="com.liferay.frontend.css.common" org="com.liferay" rev="2.0.1" />
<dependency name="com.liferay.frontend.theme.admin.web" org="com.liferay" rev="1.0.3" />
<dependency name="com.liferay.frontend.theme.classic.web" org="com.liferay" rev="2.0.2" />
<dependency name="com.liferay.frontend.theme.styled" org="com.liferay" rev="2.0.9" />
<dependency name="com.liferay.frontend.theme.unstyled" org="com.liferay" rev="2.0.9" />
</dependencies>
</ivy-module>
2 changes: 1 addition & 1 deletion dependencies/com.liferay.css.builder/ivy.xml.MD5
Original file line number Diff line number Diff line change
@@ -1 +1 @@
988b57a5c060a5bcbe856675d55eddc7
ee5303a83a1f2f93ce583c513415b874
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified dependencies/com.liferay.css.builder/lib/com.liferay.rtl.css.jar
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit 43682b8

Please sign in to comment.