diff options
| author | Alexander Kurtakov | 2012-04-27 07:40:08 +0000 |
|---|---|---|
| committer | Alexander Kurtakov | 2012-04-27 07:41:23 +0000 |
| commit | 204a87e76d377679171008359d5498b4400cc5f2 (patch) | |
| tree | 6958108888884fa881d48b9ca53a1f8ec013022c /rpm | |
| parent | 538487da63c4019105fc1a8f3e04030d45beff9d (diff) | |
| download | org.eclipse.linuxtools-204a87e76d377679171008359d5498b4400cc5f2.tar.gz org.eclipse.linuxtools-204a87e76d377679171008359d5498b4400cc5f2.tar.xz org.eclipse.linuxtools-204a87e76d377679171008359d5498b4400cc5f2.zip | |
Use sourceConfiguration properly after the rse addition.
Diffstat (limited to 'rpm')
2 files changed, 5 insertions, 4 deletions
diff --git a/rpm/org.eclipse.linuxtools.rpm.core.tests/src/org/eclipse/linuxtools/rpm/core/tests/RPMProjectTest.java b/rpm/org.eclipse.linuxtools.rpm.core.tests/src/org/eclipse/linuxtools/rpm/core/tests/RPMProjectTest.java index 8f0296c5fe..4fbeed388d 100644 --- a/rpm/org.eclipse.linuxtools.rpm.core.tests/src/org/eclipse/linuxtools/rpm/core/tests/RPMProjectTest.java +++ b/rpm/org.eclipse.linuxtools.rpm.core.tests/src/org/eclipse/linuxtools/rpm/core/tests/RPMProjectTest.java @@ -134,6 +134,7 @@ public class RPMProjectTest { rpmProject.importSourceRPM(foo); ByteArrayOutputStream bos = new ByteArrayOutputStream(); rpmProject.buildPrep(bos); + // Make sure we got everything in the build directory IContainer builddir = rpmProject.getConfiguration().getBuildFolder(); diff --git a/rpm/org.eclipse.linuxtools.rpm.core/src/org/eclipse/linuxtools/internal/rpm/core/utils/RPMBuild.java b/rpm/org.eclipse.linuxtools.rpm.core/src/org/eclipse/linuxtools/internal/rpm/core/utils/RPMBuild.java index 65e3a22b8a..652a0c84a1 100644 --- a/rpm/org.eclipse.linuxtools.rpm.core/src/org/eclipse/linuxtools/internal/rpm/core/utils/RPMBuild.java +++ b/rpm/org.eclipse.linuxtools.rpm.core/src/org/eclipse/linuxtools/internal/rpm/core/utils/RPMBuild.java @@ -87,15 +87,15 @@ public class RPMBuild { rpmBuildCmd, "-v", //$NON-NLS-1$ DEFINE, "_sourcedir " //$NON-NLS-1$ - + config.getBuildFolder().getLocation().toOSString() + "/" + IRPMConstants.SOURCES_FOLDER, //$NON-NLS-1$ + + config.getSourcesFolder().getLocation().toOSString(), DEFINE, "_srcrpmdir " + //$NON-NLS-1$ - config.getBuildFolder().getLocation().toOSString() + "/" + IRPMConstants.SRPMS_FOLDER, //$NON-NLS-1$ + config.getSrpmsFolder().getLocation().toOSString() , DEFINE, "_builddir " + //$NON-NLS-1$ config.getBuildFolder().getLocation().toOSString(), DEFINE, "_rpmdir " + //$NON-NLS-1$ - config.getBuildFolder().getLocation().toOSString() + "/" + IRPMConstants.RPMS_FOLDER, //$NON-NLS-1$ + config.getRpmsFolder().getLocation().toOSString(), DEFINE, "_specdir " + //$NON-NLS-1$ - config.getBuildFolder().getLocation().toOSString() + "/" + IRPMConstants.SPECS_FOLDER}; //$NON-NLS-1$ + config.getSpecsFolder().getLocation().toOSString() }; this.macroDefines = tmpMacroDefines; } } |