Skip to content

Commit 23f11d1

Browse files
bobzhangbobzhang
authored
Merge pull request #1182 from bloomberg/clean_up
make header static
2 parents 9b011ac + 811feda commit 23f11d1

File tree

10 files changed

+264
-14
lines changed

10 files changed

+264
-14
lines changed

‎docs/Manual.html‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -605,6 +605,7 @@ <h1><a href="https://github.com/bloomberg/bucklescript">BuckleScript</a> User Ma
605605
<li><a href="#__bs_no_warn_ffi_type">-bs-no-warn-ffi-type</a></li>
606606
<li><a href="#__bs_eval">-bs-eval</a></li>
607607
<li><a href="#__bs_no_builtin_ppx_ml_bs_no_builtin_ppx_mli">-bs-no-builtin-ppx-ml, -bs-no-builtin-ppx-mli</a></li>
608+
<li><a href="#__bs_no_version_header">-bs-no-version-header</a></li>
608609
</ul>
609610
</li>
610611
<li><a href="#_semantics_difference_from_other_backends">Semantics difference from other backends</a>
@@ -3544,6 +3545,12 @@ <h3 id="__bs_no_builtin_ppx_ml_bs_no_builtin_ppx_mli"><a class="anchor" href="#_
35443545
</div>
35453546
</div>
35463547
</div>
3548+
<div class="sect2">
3549+
<h3 id="__bs_no_version_header"><a class="anchor" href="#__bs_no_version_header"></a>-bs-no-version-header</h3>
3550+
<div class="paragraph">
3551+
<p>Don&#8217;t print version header</p>
3552+
</div>
3553+
</div>
35473554
</div>
35483555
</div>
35493556
<div class="sect1">

‎jscomp/bin/bsdep.ml‎

Lines changed: 53 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,64 @@
11
module Config = Config_bsdep
22
module Bs_version : sig
33
#1 "bs_version.mli"
4+
(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
5+
*
6+
* This program is free software: you can redistribute it and/or modify
7+
* it under the terms of the GNU Lesser General Public License as published by
8+
* the Free Software Foundation, either version 3 of the License, or
9+
* (at your option) any later version.
10+
*
11+
* In addition to the permissions granted to you by the LGPL, you may combine
12+
* or link a "work that uses the Library" with a publicly distributed version
13+
* of this file to produce a combined library or application, then distribute
14+
* that combined work under the terms of your choosing, with no requirement
15+
* to comply with the obligations normally placed on you by section 4 of the
16+
* LGPL version 3 (or the corresponding section of a later version of the LGPL
17+
* should you choose to use a later version).
18+
*
19+
* This program is distributed in the hope that it will be useful,
20+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
21+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
22+
* GNU Lesser General Public License for more details.
23+
*
24+
* You should have received a copy of the GNU Lesser General Public License
25+
* along with this program; if not, write to the Free Software
26+
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
27+
428
val version : string
529

30+
val header : string
31+
632
end = struct
733
#1 "bs_version.ml"
8-
let version = "1.4.3"
934

35+
(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
36+
*
37+
* This program is free software: you can redistribute it and/or modify
38+
* it under the terms of the GNU Lesser General Public License as published by
39+
* the Free Software Foundation, either version 3 of the License, or
40+
* (at your option) any later version.
41+
*
42+
* In addition to the permissions granted to you by the LGPL, you may combine
43+
* or link a "work that uses the Library" with a publicly distributed version
44+
* of this file to produce a combined library or application, then distribute
45+
* that combined work under the terms of your choosing, with no requirement
46+
* to comply with the obligations normally placed on you by section 4 of the
47+
* LGPL version 3 (or the corresponding section of a later version of the LGPL
48+
* should you choose to use a later version).
49+
*
50+
* This program is distributed in the hope that it will be useful,
51+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
52+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
53+
* GNU Lesser General Public License for more details.
54+
*
55+
* You should have received a copy of the GNU Lesser General Public License
56+
* along with this program; if not, write to the Free Software
57+
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
58+
let version = "1.4.3"
59+
let header =
60+
"// Generated by BUCKLESCRIPT VERSION 1.4.3, PLEASE EDIT WITH CARE"
61+
1062
end
1163
module Terminfo : sig
1264
#1 "terminfo.mli"

‎jscomp/bin/bsppx.ml‎

Lines changed: 53 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9178,12 +9178,64 @@ let make_obj ~loc xs =
91789178
end
91799179
module Bs_version : sig
91809180
#1 "bs_version.mli"
9181+
(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
9182+
*
9183+
* This program is free software: you can redistribute it and/or modify
9184+
* it under the terms of the GNU Lesser General Public License as published by
9185+
* the Free Software Foundation, either version 3 of the License, or
9186+
* (at your option) any later version.
9187+
*
9188+
* In addition to the permissions granted to you by the LGPL, you may combine
9189+
* or link a "work that uses the Library" with a publicly distributed version
9190+
* of this file to produce a combined library or application, then distribute
9191+
* that combined work under the terms of your choosing, with no requirement
9192+
* to comply with the obligations normally placed on you by section 4 of the
9193+
* LGPL version 3 (or the corresponding section of a later version of the LGPL
9194+
* should you choose to use a later version).
9195+
*
9196+
* This program is distributed in the hope that it will be useful,
9197+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
9198+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
9199+
* GNU Lesser General Public License for more details.
9200+
*
9201+
* You should have received a copy of the GNU Lesser General Public License
9202+
* along with this program; if not, write to the Free Software
9203+
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
9204+
91819205
val version : string
91829206

9207+
val header : string
9208+
91839209
end = struct
91849210
#1 "bs_version.ml"
9185-
let version = "1.4.3"
91869211

9212+
(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
9213+
*
9214+
* This program is free software: you can redistribute it and/or modify
9215+
* it under the terms of the GNU Lesser General Public License as published by
9216+
* the Free Software Foundation, either version 3 of the License, or
9217+
* (at your option) any later version.
9218+
*
9219+
* In addition to the permissions granted to you by the LGPL, you may combine
9220+
* or link a "work that uses the Library" with a publicly distributed version
9221+
* of this file to produce a combined library or application, then distribute
9222+
* that combined work under the terms of your choosing, with no requirement
9223+
* to comply with the obligations normally placed on you by section 4 of the
9224+
* LGPL version 3 (or the corresponding section of a later version of the LGPL
9225+
* should you choose to use a later version).
9226+
*
9227+
* This program is distributed in the hope that it will be useful,
9228+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
9229+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
9230+
* GNU Lesser General Public License for more details.
9231+
*
9232+
* You should have received a copy of the GNU Lesser General Public License
9233+
* along with this program; if not, write to the Free Software
9234+
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
9235+
let version = "1.4.3"
9236+
let header =
9237+
"// Generated by BUCKLESCRIPT VERSION 1.4.3, PLEASE EDIT WITH CARE"
9238+
91879239
end
91889240
module Ast_ffi_types : sig
91899241
#1 "ast_ffi_types.mli"

‎jscomp/bin/whole_compiler.ml‎

Lines changed: 54 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,64 @@
11
module Config = Config_whole_compiler
22
module Bs_version : sig
33
#1 "bs_version.mli"
4+
(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
5+
*
6+
* This program is free software: you can redistribute it and/or modify
7+
* it under the terms of the GNU Lesser General Public License as published by
8+
* the Free Software Foundation, either version 3 of the License, or
9+
* (at your option) any later version.
10+
*
11+
* In addition to the permissions granted to you by the LGPL, you may combine
12+
* or link a "work that uses the Library" with a publicly distributed version
13+
* of this file to produce a combined library or application, then distribute
14+
* that combined work under the terms of your choosing, with no requirement
15+
* to comply with the obligations normally placed on you by section 4 of the
16+
* LGPL version 3 (or the corresponding section of a later version of the LGPL
17+
* should you choose to use a later version).
18+
*
19+
* This program is distributed in the hope that it will be useful,
20+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
21+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
22+
* GNU Lesser General Public License for more details.
23+
*
24+
* You should have received a copy of the GNU Lesser General Public License
25+
* along with this program; if not, write to the Free Software
26+
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
27+
428
val version : string
529

30+
val header : string
31+
632
end = struct
733
#1 "bs_version.ml"
8-
let version = "1.4.3"
934

35+
(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
36+
*
37+
* This program is free software: you can redistribute it and/or modify
38+
* it under the terms of the GNU Lesser General Public License as published by
39+
* the Free Software Foundation, either version 3 of the License, or
40+
* (at your option) any later version.
41+
*
42+
* In addition to the permissions granted to you by the LGPL, you may combine
43+
* or link a "work that uses the Library" with a publicly distributed version
44+
* of this file to produce a combined library or application, then distribute
45+
* that combined work under the terms of your choosing, with no requirement
46+
* to comply with the obligations normally placed on you by section 4 of the
47+
* LGPL version 3 (or the corresponding section of a later version of the LGPL
48+
* should you choose to use a later version).
49+
*
50+
* This program is distributed in the hope that it will be useful,
51+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
52+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
53+
* GNU Lesser General Public License for more details.
54+
*
55+
* You should have received a copy of the GNU Lesser General Public License
56+
* along with this program; if not, write to the Free Software
57+
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
58+
let version = "1.4.3"
59+
let header =
60+
"// Generated by BUCKLESCRIPT VERSION 1.4.3, PLEASE EDIT WITH CARE"
61+
1062
end
1163
module Terminfo : sig
1264
#1 "terminfo.mli"
@@ -82647,10 +82699,6 @@ let es6_program ~output_prefix f ( x : J.deps_program) =
8264782699
Linguist::FileBlob.new('jscomp/test/test_u.js').generated?
8264882700
]}
8264982701
*)
82650-
let bs_header =
82651-
"// Generated by BUCKLESCRIPT VERSION " ^
82652-
Bs_version.version ^
82653-
" , PLEASE EDIT WITH CARE"
8265482702

8265582703
let pp_deps_program
8265682704
~output_prefix
@@ -82659,7 +82707,7 @@ let pp_deps_program
8265982707
begin
8266082708
if not !Js_config.no_version_header then
8266182709
begin
82662-
P.string f bs_header;
82710+
P.string f Bs_version.header;
8266382711
P.newline f
8266482712
end ;
8266582713
P.string f L.strict_directive;

‎jscomp/build_version.js‎

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,39 @@
1+
2+
/**
3+
* This file is used only in dev time, feel free to use es6
4+
*/
15
var fs = require('fs')
26
var path = require('path')
37
var version = JSON.parse(fs.readFileSync('../package.json','utf8')).version
48

59
fs.writeFileSync(
610
path.join(__dirname,'common', 'bs_version.ml'),
7-
"let version = \"" + version + "\"\n",'utf8')
11+
`
12+
(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
13+
*
14+
* This program is free software: you can redistribute it and/or modify
15+
* it under the terms of the GNU Lesser General Public License as published by
16+
* the Free Software Foundation, either version 3 of the License, or
17+
* (at your option) any later version.
18+
*
19+
* In addition to the permissions granted to you by the LGPL, you may combine
20+
* or link a "work that uses the Library" with a publicly distributed version
21+
* of this file to produce a combined library or application, then distribute
22+
* that combined work under the terms of your choosing, with no requirement
23+
* to comply with the obligations normally placed on you by section 4 of the
24+
* LGPL version 3 (or the corresponding section of a later version of the LGPL
25+
* should you choose to use a later version).
26+
*
27+
* This program is distributed in the hope that it will be useful,
28+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
29+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
30+
* GNU Lesser General Public License for more details.
31+
*
32+
* You should have received a copy of the GNU Lesser General Public License
33+
* along with this program; if not, write to the Free Software
34+
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
35+
let version = "${version}"
36+
let header =
37+
"// Generated by BUCKLESCRIPT VERSION ${version}, PLEASE EDIT WITH CARE"
38+
`
39+
,'utf8')

‎jscomp/common/bs_version.ml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,28 @@
1+
2+
(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
3+
*
4+
* This program is free software: you can redistribute it and/or modify
5+
* it under the terms of the GNU Lesser General Public License as published by
6+
* the Free Software Foundation, either version 3 of the License, or
7+
* (at your option) any later version.
8+
*
9+
* In addition to the permissions granted to you by the LGPL, you may combine
10+
* or link a "work that uses the Library" with a publicly distributed version
11+
* of this file to produce a combined library or application, then distribute
12+
* that combined work under the terms of your choosing, with no requirement
13+
* to comply with the obligations normally placed on you by section 4 of the
14+
* LGPL version 3 (or the corresponding section of a later version of the LGPL
15+
* should you choose to use a later version).
16+
*
17+
* This program is distributed in the hope that it will be useful,
18+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
19+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20+
* GNU Lesser General Public License for more details.
21+
*
22+
* You should have received a copy of the GNU Lesser General Public License
23+
* along with this program; if not, write to the Free Software
24+
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
125
let version = "1.4.3"
26+
let header =
27+
"// Generated by BUCKLESCRIPT VERSION 1.4.3, PLEASE EDIT WITH CARE"
28+

‎jscomp/common/bs_version.mli‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,27 @@
1+
(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
2+
*
3+
* This program is free software: you can redistribute it and/or modify
4+
* it under the terms of the GNU Lesser General Public License as published by
5+
* the Free Software Foundation, either version 3 of the License, or
6+
* (at your option) any later version.
7+
*
8+
* In addition to the permissions granted to you by the LGPL, you may combine
9+
* or link a "work that uses the Library" with a publicly distributed version
10+
* of this file to produce a combined library or application, then distribute
11+
* that combined work under the terms of your choosing, with no requirement
12+
* to comply with the obligations normally placed on you by section 4 of the
13+
* LGPL version 3 (or the corresponding section of a later version of the LGPL
14+
* should you choose to use a later version).
15+
*
16+
* This program is distributed in the hope that it will be useful,
17+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
18+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19+
* GNU Lesser General Public License for more details.
20+
*
21+
* You should have received a copy of the GNU Lesser General Public License
22+
* along with this program; if not, write to the Free Software
23+
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
24+
125
val version : string
26+
27+
val header : string

‎jscomp/core/js_dump.ml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1830,10 +1830,6 @@ let es6_program ~output_prefix f ( x : J.deps_program) =
18301830
Linguist::FileBlob.new('jscomp/test/test_u.js').generated?
18311831
]}
18321832
*)
1833-
let bs_header =
1834-
"// Generated by BUCKLESCRIPT VERSION " ^
1835-
Bs_version.version ^
1836-
" , PLEASE EDIT WITH CARE"
18371833

18381834
let pp_deps_program
18391835
~output_prefix
@@ -1842,7 +1838,7 @@ let pp_deps_program
18421838
begin
18431839
if not !Js_config.no_version_header then
18441840
begin
1845-
P.string f bs_header;
1841+
P.string f Bs_version.header;
18461842
P.newline f
18471843
end ;
18481844
P.string f L.strict_directive;

‎site/docsource/Compiler-options.adoc‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,3 +138,8 @@ Another use case is that users can use `-ppx` explicitly as below:
138138
--------------
139139
bsc.exe -c -ppx bsppx.exe -bs-no-builtin-ppx-ml c.ml
140140
--------------
141+
142+
143+
### -bs-no-version-header
144+
145+
Don't print version header

‎site/docsource/Release.1.4.3.adoc‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
2+
WIP
3+
4+
# ES6 module support
5+

0 commit comments

Comments
 (0)