Improve RPM Factory

git-svn-id: https://svn.argeo.org/slc/trunk@6312 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/runtime/org.argeo.slc.support.simple/.settings/org.eclipse.jdt.core.prefs b/runtime/org.argeo.slc.support.simple/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644 (file)
index 93d3174..0000000
--- a/runtime/org.argeo.slc.support.simple/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Fri Aug 29 11:10:18 CEST 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5

diff --git a/runtime/org.argeo.slc.support.simple/build.properties b/runtime/org.argeo.slc.support.simple/build.properties
index 687d3188265882dc2fc1a1e9bc2baf613174774e..bdd5166ac9621c33832863a0714995a702cdc03b 100644 (file)
--- a/runtime/org.argeo.slc.support.simple/build.properties
+++ b/runtime/org.argeo.slc.support.simple/build.properties
@@ -1,3 +1,4 @@
 source.. = src/main/java/,\
            src/test/java/,\
-           src/test/resources/
+           src/test/resources/,\
+           src/main/resources/

diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/lib/linux/rpmfactory/BuildInMock.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/lib/linux/rpmfactory/BuildInMock.java
index 775efa51f7d15b379ad231adb712b181ca8737a3..1bafe8c777e6664918432be67d36e19b20e12ad8 100644 (file)
--- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/lib/linux/rpmfactory/BuildInMock.java
+++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/lib/linux/rpmfactory/BuildInMock.java
@@ -51,7 +51,7 @@ public class BuildInMock implements Runnable {
        private String level = null;
        private String arch = NOARCH;
 
-       private String srpm;
+       private String rpmPackage = null;
 
        private Boolean mkdirs = true;
 
@@ -63,8 +63,8 @@ public class BuildInMock implements Runnable {
        public void run() {
                // TODO check if caller is in mock group
 
-               String cfg = mockConfig != null ? mockConfig : repository + "-"
-                               + release + "-" + level + "-" + arch;
+               String cfgId = repository + "-" + release + "-" + arch;
+               String cfg = mockConfig != null ? mockConfig : "slc/" + cfgId;
 
                // prepare mock call
                SystemCall mock = new SystemCall();
@@ -78,7 +78,9 @@ public class BuildInMock implements Runnable {
                if (arch != null)
                        mock.arg("--arch=" + arch);
                mock.arg("-r").arg(cfg);
-               mock.arg(srpm);
+
+               mock.arg("--scm-enable");
+               mock.arg("--scm-option").arg("package=" + rpmPackage);
 
                mock.setLogCommand(true);
 
@@ -89,7 +91,7 @@ public class BuildInMock implements Runnable {
                // File repoDir = new File(buildEnvironment.getStagingBase() + "/"
                // + repository + "/" + level + "/" + release);
                File repoDir = new File(buildEnvironment.getStagingBase() + "/"
-                               + repository + "-staging" + "/" + release);
+                               + repository + "-" + release + "-staging");
                File srpmDir = new File(repoDir, "SRPMS");
                if (mkdirs)
                        srpmDir.mkdirs();
@@ -103,7 +105,7 @@ public class BuildInMock implements Runnable {
 
                // copy RPMs
                Set<File> reposToRecreate = new HashSet<File>();
-               File resultDir = new File(mockVar + "/" + cfg + "/result");
+               File resultDir = new File(mockVar + "/" + cfgId + "/result");
                rpms: for (File file : resultDir.listFiles()) {
                        if (file.isDirectory())
                                continue rpms;
@@ -188,8 +190,8 @@ public class BuildInMock implements Runnable {
                this.arch = arch;
        }
 
-       public void setSrpm(String srpm) {
-               this.srpm = srpm;
+       public void setRpmPackage(String rpmPackage) {
+               this.rpmPackage = rpmPackage;
        }
 
        public void setMockVar(String mockVar) {

diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/lib/linux/rpmfactory/RpmBuildEnvironment.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/lib/linux/rpmfactory/RpmBuildEnvironment.java
index 56e93d4ba6335001e15148512899825971306e4a..a5c1fc7ded02d674480ee5e233a56e0ff21a89aa 100644 (file)
--- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/lib/linux/rpmfactory/RpmBuildEnvironment.java
+++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/lib/linux/rpmfactory/RpmBuildEnvironment.java
@@ -36,7 +36,7 @@ public class RpmBuildEnvironment {
 
        private List<String> archs = new ArrayList<String>();
 
-       private String stagingBase = "/srv/rpmfactory";
+       private String stagingBase = "/mnt/slc/repos/rpm";
 
        /** Write (topdir)/rpmmacros and (topdir)/rpmrc */
        public void writeRpmbuildConfigFiles(File topdir) {