1 files changed, 16 insertions, 4 deletions

diff --git a/xtask/src/dist.rs b/xtask/src/dist.rs
index 12bad820f..bb3593b11 100644
--- a/xtask/src/dist.rs
+++ b/xtask/src/dist.rs
@@ -27,7 +27,13 @@ fn dist_client(nightly: bool) -> Result<()> {
     let _restore =
         Restore { path: package_json_path.clone(), contents: original_package_json.clone() };
 
-    let mut package_json = original_package_json.replace(r#""enableProposedApi": true,"#, r#""#);
+    let date = run!("date --utc +%Y%m%d")?;
+    let version_suffix = if nightly { "-nightly" } else { "" };
+
+    let mut package_json = original_package_json.replace(
+        r#""version": "0.2.20200211-dev""#,
+        &format!(r#""version": "0.1.{}{}""#, date, version_suffix),
+    );
 
     if nightly {
         package_json = package_json.replace(
@@ -35,7 +41,7 @@ fn dist_client(nightly: bool) -> Result<()> {
             r#""displayName": "rust-analyzer nightly""#,
         );
     } else {
-        package_json = original_package_json.replace(r#""enableProposedApi": true,"#, r#""#);
+        package_json = package_json.replace(r#""enableProposedApi": true,"#, r#""#);
     }
     fs2::write(package_json_path, package_json)?;
 
@@ -47,10 +53,16 @@ fn dist_client(nightly: bool) -> Result<()> {
 fn dist_server() -> Result<()> {
     if cfg!(target_os = "linux") {
         std::env::set_var("CC", "clang");
-        run!("cargo build --package rust-analyzer --bin rust-analyzer --release --target x86_64-unknown-linux-musl")?;
+        run!(
+            "cargo build --manifest-path ./crates/rust-analyzer/Cargo.toml --bin rust-analyzer --release
+             --target x86_64-unknown-linux-musl
+            "
+            // We'd want to add, but that requires setting the right linker somehow
+            // --features=jemalloc
+        )?;
         run!("strip ./target/x86_64-unknown-linux-musl/release/rust-analyzer")?;
     } else {
-        run!("cargo build --package rust-analyzer --bin rust-analyzer --release")?;
+        run!("cargo build --manifest-path ./crates/rust-analyzer/Cargo.toml --bin rust-analyzer --release")?;
     }
 
     let (src, dst) = if cfg!(target_os = "linux") {