Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Taal2011-11-01 04:40:29 -0400
committerMartin Taal2011-11-01 04:40:29 -0400
commit36d00f9d7cb4457425420c51a6fe9e2aff127cac (patch)
tree1d48bdf3cf6c5daf1b662ec572e471337d6ce492
parent1b8f54738bb2e1710406e36fe7256064b17345bd (diff)
downloadorg.eclipse.emf.texo-36d00f9d7cb4457425420c51a6fe9e2aff127cac.tar.gz
org.eclipse.emf.texo-36d00f9d7cb4457425420c51a6fe9e2aff127cac.tar.xz
org.eclipse.emf.texo-36d00f9d7cb4457425420c51a6fe9e2aff127cac.zip
Several changes to build infrastructure
-rw-r--r--infra/org.eclipse.emf.texo.releng.buckminster/ant_common.xml2
-rw-r--r--infra/org.eclipse.emf.texo.releng.buckminster/build.xml4
-rw-r--r--infra/org.eclipse.emf.texo.releng.buckminster/build/texo.rmap10
-rw-r--r--infra/org.eclipse.emf.texo.releng.buckminster/test/texo.rmap10
-rw-r--r--infra/org.eclipse.emf.texo.releng.buckminster/test/texo_test.xml10
5 files changed, 18 insertions, 18 deletions
diff --git a/infra/org.eclipse.emf.texo.releng.buckminster/ant_common.xml b/infra/org.eclipse.emf.texo.releng.buckminster/ant_common.xml
index c1ca6e4d..bb4dc9a2 100644
--- a/infra/org.eclipse.emf.texo.releng.buckminster/ant_common.xml
+++ b/infra/org.eclipse.emf.texo.releng.buckminster/ant_common.xml
@@ -57,7 +57,7 @@ http://dev.eclipse.org/viewsvn/index.cgi/trunk/org.eclipse.buckminster.releng/bu
<args>
<jvmarg value="-Xmx1024m" />
<jvmarg value="-Dbugfix.288796=true" />
- <jvmarg value="-Dgit.clone=${git.clone}" />
+ <jvmarg value="-Dgit.clone=${gitPath}" />
<arg value="-data" />
<arg value="@{workspace}" />
<arg value="--loglevel" />
diff --git a/infra/org.eclipse.emf.texo.releng.buckminster/build.xml b/infra/org.eclipse.emf.texo.releng.buckminster/build.xml
index b0c04a10..34129f27 100644
--- a/infra/org.eclipse.emf.texo.releng.buckminster/build.xml
+++ b/infra/org.eclipse.emf.texo.releng.buckminster/build.xml
@@ -28,8 +28,6 @@ http://dev.eclipse.org/viewsvn/index.cgi/trunk/org.eclipse.buckminster.releng/bu
<isset property="env.WORKSPACE" />
</condition>
- <property name="git.clone" location="${hudsonWorkSpacePath}/git" />
-
<condition property="texo.update.site.type" value="${env.TEXO_UPDATE_SITE_TYPE}" else="interim">
<isset property="env.TEXO_UPDATE_SITE_TYPE" />
</condition>
@@ -64,6 +62,7 @@ http://dev.eclipse.org/viewsvn/index.cgi/trunk/org.eclipse.buckminster.releng/bu
</condition>
<property name="buildsPath" location="${hudsonWorkSpacePath}/build" />
+ <property name="gitPath" location="${hudsonWorkSpacePath}/git" />
<!--property name="rootPath" location="${buildsPath}/${build.type}${buildTimestamp}"/-->
<property name="rootPath" location="${buildsPath}" />
@@ -110,6 +109,7 @@ http://dev.eclipse.org/viewsvn/index.cgi/trunk/org.eclipse.buckminster.releng/bu
<target name="init">
<echo message="Removing old build" />
+ <delete dir="${gitPath}" quiet="true" />
<delete dir="${testPath}" quiet="true" />
<delete dir="${buildPath}" quiet="true" />
<delete dir="${generatePath}" quiet="true" />
diff --git a/infra/org.eclipse.emf.texo.releng.buckminster/build/texo.rmap b/infra/org.eclipse.emf.texo.releng.buckminster/build/texo.rmap
index 221c2df2..8869cf39 100644
--- a/infra/org.eclipse.emf.texo.releng.buckminster/build/texo.rmap
+++ b/infra/org.eclipse.emf.texo.releng.buckminster/build/texo.rmap
@@ -18,28 +18,28 @@
<provider componentTypes="osgi.bundle" readerType="git" source="true">
<property key="git.remote.uri" value="git://git.eclipse.org/gitroot/texo/org.eclipse.emf.texo.git"/>
<uri format="{0},core/{1}">
- <bc:propertyRef key="git.clone"/>
+ <bc:propertyRef key="git.path"/>
<bc:propertyRef key="buckminster.component"/>
</uri>
</provider>
<provider componentTypes="osgi.bundle" readerType="git" source="true">
<property key="git.remote.uri" value="git://git.eclipse.org/gitroot/texo/org.eclipse.emf.texo.git"/>
<uri format="{0},runtime/{1}">
- <bc:propertyRef key="git.clone"/>
+ <bc:propertyRef key="git.path"/>
<bc:propertyRef key="buckminster.component"/>
</uri>
</provider>
<provider componentTypes="osgi.bundle" readerType="git" source="true">
<property key="git.remote.uri" value="git://git.eclipse.org/gitroot/texo/org.eclipse.emf.texo.git"/>
<uri format="{0},tests/{1}">
- <bc:propertyRef key="git.clone"/>
+ <bc:propertyRef key="git.path"/>
<bc:propertyRef key="buckminster.component"/>
</uri>
</provider>
<provider componentTypes="osgi.bundle" readerType="git" source="true">
<property key="git.remote.uri" value="git://git.eclipse.org/gitroot/texo/org.eclipse.emf.texo.git"/>
<uri format="{0},generator/{1}">
- <bc:propertyRef key="git.clone"/>
+ <bc:propertyRef key="git.path"/>
<bc:propertyRef key="buckminster.component"/>
</uri>
</provider>
@@ -49,7 +49,7 @@
<provider componentTypes="eclipse.feature" readerType="git" source="true" mutable="false">
<property key="git.remote.uri" value="git://git.eclipse.org/gitroot/texo/org.eclipse.emf.texo.git"/>
<uri format="{0},features/{1}-feature">
- <bc:propertyRef key="git.clone"/>
+ <bc:propertyRef key="git.path"/>
<bc:propertyRef key="buckminster.component"/>
</uri>
</provider>
diff --git a/infra/org.eclipse.emf.texo.releng.buckminster/test/texo.rmap b/infra/org.eclipse.emf.texo.releng.buckminster/test/texo.rmap
index 142eb739..a548ac46 100644
--- a/infra/org.eclipse.emf.texo.releng.buckminster/test/texo.rmap
+++ b/infra/org.eclipse.emf.texo.releng.buckminster/test/texo.rmap
@@ -26,28 +26,28 @@
<provider componentTypes="osgi.bundle" readerType="git" source="true">
<property key="git.remote.uri" value="git://git.eclipse.org/gitroot/texo/org.eclipse.emf.texo.git"/>
<uri format="{0},core/{1}">
- <bc:propertyRef key="git.clone"/>
+ <bc:propertyRef key="git.path"/>
<bc:propertyRef key="buckminster.component"/>
</uri>
</provider>
<provider componentTypes="osgi.bundle" readerType="git" source="true">
<property key="git.remote.uri" value="git://git.eclipse.org/gitroot/texo/org.eclipse.emf.texo.git"/>
<uri format="{0},runtime/{1}">
- <bc:propertyRef key="git.clone"/>
+ <bc:propertyRef key="git.path"/>
<bc:propertyRef key="buckminster.component"/>
</uri>
</provider>
<provider componentTypes="osgi.bundle" readerType="git" source="true">
<property key="git.remote.uri" value="git://git.eclipse.org/gitroot/texo/org.eclipse.emf.texo.git"/>
<uri format="{0},tests/{1}">
- <bc:propertyRef key="git.clone"/>
+ <bc:propertyRef key="git.path"/>
<bc:propertyRef key="buckminster.component"/>
</uri>
</provider>
<provider componentTypes="osgi.bundle" readerType="git" source="true">
<property key="git.remote.uri" value="git://git.eclipse.org/gitroot/texo/org.eclipse.emf.texo.git"/>
<uri format="{0},generator/{1}">
- <bc:propertyRef key="git.clone"/>
+ <bc:propertyRef key="git.path"/>
<bc:propertyRef key="buckminster.component"/>
</uri>
</provider>
@@ -57,7 +57,7 @@
<provider componentTypes="eclipse.feature" readerType="git" source="true" mutable="false">
<property key="git.remote.uri" value="git://git.eclipse.org/gitroot/texo/org.eclipse.emf.texo.git"/>
<uri format="{0},features/{1}-feature">
- <bc:propertyRef key="git.clone"/>
+ <bc:propertyRef key="git.path"/>
<bc:propertyRef key="buckminster.component"/>
</uri>
</provider>
diff --git a/infra/org.eclipse.emf.texo.releng.buckminster/test/texo_test.xml b/infra/org.eclipse.emf.texo.releng.buckminster/test/texo_test.xml
index 569d4291..b81f509c 100644
--- a/infra/org.eclipse.emf.texo.releng.buckminster/test/texo_test.xml
+++ b/infra/org.eclipse.emf.texo.releng.buckminster/test/texo_test.xml
@@ -152,12 +152,12 @@ http://dev.eclipse.org/viewsvn/index.cgi/trunk/org.eclipse.buckminster.releng/bu
</buckminster>
<echo message="Delete some to-be generated files"/>
- <delete dir="${workspacePath}/git/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/capa"/>
- <delete dir="${workspacePath}/git/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/employee"/>
- <delete dir="${workspacePath}/git/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/extendedpo2"/>
+ <delete dir="${gitPath}/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/capa"/>
+ <delete dir="${gitPath}/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/employee"/>
+ <delete dir="${gitPath}/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/extendedpo2"/>
<echo message="Copy from src-merge-test to src-test-gen, to test merging during generation"/>
- <copy todir="${workspacePath}/git/tests/org.eclipse.emf.texo.test.model/src-test-gen" flatten="false">
- <fileset dir="${workspacePath}/git/tests/org.eclipse.emf.texo.test.model/src-merge-testing">
+ <copy todir="${gitPath}/tests/org.eclipse.emf.texo.test.model/src-test-gen" flatten="false">
+ <fileset dir="${gitPath}/tests/org.eclipse.emf.texo.test.model/src-merge-testing">
<include name="**/*"/>
</fileset>
</copy>

Back to the top