From 224a106d2faa616606bec41f6442db22801248fa Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Fri, 7 Jun 2013 12:08:17 +0000 Subject: [PATCH] Add developer git base url git-svn-id: https://svn.argeo.org/slc/trunk@6335 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../argeo/slc/rpmfactory/core/RpmFactory.java | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/runtime/org.argeo.slc.rpmfactory/src/main/java/org/argeo/slc/rpmfactory/core/RpmFactory.java b/runtime/org.argeo.slc.rpmfactory/src/main/java/org/argeo/slc/rpmfactory/core/RpmFactory.java index 4daf3b1ea..95e697703 100644 --- a/runtime/org.argeo.slc.rpmfactory/src/main/java/org/argeo/slc/rpmfactory/core/RpmFactory.java +++ b/runtime/org.argeo.slc.rpmfactory/src/main/java/org/argeo/slc/rpmfactory/core/RpmFactory.java @@ -61,6 +61,8 @@ public class RpmFactory { private String gitWorkspace = "git"; private String localUrlBase = "http://localhost:7070/"; + /** If not null or empty, this is a developer instance. */ + private String gitDevBaseUrl = null; private Boolean withTestingRepository = false; @@ -220,9 +222,16 @@ public class RpmFactory { buf.append("config_opts['scm_opts']['ext_src_dir'] = '" + getSourcesDir().getAbsolutePath() + "'\n"); buf.append("config_opts['scm_opts']['git_timestamps'] = True\n"); - buf.append("config_opts['scm_opts']['git_get'] = 'git clone " - + (branch != null ? "-b " + branch : "") + " " - + getGitBaseUrl() + "/SCM_PKG.git SCM_PKG'\n"); + + // development + if (gitDevBaseUrl != null && !gitDevBaseUrl.trim().equals("")) + buf.append("config_opts['scm_opts']['git_get'] = 'git clone " + + (branch != null ? "-b " + branch : "") + " " + + gitDevBaseUrl + "/SCM_PKG SCM_PKG'\n"); + else + buf.append("config_opts['scm_opts']['git_get'] = 'git clone " + + (branch != null ? "-b " + branch : "") + " " + + getGitBaseUrl() + "/SCM_PKG.git SCM_PKG'\n"); buf.append("\nconfig_opts['yum.conf'] = \"\"\"\n"); buf.append(generateYumConfigFile(arch)).append('\n'); @@ -441,4 +450,7 @@ public class RpmFactory { this.withTestingRepository = withTestingRepository; } + public void setGitDevBaseUrl(String gitBaseUrl) { + this.gitDevBaseUrl = gitBaseUrl; + } } -- 2.39.5