Move reedsolomon into a subdirectory

The aim for this move is to extract the SIMD backend from the main library in the future, which should ease the build infrastructure maintenance, and allow to implement some other (optional) backend types (like OpenCL).
NicolasT · Oct 20, 2016 · d8f899e · d8f899e
1 parent 58a3716
commit d8f899e
Show file tree

Hide file tree

Showing 54 changed files with 21 additions and 15 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -25,7 +25,7 @@ install:
   - echo "" | stack build --test --only-snapshot --flag=reedsolomon:-LLVM
 
 build_script:
-  - echo "" | stack exec bash -- -lc "cd /c/reedsolomon/cbits; autoreconf -vi"
+  - echo "" | stack exec bash -- -lc "cd /c/reedsolomon/reedsolomon/cbits; autoreconf -vi"
   # Building benchmarks is temporarily disabled due to https://github.com/fpco/stackage/issues/1912
   # - echo "" | stack build --pedantic --test --no-run-tests --bench --no-run-benchmarks --flag=reedsolomon:-LLVM --flag=reedsolomon:examples
   - echo "" | stack build --pedantic --test --no-run-tests --flag=reedsolomon:-LLVM
@@ -35,4 +35,4 @@ test_script:
   - echo "" | stack build --pedantic --test --test-arguments "--xml junit.xml +RTS -N1" --flag=reedsolomon:-LLVM
 
 on_finish:
-  - ps: (new-object net.webclient).UploadFile("https://ci.appveyor.com/api/testresults/junit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path .\junit.xml))
+  - ps: (new-object net.webclient).UploadFile("https://ci.appveyor.com/api/testresults/junit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path .\reedsolomon\junit.xml))
diff --git a/ci/travisci/build-test-bench/install.sh b/ci/travisci/build-test-bench/install.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -ue
 
-pushd cbits
+pushd reedsolomon/cbits
 autoreconf -fvi
 popd
 

diff --git a/ci/travisci/cbits-cross/install.sh b/ci/travisci/cbits-cross/install.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -xue
 
-pushd cbits
+pushd reedsolomon/cbits
 autoreconf -fvi
 popd
 

diff --git a/ci/travisci/cbits-cross/script.sh b/ci/travisci/cbits-cross/script.sh
@@ -1,5 +1,7 @@
 #!/bin/bash -xue
 
+cd reedsolomon
+
 function build() {
     local suffix=$1
     shift

diff --git a/ci/travisci/check-sdist/install.sh b/ci/travisci/check-sdist/install.sh
@@ -1,5 +1,5 @@
 #!/bin/bash -xue
 
-pushd cbits
+pushd reedsolomon/cbits
 autoreconf -fvi
 popd
diff --git a/ci/travisci/check-sdist/script.sh b/ci/travisci/check-sdist/script.sh
@@ -1,5 +1,6 @@
 #!/bin/bash -xue
 
+pushd reedsolomon
 PKG_VERSION=`grep ^Version\: reedsolomon.cabal | awk '{ print $2 }'`
 
 pushd cbits
@@ -8,11 +9,14 @@ make distcheck
 mv reedsolomon-$PKG_VERSION.tar.gz /tmp/reedsolomon-$PKG_VERSION-cbits.tar.gz
 make distclean
 popd
+popd
 
 cp ci/travisci/check-sdist/test.hs /tmp
 
 git clean -dxf
 
+cd reedsolomon
+
 cabal sdist
 
 PKG_TAR=reedsolomon-$PKG_VERSION.tar.gz

diff --git a/circle.yml b/circle.yml
@@ -16,16 +16,17 @@ dependencies:
   override:
     - cabal update
     - cabal sandbox init
-    - cabal install --constraint="template-haskell installed" --dependencies-only --enable-tests -fexamples
-    - cabal configure --enable-tests -fexamples
+    - cd reedsolomon; cabal sandbox init --sandbox `pwd`/../.cabal-sandbox
+    - cd reedsolomon; cabal install --constraint="template-haskell installed" --dependencies-only --enable-tests -fexamples
+    - cd reedsolomon; cabal configure --enable-tests -fexamples
 
 test:
   override:
-    - cd cbits; autoreconf -vi
-    - cabal build
-    - cabal test --show-details=always --test-options="+RTS -N2"
-    - cabal test --show-details=always --test-options="--xml $CIRCLE_TEST_REPORTS/junit.xml +RTS -N2"
+    - cd reedsolomon; cd cbits; autoreconf -vi
+    - cd reedsolomon; cabal build
+    - cd reedsolomon; cabal test --show-details=always --test-options="+RTS -N2"
+    - cd reedsolomon; cabal test --show-details=always --test-options="--xml $CIRCLE_TEST_REPORTS/junit.xml +RTS -N2"
 
   post:
-    - cabal haddock --hyperlink-source
-    - mv dist/doc/html/reedsolomon/* $CIRCLE_ARTIFACTS/
+    - cd reedsolomon; cabal haddock --hyperlink-source
+    - cd reedsolomon; mv dist/doc/html/reedsolomon/* $CIRCLE_ARTIFACTS/
diff --git a/LICENSE → reedsolomon/LICENSE b/LICENSE → reedsolomon/LICENSE
diff --git a/README.md → reedsolomon/README.md b/README.md → reedsolomon/README.md
diff --git a/Setup.hs → reedsolomon/Setup.hs b/Setup.hs → reedsolomon/Setup.hs
diff --git a/bench/Main.hs → reedsolomon/bench/Main.hs b/bench/Main.hs → reedsolomon/bench/Main.hs
diff --git a/bench/profiling.hs → reedsolomon/bench/profiling.hs b/bench/profiling.hs → reedsolomon/bench/profiling.hs
diff --git a/build-tools/ar-wrapper → reedsolomon/build-tools/ar-wrapper b/build-tools/ar-wrapper → reedsolomon/build-tools/ar-wrapper
diff --git a/build-tools/ghc-wrapper → reedsolomon/build-tools/ghc-wrapper b/build-tools/ghc-wrapper → reedsolomon/build-tools/ghc-wrapper
diff --git a/cbits/.gitignore → reedsolomon/cbits/.gitignore b/cbits/.gitignore → reedsolomon/cbits/.gitignore
diff --git a/cbits/Makefile.am → reedsolomon/cbits/Makefile.am b/cbits/Makefile.am → reedsolomon/cbits/Makefile.am
diff --git a/cbits/compare-isa.sh → reedsolomon/cbits/compare-isa.sh b/cbits/compare-isa.sh → reedsolomon/cbits/compare-isa.sh
diff --git a/cbits/configure.ac → reedsolomon/cbits/configure.ac b/cbits/configure.ac → reedsolomon/cbits/configure.ac
diff --git a/cbits/m4/ax_append_compile_flags.m4 → ...lomon/cbits/m4/ax_append_compile_flags.m4 b/cbits/m4/ax_append_compile_flags.m4 → ...lomon/cbits/m4/ax_append_compile_flags.m4
diff --git a/cbits/m4/ax_append_flag.m4 → reedsolomon/cbits/m4/ax_append_flag.m4 b/cbits/m4/ax_append_flag.m4 → reedsolomon/cbits/m4/ax_append_flag.m4
diff --git a/cbits/m4/ax_check_compile_flag.m4 → ...solomon/cbits/m4/ax_check_compile_flag.m4 b/cbits/m4/ax_check_compile_flag.m4 → ...solomon/cbits/m4/ax_check_compile_flag.m4
diff --git a/cbits/m4/ax_gcc_func_attribute.m4 → ...solomon/cbits/m4/ax_gcc_func_attribute.m4 b/cbits/m4/ax_gcc_func_attribute.m4 → ...solomon/cbits/m4/ax_gcc_func_attribute.m4
diff --git a/cbits/m4/ax_require_defined.m4 → reedsolomon/cbits/m4/ax_require_defined.m4 b/cbits/m4/ax_require_defined.m4 → reedsolomon/cbits/m4/ax_require_defined.m4
diff --git a/cbits/malloc.c → reedsolomon/cbits/malloc.c b/cbits/malloc.c → reedsolomon/cbits/malloc.c
diff --git a/...s/reedsolomon-gal-mul-stdio-quickcheck.hs → ...s/reedsolomon-gal-mul-stdio-quickcheck.hs b/...s/reedsolomon-gal-mul-stdio-quickcheck.hs → ...s/reedsolomon-gal-mul-stdio-quickcheck.hs
diff --git a/cbits/reedsolomon-gal-mul-stdio.c → ...solomon/cbits/reedsolomon-gal-mul-stdio.c b/cbits/reedsolomon-gal-mul-stdio.c → ...solomon/cbits/reedsolomon-gal-mul-stdio.c
diff --git a/cbits/reedsolomon.c → reedsolomon/cbits/reedsolomon.c b/cbits/reedsolomon.c → reedsolomon/cbits/reedsolomon.c
diff --git a/cbits/reedsolomon.h → reedsolomon/cbits/reedsolomon.h b/cbits/reedsolomon.h → reedsolomon/cbits/reedsolomon.h
diff --git a/cbits/reedsolomon_dispatch.c → reedsolomon/cbits/reedsolomon_dispatch.c b/cbits/reedsolomon_dispatch.c → reedsolomon/cbits/reedsolomon_dispatch.c
diff --git a/cbits/test-compilers.sh → reedsolomon/cbits/test-compilers.sh b/cbits/test-compilers.sh → reedsolomon/cbits/test-compilers.sh
diff --git a/examples/README.md → reedsolomon/examples/README.md b/examples/README.md → reedsolomon/examples/README.md
diff --git a/examples/simple-bench.hs → reedsolomon/examples/simple-bench.hs b/examples/simple-bench.hs → reedsolomon/examples/simple-bench.hs
diff --git a/examples/simple-decoder.lhs → reedsolomon/examples/simple-decoder.lhs b/examples/simple-decoder.lhs → reedsolomon/examples/simple-decoder.lhs
diff --git a/examples/simple-encoder.lhs → reedsolomon/examples/simple-encoder.lhs b/examples/simple-encoder.lhs → reedsolomon/examples/simple-encoder.lhs
diff --git a/reedsolomon.cabal → reedsolomon/reedsolomon.cabal b/reedsolomon.cabal → reedsolomon/reedsolomon.cabal
@@ -16,7 +16,6 @@ Category:            Data
 Build-Type:          Custom
 Extra-Source-Files:  README.md
                    , examples/README.md
-                   , stack.yaml
 
                    , build-tools/ar-wrapper
                    , build-tools/ghc-wrapper

diff --git a/src/Data/ReedSolomon.lhs → reedsolomon/src/Data/ReedSolomon.lhs b/src/Data/ReedSolomon.lhs → reedsolomon/src/Data/ReedSolomon.lhs
diff --git a/src/Data/ReedSolomon/Backend.hs → reedsolomon/src/Data/ReedSolomon/Backend.hs b/src/Data/ReedSolomon/Backend.hs → reedsolomon/src/Data/ReedSolomon/Backend.hs
diff --git a/src/Data/ReedSolomon/BuildInfo.hs → ...solomon/src/Data/ReedSolomon/BuildInfo.hs b/src/Data/ReedSolomon/BuildInfo.hs → ...solomon/src/Data/ReedSolomon/BuildInfo.hs
diff --git a/src/Data/ReedSolomon/Galois.lhs → reedsolomon/src/Data/ReedSolomon/Galois.lhs b/src/Data/ReedSolomon/Galois.lhs → reedsolomon/src/Data/ReedSolomon/Galois.lhs
diff --git a/src/Data/ReedSolomon/Galois/GenTables.lhs → ...src/Data/ReedSolomon/Galois/GenTables.lhs b/src/Data/ReedSolomon/Galois/GenTables.lhs → ...src/Data/ReedSolomon/Galois/GenTables.lhs
diff --git a/src/Data/ReedSolomon/Galois/NoAsm.lhs → ...mon/src/Data/ReedSolomon/Galois/NoAsm.lhs b/src/Data/ReedSolomon/Galois/NoAsm.lhs → ...mon/src/Data/ReedSolomon/Galois/NoAsm.lhs
diff --git a/src/Data/ReedSolomon/Galois/SIMD.lhs → ...omon/src/Data/ReedSolomon/Galois/SIMD.lhs b/src/Data/ReedSolomon/Galois/SIMD.lhs → ...omon/src/Data/ReedSolomon/Galois/SIMD.lhs
diff --git a/src/Data/ReedSolomon/Matrix.lhs → reedsolomon/src/Data/ReedSolomon/Matrix.lhs b/src/Data/ReedSolomon/Matrix.lhs → reedsolomon/src/Data/ReedSolomon/Matrix.lhs
diff --git a/src/Data/Vector/Generic/Compat.hs → ...solomon/src/Data/Vector/Generic/Compat.hs b/src/Data/Vector/Generic/Compat.hs → ...solomon/src/Data/Vector/Generic/Compat.hs
diff --git a/src/Data/Vector/Generic/Exceptions.hs → ...mon/src/Data/Vector/Generic/Exceptions.hs b/src/Data/Vector/Generic/Exceptions.hs → ...mon/src/Data/Vector/Generic/Exceptions.hs
diff --git a/src/Data/Vector/Generic/Lifted.hs → ...solomon/src/Data/Vector/Generic/Lifted.hs b/src/Data/Vector/Generic/Lifted.hs → ...solomon/src/Data/Vector/Generic/Lifted.hs
diff --git a/src/Data/Vector/Generic/Sized.hs → reedsolomon/src/Data/Vector/Generic/Sized.hs b/src/Data/Vector/Generic/Sized.hs → reedsolomon/src/Data/Vector/Generic/Sized.hs
diff --git a/src/Data/Vector/Storable/ByteString.hs → ...on/src/Data/Vector/Storable/ByteString.hs b/src/Data/Vector/Storable/ByteString.hs → ...on/src/Data/Vector/Storable/ByteString.hs
diff --git a/test/Galois.lhs → reedsolomon/test/Galois.lhs b/test/Galois.lhs → reedsolomon/test/Galois.lhs
diff --git a/test/Main.hs → reedsolomon/test/Main.hs b/test/Main.hs → reedsolomon/test/Main.hs
diff --git a/test/Matrix.lhs → reedsolomon/test/Matrix.lhs b/test/Matrix.lhs → reedsolomon/test/Matrix.lhs
diff --git a/test/ReedSolomon.lhs → reedsolomon/test/ReedSolomon.lhs b/test/ReedSolomon.lhs → reedsolomon/test/ReedSolomon.lhs
diff --git a/test/Vector.hs → reedsolomon/test/Vector.hs b/test/Vector.hs → reedsolomon/test/Vector.hs
diff --git a/stack.yaml b/stack.yaml
@@ -1,5 +1,5 @@
 packages:
-- '.'
+- reedsolomon
 
 extra-deps:
 - bytestring-mmap-0.2.2