X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=Workspace%2FSiman%2Fbuild.xml;h=d585c6df03d84c4280a3330a4ce99e4f9aabcaab;hb=5dbc22da2ab75ac8059dcc84b936f09697a061ae;hp=82494cf9f2bebbb954e56d8963b9312847e69072;hpb=b99667abaeeb1ca2db673334a9789aa064a20d33;p=tools%2Fsiman.git

diff --git a/Workspace/Siman/build.xml b/Workspace/Siman/build.xml
index 82494cf..d585c6d 100644
--- a/Workspace/Siman/build.xml
+++ b/Workspace/Siman/build.xml
@@ -59,12 +59,18 @@
 		<sequential>
 			<echo message="Generating configuration in @{mode} mode" />
 			<!-- Copy files from config source directory according to the given mode -->
+            <loadfile property="customer" srcfile="${config.src.dir}/customer.txt"/>
+            <loadfile property="som" srcfile="${config.src.dir}/${customer}_som.properties"/>
+			<echo message="som: ${som}"/>
+            <loadfile property="som.en" srcfile="${config.src.dir}/${customer}_som_en.properties"/>
 			<copy todir="${basedir}/${config.@{mode}.dir}" overwrite="true">
 				<fileset dir="${config.src.dir}/templates">
 				</fileset>
 				<!-- Transform the files from templates substituting properties values -->
 				<filterset>
-					<filter token="datesimple" value="${datesimple}" />
+                    <filter token="som" value="${som}" />
+                    <filter token="som.en" value="${som.en}" />
+                    <filter token="datesimple" value="${datesimple}" />
 					<filter token="time" value="${time}" />
 					<!-- Get properties to substitute according to the given mode -->
 					<filtersfile file="${config.src.dir}/@{mode}.properties" />
@@ -151,8 +157,8 @@
     <!-- ================================================= -->
     <target name="prepare-postgres" description="prepare configuration for Postgress">
         <echo message="Prepare configuration for Postgress..." />
-        <copy file="conf/debug_pg.properties" tofile="conf/debug.properties" overwrite="true"/>
-        <copy file="conf/release_pg.properties" tofile="conf/release.properties" overwrite="true"/>
+        <copy file="${config.src.dir}/debug_pg.properties" tofile="${config.src.dir}/debug.properties" overwrite="true"/>
+        <copy file="${config.src.dir}/release_pg.properties" tofile="${config.src.dir}/release.properties" overwrite="true"/>
         <antcall target="debug-config"/>
     </target>
 	
@@ -161,8 +167,38 @@
     <!-- ================================================= -->
     <target name="prepare-mysql" description="prepare configuration for MySql">
         <echo message="Prepare configuration for MySql..." />
-        <copy file="conf/debug_mysql.properties" tofile="conf/debug.properties" overwrite="true"/>
-        <copy file="conf/release_mysql.properties" tofile="conf/release.properties" overwrite="true"/>
+        <copy file="${config.src.dir}/debug_mysql.properties" tofile="${config.src.dir}/debug.properties" overwrite="true"/>
+        <copy file="${config.src.dir}/release_mysql.properties" tofile="${config.src.dir}/release.properties" overwrite="true"/>
         <antcall target="debug-config"/>
     </target>
+
+    <!-- ================================================= -->
+    <!--    prepare-customer: Prepare config for the given customer -->
+    <!-- ================================================= -->
+    <macrodef name="prepare-customer">
+        <!-- Parameter "customer" can be equal to "cea" or "edf" -->
+        <attribute name="customer" />
+        <sequential>
+            <echo message="Prepare config for the customer @{customer}" />
+            <echo message="@{customer}" file="${config.src.dir}/customer.txt"/>
+            <copy file="${config.src.dir}/@{customer}_som.xml" tofile="WebContent/conf/som.xml" overwrite="true"/>
+            <antcall target="debug-config"/>
+        </sequential>
+    </macrodef>
+	
+    <!-- ================================================= -->
+    <!--    prepare-cea: Prepare config for CEA            -->
+    <!-- ================================================= -->
+    <target name="prepare-cea" description="prepare configuration for CEA">
+        <echo message="Prepare configuration for CEA..." />
+        <prepare-customer customer="cea" />
+    </target>
+
+    <!-- ================================================= -->
+    <!--    prepare-cea: Prepare config for EDF            -->
+    <!-- ================================================= -->
+    <target name="prepare-edf" description="prepare configuration for EDF">
+        <echo message="Prepare configuration for EDF..." />
+        <prepare-customer customer="edf" />
+    </target>
 </project>