From 301cbf93093011b25e91db8d7639c0612d5cb57e Mon Sep 17 00:00:00 2001
From: mat007 <mat007@860be788-9bd5-4423-9f1e-828f051e677b>
Date: Fri, 15 Jun 2012 21:15:06 +0000
Subject: [PATCH] Changed project layout

git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@461 860be788-9bd5-4423-9f1e-828f051e677b
---
 build/build.properties | 2 +-
 build/build.xml        | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/build/build.properties b/build/build.properties
index 1323264..fb16eff 100644
--- a/build/build.properties
+++ b/build/build.properties
@@ -1,4 +1,4 @@
 extensions = svn,headers,check
 platform = vc80
 tests.dir = ${root.dir}
-libraries.dir = ${root.dir}/../..
+libraries.dir = ${root.dir}
diff --git a/build/build.xml b/build/build.xml
index 925567c..8e64fb1 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -119,7 +119,7 @@
     </tar>
   </target>
 
-  <property name="boost.dir" value="${out.dir}/../boost.mock"/>
+  <property name="boost.dir" value="${out.dir}/../boost"/>
   <target name="boost" description="convert to boost">
     <delete dir="${boost.dir}"/>
     <copy todir="${boost.dir}/boost/mock">
@@ -127,9 +127,10 @@
     </copy>
     <copy todir="${boost.dir}/libs/mock/test">
         <fileset dir="${tests.dir}/test" includes="**"/>
+        <fileset dir="jam" includes="Jamfile.jam"/>
     </copy>
     <copy todir="${boost.dir}">
-        <fileset dir="${libraries.dir}" includes="Jam*"/>
+        <fileset dir="jam" includes="Jamroot.jam,Jamfile.v2"/>
     </copy>
     <replaceregexp match="MOCK" replace="BOOST_MOCK" flags="g">
         <fileset dir="${boost.dir}" includes="**/*.hpp,**/*.cpp"/>