Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--org.eclipse.emf.cdo.releng.promotion/PromoterLocal.launch13
-rw-r--r--org.eclipse.emf.cdo.releng.promotion/build.xml1
-rw-r--r--org.eclipse.emf.cdo.releng.promotion/config/promoter.properties2
-rw-r--r--org.eclipse.emf.cdo.releng.promotion/src/promoter/PromoterConfig.java26
-rw-r--r--org.eclipse.emf.cdo.releng.promotion/src/promoter/util/Util.java31
5 files changed, 50 insertions, 23 deletions
diff --git a/org.eclipse.emf.cdo.releng.promotion/PromoterLocal.launch b/org.eclipse.emf.cdo.releng.promotion/PromoterLocal.launch
deleted file mode 100644
index 8387531..0000000
--- a/org.eclipse.emf.cdo.releng.promotion/PromoterLocal.launch
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.emf.cdo.releng.promotion/src/promoter/Promoter.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.jdt.launching.ATTR_EXCLUDE_TEST_CODE" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="promoter.Promoter"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.emf.cdo.releng.promotion"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-DANT_HOME=&quot;C:\Develop\bin\apache-ant-1.8.2&quot;&#13;&#10;-DDOWNLOADS_HOME=&quot;C:\Users\Stepper\Desktop\download.e.o&quot;&#13;&#10;-DARCHIVE_HOME=&quot;C:\Users\Stepper\Desktop\archive.e.o&quot;&#13;&#10;-DworkingArea=&quot;C:\Users\Stepper\Desktop\workingArea&quot;&#13;&#10;-DforcedPromotion=true&#13;&#10;-DwebExpandAll=true&#13;&#10;-DskipCopyBuilds=true&#13;&#10;-DskipPerformTasks=true&#13;&#10;-DXXXskipGenerateReleaseNotes=true&#13;&#10;-DskipFileChecks=true"/>
-</launchConfiguration>
diff --git a/org.eclipse.emf.cdo.releng.promotion/build.xml b/org.eclipse.emf.cdo.releng.promotion/build.xml
index bce7b60..43a0b1d 100644
--- a/org.eclipse.emf.cdo.releng.promotion/build.xml
+++ b/org.eclipse.emf.cdo.releng.promotion/build.xml
@@ -41,6 +41,7 @@
<sysproperty key="JOB_URL" value="${env.JOB_URL}" />
<sysproperty key="JOB_NAME" value="${env.JOB_NAME}" />
<sysproperty key="ANT_HOME" value="${env.ANT_HOME}" />
+ <sysproperty key="TEST" value="${env.TEST}" />
<sysproperty key="workingArea" value="${env.WORKSPACE}" />
<sysproperty key="forcedPromotion" value="${promotion.force}" />
</java>
diff --git a/org.eclipse.emf.cdo.releng.promotion/config/promoter.properties b/org.eclipse.emf.cdo.releng.promotion/config/promoter.properties
index 488aa95..4a08ff9 100644
--- a/org.eclipse.emf.cdo.releng.promotion/config/promoter.properties
+++ b/org.eclipse.emf.cdo.releng.promotion/config/promoter.properties
@@ -1,7 +1,7 @@
projectName=CDO
# Path to the directory where the web pages and downloadable contents for users are located
-projectPath=modeling/emf/cdo/test
+projectPath=modeling/emf/cdo
compositionPath=updates
compositionTempPath=temp
diff --git a/org.eclipse.emf.cdo.releng.promotion/src/promoter/PromoterConfig.java b/org.eclipse.emf.cdo.releng.promotion/src/promoter/PromoterConfig.java
index 339e62f..41a7984 100644
--- a/org.eclipse.emf.cdo.releng.promotion/src/promoter/PromoterConfig.java
+++ b/org.eclipse.emf.cdo.releng.promotion/src/promoter/PromoterConfig.java
@@ -13,6 +13,7 @@ package promoter;
import java.io.File;
import promoter.util.Config;
+import promoter.util.Util;
/**
* @author Eike Stepper
@@ -28,6 +29,11 @@ public final class PromoterConfig extends Config
super(filename);
}
+ public boolean isTEST()
+ {
+ return "true".equalsIgnoreCase(getProperty("TEST"));
+ }
+
public File getGitExecutable()
{
return getFile("GIT_EXECUTABLE");
@@ -91,7 +97,15 @@ public final class PromoterConfig extends Config
public String getProjectPath()
{
- return getProperty("projectPath");
+ String projectPath = getProperty("projectPath");
+ projectPath = Util.rstrip(projectPath, "/");
+
+ if (isTEST())
+ {
+ projectPath += "/test";
+ }
+
+ return projectPath;
}
public File getCompositionArea()
@@ -166,20 +180,14 @@ public final class PromoterConfig extends Config
String jobName = getProperty("JOB_NAME");
if (jobURL != null && jobName != null)
{
- if (jobURL.endsWith("/"))
- {
- jobURL = jobURL.substring(0, jobURL.length() - "/".length());
- }
+ jobURL = Util.rstrip(jobURL, "/");
if (jobURL.endsWith(jobName))
{
jobURL = jobURL.substring(0, jobURL.length() - jobName.length());
}
- if (jobURL.endsWith("/"))
- {
- jobURL = jobURL.substring(0, jobURL.length() - "/".length());
- }
+ jobURL = Util.rstrip(jobURL, "/");
return jobURL;
}
diff --git a/org.eclipse.emf.cdo.releng.promotion/src/promoter/util/Util.java b/org.eclipse.emf.cdo.releng.promotion/src/promoter/util/Util.java
new file mode 100644
index 0000000..6e2eeaa
--- /dev/null
+++ b/org.eclipse.emf.cdo.releng.promotion/src/promoter/util/Util.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2004 - 2012 Eike Stepper (Loehne, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
+ */
+package promoter.util;
+
+/**
+ * @author Eike Stepper
+ */
+public final class Util
+{
+ private Util()
+ {
+ }
+
+ public static String rstrip(String line, String needle)
+ {
+ if (line.endsWith(needle))
+ {
+ line = line.substring(0, line.length() - needle.length());
+ }
+
+ return line;
+ }
+}

Back to the top