version bump, no build dir

JPMoresmau · Jul 26, 2013 · f0cd5de · f0cd5de
1 parent b64cc88
commit f0cd5de
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/net.sf.eclipsefp.haskell-feature/feature.xml b/net.sf.eclipsefp.haskell-feature/feature.xml
@@ -158,7 +158,7 @@ available at http://www.eclipse.org/legal/epl-v10.html.
          id="net.sf.eclipsefp.haskell.buildwrapper"
          download-size="0"
          install-size="0"
-         version="2.5.3.qualifier"
+         version="2.5.4.qualifier"
          unpack="false"/>
 
    <plugin

diff --git a/net.sf.eclipsefp.haskell.buildwrapper/META-INF/MANIFEST.MF b/net.sf.eclipsefp.haskell.buildwrapper/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %bundleName
 Bundle-SymbolicName: net.sf.eclipsefp.haskell.buildwrapper;singleton:=true
-Bundle-Version: 2.5.3.qualifier
+Bundle-Version: 2.5.4.qualifier
 Bundle-Activator: net.sf.eclipsefp.haskell.buildwrapper.BuildWrapperPlugin
 Bundle-Vendor: %bundleVendor
 Bundle-Localization: plugin

diff --git a/...sf.eclipsefp.haskell.buildwrapper/src/net/sf/eclipsefp/haskell/buildwrapper/BWFacade.java b/...sf.eclipsefp.haskell.buildwrapper/src/net/sf/eclipsefp/haskell/buildwrapper/BWFacade.java
@@ -1435,9 +1435,11 @@ public void runCabal(LinkedList<String> args,String explicitFlags){
 		for (String s:cabalImplDetails.getOptions()){
 			args.add(s);
 		}
+		// no we can't build one project in the directory of another
+		// because 
 		// we pass the build dir as an absolute path otherwise there's confusion, I think cabal-dev launches cabal in the project directory...
-		File bd=new File (workingDir,BWFacade.DIST_FOLDER_CABAL);
-		args.add("--builddir="+bd.getAbsolutePath());
+		//File bd=new File (workingDir,BWFacade.DIST_FOLDER_CABAL);
+		//args.add("--builddir="+BWFacade.DIST_FOLDER_CABAL);
 		ProcessBuilder pb=new ProcessBuilder();
 		pb.directory(workingDir);
 		pb.redirectErrorStream(true);