Skip to content
Browse files

LPS-34948 project.dir -> sdk.dir

  • Loading branch information...
1 parent 81d6533 commit d32f12ceaca86c7a5314c2796d641e26867a1a23 @shinnlok shinnlok committed with brianchandotcom May 2, 2013
View
8 build-common-ivy.xml
@@ -2,7 +2,7 @@
<!DOCTYPE project>
<project name="build-common-ivy" xmlns:antelope="antlib:ise.antelope.tasks" xmlns:ivy="antlib:org.apache.ivy.ant">
- <property name="ivy.home" value="${project.dir}/.ivy" />
+ <property name="ivy.home" value="${sdk.dir}/.ivy" />
<property name="ivy.install.version" value="2.3.0" />
<if>
@@ -28,7 +28,7 @@
<taskdef classpathref="ivy.lib.path" resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" />
- <for list="${basedir},${project.dir}" param="ivy.xml.dir">
+ <for list="${basedir},${sdk.dir}" param="ivy.xml.dir">
<sequential>
<if>
<available file="@{ivy.xml.dir}/ivy.xml" />
@@ -38,7 +38,7 @@
<if>
<isfalse value="${ivy.xml.unmodified}" />
<then>
- <ivy:settings file="${project.dir}/ivy-settings.xml" />
+ <ivy:settings file="${sdk.dir}/ivy-settings.xml" />
<ivy:resolve
file="@{ivy.xml.dir}/ivy.xml"
@@ -47,7 +47,7 @@
<if>
<or>
- <equals arg1="@{ivy.xml.dir}" arg2="${project.dir}" />
+ <equals arg1="@{ivy.xml.dir}" arg2="${sdk.dir}" />
<antelope:endswith string="${ant.project.name}" with="-shared" />
<available file="@{ivy.xml.dir}/bnd.bnd" />
</or>
View
4 build-common-osgi-plugin.xml
@@ -24,7 +24,7 @@
<path id="plugin-lib.classpath">
<path refid="portal.classpath" />
- <fileset dir="${project.dir}/lib" includes="bnd.jar" />
+ <fileset dir="${sdk.dir}/lib" includes="bnd.jar" />
<pathelement path="${plugin-lib.classpath.path}" />
</path>
@@ -87,7 +87,7 @@
<then>
<manifest-helper />
- <bndexpand propertyfile="${project.dir}/common.bnd" />
+ <bndexpand propertyfile="${sdk.dir}/common.bnd" />
<bnd
eclipse="false"
View
46 build-common-plugin.xml
@@ -20,12 +20,12 @@
<if>
<antelope:endswith string="${plugin.name}" with="-shared" />
<then>
- <var name="plugin.file" value="${project.dir}/dist/${plugin.name}-${lp.version}.${plugin.version}${lp.version.file.suffix}.jar" />
- <var name="plugin.src.file" value="${project.dir}/dist/${plugin.name}-src-${lp.version}.${plugin.version}${lp.version.file.suffix}.zip" />
+ <var name="plugin.file" value="${sdk.dir}/dist/${plugin.name}-${lp.version}.${plugin.version}${lp.version.file.suffix}.jar" />
+ <var name="plugin.src.file" value="${sdk.dir}/dist/${plugin.name}-src-${lp.version}.${plugin.version}${lp.version.file.suffix}.zip" />
</then>
<else>
- <var name="plugin.file" value="${project.dir}/dist/${plugin.name}-${lp.version}.${plugin.version}${lp.version.file.suffix}.war" />
- <var name="plugin.src.file" value="${project.dir}/dist/${plugin.name}-src-${lp.version}.${plugin.version}${lp.version.file.suffix}.zip" />
+ <var name="plugin.file" value="${sdk.dir}/dist/${plugin.name}-${lp.version}.${plugin.version}${lp.version.file.suffix}.war" />
+ <var name="plugin.src.file" value="${sdk.dir}/dist/${plugin.name}-src-${lp.version}.${plugin.version}${lp.version.file.suffix}.zip" />
</else>
</if>
@@ -562,13 +562,13 @@
<for list="${import.shared}" param="import.shared.current">
<sequential>
<if>
- <available file="${project.dir}/shared/@{import.shared.current}/src" />
+ <available file="${sdk.dir}/shared/@{import.shared.current}/src" />
<then>
- <ant dir="${project.dir}/shared/@{import.shared.current}" target="jar" inheritAll="false" />
+ <ant dir="${sdk.dir}/shared/@{import.shared.current}" target="jar" inheritAll="false" />
<for param="import.shared.full.path">
<path>
- <fileset dir="${project.dir}/dist" includes="@{import.shared.current}-${lp.version}.1*.jar" />
+ <fileset dir="${sdk.dir}/dist" includes="@{import.shared.current}-${lp.version}.1*.jar" />
</path>
<sequential>
<copy
@@ -579,10 +579,10 @@
</for>
<if>
- <available file="${project.dir}/shared/@{import.shared.current}/lib" />
+ <available file="${sdk.dir}/shared/@{import.shared.current}/lib" />
<then>
<copy todir="docroot/WEB-INF/lib">
- <fileset dir="${project.dir}/shared/@{import.shared.current}/lib" includes="*.jar" />
+ <fileset dir="${sdk.dir}/shared/@{import.shared.current}/lib" includes="*.jar" />
</copy>
</then>
</if>
@@ -606,29 +606,29 @@
<for list="${plugin-package.required-deployment-contexts}" param="required.deployment.context">
<sequential>
<if>
- <available file="${project.dir}/hooks/@{required.deployment.context}/docroot/WEB-INF/lib/@{required.deployment.context}-service.jar" />
+ <available file="${sdk.dir}/hooks/@{required.deployment.context}/docroot/WEB-INF/lib/@{required.deployment.context}-service.jar" />
<then>
<copy
- file="${project.dir}/hooks/@{required.deployment.context}/docroot/WEB-INF/lib/@{required.deployment.context}-service.jar"
+ file="${sdk.dir}/hooks/@{required.deployment.context}/docroot/WEB-INF/lib/@{required.deployment.context}-service.jar"
todir="docroot/WEB-INF/lib"
overwrite="true"
/>
</then>
<elseif>
- <available file="${project.dir}/portlets/@{required.deployment.context}/docroot/WEB-INF/lib/@{required.deployment.context}-service.jar" />
+ <available file="${sdk.dir}/portlets/@{required.deployment.context}/docroot/WEB-INF/lib/@{required.deployment.context}-service.jar" />
<then>
<copy
- file="${project.dir}/portlets/@{required.deployment.context}/docroot/WEB-INF/lib/@{required.deployment.context}-service.jar"
+ file="${sdk.dir}/portlets/@{required.deployment.context}/docroot/WEB-INF/lib/@{required.deployment.context}-service.jar"
todir="docroot/WEB-INF/lib"
overwrite="true"
/>
</then>
</elseif>
<elseif>
- <available file="${project.dir}/webs/@{required.deployment.context}/docroot/WEB-INF/lib/@{required.deployment.context}-service.jar" />
+ <available file="${sdk.dir}/webs/@{required.deployment.context}/docroot/WEB-INF/lib/@{required.deployment.context}-service.jar" />
<then>
<copy
- file="${project.dir}/webs/@{required.deployment.context}/docroot/WEB-INF/lib/@{required.deployment.context}-service.jar"
+ file="${sdk.dir}/webs/@{required.deployment.context}/docroot/WEB-INF/lib/@{required.deployment.context}-service.jar"
todir="docroot/WEB-INF/lib"
overwrite="true"
/>
@@ -741,7 +741,7 @@ Please find a solution that does not require portal-impl.jar.
<jvmarg value="-Dexternal-properties=com/liferay/portal/tools/dependencies/portal-tools.properties" />
<jvmarg value="-Dliferay.lib.portal.dir=${app.server.lib.portal.dir}" />
- <jvmarg value="-Ddeployer.base.dir=${project.dir}/dist" />
+ <jvmarg value="-Ddeployer.base.dir=${sdk.dir}/dist" />
<jvmarg value="-Ddeployer.dest.dir=${app.server.deploy.dir}" />
<jvmarg value="-Ddeployer.app.server.type=${app.server.type}" />
<jvmarg value="-Ddeployer.unpack.war=${auto.deploy.unpack.war}" />
@@ -772,7 +772,7 @@ Please find a solution that does not require portal-impl.jar.
<jvmarg value="-Dexternal-properties=com/liferay/portal/tools/dependencies/portal-tools.properties" />
<jvmarg value="-Dliferay.lib.portal.dir=${app.server.lib.portal.dir}" />
- <jvmarg value="-Ddeployer.base.dir=${project.dir}/dist" />
+ <jvmarg value="-Ddeployer.base.dir=${sdk.dir}/dist" />
<jvmarg value="-Ddeployer.dest.dir=${app.server.deploy.dir}" />
<jvmarg value="-Ddeployer.app.server.type=${app.server.type}" />
<jvmarg value="-Ddeployer.unpack.war=${auto.deploy.unpack.war}" />
@@ -804,7 +804,7 @@ Please find a solution that does not require portal-impl.jar.
<jvmarg value="-Dexternal-properties=com/liferay/portal/tools/dependencies/portal-tools.properties" />
<jvmarg value="-Dliferay.lib.portal.dir=${app.server.lib.portal.dir}" />
- <jvmarg value="-Ddeployer.base.dir=${project.dir}/dist" />
+ <jvmarg value="-Ddeployer.base.dir=${sdk.dir}/dist" />
<jvmarg value="-Ddeployer.dest.dir=${app.server.deploy.dir}" />
<jvmarg value="-Ddeployer.app.server.type=${app.server.type}" />
<jvmarg value="-Ddeployer.unpack.war=${auto.deploy.unpack.war}" />
@@ -832,7 +832,7 @@ Please find a solution that does not require portal-impl.jar.
<jvmarg value="-Dexternal-properties=com/liferay/portal/tools/dependencies/portal-tools.properties" />
<jvmarg value="-Dliferay.lib.portal.dir=${app.server.lib.portal.dir}" />
- <jvmarg value="-Ddeployer.base.dir=${project.dir}/dist" />
+ <jvmarg value="-Ddeployer.base.dir=${sdk.dir}/dist" />
<jvmarg value="-Ddeployer.dest.dir=${app.server.deploy.dir}" />
<jvmarg value="-Ddeployer.app.server.type=${app.server.type}" />
<jvmarg value="-Ddeployer.aui.taglib.dtd=${app.server.portal.dir}/WEB-INF/tld/aui.tld" />
@@ -872,7 +872,7 @@ Please find a solution that does not require portal-impl.jar.
<jvmarg value="-Dexternal-properties=com/liferay/portal/tools/dependencies/portal-tools.properties" />
<jvmarg value="-Dliferay.lib.portal.dir=${app.server.lib.portal.dir}" />
- <jvmarg value="-Ddeployer.base.dir=${project.dir}/dist" />
+ <jvmarg value="-Ddeployer.base.dir=${sdk.dir}/dist" />
<jvmarg value="-Ddeployer.dest.dir=${app.server.deploy.dir}" />
<jvmarg value="-Ddeployer.app.server.type=${app.server.type}" />
<jvmarg value="-Ddeployer.theme.taglib.dtd=${app.server.portal.dir}/WEB-INF/tld/liferay-theme.tld" />
@@ -906,7 +906,7 @@ Please find a solution that does not require portal-impl.jar.
<jvmarg value="-Dexternal-properties=com/liferay/portal/tools/dependencies/portal-tools.properties" />
<jvmarg value="-Dliferay.lib.portal.dir=${app.server.lib.portal.dir}" />
- <jvmarg value="-Ddeployer.base.dir=${project.dir}/dist" />
+ <jvmarg value="-Ddeployer.base.dir=${sdk.dir}/dist" />
<jvmarg value="-Ddeployer.dest.dir=${app.server.deploy.dir}" />
<jvmarg value="-Ddeployer.app.server.type=${app.server.type}" />
<jvmarg value="-Ddeployer.unpack.war=${auto.deploy.unpack.war}" />
@@ -1080,7 +1080,7 @@ Please find a solution that does not require portal-impl.jar.
<if>
<available file="test/${test.type}" type="dir" />
<then>
- <junit dir="${project.dir}" fork="on" forkmode="once" outputtoformatters="false" printsummary="on" showoutput="true">
+ <junit dir="${sdk.dir}" fork="on" forkmode="once" outputtoformatters="false" printsummary="on" showoutput="true">
<sysproperty key="net.sourceforge.cobertura.datafile" file="test-coverage/cobertura.ser" />
<jvmarg line="${junit.debug.jpda}" />
<jvmarg value="-Xmx${junit.java.mx}" />
@@ -1120,7 +1120,7 @@ Please find a solution that does not require portal-impl.jar.
</target>
<target name="war" depends="compile">
- <mkdir dir="${project.dir}/dist" />
+ <mkdir dir="${sdk.dir}/dist" />
<if>
<available file="tmp" />
View
26 build-common.xml
@@ -2,23 +2,23 @@
<!DOCTYPE project>
<project name="build-common">
- <dirname file="${ant.file.build-common}" property="project.dir" />
+ <dirname file="${ant.file.build-common}" property="sdk.dir" />
<property environment="env" />
<path id="lib.classpath">
- <fileset dir="${project.dir}/lib" includes="*.jar" />
+ <fileset dir="${sdk.dir}/lib" includes="*.jar" />
</path>
<taskdef classpathref="lib.classpath" resource="net/sf/antcontrib/antlib.xml" />
<taskdef classpathref="lib.classpath" resource="ise/antelope/tasks/antlib.xml" uri="antlib:ise.antelope.tasks" />
<import file="build-common-ivy.xml" />
- <property file="${project.dir}/build.${user.name}.properties" />
- <property file="${project.dir}/build.${env.COMPUTERNAME}.properties" />
- <property file="${project.dir}/build.${env.HOST}.properties" />
- <property file="${project.dir}/build.${env.HOSTNAME}.properties" />
+ <property file="${sdk.dir}/build.${user.name}.properties" />
+ <property file="${sdk.dir}/build.${env.COMPUTERNAME}.properties" />
+ <property file="${sdk.dir}/build.${env.HOST}.properties" />
+ <property file="${sdk.dir}/build.${env.HOSTNAME}.properties" />
<if>
<isset property="app.server.dir" />
@@ -35,7 +35,7 @@
</then>
</if>
- <property file="${project.dir}/build.properties" />
+ <property file="${sdk.dir}/build.properties" />
<propertycopy from="app.server.${app.server.type}.dir" name="app.server.dir" />
<propertycopy from="app.server.${app.server.type}.deploy.dir" name="app.server.deploy.dir" />
@@ -49,20 +49,20 @@
<path refid="plugin-lib.classpath" />
<fileset dir="${app.server.lib.global.dir}" includes="*.jar" />
<fileset dir="${app.server.lib.portal.dir}" includes="annotations.jar,commons-logging.jar,log4j.jar,util-bridges.jar,util-java.jar,util-taglib.jar" />
- <fileset dir="${project.dir}/lib" includes="activation.jar,jsp-api.jar,mail.jar,servlet-api.jar" />
+ <fileset dir="${sdk.dir}/lib" includes="activation.jar,jsp-api.jar,mail.jar,servlet-api.jar" />
</path>
<path id="portal.classpath">
<pathelement location="${app.server.classes.portal.dir}" />
<fileset dir="${app.server.lib.global.dir}" includes="*.jar" />
<fileset dir="${app.server.lib.portal.dir}" includes="*.jar" />
- <fileset dir="${project.dir}/lib" includes="activation.jar,jargs.jar,jsp-api.jar,qdox.jar,servlet-api.jar" />
+ <fileset dir="${sdk.dir}/lib" includes="activation.jar,jargs.jar,jsp-api.jar,qdox.jar,servlet-api.jar" />
</path>
<path id="test.classpath">
<path refid="plugin.classpath" />
<fileset dir="${app.server.lib.portal.dir}" includes="aspectj-weaver.jar,commons-io.jar,spring-*.jar" />
- <fileset dir="${project.dir}/lib" includes="junit.jar,mockito-all.jar,powermock-*.jar,spring-test.jar" />
+ <fileset dir="${sdk.dir}/lib" includes="junit.jar,mockito-all.jar,powermock-*.jar,spring-test.jar" />
<pathelement location="test-classes/integration" />
<pathelement location="test-classes/unit" />
</path>
@@ -90,7 +90,7 @@
</not>
</and>
<then>
- <copy file="${project.dir}/lib/ecj.jar" todir="${ant.home}/lib" />
+ <copy file="${sdk.dir}/lib/ecj.jar" todir="${ant.home}/lib" />
<fail>
.
@@ -140,12 +140,12 @@ ECJ was automatically installed. Please rerun your task.
</or>
<then>
<subant target="create">
- <fileset dir="${project.dir}/${plugin.type}s" includes="build.xml"/>
+ <fileset dir="${sdk.dir}/${plugin.type}s" includes="build.xml"/>
</subant>
</then>
<else>
<subant target="create">
- <fileset dir="${project.dir}/${plugin.type}" includes="build.xml"/>
+ <fileset dir="${sdk.dir}/${plugin.type}" includes="build.xml"/>
</subant>
</else>
</if>
View
2 build.properties
@@ -25,7 +25,7 @@
#
# Specify the application server parent directory.
#
- app.server.parent.dir=${project.dir}/../bundles
+ app.server.parent.dir=${sdk.dir}/../bundles
#
# Specify the paths to an unzipped Geronimo bundle.
View
10 build.xml
@@ -23,7 +23,7 @@
newenvironment="true"
>
<jvmarg value="-Dexternal-properties=com/liferay/portal/tools/dependencies/portal-tools.properties" />
- <jvmarg value="-Dplugins.dir=${project.dir}" />
+ <jvmarg value="-Dplugins.dir=${sdk.dir}" />
</java>
<java
@@ -33,9 +33,9 @@
newenvironment="true"
>
<jvmarg value="-Dexternal-properties=com/liferay/portal/tools/dependencies/portal-tools.properties" />
- <arg value="${project.dir}/summary.xml" />
- <arg value="${project.dir}/summary.xsl" />
- <arg value="${project.dir}/summary.html" />
+ <arg value="${sdk.dir}/summary.xml" />
+ <arg value="${sdk.dir}/summary.xsl" />
+ <arg value="${sdk.dir}/summary.html" />
</java>
</target>
@@ -77,7 +77,7 @@
<copy todir="dist" overwrite="yes">
<fileset
- dir="${project.dir}/tools/ear_tmpl"
+ dir="${sdk.dir}/tools/ear_tmpl"
/>
</copy>
View
2 ext/build-common-ext.xml
@@ -307,7 +307,7 @@ loader.
<arg line="docroot/WEB-INF docroot/WEB-INF ${plugin.name}" />
</java>
- <mkdir dir="${project.dir}/dist" />
+ <mkdir dir="${sdk.dir}/dist" />
<delete file="${plugin.file}" />
View
2 ext/build.xml
@@ -26,7 +26,7 @@
<copy todir="${ext.plugin.dir}">
<fileset
- dir="${project.dir}/tools/ext_tmpl"
+ dir="${sdk.dir}/tools/ext_tmpl"
/>
</copy>
View
2 hooks/build.xml
@@ -31,7 +31,7 @@
<copy todir="${hook.dir}">
<fileset
- dir="${project.dir}/tools/hook_tmpl"
+ dir="${sdk.dir}/tools/hook_tmpl"
/>
</copy>
View
2 layouttpl/build.xml
@@ -31,7 +31,7 @@
<copy todir="${layouttpl.dir}">
<fileset
- dir="${project.dir}/tools/layouttpl_tmpl"
+ dir="${sdk.dir}/tools/layouttpl_tmpl"
/>
</copy>
View
6 portlets/build.xml
@@ -31,7 +31,7 @@
<copy todir="${portlet.dir}">
<fileset
- dir="${project.dir}/tools/portlet_tmpl"
+ dir="${sdk.dir}/tools/portlet_tmpl"
/>
</copy>
@@ -66,15 +66,15 @@
<then>
<copy todir="${portlet.dir}">
<fileset
- dir="${project.dir}/tools/portlet_jsf_tmpl"
+ dir="${sdk.dir}/tools/portlet_jsf_tmpl"
/>
</copy>
</then>
</if>
<copy overwrite="true" todir="${portlet.dir}">
<fileset
- dir="${project.dir}/tools/portlet_${portlet.framework}_tmpl"
+ dir="${sdk.dir}/tools/portlet_${portlet.framework}_tmpl"
/>
</copy>
</then>
View
10 shared/build-common-shared.xml
@@ -5,13 +5,13 @@
<import file="../build-common-plugin.xml" />
<if>
- <available file="${project.dir}/shared/portal-compat-shared" />
+ <available file="${sdk.dir}/shared/portal-compat-shared" />
<then>
<property name="plugin-lib.classpath.path" refid="plugin-lib.classpath" />
<path id="plugin-lib.classpath">
<pathelement path="${plugin-lib.classpath.path}" />
- <pathelement location="${project.dir}/shared/portal-compat-shared/classes" />
+ <pathelement location="${sdk.dir}/shared/portal-compat-shared/classes" />
</path>
<var name="plugin-lib.classpath.path" unset="true" />
@@ -27,13 +27,13 @@
<target name="compile">
<if>
<and>
- <available file="${project.dir}/shared/portal-compat-shared" />
+ <available file="${sdk.dir}/shared/portal-compat-shared" />
<not>
<equals arg1="${plugin.name}" arg2="portal-compat-shared" />
</not>
</and>
<then>
- <ant dir="${project.dir}/shared/portal-compat-shared" target="compile" inheritAll="false" />
+ <ant dir="${sdk.dir}/shared/portal-compat-shared" target="compile" inheritAll="false" />
</then>
</if>
@@ -54,7 +54,7 @@
</target>
<target name="jar" depends="compile">
- <mkdir dir="${project.dir}/dist" />
+ <mkdir dir="${sdk.dir}/dist" />
<jar
basedir="classes"
View
2 themes/build-common-theme.xml
@@ -235,7 +235,7 @@
</then>
</if>
- <mkdir dir="${project.dir}/dist" />
+ <mkdir dir="${sdk.dir}/dist" />
<delete file="${plugin.file}" />
View
2 themes/build.xml
@@ -31,7 +31,7 @@
<copy todir="${theme.dir}">
<fileset
- dir="${project.dir}/tools/theme_tmpl"
+ dir="${sdk.dir}/tools/theme_tmpl"
/>
</copy>

0 comments on commit d32f12c

Please sign in to comment.
Something went wrong with that request. Please try again.