Alberto G. Corona 5 years ago
parent
commit
eb99317a47
  1. 133
      .travis.yml
  2. 4
      buildrun.sh
  3. 5
      examples/distributedApps.hs
  4. 17
      stack-ghcjs.yaml
  5. 14
      stack.yaml
  6. 55
      tests/Test.hs
  7. 12
      tests/cell.hs
  8. 47
      tests/test5.hs

133
.travis.yml

@ -0,0 +1,133 @@
# Use new container infrastructure to enable caching
sudo: false
# Choose a lightweight base image; we provide our own build tools.
language: c
# Caching so the next build will be fast too.
cache:
directories:
- $HOME/.ghc
- $HOME/.cabal
- $HOME/.stack
- $HOME/.ghcjs
# The different configurations we want to test. We have BUILD=cabal which uses
# cabal-install, and BUILD=stack which uses Stack. More documentation on each
# of those below.
#
# We set the compiler values here to tell Travis to use a different
# cache file per set of arguments.
#
# If you need to have different apt packages for each combination in the
# matrix, you can use a line such as:
# addons: {apt: {packages: [libfcgi-dev,libgmp-dev]}}
matrix:
include:
# We grab the appropriate GHC and cabal-install versions from hvr's PPA. See:
# https://github.com/hvr/multi-ghc-travis
- env: BUILD=cabal GHCVER=7.10.2 CABALVER=1.22
compiler: ": #GHC 7.10.2"
addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.2], sources: [hvr-ghc]}}
- env: BUILD=cabal GHCVER=7.10.3 CABALVER=1.22
compiler: ": #GHC 7.10.3"
addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3], sources: [hvr-ghc]}}
- env: BUILD=cabal GHCVER=8.0.1 CABALVER=1.24
compiler: ": #GHC 8.0.1"
addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.1], sources: [hvr-ghc]}}
# Build with the newest GHC and cabal-install. This is an accepted failure,
# see below.
- env: BUILD=cabal GHCVER=head CABALVER=head
compiler: ": #GHC HEAD"
addons: {apt: {packages: [cabal-install-head,ghc-head], sources: [hvr-ghc]}}
# The Stack builds. We can pass in arbitrary Stack arguments via the ARGS
# variable, such as using --stack-yaml to point to a different file.
- env: BUILD=stack ARGS="--resolver lts-3"
compiler: ": #stack 7.10.2"
addons: {apt: {packages: [ghc-7.10.2], sources: [hvr-ghc]}}
- env: BUILD=stack ARGS="--resolver lts-5"
compiler: ": #stack 7.10.3 LTS 5"
addons: {apt: {packages: [ghc-7.10.3], sources: [hvr-ghc]}}
- env: BUILD=stack ARGS="--resolver lts-6"
compiler: ": #stack 7.10.3 LTS 6"
addons: {apt: {packages: [ghc-7.10.3], sources: [hvr-ghc]}}
# Nightly builds are allowed to fail
- env: BUILD=stack ARGS="--resolver nightly"
compiler: ": #stack nightly"
addons: {apt: {packages: [libgmp-dev]}}
# GHCJS build via stack
- env: BUILD=ghcjs ARGS="--stack-yaml=stack-ghcjs.yaml"
compiler: ": #stack GHCJS"
addons: {apt: {packages: [ghc-7.10.3], sources: [hvr-ghc]}}
# Build on OS X in addition to Linux
- env: BUILD=stack ARGS="--resolver lts-6"
compiler: ": #stack 7.10.3 LTS 6 (OS X)"
os: osx
allow_failures:
- env: BUILD=cabal GHCVER=head CABALVER=head
- env: BUILD=stack ARGS="--resolver nightly"
before_install:
# Using compiler above sets CC to an invalid value, so unset it
- unset CC
- export CASHER_TIME_OUT=600
# We want to always allow newer versions of packages when building on GHC HEAD
- CABALARGS=""
- if [ "x$GHCVER" = "xhead" ]; then CABALARGS=--allow-newer; fi
# Download and unpack the stack executable
- export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$HOME/.local/bin:$PATH
- mkdir -p ~/.local/bin
- |
if [ `uname` = "Darwin" ]
then
curl --insecure -L https://www.stackage.org/stack/osx-x86_64 | tar xz --strip-components=1 --include '*/stack' -C ~/.local/bin
else
curl -L https://www.stackage.org/stack/linux-x86_64 | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'
fi
install:
- echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]"
- if [ -f configure.ac ]; then autoreconf -i; fi
- |
case "$BUILD" in
stack)
stack --no-terminal --install-ghc $ARGS test --only-dependencies
;;
cabal)
cabal --version
travis_retry cabal update
cabal install --only-dependencies --enable-tests --enable-benchmarks --force-reinstalls --ghc-options=-O0 --reorder-goals --max-backjumps=-1 $CABALARGS
;;
ghcjs)
stack --no-terminal setup $ARGS
stack --no-terminal --install-ghc $ARGS test --only-dependencies
;;
esac
script:
- |
case "$BUILD" in
cabal)
cabal configure --enable-tests --enable-benchmarks -v2 --ghc-options="-O0 -Werror"
cabal build
cabal check || [ "$CABALVER" == "1.16" ]
cabal test
cabal sdist
cabal copy
SRC_TGZ=$(cabal info . | awk '{print $2;exit}').tar.gz && \
(cd dist && cabal install --force-reinstalls "$SRC_TGZ")
;;
*)
stack --no-terminal $ARGS test --haddock --no-haddock-deps
;;
esac

4
buildrun.sh

@ -5,5 +5,5 @@
set -e
stack exec --allow-different-user ghcjs -- -j2 -isrc -i../transient/src -i../transient-universe/src -i../ghcjs-hplay/src -i../ghcjs-perch/src $1 -o static/out
stack exec --allow-different-user ghc -- -j2 -isrc -i../transient/src -i../transient-universe/src -i../ghcjs-hplay/src -i../ghcjs-perch/src $1 $2 $3 $4
ghcjs -j2 -isrc -i../transient/src -i../transient-universe/src -i../ghcjs-hplay/src -i../ghcjs-perch/src $1 -o static/out
runghc -j2 -isrc -i../transient/src -i../transient-universe/src -i../ghcjs-hplay/src -i../ghcjs-perch/src $1 $2 $3 $4

5
examples/distributedApps.hs

@ -6,8 +6,11 @@ import Prelude hiding (div,id)
import Transient.Base
#ifdef ghcjs_HOST_OS
hiding ( option)
hiding ( option,(<**))
#else
hiding ((<**))
#endif
import GHCJS.HPlay.Cell
import GHCJS.HPlay.View
#ifdef ghcjs_HOST_OS

17
stack-ghcjs.yaml

@ -0,0 +1,17 @@
resolver: lts-6.6
packages:
- '.'
- location:
git: https://github.com/agocorona/transient.git
commit: d9ee775d84b4d9aa7c4df3fa441450b8640a0d63
extra-dep: true
extra-package-dbs: []
flags: {}
compiler: ghcjs-0.2.0.20160703_ghc-7.10.3
compiler-check: match-exact
setup-info:
ghcjs:
source:
ghcjs-0.2.0.20160703_ghc-7.10.3:
url: http://ghcjs.luite.com/master-20160703.tar.gz

14
stack.yaml

@ -1,13 +1,9 @@
flags: {}
resolver: lts-6.6
packages:
- '.'
- location:
git: https://github.com/agocorona/transient.git
commit: e0e6be907a4045692155166ac450ca1def2f1a47
extra-deps:
- transient-0.4
resolver: lts-6.0
commit: d9ee775d84b4d9aa7c4df3fa441450b8640a0d63
extra-dep: true
extra-package-dbs: []
flags: {}

55
tests/Test.hs

@ -1,27 +1,50 @@
{-# LANGUAGE CPP #-}
{-# LANGUAGE MultiParamTypeClasses, GeneralizedNewtypeDeriving #-}
module Main (main) where
import Transient.Base
import Transient.Move
import Transient.Move.Utils
import Transient.Move.Services
import Control.Applicative
import Control.Monad
import Data.Typeable
import Data.IORef
import Control.Concurrent (threadDelay)
import Control.Monad.IO.Class
import Data.Monoid
newtype WithIndex v = WithIndex { unWithIndex :: Maybe v } deriving Monoid
class Foldable f => FoldableWithIndex f where
ifoldMap :: f a -> x
ifoldMap = undefined
instance Foldable WithIndex where
instance FoldableWithIndex WithIndex where
class A
instance A
class B
instance B
class C
instance C
class HasIndex f where
keysByIndex :: f a
findValues :: (A, B, FoldableWithIndex f, C)
=> ()
-> f b
-> f b
instance HasIndex WithIndex where
findValues _ wi = ifoldMap wi
main= do
main :: IO ()
main = keep $ initNode $ onBrowser $ lliftIO $ do
initNode $ do
local $ option "start" "start"
client ("hello","world")
let val = WithIndex mempty :: WithIndex ()
f val = (WithIndex $(unWithIndex $ findValues () val)) <>( WithIndex $ (unWithIndex $ findValues () val))
f val `seq` return ()
client params= do
r <- callService "" ("service","service") params ""
lliftIO $ print r

12
tests/cell.hs

@ -25,15 +25,15 @@ main= keep $ do
where
cellA = scell "cella" $ runCloud $ do
lliftIO $ print "local"
-- atRemote $ do
lliftIO $ print "running cella at server"
return 2
atRemote $ do
lliftIO $ print "running cella at server"
return 2
cellB = scell "cellb" $ runCloud $ do
lliftIO $ print "local2"
-- atRemote $ do
lliftIO $ print "running cellb at server"
return 4
atRemote $ do
lliftIO $ print "running cellb at server"
return 4
main2= keep $ do

47
tests/test5.hs

@ -1,52 +1,37 @@
module Main where
import Transient.Base
import Transient.Move
import Transient.Internals
import GHCJS.HPlay.View
import Transient.Move.Utils
import GHCJS.HPlay.View
import Transient.Logged
import Transient.Base
import Transient.Indeterminism
import Transient.EVars
import Control.Applicative
import Control.Monad.IO.Class
import System.Environment
import System.IO.Unsafe
import Data.Monoid
import System.IO
import Control.Monad
import Data.Maybe
import Data.String
import Control.Exception
import Control.Concurrent (threadDelay)
import Data.Typeable
import Data.IORef
import Data.List((\\))
import Control.Monad.State
-- to be executed with two or more nodes
main = keep $ initNode $ test
alert1 x = liftIO $ do alert $ fromString $ show x ; return x
test= onBrowser $ local $ do
r <- render $
(,) <$> inputString Nothing -- `fire` OnChange
<*> inputInt Nothing -- `fire` OnChange
<** inputSubmit "click" `fire` OnClick
(,) <$> getString (Just "eee") `fire` OnChange
<*> getString (Just "eee") `fire` OnChange
<** (inputSubmit "click" `fire` OnClick)
liftIO $ alert $ fromString $ show r
(<*|) a b= do
(x,_) <- (,) <$> a <*> b
return x
-- box <- local newMailBox
-- getMailBox box >>= lliftIO . print <|> putMailBox box "hello"
--return1 l= do
-- IDNUM id <- getSData <|> error "error"
-- id1 <- gets mfSequence
-- liftIO $ alert $ fromString $ show (id,id1)
-- return l

Loading…
Cancel
Save