about summary refs log tree commit diff
path: root/.gitattributes
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2017-01-20 17:03:06 -0800
committerAlex Crichton <alex@alexcrichton.com>2017-01-24 14:48:03 -0800
commitf3dfcae2029be9de5ad2e015d97ca246c2381b84 (patch)
tree8eca17e64de342c64c855ccb745872baf7acaf6d /.gitattributes
parentc2a0d1ba112d94e48d5292bde272de7904c66fff (diff)
downloadrust-f3dfcae2029be9de5ad2e015d97ca246c2381b84.tar.gz
rust-f3dfcae2029be9de5ad2e015d97ca246c2381b84.zip
rustbuild: Start building --enable-extended
This commit adds a new flag to the configure script,
`--enable-extended`, which is intended for specifying a desire to
compile the full suite of Rust tools such as Cargo, the RLS, etc. This
is also an indication that the build system should create combined
installers such as the pkg/exe/msi artifacts.

Currently the `--enable-extended` flag just indicates that combined
installers should be built, and Cargo is itself not compiled just yet
but rather only downloaded from its location. The intention here is to
quickly get to feature parity with the current release process and then
we can start improving it afterwards.

All new files in this PR inside `src/etc/installer` are copied from the
rust-packaging repository.
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes3
1 files changed, 1 insertions, 2 deletions
diff --git a/.gitattributes b/.gitattributes
index 1d4c6252f2c..e2d04142766 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -4,7 +4,6 @@
 *.cpp rust
 *.h rust
 *.rs rust
-src/etc/pkg/rust-logo.ico binary
-src/etc/pkg/rust-logo.png binary
+src/etc/installer/gfx/* binary
 *.woff binary
 src/vendor/* binary