Skip to content

Commit bf12126

Browse files
committed
update operational-transformation install to be dynamic
1 parent 139d75a commit bf12126

File tree

28 files changed

+12
-3275
lines changed

28 files changed

+12
-3275
lines changed

build.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,7 @@ run codeworld-api cabal haddock --hoogle
4343

4444
# Build codeworld-server from this project.
4545

46-
run . cabal_install ./third_party/ot.hs \
47-
./funblocks-server \
46+
run . cabal_install ./funblocks-server \
4847
./codeworld-error-sanitizer \
4948
./codeworld-compiler \
5049
./codeworld-server \

install.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,16 @@ run . ghcjs-boot --dev --ghcjs-boot-dev-branch ghc-8.0 --shims-dev-branch ghc-8.
173173

174174
run $BUILD rm -rf downloads
175175

176+
# Install ot.hs
177+
178+
run $BUILD git clone https://github.com/Operational-Transformation/ot.hs
179+
run $BUILD cabal install --force-reinstalls --global --prefix=$BUILD --allow-newer ./ot.hs
180+
run $BUILD rm -rf ot.hs
181+
182+
# Install ot.js
183+
184+
run $BUILD git clone https://github.com/Operational-Transformation/ot.js
185+
176186
# Install and build CodeMirror editor.
177187

178188
run $BUILD git clone https://github.com/codemirror/CodeMirror.git

third_party/ot.hs/.ghci

Lines changed: 0 additions & 4 deletions
This file was deleted.

third_party/ot.hs/.gitignore

Lines changed: 0 additions & 7 deletions
This file was deleted.

third_party/ot.hs/.travis.yml

Lines changed: 0 additions & 39 deletions
This file was deleted.

third_party/ot.hs/Changelog.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

third_party/ot.hs/LICENSE

Lines changed: 0 additions & 20 deletions
This file was deleted.

third_party/ot.hs/README.md

Lines changed: 0 additions & 10 deletions
This file was deleted.

third_party/ot.hs/Setup.hs

Lines changed: 0 additions & 2 deletions
This file was deleted.

third_party/ot.hs/TODO.md

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)