diff options
Diffstat (limited to 'build.ant')
| -rw-r--r-- | build.ant | 52 |
1 files changed, 41 insertions, 11 deletions
@@ -39,6 +39,7 @@ <property name="remoteDeployServer" value="rz-0.unige.ch" /> <property name="targetDomain" value="default.rhizi.net" /> <property name="doClientOptimize" value="false" /> + <property name="defaultDomain" value="default.rhizi.net" /> <tstamp> <format property="versionQualifier" pattern="yyyyMMddHHmm" /> @@ -63,7 +64,9 @@ </target> <target name="version-tag"> - <exec dir="${basedir}" executable="/usr/bin/git" output="res/templates/fragment/version.txt"> + <exec dir="${basedir}" + executable="/usr/bin/git" + output="res/templates/fragment/version.txt"> <arg line="describe" /> </exec> @@ -86,27 +89,52 @@ <!-- note: defaults to not overwriting, so rhizi-server.conf is safe --> - <copy file="res/etc/rhizi-server.conf.example" - tofile="res/etc/rhizi-server.conf" /> + <!-- copy defaults--> + <parallel> + <copy file="res/etc/rhizi-server.conf.example" + tofile="res/etc/rhizi-server.conf" /> + <copy todir="${targetDeploymentDir}/templates/fragment" + failonerror="false"> + <fileset dir="res/local/template/fragment/by-domain/${defaultDomain}" + includes="*" /> + </copy> + </parallel> - <client-optimize if:true="${doClientOptimize}" root="src/client/" build="build.js" /> + <client-optimize if:true="${doClientOptimize}" + root="src/client/" + build="build.js" /> <parallel> - <rsync src="${src_client}/" dst="${targetDeploymentDir}/static" /> - <rsync src="res/client/" dst="${targetDeploymentDir}/static" /> + <!-- code--> + <rsync src="${src_client}/" dst="${targetDeploymentDir}/static" /> <symlink action="single" overwrite="true" link="${targetDeploymentDir}/bin" resource="${basedir}/${src_server}" /> + <!-- conf--> <copy file="res/etc/rhizi-server.conf" tofile="${targetDeploymentDir}/etc/rhizi-server.conf" /> - <copy file="src/local/domain/${targetDomain}/domain_types.js" - tofile="${targetDeploymentDir}/static/model/domain_types.js" description="copy schema, rename"/> + + <!-- res--> + <rsync src="res/client/" dst="${targetDeploymentDir}/static" /> <rsync src="res/templates/" dst="${targetDeploymentDir}/templates/" /> - <rsync src="res/local/template/fragment/by-domain/${targetDomain}/" dst="${targetDeploymentDir}/templates/fragment/" /> - <copy file="res/etc/user_db.db" tofile="${targetDeploymentDir}/user_db.db" failonerror="false" /> + + <!-- auth--> + <copy file="res/etc/user_db.db" + tofile="${targetDeploymentDir}/user_db.db" + failonerror="false" /> + + <!-- domain specific: schema, templates, fragments--> + <copy file="src/local/domain/${targetDomain}/domain_types.js" + tofile="${targetDeploymentDir}/static/model/domain_types.js" /> + <copy todir="${targetDeploymentDir}/templates/fragment" + failonerror="false"> + <fileset dir="res/local/template/fragment/by-domain/${targetDomain}" + includes="*" /> + </copy> + </parallel> </target> @@ -119,7 +147,9 @@ <property name="filter_list_str" value="-f '- __pycache__/' -f '- *.pyc'" /> - <client-optimize if:true="${doClientOptimize}" root="src/client/" build="build.js" /> + <client-optimize if:true="${doClientOptimize}" + root="src/client/" + build="build.js" /> <!-- -l: traverse bin/ -> ../src-py link --> <rsync src="${targetDeploymentDir}/" |