From 74547c91ec458b0a1c76c7e7f478d229406cd656 Mon Sep 17 00:00:00 2001
From: seefo <robbie.uvanni@gmail.com>
Date: Tue, 4 Jun 2019 20:41:52 -0400
Subject: [PATCH] Updated build.xml for new paths

---
 build.properties | 6 +++---
 build.xml        | 9 ++++-----
 configs/example  | 2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/build.properties b/build.properties
index 55d3558..71dcdef 100755
--- a/build.properties
+++ b/build.properties
@@ -23,9 +23,9 @@ db_service = swg
 
 # Git Settings 
 src_branch = master
-dsrc_branch = master
-clientdata_branch = new-pipeline
-configs_branch = new-pipeline
+dsrc_branch = testing
+clientdata_branch = master
+configs_branch = testing
 dependencies_branch = master
 
 # SRC Compilation
diff --git a/build.xml b/build.xml
index ba46e72..3e89f8e 100755
--- a/build.xml
+++ b/build.xml
@@ -21,9 +21,9 @@
 	<property name="data" location="data" relative="true" basedir="${basedir}"/>
 	<property name="chat_home" location="${basedir}/stationapi"/>
 	<property name="chat_build" location="${chat_home}/build"/>
-	<property name="clientdata" location="${basedir}/clientdata"/>
+	<property name="clientdata" location="${dsrc}/sku.0/data/sys.client/compiled/game"/>
 	<property name="configs" location="configs" relative="true" basedir="${basedir}"/>
-	<property name="dependencies" location="dependencies" relative="true" basedir="${basedir}"/>
+	<property name="dependencies" location="utils/initial-setup/dependencies" relative="true" basedir="${basedir}"/>
 
 	<!-- Setup Key Game Directories -->
 	<property name="dsrc_server" location="${dsrc}/sku.0/sys.server/compiled/game"/>
@@ -123,13 +123,13 @@
 		<git-update-submods dir="${basedir}"/>
 		<!-- Checkout branches from config -->
 		<git-checkout branch="${src_branch}" dir="${src}"/>
-		<git-checkout branch="${dsrc_branch}" dir="${dsrc}"/>
+		<git-checkout branch="${dsrc_branch}" dir="${dsrc}/sku.0/dsrc"/>
 		<git-checkout branch="${configs_branch}" dir="${configs}/example"/>
 		<git-checkout branch="${clientdata_branch}" dir="${clientdata}"/>
 		<git-checkout branch="${dependencies_branch}" dir="${dependencies}"/>
 		<!-- Pull latest changes from remote -->
 		<git-pull branch="${src_branch}" dir="${src}"/>
-		<git-pull branch="${dsrc_branch}" dir="${dsrc}"/>
+		<git-pull branch="${dsrc_branch}" dir="${dsrc}/sku.0/dsrc"/>
 		<git-pull branch="${configs_branch}" dir="${configs}/example"/>
 		<git-pull branch="${clientdata_branch}" dir="${clientdata}"/>
 		<git-pull branch="${dependencies_branch}" dir="${dependencies}"/>
@@ -318,7 +318,6 @@
 	</target>
 
 	<target name="create_symlinks">
-		<symlink link="${basedir}/data/sku.0/sys.client/compiled/game" resource="${clientdata}" overwrite="true"/>
 		<symlink link="${configs}/bin" resource="${tools_home}" overwrite="true"/>
 	</target>
 
diff --git a/configs/example b/configs/example
index f754e20..a3b7001 160000
--- a/configs/example
+++ b/configs/example
@@ -1 +1 @@
-Subproject commit f754e200fde2d5919f2103526e71a297bb581ce3
+Subproject commit a3b700193d76c7859151a7c2099ecbc49d600456