diff options
author | Eike Stepper | 2010-02-17 08:14:48 +0000 |
---|---|---|
committer | Eike Stepper | 2010-02-17 08:14:48 +0000 |
commit | 689906176fc65e524b6f80d3bbc92fbe1a499aea (patch) | |
tree | 48e5bd493a9e8fe2901af29147f1479e09771988 /releng | |
parent | 7a81f97edea34d1cc41016761241a5c6d3377904 (diff) | |
download | cdo-689906176fc65e524b6f80d3bbc92fbe1a499aea.tar.gz cdo-689906176fc65e524b6f80d3bbc92fbe1a499aea.tar.xz cdo-689906176fc65e524b6f80d3bbc92fbe1a499aea.zip |
*** empty log message ***
Diffstat (limited to 'releng')
-rw-r--r-- | releng/org.eclipse.emf.cdo.releng/build.properties | 4 | ||||
-rw-r--r-- | releng/org.eclipse.emf.cdo.releng/build.xml | 28 | ||||
-rw-r--r-- | releng/org.eclipse.emf.cdo.releng/local.properties | 4 |
3 files changed, 26 insertions, 10 deletions
diff --git a/releng/org.eclipse.emf.cdo.releng/build.properties b/releng/org.eclipse.emf.cdo.releng/build.properties index 404f9eb752..e779634ee7 100644 --- a/releng/org.eclipse.emf.cdo.releng/build.properties +++ b/releng/org.eclipse.emf.cdo.releng/build.properties @@ -9,8 +9,8 @@ target.os=* target.ws=* target.arch=* -site.pack200=false -site.signing=false +#site.pack200=false +#site.signing=false signing.type=eclipse.local #cbi.include.source=false diff --git a/releng/org.eclipse.emf.cdo.releng/build.xml b/releng/org.eclipse.emf.cdo.releng/build.xml index 5913152dd1..2577147fe0 100644 --- a/releng/org.eclipse.emf.cdo.releng/build.xml +++ b/releng/org.eclipse.emf.cdo.releng/build.xml @@ -20,14 +20,30 @@ <isset property="env.BUCKMINSTER_LOGLEVEL" /> </condition> - <condition property="site.pack200" value="${env.SITE_PACK200}"> + <condition property="site.pack200" value="${env.SITE_PACK200}" else="false"> <isset property="env.SITE_PACK200" /> </condition> - <condition property="site.signing" value="${env.SITE_SIGNING}"> + <condition property="site.signing" value="${env.SITE_SIGNING}" else="false"> <isset property="SITE_SIGNING" /> </condition> + <condition property="clean.tools" value="${env.CLEAN_TOOLS}" else="false"> + <isset property="CLEAN_TOOLS" /> + </condition> + + <condition property="clean.tp" value="${env.CLEAN_TP}" else="false"> + <isset property="CLEAN_TP" /> + </condition> + + <condition property="clean.workspace" value="${env.CLEAN_WORKSPACE}" else="true"> + <isset property="CLEAN_WORKSPACE" /> + </condition> + + <condition property="clean.output" value="${env.CLEAN_OUTPUT}" else="true"> + <isset property="CLEAN_OUTPUT" /> + </condition> + <!-- Default properties intended to be overridden by entries in the above property file --> <property name="tools" location="${build.root}/tools" /> <property name="result" location="${build.root}/result" /> @@ -90,22 +106,22 @@ </sequential> </macrodef> - <target name="init.clean.tools" if="${env.CLEAN_TOOLS}"> + <target name="init.clean.tools" if="${clean.tools}"> <echo message="Cleaning tools..." /> <antcall target="clean.tools" /> </target> - <target name="init.clean.tp" if="${env.CLEAN_TP}"> + <target name="init.clean.tp" if="${clean.tp}}"> <echo message="Cleaning target platform..." /> <antcall target="clean.tp" /> </target> - <target name="init.clean.workspace" if="${env.CLEAN_WORKSPACE}"> + <target name="init.clean.workspace" if="${clean.workspace}"> <echo message="Cleaning workspace..." /> <antcall target="clean.workspace" /> </target> - <target name="init.clean.output" if="${env.CLEAN_OUTPUT}"> + <target name="init.clean.output" if="${clean.output}"> <echo message="Cleaning output..." /> <antcall target="clean.output" /> </target> diff --git a/releng/org.eclipse.emf.cdo.releng/local.properties b/releng/org.eclipse.emf.cdo.releng/local.properties index b2666485f8..2c2d5b7e7d 100644 --- a/releng/org.eclipse.emf.cdo.releng/local.properties +++ b/releng/org.eclipse.emf.cdo.releng/local.properties @@ -9,8 +9,8 @@ target.os=* target.ws=* target.arch=* -site.pack200=false -site.signing=false +#site.pack200=false +#site.signing=false signing.type=eclipse.remote #cbi.include.source=false |