Merge pull request #4203 from BuckleScript/bump

bobzhang · web-flow · commit 305bf2303be9 · 2020-02-29T15:28:13.000+08:00
bump version
diff --git a/.npmignore b/.npmignore
@@ -10,6 +10,9 @@
 *.ninja_deps
 *.ninja_log
 *~
+# darwin/bsc this does not work because bin
+# has a file happens to be named after it
+# npmignore is completely broken
 docs/*
 docs/docson/*
 !docs/docson/build-schema.json
@@ -32,4 +35,3 @@ vendor/cppo
 vendor/rollup.js
 package/
 *.tgz
-darwin/bsc
diff --git a/Changes.md b/Changes.md
@@ -1,6 +1,7 @@
 `*` means  potential break changes
-
 # current
+
+# 7.2
 - #4177 #4180 support `[@@@bs.config {flags = [| ".." |] }]` per file level to allow file level special flags
 - #4158 #4157 #4166 #4168 loading stdlib from memory, no postinstall needed
 - #4152 support copyright style comments preserved in JS 
diff --git a/esy.json b/esy.json
@@ -1,6 +1,6 @@
 {
   "name": "bs-platform",
-  "version": "5.2.0-dev.2",
+  "version": "7.2.0",
   "dependencies": {
     "ocaml": "4.6.1000+BS"
   },
diff --git a/jscomp/common/bs_version.ml b/jscomp/common/bs_version.ml
@@ -22,7 +22,7 @@
  * 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. *)    
-let version = "7.2.0-dev.4"
+let version = "7.3.0-dev.1"
 let header = 
    "// Generated by BUCKLESCRIPT, PLEASE EDIT WITH CARE"  
 let package_name = "bs-platform"   
diff --git a/lib/4.06.1/bsb.ml b/lib/4.06.1/bsb.ml
@@ -55,7 +55,7 @@ end = struct
  * 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. *)    
-let version = "7.2.0-dev.4"
+let version = "7.3.0-dev.1"
 let header = 
    "// Generated by BUCKLESCRIPT, PLEASE EDIT WITH CARE"  
 let package_name = "bs-platform"   
diff --git a/lib/4.06.1/unstable/bsb_native.ml b/lib/4.06.1/unstable/bsb_native.ml
@@ -55,7 +55,7 @@ end = struct
  * 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. *)    
-let version = "7.2.0-dev.4"
+let version = "7.3.0-dev.1"
 let header = 
    "// Generated by BUCKLESCRIPT, PLEASE EDIT WITH CARE"  
 let package_name = "bs-platform"   
diff --git a/lib/4.06.1/unstable/js_compiler.ml b/lib/4.06.1/unstable/js_compiler.ml
@@ -314842,7 +314842,7 @@ end = struct
  * 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. *)    
-let version = "7.2.0-dev.4"
+let version = "7.3.0-dev.1"
 let header = 
    "// Generated by BUCKLESCRIPT, PLEASE EDIT WITH CARE"  
 let package_name = "bs-platform"   
diff --git a/lib/4.06.1/unstable/js_refmt_compiler.ml b/lib/4.06.1/unstable/js_refmt_compiler.ml
@@ -314842,7 +314842,7 @@ end = struct
  * 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. *)    
-let version = "7.2.0-dev.4"
+let version = "7.3.0-dev.1"
 let header = 
    "// Generated by BUCKLESCRIPT, PLEASE EDIT WITH CARE"  
 let package_name = "bs-platform"   
diff --git a/lib/4.06.1/whole_compiler.ml b/lib/4.06.1/whole_compiler.ml
@@ -304049,7 +304049,7 @@ end = struct
  * 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. *)    
-let version = "7.2.0-dev.4"
+let version = "7.3.0-dev.1"
 let header = 
    "// Generated by BUCKLESCRIPT, PLEASE EDIT WITH CARE"  
 let package_name = "bs-platform"   
diff --git a/package.json b/package.json
@@ -16,7 +16,7 @@
     "postinstall": "node scripts/install.js"
   },
   "name": "bs-platform",
-  "version": "7.2.0-dev.4",
+  "version": "7.3.0-dev.1",
   "description": "bucklescript compiler, ocaml standard libary by bucklescript and its required runtime support",
   "repository": {
     "type": "git",
diff --git a/scripts/prepublish.js b/scripts/prepublish.js
@@ -13,6 +13,13 @@ var output = p.spawnSync(`npm pack --dry-run`, {
   // stdio: [0, 1, 2]
 });
 
+try {
+  // npmignore is broken let's do it
+  let file = path.join(root, process.platform, "bsc")
+  console.log(`try removing ${file}`)
+  fs.unlinkSync(file);
+} catch (e) {}
+
 /**
  *
  * @param {string} output
@@ -60,9 +67,10 @@ function stat(files) {
  * @param {Map<string, Set<string> >} map
  */
 function check(map) {
-  var compilers = ["bsb", "bsb_helper", "bsc",  "ninja", "refmt"];
+  var compilers = ["bsb", "bsb_helper", "bsc", "ninja", "refmt"];
   for (let os of ["win32", "darwin", "linux"]) {
     for (let c of compilers) {
+      assert(map.get(os));
       assert(map.get(os).has(`${c}.exe`));
     }
   }
@@ -96,3 +104,7 @@ fs.writeFileSync(
 if (!process.argv.includes("-nocheck")) {
   check(map);
 }
+
+console.log("The diff of artifacts")
+var output = p.spawnSync(`git diff jscomp/artifacts.json`,{cwd:root,encoding:'utf8'})
+console.log(output.stdout)

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "bs-platform",`
`3`		`- "version": "5.2.0-dev.2",`
	`3`	`+ "version": "7.2.0",`
`4`	`4`	`"dependencies": {`
`5`	`5`	`"ocaml": "4.6.1000+BS"`
`6`	`6`	`},`