Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

defensive

  • Loading branch information...
commit 0894b286c08913273881bda5bcd0a8c21a7c7de7 1 parent cf6c756
@JPMoresmau authored
View
4 net.sf.eclipsefp.haskell-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="net.sf.eclipsefp.haskell"
label="%bundleName"
- version="2.4.0"
+ version="2.4.1"
provider-name="%bundleVendor">
<description>
@@ -95,7 +95,7 @@ available at http://www.eclipse.org/legal/epl-v10.html.
id="net.sf.eclipsefp.haskell.ui"
download-size="0"
install-size="0"
- version="2.4.0"
+ version="2.4.1"
unpack="false"/>
<plugin
View
2  net.sf.eclipsefp.haskell.ui/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-Name: %bundleName
Bundle-SymbolicName: net.sf.eclipsefp.haskell.ui;singleton:=true
-Bundle-Version: 2.4.0
+Bundle-Version: 2.4.1
Bundle-Activator: net.sf.eclipsefp.haskell.ui.HaskellUIPlugin
Bundle-Vendor: %bundleVendor
Bundle-Localization: plugin
View
31 net.sf.eclipsefp.haskell.ui/src/net/sf/eclipsefp/haskell/ui/internal/scion/ScionManager.java
@@ -296,23 +296,10 @@ public void handlePreferenceChangesBrowser() {
}
/**
- * Server factory setup. This is common code used by both start() and handlePreferenceChanges() for setting
- * and starting scion server factories.
+ * setup buildwrapper
*/
private synchronized void buildWrapperFactorySetup(){
- try {
- /** we get the dreaded message about mismatch cabal versions if the buildwrapper cabal library is not the same as the cabal library used to build the cabal executable **/
- List<String> ls=ProcessRunner.getExecutableAndCabalVersion( buildWrapperExecutablePath.toOSString(),true);
- if (ls!=null && ls.size()>1){
- String cabalVersion=ls.get( 1 );
- if (CabalImplementationManager.getCabalLibraryVersion()!=null && !CabalImplementationManager.getCabalLibraryVersion().toString().equals( cabalVersion )){
- String msg=NLS.bind( UITexts.buildWrapperCabalVersionMismatch, new Object[]{CabalImplementationManager.getCabalLibraryVersion().toString(),cabalVersion,CabalImplementationManager.getCabalExecutable()} );
- HaskellUIPlugin.log( msg, IStatus.ERROR );
- }
- }
- } catch (IOException ioe){
- HaskellUIPlugin.log(UITexts.error_getVersion, ioe);
- }
+
IPreferenceStore preferenceStore = HaskellUIPlugin.getDefault().getPreferenceStore();
@@ -321,6 +308,20 @@ private synchronized void buildWrapperFactorySetup(){
if ( buildWrapperExecutablePath != null && buildWrapperExecutablePath.toFile().exists() ) {
+ try {
+ /** we get the dreaded message about mismatch cabal versions if the buildwrapper cabal library is not the same as the cabal library used to build the cabal executable **/
+ List<String> ls=ProcessRunner.getExecutableAndCabalVersion( buildWrapperExecutablePath.toOSString(),true);
+ if (ls!=null && ls.size()>1){
+ String cabalVersion=ls.get( 1 );
+ if (CabalImplementationManager.getCabalLibraryVersion()!=null && !CabalImplementationManager.getCabalLibraryVersion().toString().equals( cabalVersion )){
+ String msg=NLS.bind( UITexts.buildWrapperCabalVersionMismatch, new Object[]{CabalImplementationManager.getCabalLibraryVersion().toString(),cabalVersion,CabalImplementationManager.getCabalExecutable()} );
+ HaskellUIPlugin.log( msg, IStatus.ERROR );
+ }
+ }
+ } catch (IOException ioe){
+ HaskellUIPlugin.log(UITexts.error_getVersion, ioe);
+ }
+
BuildWrapperPlugin.setBwPath( buildWrapperExecutablePath.toOSString() );
} else {
BuildWrapperPlugin.setBwPath(null);

0 comments on commit 0894b28

Please sign in to comment.
Something went wrong with that request. Please try again.