Permalink
Browse files

Hugs spaces and cleanup

  • Loading branch information...
1 parent 770273e commit 697a1874aefd6ec13ba831f2be7c397184ec986d @JPMoresmau committed Aug 12, 2013
@@ -5,7 +5,7 @@ Release Notes
Necessary Haskell packages:
- - EclipseFP relies on BuildWrapper, a Haskell IDE library, for a lot of its functionality. See https://github.com/JPMoresmau/BuildWrapper for more information. Version 0.7.3 of buildwrapper has been validated with this version of EclipseFP
+ - EclipseFP relies on BuildWrapper, a Haskell IDE library, for a lot of its functionality. See https://github.com/JPMoresmau/BuildWrapper for more information. Version 0.7.4 of buildwrapper has been validated with this version of EclipseFP
- EclipseFP also uses scion-browser. Version 0.2.17 has been validated with this version of EclipseFP
@@ -15,6 +15,7 @@ Fixes:
- Haskell UI Plugin would randomly fail on startup, causing all kind of grief. A bug in the initialization of the plugin has been found and fixed.
- Closing Eclipse polluted the log with spurious "stream is closed" messages from the console
- Errors suggesting language flag could sometimes be badly parsed
+ - Better handling of some GHC errors
Features:
- pass -j to cabal install (https://github.com/JPMoresmau/eclipsefp/issues/107)
@@ -0,0 +1,29 @@
+EclipseFP Haskell 2.5.5
+
+Release Notes
+
+
+Necessary Haskell packages:
+
+ - EclipseFP relies on BuildWrapper, a Haskell IDE library, for a lot of its functionality. See https://github.com/JPMoresmau/BuildWrapper for more information. Version 0.7.4 of buildwrapper has been validated with this version of EclipseFP
+ - EclipseFP also uses scion-browser. Version 0.2.17 has been validated with this version of EclipseFP
+
+
+Fixes:
+ - Spaces in Hugs executable path accepted in preference page
+
+Features:
+
+
+Internal:
+
+
+Upgrade notes:
+ - Upgrade via the Eclipse install site http://eclipsefp.sf.net/updates.
+
+
+Known issues:
+
+
+Thanks to all bug reporters and users for their feedback.
+Thanks to all the people that expressed interest in EclipseFP and want to see it stay alive and improve!
@@ -2,7 +2,7 @@
<feature
id="net.sf.eclipsefp.haskell"
label="%bundleName"
- version="2.5.4.qualifier"
+ version="2.5.5.qualifier"
provider-name="%bundleVendor">
<description>
@@ -102,7 +102,7 @@ available at http://www.eclipse.org/legal/epl-v10.html.
id="net.sf.eclipsefp.haskell.hugs"
download-size="0"
install-size="0"
- version="2.5.3.qualifier"
+ version="2.5.5.qualifier"
unpack="false"/>
<plugin
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-Name: %bundleName
Bundle-SymbolicName: net.sf.eclipsefp.haskell.hugs;singleton:=true
-Bundle-Version: 2.5.3.qualifier
+Bundle-Version: 2.5.5.qualifier
Bundle-Activator: net.sf.eclipsefp.haskell.hugs.HugsPlugin
Bundle-Vendor: %bundleVendor
Bundle-Localization: plugin
@@ -30,7 +30,7 @@ public GeneralTab( final IPreferenceStore store ) {
@Override
public Control createControl( final Composite parent ) {
- String labelText = "HUGS executable";
+ String labelText = UITexts.prefs_name;
dlgField = new ExecutableDialogField( parent,
labelText ){
@@ -39,7 +39,9 @@ protected String createDisplayContent( final String info ) {
try {
File f=new File(info);
if (f.exists() && f.canRead()){
- Process p=Runtime.getRuntime().exec(info);
+ ProcessBuilder pb=new ProcessBuilder( info );
+ Process p=pb.start();
+ //Runtime.getRuntime().exec(info);
InputStream is=p.getInputStream();
// read all text given by the console till the Hugs> prompt
@@ -77,7 +79,7 @@ protected String createDisplayContent( final String info ) {
}
return version;
}
- return "Not found";
+ return UITexts.prefs_notfound;
} catch (IOException ioe){
ioe.printStackTrace();
return ioe.getMessage();
@@ -1,26 +1,5 @@
# Copyright (c) 2003-2005 by Leif Frenzel - see http://leiffrenzel.de
-# The keys are identical to the values of the constants in
-# ... core.IHugsParameters
-#
-# Parameters
-s=Print statistics +s,-s
-t=Print type after evaluation +t,-t
-f=Terminate on error +f,-f
-g=Garbage collector notification +g,-g
-#Literate modules +l,-l,+e,-e
-.=Display dots while loading +.,-.
-q=Display nothing while loading +q,-q
-w=List files loaded +w,-w
-k=Detailed kind errors +k,-k
-u=Use "show" to display results +u,-u
-i=Import chasing +i,-i
-
-# Advanced
--p=Set prompt -p<string>
--r=Set repeat string -r<string>
-
--h=Set heap size -h<size>
--F=Set preprocessor string -F<cmd>\n(Note: this option is system dependent, and not supported on all platforms.)
--c=Set constraint cutoff limit -c<num>
+prefs_name=HUGS executable
+prefs_notfound=Not found
@@ -1,10 +1,8 @@
// Copyright (c) 2003-2005 by Leif Frenzel - see http://leiffrenzel.de
package net.sf.eclipsefp.haskell.hugs.ui.preferences;
-import java.util.ResourceBundle;
-
-import net.sf.eclipsefp.haskell.hugs.HugsPlugin;
import net.sf.eclipsefp.haskell.hugs.core.IHugsParameters;
+import org.eclipse.osgi.util.NLS;
/** <p>Helper to provide texts for the various command line option names and
@@ -14,46 +12,55 @@
*/
public class UITexts implements IHugsParameters {
- private static final String SHORT_DESC = "ShortParamDescriptions";
- private static ResourceBundle bundle = initBundle();
-
- /** returns the actual option string. */
- public static String getOption( final String key ) {
- return key;
- }
+// private static final String SHORT_DESC = "ShortParamDescriptions";
+ // private static ResourceBundle bundle = initBundle();
- /** returns a short description text for the specified key. */
- public static String getShortDescription( final String key ) {
- String result = key;
- if( bundle != null ) {
- try {
- String fromBundle = bundle.getString( key );
- if( fromBundle != null ) {
- result = fromBundle;
- }
- } catch( Exception ex ) {
- log( "Could not find value for bundle key '" + key + "'.", ex );
- }
- }
- return result;
+ static {
+ NLS.initializeMessages( UITexts.class.getPackage()
+ .getName()+".ShortParamDescriptions", UITexts.class );
}
-
-
+
+ public static String prefs_name;
+ public static String prefs_notfound;
+
+//
+// /** returns the actual option string. */
+// public static String getOption( final String key ) {
+// return key;
+// }
+//
+// /** returns a short description text for the specified key. */
+// public static String getShortDescription( final String key ) {
+// String result = key;
+// if( bundle != null ) {
+// try {
+// String fromBundle = bundle.getString( key );
+// if( fromBundle != null ) {
+// result = fromBundle;
+// }
+// } catch( Exception ex ) {
+// log( "Could not find value for bundle key '" + key + "'.", ex );
+// }
+// }
+// return result;
+// }
+
+
// helping methods
//////////////////
-
- private static ResourceBundle initBundle() {
- ResourceBundle result = null;
- try {
- String name = UITexts.class.getPackage().getName() + "." + SHORT_DESC;
- result = ResourceBundle.getBundle( name );
- } catch( Exception ex ) {
- log( "Could not init resource bundle.", ex );
- }
- return result;
- }
-
- private static void log( final String message, final Throwable thr ) {
- HugsPlugin.log( message, thr );
- }
+
+// private static ResourceBundle initBundle() {
+// ResourceBundle result = null;
+// try {
+// String name = UITexts.class.getPackage().getName() + "." + SHORT_DESC;
+// result = ResourceBundle.getBundle( name );
+// } catch( Exception ex ) {
+// log( "Could not init resource bundle.", ex );
+// }
+// return result;
+// }
+//
+// private static void log( final String message, final Throwable thr ) {
+// HugsPlugin.log( message, thr );
+// }
}

0 comments on commit 697a187

Please sign in to comment.