Commit 6a7defff authored by Jeno Attila Balasko's avatar Jeno Attila Balasko Committed by Gerrit Code Review
Browse files

Merge "the refactoring feaure should only appear in the next big relese."

parents 6e32fe8d 4ab826ba
......@@ -81,9 +81,9 @@
<build.plugin name="${titanium.regressiontests.name}"/>
</target>
<target name="titanium.refactoring.plugin" depends="init, common.plugin, designer.plugin">
<!--<target name="titanium.refactoring.plugin" depends="init, common.plugin, designer.plugin">
<build.plugin name="${titanium.refactoring.name}"/>
</target>
</target>-->
<!-- Macro which builds a feature -->
<macrodef name="build.feature">
......@@ -214,10 +214,10 @@
name="Titanium"
updatesite.name="@{updatesite.name}"
updatesite.url="@{updatesite.url}"/>
<build.feature dir="Titanium_Refactoring_feature"
<!--<build.feature dir="Titanium_Refactoring_feature"
name="Titanium.Refactoring"
updatesite.name="@{updatesite.name}"
updatesite.url="@{updatesite.url}"/>
updatesite.url="@{updatesite.url}"/>-->
<build.external_feature dir="Titan_external_dependencies_feature"
name="Titan_external_dependencies"
updatesite.name="@{updatesite.name}"
......@@ -419,7 +419,7 @@
</macrodef>
<target name="updatesite.release"
depends="common.plugin, runtime, designer.plugin, executor.plugin, help.plugin, logviewer.plugin, debug.plugin, regressiontests.plugin, titanium.plugin, titanium.regressiontests.plugin, titanium.refactoring.plugin">
depends="common.plugin, runtime, designer.plugin, executor.plugin, help.plugin, logviewer.plugin, debug.plugin, regressiontests.plugin, titanium.plugin, titanium.regressiontests.plugin"> <!-- , titanium.refactoring.plugin -->
<build.updatesite
site.name="${updatesite.release.name}"
location="${updatesite.release.location}"
......@@ -428,7 +428,7 @@
</target>
<target name="updatesite.FOA"
depends="common.plugin, runtime, designer.plugin, executor.plugin, help.plugin, logviewer.plugin, debug.plugin, regressiontests.plugin, titanium.plugin, titanium.regressiontests.plugin, titanium.refactoring.plugin">
depends="common.plugin, runtime, designer.plugin, executor.plugin, help.plugin, logviewer.plugin, debug.plugin, regressiontests.plugin, titanium.plugin, titanium.regressiontests.plugin"> <!-- , titanium.refactoring.plugin -->
<build.updatesite
site.name="${updatesite.FOA.name}"
location="${updatesite.FOA.location}"
......@@ -436,7 +436,7 @@
</target>
<target name="updatesite.experimental"
depends="common.plugin, runtime, designer.plugin, executor.plugin, help.plugin, logviewer.plugin, debug.plugin, regressiontests.plugin, titanium.plugin, titanium.regressiontests.plugin, titanium.refactoring.plugin">
depends="common.plugin, runtime, designer.plugin, executor.plugin, help.plugin, logviewer.plugin, debug.plugin, regressiontests.plugin, titanium.plugin, titanium.regressiontests.plugin"> <!-- , titanium.refactoring.plugin -->
<build.updatesite
site.name="${updatesite.experimental.name}"
location="${updatesite.experimental.location}"
......@@ -444,7 +444,7 @@
</target>
<target name="updatesite.testing"
depends="common.plugin, runtime, designer.plugin, executor.plugin, help.plugin, logviewer.plugin, debug.plugin, regressiontests.plugin, titanium.plugin, titanium.regressiontests.plugin, titanium.refactoring.plugin">
depends="common.plugin, runtime, designer.plugin, executor.plugin, help.plugin, logviewer.plugin, debug.plugin, regressiontests.plugin, titanium.plugin, titanium.regressiontests.plugin"> <!-- , titanium.refactoring.plugin -->
<build.updatesite
site.name="${updatesite.testing.name}"
location="${updatesite.testing.location}"
......@@ -452,7 +452,7 @@
</target>
<target name="zip"
depends="common.plugin, runtime, designer.plugin, executor.plugin, help.plugin, logviewer.plugin, debug.plugin, regressiontests.plugin, titanium.plugin, titanium.regressiontests.plugin, titanium.refactoring.plugin">
depends="common.plugin, runtime, designer.plugin, executor.plugin, help.plugin, logviewer.plugin, debug.plugin, regressiontests.plugin, titanium.plugin, titanium.regressiontests.plugin"> <!-- , titanium.refactoring.plugin -->
<build.updatesite
site.name="${updatesite.release.name}"
location="${result.dir}/zip/${version.qualifier}/"
......@@ -476,7 +476,7 @@
<clean.plugin name="${regressiontests.name}"/>
<clean.plugin name="${titanium.name}"/>
<clean.plugin name="${titanium.regressiontests.name}"/>
<clean.plugin name="${titanium.refactoring.name}"/>
<!--<clean.plugin name="${titanium.refactoring.name}"/>-->
<delete dir="${result.dir}" failonerror="false"/>
</target>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment