---

yaml
---
r: 145877
b: refs/heads/try2
c: 8854b78
h: refs/heads/master
i:
  145875: 3ebb20c
v: v3

Author: catamorphism

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 6ad1d0f861b02589ede7e06f1221bbe790ef31a8
+refs/heads/try2: 8854b78b555d9a03a3b2ff248230696ec94e24c0
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/doc/rustpkg.md

@@ -137,6 +137,9 @@ and builds it in any workspace(s) where it finds one.
 Supposing such packages are found in workspaces X, Y, and Z,
 the command leaves behind files in `X`'s, `Y`'s, and `Z`'s `build` directories,
 but not in their `lib` or `bin` directories.
+(The exception is when rustpkg fetches a package `foo`'s sources from a remote repository.
+In that case, it stores both the sources *and* the build artifacts for `foo`
+in the workspace that `foo` will install to (see ##install below)).
 
 ## clean
 
@@ -148,7 +151,11 @@ but not in their `lib` or `bin` directories.
 If `RUST_PATH` is declared as an environment variable, then rustpkg installs the
 libraries and executables into the `lib` and `bin` subdirectories
 of the first entry in `RUST_PATH`.
-Otherwise, it installs them into `foo`'s `lib` and `bin` directories.
+Otherwise, if the current working directory CWD is a workspace,
+it installs them into CWD's `lib` and `bin` subdirectories.
+Otherwise, if the current working directory is CWD,
+it installs them into the .rust/lib and .rust/bin subdirectories of CWD
+(creating them if necessary). 
 
 ## test
 

branches/try2/doc/tutorial-ffi.md

@@ -135,7 +135,7 @@ the true length after compression for setting the length.
 ~~~~ {.xfail-test}
 pub fn compress(src: &[u8]) -> ~[u8] {
     #[fixed_stack_segment]; #[inline(never)];
-
+    
     unsafe {
         let srclen = src.len() as size_t;
         let psrc = vec::raw::to_ptr(src);
@@ -157,7 +157,7 @@ format and `snappy_uncompressed_length` will retrieve the exact buffer size requ
 ~~~~ {.xfail-test}
 pub fn uncompress(src: &[u8]) -> Option<~[u8]> {
     #[fixed_stack_segment]; #[inline(never)];
-
+    
     unsafe {
         let srclen = src.len() as size_t;
         let psrc = vec::raw::to_ptr(src);
@@ -236,7 +236,7 @@ use std::libc::size_t;
 unsafe fn snappy_max_compressed_length(source_length: size_t) -> size_t {
     #[fixed_stack_segment]; #[inline(never)];
     return snappy_max_compressed_length(source_length);
-
+    
     #[link_args = "-lsnappy"]
     extern {
         fn snappy_max_compressed_length(source_length: size_t) -> size_t;
@@ -259,9 +259,9 @@ check that one of the following conditions holds:
 2. The call occurs inside of an `extern fn`;
 3. The call occurs within a stack closure created by some other
    safe fn.
-
+   
 All of these conditions ensure that you are running on a large stack
-segment. However, they are sometimes too strict. If your application
+segmented. However, they are sometimes too strict. If your application
 will be making many calls into C, it is often beneficial to promote
 the `#[fixed_stack_segment]` attribute higher up the call chain.  For
 example, the Rust compiler actually labels main itself as requiring a
@@ -298,7 +298,7 @@ impl<T: Send> Unique<T> {
     pub fn new(value: T) -> Unique<T> {
         #[fixed_stack_segment];
         #[inline(never)];
-
+        
         unsafe {
             let ptr = malloc(std::sys::size_of::<T>() as size_t) as *mut T;
             assert!(!ptr::is_null(ptr));
@@ -324,7 +324,7 @@ impl<T: Send> Drop for Unique<T> {
     fn drop(&mut self) {
         #[fixed_stack_segment];
         #[inline(never)];
-
+        
         unsafe {
             let x = intrinsics::init(); // dummy value to swap in
             // moving the object out is needed to call the destructor

branches/try2/src/librustpkg/api.rs

@@ -16,6 +16,8 @@ use target::*;
 use version::Version;
 use workcache_support::*;
 
+pub use source_control::{safe_git_clone, git_clone_url};
+
 use std::os;
 use extra::arc::{Arc,RWArc};
 use extra::workcache;
@@ -68,23 +70,27 @@ pub fn build_lib(sysroot: Path, root: Path, name: ~str, version: Version,
                  lib: Path) {
     let cx = default_context(sysroot);
     let pkg_src = PkgSrc {
-            workspace: root.clone(),
-            start_dir: root.push("src").push(name),
-            id: PkgId{ version: version, ..PkgId::new(name)},
-            // n.b. This assumes the package only has one crate
-            libs: ~[mk_crate(lib)],
-            mains: ~[],
-            tests: ~[],
-            benchs: ~[]
-        };
+        source_workspace: root.clone(),
+        build_in_destination: false,
+        destination_workspace: root.clone(),
+        start_dir: root.push("src").push(name),
+        id: PkgId{ version: version, ..PkgId::new(name)},
+        // n.b. This assumes the package only has one crate
+        libs: ~[mk_crate(lib)],
+        mains: ~[],
+        tests: ~[],
+        benchs: ~[]
+    };
     pkg_src.build(&cx, ~[]);
 }
 
 pub fn build_exe(sysroot: Path, root: Path, name: ~str, version: Version,
                  main: Path) {
     let cx = default_context(sysroot);
     let pkg_src = PkgSrc {
-        workspace: root.clone(),
+        source_workspace: root.clone(),
+        build_in_destination: false,
+        destination_workspace: root.clone(),
         start_dir: root.push("src").push(name),
         id: PkgId{ version: version, ..PkgId::new(name)},
         libs: ~[],
@@ -100,7 +106,7 @@ pub fn build_exe(sysroot: Path, root: Path, name: ~str, version: Version,
 pub fn install_pkg(sysroot: Path, workspace: Path, name: ~str, version: Version) {
     let cx = default_context(sysroot);
     let pkgid = PkgId{ version: version, ..PkgId::new(name)};
-    cx.install(PkgSrc::new(workspace, false, pkgid), &Everything);
+    cx.install(PkgSrc::new(workspace.clone(), workspace, false, pkgid), &Everything);
 }
 
 fn mk_crate(p: Path) -> Crate {

branches/try2/src/librustpkg/conditions.rs

@@ -50,3 +50,7 @@ condition! {
 condition! {
     pub failed_to_create_temp_dir: (~str) -> Path;
 }
+
+condition! {
+    pub git_checkout_failed: (~str, Path) -> ();
+}

branches/try2/src/librustpkg/package_id.rs

@@ -102,10 +102,7 @@ impl PkgId {
     }
 
     pub fn prefixes_iter(&self) -> Prefixes {
-        Prefixes {
-            components: self.path.components().to_owned(),
-            remaining: ~[]
-        }
+        prefixes_iter(&self.path)
     }
 
     // This is the workcache function name for the *installed*
@@ -116,6 +113,13 @@ impl PkgId {
     }
 }
 
+pub fn prefixes_iter(p: &Path) -> Prefixes {
+    Prefixes {
+        components: p.components().to_owned(),
+        remaining: ~[]
+    }
+}
+
 struct Prefixes {
     priv components: ~[~str],
     priv remaining: ~[~str]