swg-source/swg-main
1
0
Fork 0
mirror of https://github.com/SWG-Source/swg-main.git synced 2026-01-16 20:04:18 -05:00
Code Issues Projects Releases Wiki Activity

Put the database IP in a property

Browse Source 
This won't change the behavior of the build for the VM at all, but it
will make it possible to override the database IP in the
local.properties file if you happen to have the database on a different
machine.
This commit is contained in:
Tekaoh
2021-01-22 14:42:38 -05:00
parent 723d991b27
commit 64a1989224
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
build.xml
View File

@@ -16,6 +16,8 @@
<!-- Database Service Name is derived to make it easier in the properties file -->
<property name="service_name" value="//127.0.0.1/${db_service}"/>
<property name="dbip" value="${ADDR4}"/>
<!-- Setup Source Directories -->
<property name="exe" location="${basedir}/exe"/>
<property name="src" location="${basedir}/src"/>
@@ -398,7 +400,7 @@
<!-- Executes the generated Template CRC SQL in SQL*Plus -->
<target name="load_templates" description="loads generated templates into the database" depends="process_templates">
<exec executable="sqlplus" dir="${build}">
<arg value="${db_username}/${db_password}@${ADDR4}/${db_service}"/>
<arg value="${db_username}/${db_password}@${dbip}/${db_service}"/>
<arg value="@${templates_sql_file}"/>
</exec>
</target>
@@ -411,7 +413,7 @@
<arg value="database_update.pl"/>
<arg value="--username=${db_username}"/>
<arg value="--password=${db_password}"/>
<arg value="--service=${ADDR4}/${db_service}"/>
<arg value="--service=${dbip}/${db_service}"/>
<arg value="--goldusername=${db_username}"/>
<arg value="--loginusername=${db_username}"/>
<arg value="--createnewcluster"/>
@@ -429,7 +431,7 @@
<arg value="database_update.pl"/>
<arg value="--username=${db_username}"/>
<arg value="--password=${db_password}"/>
<arg value="--service=${ADDR4}/${db_service}"/>
<arg value="--service=${dbip}/${db_service}"/>
<arg value="--goldusername=${db_username}"/>
<arg value="--loginusername=${db_username}"/>
<arg value="--delta"/>
@@ -439,7 +441,7 @@
<target name="add_new_cluster" description="Adds the cluster name to the database" if="firstrun">
<sql classpath="${env.ORACLE_HOME}/lib/ojdbc8.jar"
driver="oracle.jdbc.OracleDriver"
url="jdbc:oracle:thin:@${ADDR4}:1521:${db_service}"
url="jdbc:oracle:thin:@${dbip}:1521:${db_service}"
userid="${db_username}"
password="${db_password}">
insert into cluster_list (id, name, num_characters, address, secret, locked, not_recommended)
@@ -451,7 +453,7 @@
<target name="configure_limits" description="Defines the limits of the cluster and accounts in the database">
<sql classpath="${env.ORACLE_HOME}/lib/ojdbc8.jar"
driver="oracle.jdbc.OracleDriver"
url="jdbc:oracle:thin:@${ADDR4}:1521:${db_service}"
url="jdbc:oracle:thin:@${dbip}:1521:${db_service}"
userid="${db_username}"
password="${db_password}">
update default_char_limits set account_limit = ${max_characters_per_account}, cluster_limit = ${max_characters_per_cluster};
@@ -472,7 +474,7 @@
<arg value="database_update.pl"/>
<arg value="--username=${db_username}"/>
<arg value="--password=${db_password}"/>
<arg value="--service=${ADDR4}/${db_service}"/>
<arg value="--service=${dbip}/${db_service}"/>
<arg value="--goldusername=${db_username}"/>
<arg value="--loginusername=${db_username}"/>
<arg value="--drop"/>