diff --git a/Readme.md b/Readme.md --- a/Readme.md +++ b/Readme.md @@ -1,6 +1,6 @@ # Leksah, an Integrated Development Environment for Haskell -[![Build Status](https://secure.travis-ci.org/leksah/leksah.png?branch=vcs)](http://travis-ci.org/leksah/leksah) +[![Build Status](https://secure.travis-ci.org/leksah/leksah.png)](http://travis-ci.org/leksah/leksah) [Leksah](http://leksah.org/) aims to integrate various Haskell development tools to provide a practical and pleasant development environment. @@ -8,121 +8,118 @@ Documentation can be found on [leksah.org](http://leksah.org/). -## Installation - -Requirements: ghc >= 7.8.3 cabal >= 1.18 - -You can get Leksah up and running quickly on Windows and OS X using the -[official binaries](https://github.com/leksah/leksah/wiki/download). - -Some Linux distributions include Leksah packages, but building from source -on Linux is normally relatively easy. - -## Building From Source - -### Building on Linux - -Install the GtkSourceView and WebKitGtk development packages for your distribution: - - sudo apt-get install libgtksourceview-3.0-dev libwebkitgtk-3.0-dev - -Make sure `$HOME/.cabal/bin` is in your `PATH` then: - - cabal update - cabal install Cabal cabal-install - cabal install regex-tdfa-text --ghc-options=-XFlexibleContexts - cabal install alex happy - cabal install gtk2hs-buildtools - cabal install leksah - leksah - -### Building on OS X - -[Install MacPorts](https://www.macports.org/install.php). - -Make sure `/opt/local/bin` and `$HOME/Libraries/Haskell/bin` are in your `PATH`. - -To avoid a dependency on X11 add the following to `/opt/local/etc/macports/variants.conf`: - - -x11 +no_x11 +quartz +gtk3 - -Use MacPorts to install `python27` and `rsync` (sometimes it stops to ask for these to be -activated so if you do them first it might help): - - sudo port install python27 rsync - -Use MacPorts to install GHC and the C libraries needed by Leksah (this will take a long time): - - sudo port install ghc gtk3 webkit-gtk3 gtksourceview3 gtk-osx-application-gtk3 adwaita-icon-theme - -Update Cabal and cabal-install - - cabal update - cabal install Cabal cabal-install - -Make sure the right `cabal` made it into your `PATH`. - - cabal --version - -Check that the versions match the ones you just installed (if not check the symbolic links in -`$HOME/Libraries/Haskell/bin`). +## Getting Leksah +### Installation +Leksah requires `ghc --version` >=7.10.3 and `cabal --version` >=1.24. To get them go to **[haskell.og/download](https://www.haskell.org/downloads)** and choose the **Minimal GHC** or **Haskell Platform**. -Install `gtk2hs-buildtools` and `leksah`: +* **Windows** [latest github version built with AppVeyor](https://ci.appveyor.com/project/hamishmack/leksah/build/artifacts) +* **OS X**: [official binaries](https://github.com/leksah/leksah/wiki/download) +* **Linux**: [build from source](https://github.com/leksah/leksah#building-from-source) - cabal install regex-tdfa-text --ghc-options=-XFlexibleContexts - cabal install alex happy - cabal install gtk2hs-buildtools - cabal install leksah - leksah +### Building from source +We have completed a port of Leksah from Gtk2Hs to haskell-gi. Not all of the code is in Hackage yet so to build it you can either use [Xobl](xobl/Readme.md) or follow the instructions below. -### Building on Windows +#### Step 1: Install C libraries -Install [GHC](https://www.haskell.org/downloads/windows). +##### Fedora +```shell +sudo dnf install gobject-introspection-devel webkitgtk4-devel gtksourceview3-devel +``` -Update MinGW if necessary. The GHC installers currently come with old versions of -MinGW and you will probably need to replace it with one that comes with gcc 4.8.1. -The current 64bit GHC installer seems to be happy to work with newer MinGW. -It may not be possible to use the current 32bit GHC installers at all. -Make sure you replace MinGW so that GHC will find the new one (just adding -it to the `PATH` will not work). The MinGW used by GHC is typically in a location -like `C:\Program Files\MinGHC-7.10.1\ghc-7.10.1\mingw`. Move it out of the way -and put a newer one in its place. +##### Ubuntu/Debian +```shell +sudo apt-get install libgirepository1.0-dev libwebkit2gtk-4.0-dev libgtksourceview-3.0-dev +``` -[MinGW version used to build the Leksah binaries](http://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win64/Personal%20Builds/mingw-builds/4.9.2/threads-posix/seh/x86_64-4.9.2-release-posix-seh-rt_v4-rev2.7z) +##### Arch Linux +```shell +sudo pacman -S gobject-introspection gobject-introspection-runtime gtksourceview3 webkit2gtk +``` -Install the C libraries needed by Leksah. The easiest way to do this is to install -Leksah using the MSI files. They include pkg-config and all the C libraries needed. +##### OS X MacPorts +```shell +sudo port install gobject-introspection webkit2-gtk gtksourceview3 gtk-osx-application-gtk3 adwaita-icon-theme` +``` +You will also need to build a MacPorts compatible of GHC. First install GHC some other way then unpack the source for the GHC version you want to use and run: +```shell +sudo port install libxslt gmp ncurses libiconv llvm-3.5 libffi +./configure --prefix=$HOME/ghc-8.0.1 --with-iconv-includes=/opt/local/include --with-iconv-libraries=/opt/local/lib --with-gmp-includes=/opt/local/include --with-gmp-libraries=/opt/local/lib --with-system-libffi --with-ffi-includes=/opt/local/lib/libffi-3.2.1/include --with-ffi-libraries=/opt/local/lib --with-nm=/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/nm-classic +make +make install +echo 'PATH: '"$PATH" +``` -Make sure `C:\Leksah\bin` and `%APPDATA%\cabal\bin` are in your `PATH` and build: +Make sure the `$HOME/ghc-8.0.1/bin` is present in PATH. - cabal update - cabal install Cabal - cabal install alex happy - cabal install gtk2hs-buildtools - cabal install leksah - leksah - -### Building Leksah for Windows using Docker +##### OS X Homebrew +It might be possible to build Leksah using Homebrew now we have switched to WebKit 2. If you can figure it out please send us the details or better yet a pull request to update this file. Raise an issue if you try and it does not work. -It may seem crazy, but this is currently the best way to bootstrap Leksah for -Windows from source. This is mostly because Fedora and SUSE have a much -more complete set of MinGW packages than any thing else (including Windows). +##### Windows MSYS2 +Install: +* [MSYS2](https://msys2.github.io/) +* [Chocolatey](https://chocolatey.org/) -Get the leksah source: +Then in Bash shell with administrator privileges execute: +```shell +choco install ghc +pacman -S mingw64/mingw-w64-x86_64-pkg-config mingw64/mingw-w64-x86_64-gobject-introspection mingw64/mingw-w64-x86_64-gtksourceview3 mingw64/mingw-w64-x86_64-webkitgtk3 +``` - git clone https://github.com/leksah/leksah - cd leksah - git submodule update --init +Set the following environment variables: +```shell +SET PATH=%APPDATA%\cabal\bin;C:\msys64\mingw64\bin;C:\msys64\usr\bin;C:\ProgramData\chocolatey\lib\ghc\tools\ghc-8.0.2\bin;C:\ProgramData\chocolatey\lib\cabal\tools;%PATH% +SET PKG_CONFIG_PATH=C:\msys64\mingw64\lib\pkgconfig +SET XDG_DATA_DIRS=C:\msys64\mingw64\share +``` +(change `C:\ProgramData\chocolatey\lib\ghc\tools\ghc-8.0.2\bin` if a newer version is installed) -Get the Fedora 22 docker image and load it: +##### FreeBSD +```shell +pkg install devel/gobject-introspection x11-toolkits/gtksourceview3 www/webkit2-gtk3 +``` - wget http://dl.fedoraproject.org/pub/fedora/linux/releases/22/Docker/x86_64/Fedora-Docker-Base-22-20150521.x86_64.tar.xz - sudo docker load -i Fedora-Docker-Base-22-20150521.x86_64.tar.xz +#### Step 2: Clone repository and its submodules +```shell +git clone --recursive https://github.com/leksah/leksah.git +cd leksah +``` -Build Leksah using the Dockerfile: +#### (Cabal variant) Step 3.a: Build +##### Step 3.a.1: Install extra tools +```shell +cabal update +cabal install alex happy +cabal install haskell-gi +``` +Make sure `~/.cabal/bin` is present in the PATH (*Windows:* Make sure `%APPDATA%\cabal\bin` is present in the PATH). - sudo docker build -t leksah/build . +##### Step 3.a.2: Build and run Leksah +###### OS X using MacPorts +```shell +XDG_DATA_DIRS=/opt/local/share ./leksah.sh +``` +###### All other OS'es +```shell +./leksah.sh +``` -Copy the resulting msi file out of the container (version number in the file name will match the one in the leksah.cabal file): +#### (Stack variant) Step 3.b: Build +##### Step 3.b.1: Install extra tools +```shell +stack setup --upgrade-cabal +stack install alex happy +stack install haskell-gi +stack install gtk2hs-buildtools +``` +##### Step 3.b.2: Build and run Leksah +###### For Mac OS +```shell +stack install --stack-yaml stack.osx.yaml +stack exec leksah +``` - sudo docker run --rm --volume $HOME/output:/output leksah/build cp /leksah/win32/leksah-0.15.0.1-ghc-7.10.1.msi /output +###### All other OS'es +```shell +stack install +stack exec leksah +``` diff --git a/bew/Main.hs b/bew/Main.hs deleted file mode 100644 --- a/bew/Main.hs +++ /dev/null @@ -1,14 +0,0 @@ -module Main ( - main -) where - -import Graphics.UI.Gtk (postGUIAsync) -import GHCJS.DOM (runWebGUI, webViewGetDomDocument) - -main = - runWebGUI $ \ webView -> postGUIAsync $ do - Just doc <- webViewGetDomDocument webView - putStrLn "Bewleksah is a version of Leksah that can run in a web browser." - putStrLn "Nothing working yet." - - diff --git a/data/current.lkshs b/data/current.lkshs --- a/data/current.lkshs +++ b/data/current.lkshs @@ -1,19 +1,18 @@ Version of session file format: - 1 + 2 Time of storage: - "Sun Oct 27 02:21:33 NZDT 2013" -Layout: VerticalP (TerminalP {paneGroups = fromList [], paneTabs = Just TopP, currentPage = -1, detachedId = Nothing, detachedSize = Nothing}) (HorizontalP (TerminalP {paneGroups = fromList [("Debug",HorizontalP (TerminalP {paneGroups = fromList [], paneTabs = Nothing, currentPage = -1, detachedId = Nothing, detachedSize = Nothing}) (TerminalP {paneGroups = fromList [], paneTabs = Just TopP, currentPage = -1, detachedId = Nothing, detachedSize = Nothing}) 167)], paneTabs = Just TopP, currentPage = 2, detachedId = Nothing, detachedSize = Nothing}) (TerminalP {paneGroups = fromList [], paneTabs = Just TopP, currentPage = 1, detachedId = Nothing, detachedSize = Nothing}) 456) 693 -Population: [(Just (InfoSt (InfoState Nothing)),[SplitP RightP,SplitP BottomP]),(Just (LogSt LogState),[SplitP RightP,SplitP BottomP]),(Just (ModulesSt (ModulesState 200 (SystemScope,False) (Nothing,Nothing) (ExpanderState {packageExp = ([],[]), packageExpNoBlack = ([],[]), packageDExp = ([],[]), packageDExpNoBlack = ([],[]), workspaceExp = ([],[]), workspaceExpNoBlack = ([],[]), workspaceDExp = ([],[]), workspaceDExpNoBlack = ([],[]), systemExp = ([],[]), systemExpNoBlack = ([],[])}))),[SplitP RightP,SplitP TopP]),(Just (WorkspaceSt WorkspaceState),[SplitP RightP,SplitP BottomP])] -Window size: (1076,728) + "Sun Sep 4 20:03:20 CEST 2016" +Layout: VerticalP (TerminalP {paneGroups = fromList [], paneTabs = Just TopP, currentPage = 0, detachedId = Nothing, detachedSize = Nothing}) (HorizontalP (TerminalP {paneGroups = fromList [], paneTabs = Just TopP, currentPage = -1, detachedId = Nothing, detachedSize = Nothing}) (TerminalP {paneGroups = fromList [], paneTabs = Just TopP, currentPage = 0, detachedId = Nothing, detachedSize = Nothing}) 578) 336 +Population: [(Just (ErrorsSt (ErrorsState {showErrors = True, showWarnings = True, showSuggestions = True, showTestFails = True})),[SplitP RightP,SplitP BottomP]),(Just (LogSt LogState),[SplitP RightP,SplitP BottomP]),(Just (WorkspaceSt WorkspaceState),[SplitP LeftP])] +Window size: (1366,768) Full screen: False -Dark: False Completion size: (750,400) Workspace: Nothing -Active pane: Just "Modules" +Active pane: Nothing Toolbar visible: True -FindbarState: (True,FindState {entryStr = "", entryHist = [], replaceStr = "", replaceHist = [], caseSensitive = False, entireWord = False, wrapAround = False, regex = False, lineNr = 1}) +FindbarState: (False,FindState {entryStr = "", entryHist = [], replaceStr = "", replaceHist = [], caseSensitive = False, entireWord = False, wrapAround = True, regex = False, lineNr = 1}) Recently opened files: [] Recently opened workspaces: diff --git a/data/empty.lkshs b/data/empty.lkshs --- a/data/empty.lkshs +++ b/data/empty.lkshs @@ -1,19 +1,18 @@ Version of session file format: - 1 + 2 Time of storage: - "Fri Feb 26 17:11:46 CET 2010" -Layout: VerticalP (TerminalP {paneGroups = fromList [], paneTabs = Just TopP, currentPage = 1, detachedId = Nothing, detachedSize = Nothing}) (HorizontalP (TerminalP {paneGroups = fromList [("Browser",TerminalP {paneGroups = fromList [], paneTabs = Nothing, currentPage = 0, detachedId = Nothing, detachedSize = Nothing}), ("Debug",HorizontalP (TerminalP {paneGroups = fromList [], paneTabs = Nothing, currentPage = 0, detachedId = Nothing, detachedSize = Nothing}) (TerminalP {paneGroups = fromList [], paneTabs = Just TopP, currentPage = 1, detachedId = Nothing, detachedSize = Nothing}) 206)], paneTabs = Just TopP, currentPage = 2, detachedId = Nothing, detachedSize = Nothing}) (TerminalP {paneGroups = fromList [], paneTabs = Just TopP, currentPage = 1, detachedId = Nothing, detachedSize = Nothing}) 547) 733 -Population: [(Just (InfoSt (InfoState Nothing)),[SplitP RightP,SplitP BottomP]),(Just (LogSt LogState),[SplitP RightP,SplitP BottomP]),(Just (ModulesSt (ModulesState 286 (SystemScope,False) (Nothing,Nothing) (ExpanderState {packageExp = ([],[]), packageExpNoBlack = ([],[]), packageDExp = ([],[]), packageDExpNoBlack = ([],[]), workspaceExp = ([],[]), workspaceExpNoBlack = ([],[]), workspaceDExp = ([],[]), workspaceDExpNoBlack = ([],[]), systemExp = ([],[]), systemExpNoBlack = ([],[])}))),[SplitP RightP,SplitP TopP,GroupP "Browser"]),(Just (WorkspaceSt WorkspaceState),[SplitP RightP,SplitP BottomP])] -Window size: (1076,728) -Full screen: True -Dark: True + "Sun Sep 4 20:03:20 CEST 2016" +Layout: VerticalP (TerminalP {paneGroups = fromList [], paneTabs = Just TopP, currentPage = 0, detachedId = Nothing, detachedSize = Nothing}) (HorizontalP (TerminalP {paneGroups = fromList [], paneTabs = Just TopP, currentPage = -1, detachedId = Nothing, detachedSize = Nothing}) (TerminalP {paneGroups = fromList [], paneTabs = Just TopP, currentPage = 0, detachedId = Nothing, detachedSize = Nothing}) 578) 336 +Population: [(Just (ErrorsSt (ErrorsState {showErrors = True, showWarnings = True, showSuggestions = True, showTestFails = True})),[SplitP RightP,SplitP BottomP]),(Just (LogSt LogState),[SplitP RightP,SplitP BottomP]),(Just (WorkspaceSt WorkspaceState),[SplitP LeftP])] +Window size: (1366,768) +Full screen: False Completion size: (750,400) Workspace: Nothing Active pane: Nothing Toolbar visible: True -FindbarState: (True,FindState {entryStr = "", entryHist = [], replaceStr = "", replaceHist = [], caseSensitive = False, entireWord = False, wrapAround = False, regex = False, lineNr = 1}) +FindbarState: (False,FindState {entryStr = "", entryHist = [], replaceStr = "", replaceHist = [], caseSensitive = False, entireWord = False, wrapAround = True, regex = False, lineNr = 1}) Recently opened files: [] Recently opened workspaces: diff --git a/data/keymap.lkshk b/data/keymap.lkshk --- a/data/keymap.lkshk +++ b/data/keymap.lkshk @@ -1,5 +1,5 @@ --Default Keymap file for Leksah ---Allowed Modifiers are +--Allowed Modifiers are -- --There are two versions of control so we can map them differently on OS X -- is the Apple key on OS X @@ -13,16 +13,17 @@ --File -n -> FileNew "Creates a new haskell module" -o -> FileOpen "Opens an existing file" +n -> FileNewTextFile "Create a new text file" +n -> FileNewModule "Creates a new Haskell module" +o -> FileOpenFile "Opens an existing file" --x/f -> FileOpen "Opens an existing file" s -> FileSave "Saves the current buffer" --x/s -> FileSave "Saves the current buffer" ---x/w -> FileSaveAs "Saves the current buffer as a new file" +s -> FileSaveAs "Saves the current buffer as a new file" -s -> FileSaveAll "Saves all modified buffers" +--s -> FileSaveAll "Saves all modified buffers" w -> FileClose "Closes the current buffer" --x/k -> FileClose "Closes the current buffer" @@ -48,7 +49,7 @@ F3 -> EditFindPrevious "Find the previous occurence of the text string" -l -> EditGotoLine "Go to line with a known index" +g -> EditGotoLine "Go to line with a known index" d -> EditComment "Add a line style comment to the selected lies" d -> EditUncomment "Remove a line style comment" @@ -72,7 +73,7 @@ -> ViewTabsUp "Shows the tabs of the current notebook on the top" -> ViewTabsDown "Shows the tabs of the current notebook on the bottom" -> ViewSwitchTabs "Switches if tabs for the current notebook are visible" -f -> ViewFullScreen "Toggle fullscreen mode" +F11 -> ViewFullScreen "Toggle fullscreen mode" t -> ToggleToolbar -> HelpDebug -> HelpAbout diff --git a/data/leksah-welcome/cabal.project b/data/leksah-welcome/cabal.project new file mode 100644 --- /dev/null +++ b/data/leksah-welcome/cabal.project @@ -0,0 +1,2 @@ +packages: + . diff --git a/data/leksah-welcome/src/Main.hs b/data/leksah-welcome/src/Main.hs --- a/data/leksah-welcome/src/Main.hs +++ b/data/leksah-welcome/src/Main.hs @@ -13,7 +13,7 @@ -- * Package -> Build -- When you are ready to create your own workspace and package. --- * Package -> New +-- * File -> New -> Package -- Next we are importing some things from other modules. -- Leksah can normally add these imports for you, just diff --git a/data/leksah.menu b/data/leksah.menu --- a/data/leksah.menu +++ b/data/leksah.menu @@ -7,12 +7,16 @@ + + + + @@ -20,11 +24,6 @@ - - - - - @@ -69,18 +68,9 @@ - - - - - - - - - - - - + + + @@ -88,11 +78,11 @@ - - + + @@ -134,9 +124,9 @@ - - - + + + @@ -159,6 +149,11 @@ + + + + + @@ -208,7 +203,9 @@ + + diff --git a/data/prefs.lkshp b/data/prefs.lkshp --- a/data/prefs.lkshp +++ b/data/prefs.lkshp @@ -38,7 +38,9 @@ Lint Text Dark Background: Color 0 15000 0 Text Editor: "GtkSourceView" -LogView Font: "Sans 12" +LogView Font: "Monospace 10" +Workspace Font: + "Sans 10" Window default size: (1024,800) --Default size of the main ide window specified as pair (int,int) @@ -50,17 +52,17 @@ keymap --The name of a keymap file in a config dir Categories for panes: - [("*Breakpoints","LogCategory"),("*Browser","ToolCategory"),("*Debug","ToolCategory"),("*Errors","ToolCategory"),("*Files","ToolCategory"),("*Flags","ToolCategory"),("*Grep","ToolCategory"),("*HLint","ToolCategory"),("*Doc","ToolCategory"),("*Info","LogCategory"),("*Log","LogCategory"),("*Inspect","LogCategory"),("*Modules","ToolCategory"),("*Out","ToolCategory"),("*Package","EditorCategory"),("*Prefs","EditorCategory"),("*Search","ToolCategory"),("*Trace","LogCategory"),("*Variables","LogCategory"),("*Workspace","LogCategory")] + [("*Breakpoints","LogCategory"),("*Browser","ToolCategory"),("*Debug","ToolCategory"),("*Errors","LogCategory"),("*Files","ToolCategory"),("*Flags","ToolCategory"),("*Grep","LogCategory"),("*HLint","ToolCategory"),("*Doc","ToolCategory"),("*Info","LogCategory"),("*Log","LogCategory"),("*Inspect","LogCategory"),("*Modules","ToolCategory"),("*Out","ToolCategory"),("*Package","EditorCategory"),("*Prefs","EditorCategory"),("*Search","ToolCategory"),("*Trace","LogCategory"),("*Variables","LogCategory"),("*Workspace","ExplorerCategory")] Pane path for category: - [("EditorCategory",[SplitP LeftP]),("ToolCategory",[SplitP RightP,SplitP TopP]),("LogCategory",[SplitP RightP,SplitP BottomP])] + [("ExplorerCategory",[SplitP LeftP]),("EditorCategory",[SplitP RightP]),("ToolCategory",[SplitP RightP,SplitP TopP]),("LogCategory",[SplitP RightP,SplitP BottomP])] Default pane path: - [SplitP LeftP] + [SplitP RightP] Paths under which haskell sources for packages may be found: [] Unpack source for cabal packages to: - Just "~/.leksah-0.15/packageSources" + Just "~/.leksah-0.16/packageSources" URL from which to download prebuilt metadata: - "http://www.leksah.org" + "http://leksah.github.io" Strategy for downloading prebuilt metadata: RetrieveThenBuild Update metadata at startup: diff --git a/data/prefscoll.lkshp b/data/prefscoll.lkshp --- a/data/prefscoll.lkshp +++ b/data/prefscoll.lkshp @@ -1,9 +1,9 @@ Paths under which haskell sources for packages may be found: [] Unpack source for cabal packages to: - Just "~/.leksah-0.15/packageSources" + Just "~/.leksah-0.16/packageSources" URL from which to download prebuilt metadata: - "http://www.leksah.org" + "http://leksah.github.io" Strategy for downloading prebuilt metadata: RetrieveThenBuild Port number for leksah to comunicate with leksah-server: diff --git a/data/styles/leksah-dark.xml b/data/styles/leksah-dark.xml --- a/data/styles/leksah-dark.xml +++ b/data/styles/leksah-dark.xml @@ -36,6 +36,7 @@ + @@ -44,6 +45,7 @@