Try using cabal new-build on AppVeyor

leksah · Jul 1, 2018 · 1fc1c54 · 1fc1c54
1 parent fbfe345
commit 1fc1c54
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/appveyor/build-some.sh b/appveyor/build-some.sh
@@ -2,23 +2,23 @@
 
 if [ ! -d cache1 ]; then
   cabal update
-  cabal install cabal-install --disable-documentation
-  cabal new-build -gi-cairo gi-gdk gi-gdkpixbuf gi-gio gi-glib gi-gobject gi-gtk gi-gtksource gi-javascriptcore gi-pango gi-webkit gi-atk gi-soup \
+  cabal --version
+  cabal new-build gi-cairo gi-gdk gi-gdkpixbuf gi-gio gi-glib gi-gobject gi-gtk gi-gtksource gi-pango gi-atk \
           -f-enable-overloading --disable-documentation --constraint='haskell-gi-overloading==0.*'
   mkdir cache1
-  mv $APPDATA/ghc $APPDATA/cabal cache1
+  mv $APPDATA/cabal cache1
 elif [ ! -d cache2 ]; then
   mv cache1/* $APPDATA
   cabal update
   cabal new-build gi-gtk-hs vendor/ltk --disable-documentation --constraint='haskell-gi-overloading==0.*'
   mkdir cache2
-  mv $APPDATA/ghc $APPDATA/cabal cache2
+  mv $APPDATA/cabal cache2
 elif [ ! -d cache3 ]; then
   mv cache2/* $APPDATA
   cabal update
   cabal new-build ./ vendor/ltk vendor/leksah-server vendor/haskellVCSWrapper/vcswrapper vendor/haskellVCSGUI/vcsgui -fwebkit -f-yi -fpango -f-vty --constraint='haskell-gi-overloading==0.*' --only-dependencies
   mkdir cache3
-  mv $APPDATA/ghc $APPDATA/cabal cache3
+  mv $APPDATA/cabal cache3
 else
   mv cache3/* $APPDATA
   cabal update

diff --git a/scripts/stage.sh b/scripts/stage.sh
@@ -38,7 +38,13 @@ if test "`uname`" = "Darwin"; then
        vcsgui:exe:vcsgui-askpass \
        leksah:exe:leksah || exit
 else
-    $WINE cabal install ./ ./vendor/ltk ./vendor/leksah-server vendor/haskellVCSWrapper/vcswrapper vendor/haskellVCSGUI/vcsgui --with-ghc=ghc$GHCVERSION -j1 -fwebkit -f-yi -fpango -f-vty --force-reinstalls || exit
+    $WINE cabal new-build --with-ghc=ghc$GHCVERSION \
+       leksah-server:exe:leksah-server \
+       leksah-server:exe:leksahecho \
+       leksah-server:exe:leksahtrue \
+       vcsgui:exe:vcsgui \
+       vcsgui:exe:vcsgui-askpass \
+       leksah:exe:leksah -f-yi -fpango -f-vty || exit
 #  if [ "$GHC_VER" != "7.0.3" ] && [ "$GHC_VER" != "7.0.4" ] && [ "$GHC_VER" != "7.6.1" ]; then
 #    echo https://github.com/yi-editor/yi.git >> sources.txt
 #    export LEKSAH_CONFIG_ARGS="$LEKSAH_CONFIG_ARGS -fyi -f-vty -f-dyre -fpango"