Merge branch 'develop-reorg' into develop. Close #176.

ivanperez-keera · Sep 15, 2021 · 53b00ad · 53b00ad
2 parents e93e719 + 4af1d8c
commit 53b00ad
Show file tree

Hide file tree

Showing 82 changed files with 239 additions and 238 deletions.
diff --git a/.gitignore b/.gitignore
@@ -24,7 +24,7 @@ cabal.project.local~
 .ghc.environment.*
 
 # Others
-tests/testAFRPMain
+yampa/tests/testAFRPMain
 .virthualenv
 SourceGraph
 .tags
diff --git a/.travis.yml b/.travis.yml
@@ -19,10 +19,10 @@ before_install:
   - travis_retry sudo apt-get install libcwiid-dev libsdl1.2-dev
 
 install:
-  - travis_retry cabal install --enable-tests -fexamples --only-dependencies . extensions/testing/
+  - travis_retry cabal install --enable-tests -fexamples --only-dependencies yampa/ yampa-test/
 
 script:
-  - if [ "${TRAVIS_HASKELL_VERSION}" == "8.4.4" ]; then cabal install -ftest-doc-coverage --run-tests -j1 . extensions/testing/; else cabal install --enable-tests -fexamples -j1 . extensions/testing/; fi
+  - if [ "${TRAVIS_HASKELL_VERSION}" == "8.4.4" ]; then cabal install -ftest-doc-coverage --run-tests -j1  yampa/ yampa-test/; else cabal install --enable-tests -fexamples -j1 yampa/ yampa-test/; fi
 
 after_script:
 

diff --git a/README.md b/README.md
diff --git a/README.md b/README.md
@@ -0,0 +1 @@
+yampa/README.md
diff --git a/cabal.project b/cabal.project
@@ -1,4 +1,4 @@
 packages:
-  ./.
-  extensions/testing/
+  yampa/
+  yampa-test/
 
diff --git a/extensions/testing/CHANGELOG → yampa-test/CHANGELOG b/extensions/testing/CHANGELOG → yampa-test/CHANGELOG
diff --git a/extensions/testing/LICENSE → yampa-test/LICENSE b/extensions/testing/LICENSE → yampa-test/LICENSE
diff --git a/Setup.hs → yampa-test/Setup.hs b/Setup.hs → yampa-test/Setup.hs
diff --git a/extensions/testing/src/FRP/Yampa/Debug.hs → yampa-test/src/FRP/Yampa/Debug.hs b/extensions/testing/src/FRP/Yampa/Debug.hs → yampa-test/src/FRP/Yampa/Debug.hs
diff --git a/...nsions/testing/src/FRP/Yampa/LTLFuture.hs → yampa-test/src/FRP/Yampa/LTLFuture.hs b/...nsions/testing/src/FRP/Yampa/LTLFuture.hs → yampa-test/src/FRP/Yampa/LTLFuture.hs
diff --git a/extensions/testing/src/FRP/Yampa/LTLPast.hs → yampa-test/src/FRP/Yampa/LTLPast.hs b/extensions/testing/src/FRP/Yampa/LTLPast.hs → yampa-test/src/FRP/Yampa/LTLPast.hs
diff --git a/...sions/testing/src/FRP/Yampa/QuickCheck.hs → yampa-test/src/FRP/Yampa/QuickCheck.hs b/...sions/testing/src/FRP/Yampa/QuickCheck.hs → yampa-test/src/FRP/Yampa/QuickCheck.hs
diff --git a/extensions/testing/src/FRP/Yampa/Stream.hs → yampa-test/src/FRP/Yampa/Stream.hs b/extensions/testing/src/FRP/Yampa/Stream.hs → yampa-test/src/FRP/Yampa/Stream.hs
diff --git a/extensions/testing/tests/YampaQC.hs → yampa-test/tests/YampaQC.hs b/extensions/testing/tests/YampaQC.hs → yampa-test/tests/YampaQC.hs
diff --git a/extensions/testing/yampa-test.cabal → yampa-test/yampa-test.cabal b/extensions/testing/yampa-test.cabal → yampa-test/yampa-test.cabal
diff --git a/CHANGELOG → yampa/CHANGELOG b/CHANGELOG → yampa/CHANGELOG
diff --git a/HLint.hs → yampa/HLint.hs b/HLint.hs → yampa/HLint.hs
diff --git a/LICENSE → yampa/LICENSE b/LICENSE → yampa/LICENSE