Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2017-12-20 04:27:21 -0500
committerEike Stepper2017-12-20 04:27:21 -0500
commit44c5ad76acee80c7912a778b70727ab03557351b (patch)
treea7009da738658ca5c257d7a521c65cd34b96a599
parent8b331c4ee9c868c5b9a8db25b108452ea2811b2d (diff)
downloadcdo-44c5ad76acee80c7912a778b70727ab03557351b.tar.gz
cdo-44c5ad76acee80c7912a778b70727ab03557351b.tar.xz
cdo-44c5ad76acee80c7912a778b70727ab03557351b.zip
[528979] Migrate build to Maven/Tycho
https://bugs.eclipse.org/bugs/show_bug.cgi?id=528979
-rw-r--r--releng/org.eclipse.emf.cdo.releng.parent/Tycho Build.launch2
-rw-r--r--releng/org.eclipse.emf.cdo.releng.site/pom.xml2
-rw-r--r--releng/org.eclipse.emf.cdo.releng/build.xml33
3 files changed, 12 insertions, 25 deletions
diff --git a/releng/org.eclipse.emf.cdo.releng.parent/Tycho Build.launch b/releng/org.eclipse.emf.cdo.releng.parent/Tycho Build.launch
index 4dd0ecfb58..86da94f2e6 100644
--- a/releng/org.eclipse.emf.cdo.releng.parent/Tycho Build.launch
+++ b/releng/org.eclipse.emf.cdo.releng.parent/Tycho Build.launch
@@ -4,6 +4,6 @@
<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
</listAttribute>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${maven.root}\bin\mvn.bat"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-Dbuild.id=Local&#13;&#10;-DGENERATE_SOURCE=true&#13;&#10;-DsourceFeatureLabelSuffix=&quot; Source&quot;&#13;&#10;-DskipTests=true&#13;&#10;-DDtycho.debug.resolver=true&#13;&#10;-DX&#13;&#10;--fail-at-end&#13;&#10;clean&#13;&#10;verify"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-DGENERATE_SOURCE=true&#13;&#10;-DsourceFeatureLabelSuffix=&quot; Source&quot;&#13;&#10;-DskipTests=true&#13;&#10;-DDtycho.debug.resolver=true&#13;&#10;-DX&#13;&#10;--fail-at-end&#13;&#10;clean&#13;&#10;verify"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${git.clone.cdo}"/>
</launchConfiguration>
diff --git a/releng/org.eclipse.emf.cdo.releng.site/pom.xml b/releng/org.eclipse.emf.cdo.releng.site/pom.xml
index bd88c5e908..066a2a8405 100644
--- a/releng/org.eclipse.emf.cdo.releng.site/pom.xml
+++ b/releng/org.eclipse.emf.cdo.releng.site/pom.xml
@@ -35,7 +35,7 @@
<artifactId>tycho-p2-repository-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
- <repositoryName>CDO Build ${build.id}</repositoryName>
+ <repositoryName>CDO Build Local</repositoryName>
</configuration>
</plugin>
</plugins>
diff --git a/releng/org.eclipse.emf.cdo.releng/build.xml b/releng/org.eclipse.emf.cdo.releng/build.xml
index c20305127d..bf3bbca457 100644
--- a/releng/org.eclipse.emf.cdo.releng/build.xml
+++ b/releng/org.eclipse.emf.cdo.releng/build.xml
@@ -70,6 +70,16 @@
<include name="**" />
</fileset>
</copy>
+
+ <unzip src="${build.root}/content.jar" dest="${build.root}" />
+ <replace file="${build.root}/content.xml" token="Build Local" value="${build.qualifier}" />
+ <delete file="${build.root}/content.jar" />
+ <zip destfile="${build.root}/content.jar" file="${build.root}/content.xml" />
+
+ <unzip src="${build.root}/artifacts.jar" dest="${build.root}" />
+ <replace file="${build.root}/artifacts.xml" token="Build Local" value="${build.qualifier}" />
+ <delete file="${build.root}/artifacts.jar" />
+ <zip destfile="${build.root}/artifacts.jar" file="${build.root}/artifacts.xml" />
</sequential>
</macrodef>
@@ -252,27 +262,6 @@
<property name="build.type" value="${env.BUILD_TYPE}" />
</else>
</if>
-
- <!-- site.signing -->
- <condition property="site.signing" value="true" else="false">
- <and>
- <not>
- <equals arg1="${build.type}" arg2="N" />
- </not>
- <or>
- <equals arg1="${env.HUDSON_URL}" arg2="https://hudson.eclipse.org/cdo/" />
- <equals arg1="${env.HUDSON_URL}" arg2="https://hudson.eclipse.org/hudson/" />
- </or>
- </and>
- </condition>
-
- <!-- eclipse.staging.area -->
- <if>
- <equals arg1="${site.signing}" arg2="true" />
- <then>
- <property name="eclipse.staging.area" value="/shared/download-staging.priv/modeling/emf/cdo/${env.JOB_NAME}" />
- </then>
- </if>
</target>
<!-- ========== -->
@@ -284,7 +273,6 @@
<property name="build.location" value="local" />
<property name="build.trigger" value="manual" />
- <property name="site.signing" value="false" />
<property name="git.clone" value="${build.root}/git" />
<!-- build.timestamp -->
@@ -373,7 +361,6 @@
<echo message="build.trigger = ${build.trigger}" />
<echo message="build.timestamp = ${build.timestamp}" />
<echo message="build.qualifier = ${build.qualifier}" />
- <echo message="site.signing = ${site.signing}" />
</target>
<!-- ===== -->

Back to the top