Skip to content

[feature] prepare formal npm release #355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
May 9, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@ _build
*.cmx
*.cmt
*.cmti
jslambda
*.cma
*.a
*.cmxa


exports.js
*.lambda
Expand Down Expand Up @@ -69,4 +72,17 @@ coverage
dist/

bin/
man/
man/
lib/ocaml/*.ml
lib/ocaml/*.mli
lib/ocaml/caml
lib/ocaml/VERSION
lib/ocaml/camlheader
lib/ocaml/camlheader_ur
lib/ocaml/expunge
lib/ocaml/ld.conf
lib/ocaml/objinfo_helper
lib/ocaml/vmthreads/
lib/ocaml/Makefile.config
lib/ocaml/extract_crc

9 changes: 0 additions & 9 deletions .travis-ci-before-script.sh

This file was deleted.

26 changes: 26 additions & 0 deletions .travis-ci.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
#!/bin/sh
set -e

if [ $BS_TRAVIS_CI ]
then
git submodule update --init --recursive
fi

export OCAMLPARAM='_,bin-annot=1'
export OCAMLRUNPARAM=b

# we encoruage people to install from opam
# for our own local installation
# it can be minimal
cd ocaml && ./configure -prefix $(dirname $(pwd)) -no-ocamldoc -no-ocamlbuild -no-shared-libs -no-curses -no-graph -no-pthread -no-debugger && make -j9 world.opt && make install && cd ..

# we should not rely on git
# it will break `npm postinstall`
# if [ ! $BS_TRAVIS_CI ]
# then
# cd ocaml && git clean -dfx && cd ..
# fi

export PATH=$(pwd)/bin:$PATH

cd jscomp && make travis-world-test && make install
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
language: node_js
env:
- OCAML=4.02.3
- BS_TRAVIS_CI=1
node_js:
- "4.0"

before_script: bash -ex .travis-ci-before-script.sh

script: npm run coveralls

8 changes: 8 additions & 0 deletions jscomp/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,14 @@ travis-world-test:./bin/ocaml_pack
@echo "Generating the compiler finished"
make world-test

# no depend on ./bin/ocaml_pack ./bin/bsc
# since in npm mode, they are generated from a single file
install:
cp ./bin/ocaml_pack ./bin/bsc ../bin/
cp ./runtime/*.cmt* ../lib/ocaml/
cp ./runtime/*.cmj* ../lib/ocaml/
cp ./stdlib/*.cm* ../lib/ocaml/

.PHONY: stdlib
.PHONY: test quicktest release snapshot snapshotcmj

Expand Down
Loading