swg-ostrich/ostrich
1
0
Fork 0
mirror of https://github.com/swg-ostrich/ostrich.git synced 2026-01-15 22:04:30 -05:00
Code Issues Projects Releases Wiki Activity

Updated build.xml for new paths

Browse Source
This commit is contained in:
seefo
2019-06-04 20:41:52 -04:00
parent f3ea6d04e8
commit 74547c91ec
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
build.properties
View File

@@ -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

9
build.xml
View File

@@ -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>

2
configs/example

Submodule configs/example updated: f754e200fd...a3b700193d