Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Updated scripts for win32

  • Loading branch information...
commit 09db95bd1a7fb2c188bae9ddb8b1bdf716f1e696 1 parent 103cda6
@hamishmack hamishmack authored
View
21 scripts/gtk2hs.sh
@@ -7,16 +7,27 @@ ghc-pkg unregister --force gtksourceview2
ghc-pkg unregister --force gtk-mac-integration
ghc-pkg unregister --force gtk
cabal install Cabal
+
cd ../gtk2hs/gtk || exit
-cabal clean || exit
-cabal install -fgtk3 -fhave-quartz-gtk
+rm -rf dist
+if test "`uname`" = "Darwin"; then
+ cabal install -fgtk3 -fhave-quartz-gtk || exit
+else
+ cabal install || exit
+fi
+
cd ../../gtksourceview || exit
-cabal clean || exit
-cabal install -fgtk3
+rm -rf dist
+if test "`uname`" = "Darwin"; then
+ cabal install -fgtk3 || exit
+else
+ cabal install || exit
+fi
+
if test "`uname`" = "Darwin"; then
cd ../gtk-mac-integration || exit
cabal clean || exit
- cabal install
+ cabal install || exit
fi
cd ../leksah || exit
View
2  scripts/stage.sh
@@ -11,7 +11,7 @@ export LEKSAH_X_X_X_X_GHC_X_X_X=leksah-$FULL_VERSION-ghc-$GHC_VER
export SERVER_VERSION=`grep '^version: ' ../leksah-server/leksah-server.cabal | sed 's|version: ||' | tr -d '\r'`
export LEKSAH_SERVER_X_X_X_X=leksah-server-$SERVER_VERSION
-export GTK_PREFIX=`pkg-config --libs-only-L gtk+-3.0 | sed 's|^-L||' | sed 's|/lib *$||'`
+export GTK_PREFIX=`pkg-config --libs-only-L gtk+-2.0 | sed 's|^-L||' | sed 's|/lib *$||'`
echo Staging Leksah in $GTK_PREFIX
# Needed for installing curl package on windows
View
30 win32/gtk2hsall.sh
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+export PATH='/c/Program Files (x86)/Haskell Platform/2010.2.0.0/bin':$PATH
+ghc -V || exit
+PATH='/c/Program Files (x86)/Haskell Platform/2011.4.0.0/lib/extralibs/bin':$PATH cabal install haddock-2.8.1
+scripts/gtk2hs.sh
+
+export PATH='/c/Program Files (x86)/Haskell Platform/2011.2.0.1/bin':$PATH
+ghc -V || exit
+PATH='/c/Program Files (x86)/Haskell Platform/2011.2.0.1/lib/extralibs/bin':$PATH cabal install haddock-2.9.2
+scripts/gtk2hs.sh
+
+export PATH='/c/Program Files (x86)/Haskell Platform/2011.4.0.0/bin':$PATH
+ghc -V || exit
+PATH='/c/Program Files (x86)/Haskell Platform/2011.4.0.0/lib/extralibs/bin':$PATH cabal install haddock-2.9.2
+scripts/gtk2hs.sh
+
+export PATH='/c/Program Files (x86)/Haskell Platform/2012.2.0.0/bin':$PATH
+ghc -V || exit
+scripts/gtk2hs.sh
+
+export PATH='/c/ghc/ghc-7.4.2/bin':$PATH
+ghc -V || exit
+scripts/gtk2hs.sh
+
+export PATH='/c/ghc/ghc-7.6.1/bin':$PATH
+ghc -V || exit
+scripts/gtk2hs.sh
+
+
View
8 win32/leksah.nsi
@@ -38,15 +38,15 @@ Section "Leksah"
File /r "$%GTK_PREFIX%\etc"
SetOutPath $INSTDIR\leksah
- File /r "$%GTK_PREFIX%\share\$%LEKSAH_X_X%\*"
+ File /r "$%LEKSAH_PREFIX%\$%LEKSAH_X_X%\*"
SetOutPath $INSTDIR\etc\gtk-2.0
File "gtkrc"
SetOutPath $INSTDIR\bin
- File "$%GTK_PREFIX%\bin\leksah.exe"
- File "$%GTK_PREFIX%\bin\leksah-server.exe"
- File "$%GTK_PREFIX%\bin\leksahecho.exe"
+ File "$%LEKSAH_PREFIX%\bin\leksah.exe"
+ File "$%LEKSAH_SERVER_PREFIX%\bin\leksah-server.exe"
+ File "$%LEKSAH_SERVER_PREFIX%\bin\leksahecho.exe"
File "$%GTK_PREFIX%\bin\libatk-1.0-0.dll"
File "$%GTK_PREFIX%\bin\libcairo-2.dll"
File "$%GTK_PREFIX%\bin\libcurl-4.dll"
View
6 win32/makeinstaller.sh
@@ -2,7 +2,11 @@
. scripts/stage.sh || exit
-sed 's|\<ctrl\>q|\<alt\>F4|' <data/keymap.lkshk >"$GTK_PREFIX\share\$LEKSAH_X_X/keymap.lkshk"
+export GHC_USER_PREFIX=$HOME/AppData/Roaming/cabal
+export LEKSAH_PREFIX=$GHC_USER_PREFIX
+export LEKSAH_SERVER_PREFIX=$GHC_USER_PREFIX
+
+sed 's|\<ctrl\>q|\<alt\>F4|' <data/keymap.lkshk >"$LEKSAH_PREFIX/$LEKSAH_X_X/keymap.lkshk"
cd win32 || exit
View
10 win32/makeinstallers.sh
@@ -23,4 +23,14 @@ export PATH='/c/Program Files (x86)/Haskell Platform/2012.2.0.0/bin':$PATH
ghc -V || exit
win32/makeinstaller.sh || exit
+scripts/clean.sh
+export PATH='/c/ghc/ghc-7.4.2/bin':$PATH
+ghc -V || exit
+win32/makeinstaller.sh || exit
+
+scripts/clean.sh
+export PATH='/c/ghc/ghc-7.6.1/bin':$PATH
+ghc -V || exit
+win32/makeinstaller.sh || exit
+
Please sign in to comment.
Something went wrong with that request. Please try again.