Skip to content

Commit 5aa9832

Browse files
bobzhangbobzhang
committed
update
1 parent eac683b commit 5aa9832

12 files changed

+51
-30
lines changed

‎docs/Manual.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,7 @@
488488
<h1><a href="https://github.com/bloomberg/bucklescript">BuckleScript</a> User Manual</h1>
489489
<div class="details">
490490
<span id="author" class="author">Hongbo Zhang</span><br>
491-
<span id="revnumber">version 1.5.2+dev</span>
491+
<span id="revnumber">version 1.5.3+dev</span>
492492
</div>
493493
<div id="toc" class="toc2">
494494
<div id="toctitle">Table of Contents</div>
@@ -5777,7 +5777,7 @@ <h3 id="_1_0"><a class="anchor" href="#_1_0"></a>1.0</h3>
57775777
</div>
57785778
<div id="footer">
57795779
<div id="footer-text">
5780-
Version 1.5.2+dev<br>
5780+
Version 1.5.3+dev<br>
57815781
</div>
57825782
</div>
57835783
</body>

‎jscomp/bin/bsb.ml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2805,9 +2805,9 @@ end = struct
28052805
* You should have received a copy of the GNU Lesser General Public License
28062806
* along with this program; if not, write to the Free Software
28072807
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
2808-
let version = "1.5.2+dev"
2808+
let version = "1.5.3+dev"
28092809
let header =
2810-
"// Generated by BUCKLESCRIPT VERSION 1.5.2+dev, PLEASE EDIT WITH CARE"
2810+
"// Generated by BUCKLESCRIPT VERSION 1.5.3+dev, PLEASE EDIT WITH CARE"
28112811
let package_name = "bs-platform"
28122812

28132813
end

‎jscomp/bin/bsdep.ml

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ end = struct
5555
* You should have received a copy of the GNU Lesser General Public License
5656
* along with this program; if not, write to the Free Software
5757
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
58-
let version = "1.5.2+dev"
58+
let version = "1.5.3+dev"
5959
let header =
60-
"// Generated by BUCKLESCRIPT VERSION 1.5.2+dev, PLEASE EDIT WITH CARE"
60+
"// Generated by BUCKLESCRIPT VERSION 1.5.3+dev, PLEASE EDIT WITH CARE"
6161
let package_name = "bs-platform"
6262

6363
end

‎jscomp/bin/bsppx.ml

+2-2
Original file line numberDiff line numberDiff line change
@@ -10439,9 +10439,9 @@ end = struct
1043910439
* You should have received a copy of the GNU Lesser General Public License
1044010440
* along with this program; if not, write to the Free Software
1044110441
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
10442-
let version = "1.5.2+dev"
10442+
let version = "1.5.3+dev"
1044310443
let header =
10444-
"// Generated by BUCKLESCRIPT VERSION 1.5.2+dev, PLEASE EDIT WITH CARE"
10444+
"// Generated by BUCKLESCRIPT VERSION 1.5.3+dev, PLEASE EDIT WITH CARE"
1044510445
let package_name = "bs-platform"
1044610446

1044710447
end

‎jscomp/bin/vendor/ninja-1.7.2.tar.gz

176 KB
Binary file not shown.

‎jscomp/bin/whole_compiler.ml

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ end = struct
5656
* You should have received a copy of the GNU Lesser General Public License
5757
* along with this program; if not, write to the Free Software
5858
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
59-
let version = "1.5.2+dev"
59+
let version = "1.5.3+dev"
6060
let header =
61-
"// Generated by BUCKLESCRIPT VERSION 1.5.2+dev, PLEASE EDIT WITH CARE"
61+
"// Generated by BUCKLESCRIPT VERSION 1.5.3+dev, PLEASE EDIT WITH CARE"
6262
let package_name = "bs-platform"
6363

6464
end

‎jscomp/common/bs_version.ml

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
* You should have received a copy of the GNU Lesser General Public License
2323
* along with this program; if not, write to the Free Software
2424
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
25-
let version = "1.5.2+dev"
25+
let version = "1.5.3+dev"
2626
let header =
27-
"// Generated by BUCKLESCRIPT VERSION 1.5.2+dev, PLEASE EDIT WITH CARE"
27+
"// Generated by BUCKLESCRIPT VERSION 1.5.3+dev, PLEASE EDIT WITH CARE"
2828
let package_name = "bs-platform"
2929

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"postinstall": "node scripts/install.js"
3636
},
3737
"name": "bs-platform",
38-
"version": "1.5.2+dev",
38+
"version": "1.5.3+dev",
3939
"description": "bucklescript compiler, ocaml standard libary by bucklescript and its required runtime support",
4040
"repository": {
4141
"type": "git",

‎scripts/install.js

+9-9
Original file line numberDiff line numberDiff line change
@@ -32,24 +32,24 @@ var vendor_ninja_version = '1.7.2'
3232

3333
var ninja_bin_output = path.join(root_dir,'bin','ninja.exe')
3434
var ninja_vendor_dir = path.join(jscomp_bin,'vendor')
35+
36+
function build_ninja(){
37+
var build_ninja_command = "tar -xf ninja-1.7.2.tar.gz && cd ninja-1.7.2 && ./configure.py --bootstrap "
38+
child_process.execSync(build_ninja_command,{cwd:ninja_vendor_dir})
39+
fs.renameSync(path.join(ninja_vendor_dir, 'ninja-1.7.2','ninja'), ninja_bin_output)
40+
}
41+
3542
console.log('Prepare ninja binary ')
3643
if(is_windows){
3744
fs.rename(path.join(ninja_vendor_dir,'ninja.win'),ninja_bin_output)
3845
}
3946
else if(os_type==='Darwin'){
40-
47+
// build_ninja()
4148
fs.renameSync(path.join(ninja_vendor_dir,'ninja.darwin'),ninja_bin_output)
4249
}
43-
else if(process.env.BS_TRAVIS_CI){
44-
fs.renameSync(path.join(ninja_vendor_dir,'ninja.linux64'),ninja_bin_output)
45-
}
4650
else {
4751
console.log('No prebuilt Ninja, building Ninja now')
48-
var ninja_vendor_dir = "ninja-" + vendor_ninja_version
49-
var ninja_vendor_tar = ninja_vendor_dir + ".tar.gz"
50-
var build_ninja_command = "tar -xf " + ninja_vendor_tar + " && cd " + ninja_vendor_dir + " && ./configure.py --bootstrap "
51-
child_process.execSync(build_ninja_command,{cwd:root_dir})
52-
fs.renameSync(path.join(root_dir, ninja_vendor_dir,'ninja'), ninja_bin_output)
52+
build_ninja()
5353
}
5454
console.log('ninja binary is ready: ', ninja_bin_output)
5555

‎scripts/prepublish.js

+10-7
Original file line numberDiff line numberDiff line change
@@ -35,22 +35,25 @@ child_process.execSync(`git archive HEAD -o ${ocaml_tar}`, { cwd: ocaml_dir })
3535
// }
3636
// }
3737

38+
// var ninja_url_base = `${ninja_build_base}/releases/download/v${ninja_version}`
3839

3940
var ninja_build_base = 'https://github.com/ninja-build/ninja'
40-
var ninja_version = 'v1.7.2'
41-
var ninja_url_base = `${ninja_build_base}/releases/download/${ninja_version}`
41+
var ninja_version = '1.7.2'
4242

4343
var exec = child_process.exec
4444

45+
// exec(`wget --content-disposition ${ninja_build_base}/archive/v${ninja_version}.tar.gz -O ninja-${ninja_version}.tar.gz`, {cwd: root_dir}, ()=>{
46+
// // download.source = true
47+
// console.log(`downloading source finished`)
48+
// // check_all()
49+
// })
50+
4551
// var download_to_bin = function(url,cb){
4652
// exec(`wget --content-disposition ${url}`, {cwd: root_dir},cb)
4753
// }
4854

49-
exec(`wget --content-disposition ${ninja_build_base}/archive/${ninja_version}.tar.gz -O ninja-${ninja_version}.tar.gz`, {cwd: root_dir}, ()=>{
50-
// download.source = true
51-
console.log(`downloading source finished`)
52-
// check_all()
53-
})
55+
// It really sucks, check
56+
// `node.js` ninja_vendor_tar exist or not
5457
// download_to_bin(`${ninja_url_base}/ninja-mac.zip`, () => {
5558
// download.mac = true
5659
// console.log(`downloading mac finished`)

‎site/docsource/Manual.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# https://github.com/bloomberg/bucklescript[BuckleScript] User Manual
22
Hongbo Zhang
3-
v1.5.2+dev
3+
v1.5.3+dev
44
:toc: left
55
:toclevels: 4
66
:source-highlighter: pygments

‎site/docsource/Release.1.5.2.adoc

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
2+
3+
# Features
4+
1. FFI: Unicode literal support http://bloomberg.github.io/bucklescript/Manual.html#_unicode_support_since_1_5_1
5+
6+
2. FFI: return value checking
7+
http://bloomberg.github.io/bucklescript/Manual.html#_unicode_support_since_1_5_1
8+
9+
3. FFI: Detect global variable existence
10+
http://bloomberg.github.io/bucklescript/Manual.html#_detect_global_varialbe_existence_code_bs_external_code_since_1_5_1
11+
12+
# Minor breaking changes
13+
14+
1. changes NodeJS special variables from `module_` to `_module` to make it more consistent
15+
16+
2. [%node ] return [_ option] type instead of `undefined`
17+
18+

0 commit comments

Comments
 (0)