Skip to content

use gz for ocaml since gitignore issues #357

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 3 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
11 changes: 3 additions & 8 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ ocaml_pack
*~
stdlib/c.js
*.map
*.zip
*.gz
*#
qcc/
.#*
Expand All @@ -38,15 +36,12 @@ oxml

*.rawlambda
*.lambda
ocaml/*.js
ocaml/*/*/*.js
ocaml/*.js


ocaml/


test.json
ocaml/bin
ocaml/lib
ocaml/man
*~
*.annot
*.mj
Expand Down
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
language: node_js
env:
- OCAML=4.02.3
- BS_TRAVIS_CI=1
node_js:
- "4.0"
Expand Down
17 changes: 9 additions & 8 deletions jscomp/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,17 @@ world:
cd stdlib && make all
@echo "Making lib finished"

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

TMP_OCAMLLIB=$(shell ocamlopt.opt -where)


big-world:bin/big_compiler.ml bin/big_compiler.mli
@echo "Making compiler"
ocamlopt.opt -g -inline 100 -linkall -w -a -I bin bin/big_compiler.mli bin/big_compiler.ml -o bin/bsc
Expand All @@ -99,7 +108,6 @@ big-world:bin/big_compiler.ml bin/big_compiler.mli
cd stdlib && make all
@echo "Making lib finished"


world-test:
@echo "Making compiler"
ocamlopt.opt -g -inline 100 -w -a -linkall -I +compiler-libs -I bin ocamlcommon.cmxa bin/compiler.mli bin/compiler.ml -o bin/bsc
Expand Down Expand Up @@ -128,13 +136,6 @@ 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
1 change: 0 additions & 1 deletion jscomp/runtime/fn.ml

This file was deleted.

121 changes: 121 additions & 0 deletions jscomp/runtime/fn.ml
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* In addition to the permissions granted to you by the LGPL, you may combine
* or link a "work that uses the Library" with a publicly distributed version
* of this file to produce a combined library or application, then distribute
* that combined work under the terms of your choosing, with no requirement
* to comply with the obligations normally placed on you by section 4 of the
* LGPL version 3 (or the corresponding section of a later version of the LGPL
* should you choose to use a later version).
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)








(* if we allow a ppx like [%bs.uncurry [@n]], we would allow creating this
external functions dynamically.
It can not reduce dependency on [Js_fn] though, since the type depends
on it.
Example:
{[
let v = [%bs.uncurry 3 f ]
]}
*)


type + 'a t

external mk0 : (unit -> 'a0) -> 'a0 t =
"js_fn_mk_00"

external run0 : 'a0 t -> 'a0 = "js_fn_run_00"

external mk1 : ('a0 -> 'a1) -> ('a0 * 'a1) t =
"js_fn_mk_01"

external run1 : ('a0 * 'a1) t -> 'a0 -> 'a1 =
"js_fn_run_01"

external mk2 : ('a0 -> 'a1 -> 'a2 ) -> ('a0 * 'a1 * 'a2) t =
"js_fn_mk_02"

external run2 : ('a0 * 'a1 * 'a2 )t -> 'a0 -> 'a1 -> 'a2 =
"js_fn_run_02"

external mk3 :
('a0 -> 'a1 -> 'a2 -> 'a3 ) -> ('a0 * 'a1 * 'a2 * 'a3) t =
"js_fn_mk_03"

external run3 :
('a0 * 'a1 * 'a2 * 'a3) t -> 'a0 -> 'a1 -> 'a2 -> 'a3 =
"js_fn_run_03"

external mk4 : ('a0 -> 'a1 -> 'a2 -> 'a3 -> 'a4 )
-> ('a0 * 'a1 * 'a2 * 'a3 * 'a4) t =
"js_fn_mk_04"

external run4 : ('a0 * 'a1 * 'a2 * 'a3 * 'a4) t ->
'a0 -> 'a1 -> 'a2 -> 'a3 -> 'a4 =
"js_fn_run_04"

external mk5 :
('a0 -> 'a1 -> 'a2 -> 'a3 -> 'a4 -> 'a5 ) ->
('a0 * 'a1 * 'a2 * 'a3 * 'a4 * 'a5) t =
"js_fn_mk_05"

external run5 :
('a0 * 'a1 * 'a2 * 'a3 * 'a4 * 'a5) t
-> 'a0 -> 'a1 -> 'a2 -> 'a3 -> 'a4 -> 'a5 =
"js_fn_run_05"

external mk6 : ('a0 -> 'a1 -> 'a2 -> 'a3 -> 'a4 -> 'a5 -> 'a6) ->
('a0 * 'a1 * 'a2 * 'a3 * 'a4 * 'a5 * 'a6) t =
"js_fn_mk_06"
external run6 : ('a0 * 'a1 * 'a2 * 'a3 * 'a4 * 'a5 * 'a6) t
-> 'a0 -> 'a1 -> 'a2 -> 'a3 -> 'a4 -> 'a5 -> 'a6 =
"js_fn_run_06"

external mk7 : ('a0 -> 'a1 -> 'a2 -> 'a3 -> 'a4 -> 'a5 -> 'a6 -> 'a7) ->
('a0 * 'a1 * 'a2 * 'a3 * 'a4 * 'a5 * 'a6 * 'a7 ) t =
"js_fn_mk_07"

external run7 : ('a0 * 'a1 * 'a2 * 'a3 * 'a4 * 'a5 * 'a6 * 'a7 ) t
-> 'a0 -> 'a1 -> 'a2 -> 'a3 -> 'a4 -> 'a5 -> 'a6 -> 'a7 =
"js_fn_run_07"

external mk8 : ('a0 -> 'a1 -> 'a2 -> 'a3 -> 'a4 -> 'a5 -> 'a6 -> 'a7 -> 'a8 ) ->
('a0 * 'a1 * 'a2 * 'a3 * 'a4 * 'a5 * 'a6 * 'a7 * 'a8 ) t =
"js_fn_mk_08"

external run8 :
('a0 * 'a1 * 'a2 * 'a3 * 'a4 * 'a5 * 'a6 * 'a7 * 'a8 ) t ->
'a0 -> 'a1 -> 'a2 -> 'a3 -> 'a4 -> 'a5 -> 'a6 -> 'a7 -> 'a8
=
"js_fn_run_08"

external mk9 :
('a0 -> 'a1 -> 'a2 -> 'a3 -> 'a4 -> 'a5 -> 'a6 -> 'a7 -> 'a8 -> 'a9) ->
('a0 * 'a1 * 'a2 * 'a3 * 'a4 * 'a5 * 'a6 * 'a7 * 'a8 * 'a9 ) t =
"js_fn_mk_09"

external run9 :
('a0 * 'a1 * 'a2 * 'a3 * 'a4 * 'a5 * 'a6 * 'a7 * 'a8 * 'a9 ) t ->
'a0 -> 'a1 -> 'a2 -> 'a3 -> 'a4 -> 'a5 -> 'a6 -> 'a7 -> 'a8 -> 'a9 =
"js_fn_run_09"
1 change: 0 additions & 1 deletion jscomp/runtime/js.ml

This file was deleted.

Loading