Removed redundant property definitions in individual subproject build…

….xml files.
WeaveTeam · Aug 14, 2014 · 38d320c · 38d320c
1 parent c4423b4
commit 38d320c
Show file tree

Hide file tree

Showing 10 changed files with 43 additions and 176 deletions.
diff --git a/WeaveAPI/build.xml b/WeaveAPI/build.xml
@@ -4,20 +4,11 @@
      Please customize this file as necessary. -->
 <!-- Generated from project settings as of 4/14/11 8:55 PM -->
 <project name="WeaveAPI" default="build" basedir=".">
-
 	<property environment="env"/>
-	<property name="FLEX_HOME" value="${env.FLEX_HOME}"/>
-
-    <taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
-	<taskdef name="mxmlc" classname="flex.ant.MxmlcTask" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
-	<taskdef name="compc" classname="flex.ant.CompcTask" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
-	<taskdef name="html-wrapper" classname="flex.ant.HtmlWrapperTask" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
-
-	<property name="DEBUG" value="false"/>
-	<property name="PROJECT_DIR" value="${basedir}"/>
-	<property name="SOURCE_DIR" value="${PROJECT_DIR}/src"/>
-	<property name="OUTPUT_DIR" value="${PROJECT_DIR}/bin"/>
-	<property name="LOCALE" value="en_US"/>
+	<property file="../build.properties"/>
+	<taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
+	<property name="SOURCE_DIR" value="${basedir}/src"/>
+	<property name="OUTPUT_DIR" value="${basedir}/bin"/>
 
 	<target name="build">
 		<antcall target="clean"/>
@@ -55,7 +46,7 @@
 			<external-library-path file="${FLEX_HOME}/frameworks/libs/framework.swc" append="true"/>
 			<external-library-path file="${FLEX_HOME}/frameworks/libs/rpc.swc" append="true"/>
 
-			<library-path dir="${PROJECT_DIR}/libs" includes="*.swc" append="true"/>
+			<library-path dir="${basedir}/libs" includes="*.swc" append="true"/>
 
 		</compc>
 	</target>

diff --git a/WeaveAdmin/build.xml b/WeaveAdmin/build.xml
@@ -6,23 +6,10 @@
 <project name="WeaveAdmin" default="build" basedir=".">
 
 	<property environment="env"/>
-	<property name="FLEX_HOME" value="${env.FLEX_HOME}"/>
-
-    <taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
-	<taskdef name="mxmlc" classname="flex.ant.MxmlcTask" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
-	<taskdef name="compc" classname="flex.ant.CompcTask" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
-	<taskdef name="html-wrapper" classname="flex.ant.HtmlWrapperTask" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
-
-	<property name="DEBUG" value="false"/>
-	<property name="PROJECT_DIR" value="${basedir}"/>
-	<property name="SOURCE_DIR" value="${PROJECT_DIR}/src"/>
-	<property name="OUTPUT_DIR" value="${PROJECT_DIR}/bin"/>
-	<property name="LOCALE" value="en_US"/>
-	<property name="API" value="WeaveAPI"/>
-	<property name="CORE" value="WeaveCore"/>
-	<property name="DATA" value="WeaveData"/>
-	<property name="UISPARK" value="WeaveUISpark"/>
-	<property name="UI" value="WeaveUI"/>
+	<property file="../build.properties"/>
+	<taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
+	<property name="SOURCE_DIR" value="${basedir}/src"/>
+	<property name="OUTPUT_DIR" value="${basedir}/bin"/>
 
 	<target name="build">
 		<antcall target="clean"/>

diff --git a/WeaveClient/build.xml b/WeaveClient/build.xml
@@ -4,25 +4,11 @@
      Please customize this file as necessary. -->
 <!-- Generated from project settings as of 4/14/11 8:55 PM -->
 <project name="WeaveClient" default="build" basedir=".">
-
 	<property environment="env"/>
-	<property name="FLEX_HOME" value="${env.FLEX_HOME}"/>
-
-    <taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
-	<taskdef name="mxmlc" classname="flex.ant.MxmlcTask" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
-	<taskdef name="compc" classname="flex.ant.CompcTask" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
-	<taskdef name="html-wrapper" classname="flex.ant.HtmlWrapperTask" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
-
-	<property name="DEBUG" value="false"/>
-	<property name="PROJECT_DIR" value="${basedir}"/>
-	<property name="SOURCE_DIR" value="${PROJECT_DIR}/src"/>
-	<property name="OUTPUT_DIR" value="${PROJECT_DIR}/bin"/>
-	<property name="LOCALE" value="en_US"/>
-	<property name="API" value="WeaveAPI"/>
-	<property name="CORE" value="WeaveCore"/>
-	<property name="DATA" value="WeaveData"/>
-	<property name="UISPARK" value="WeaveUISpark"/>
-	<property name="UI" value="WeaveUI"/>
+	<property file="../build.properties"/>
+	<taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
+	<property name="SOURCE_DIR" value="${basedir}/src"/>
+	<property name="OUTPUT_DIR" value="${basedir}/bin"/>
 
 	<target name="build">
 		<antcall target="clean"/>

diff --git a/WeaveCore/build.xml b/WeaveCore/build.xml
@@ -4,21 +4,11 @@
      Please customize this file as necessary. -->
 <!-- Generated from project settings as of 4/14/11 8:55 PM -->
 <project name="WeaveCore" default="build" basedir=".">
-
 	<property environment="env"/>
-	<property name="FLEX_HOME" value="${env.FLEX_HOME}"/>
-
-    <taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
-	<taskdef name="mxmlc" classname="flex.ant.MxmlcTask" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
-	<taskdef name="compc" classname="flex.ant.CompcTask" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
-	<taskdef name="html-wrapper" classname="flex.ant.HtmlWrapperTask" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
-
-	<property name="DEBUG" value="false"/>
-	<property name="PROJECT_DIR" value="${basedir}"/>
-	<property name="SOURCE_DIR" value="${PROJECT_DIR}/src"/>
-	<property name="OUTPUT_DIR" value="${PROJECT_DIR}/bin"/>
-	<property name="LOCALE" value="en_US"/>
-	<property name="API" value="WeaveAPI"/>
+	<property file="../build.properties"/>
+	<taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
+	<property name="SOURCE_DIR" value="${basedir}/src"/>
+	<property name="OUTPUT_DIR" value="${basedir}/bin"/>
 
 	<target name="build">
 		<antcall target="clean"/>
@@ -58,7 +48,7 @@
 
 			<external-library-path file="../${API}/bin/${API}.swc" append="true"/>
 
-			<library-path dir="${PROJECT_DIR}/libs" includes="*.swc" append="true"/>
+			<library-path dir="${basedir}/libs" includes="*.swc" append="true"/>
 
 		</compc>
 	</target>

diff --git a/WeaveData/build.xml b/WeaveData/build.xml
@@ -4,22 +4,11 @@
      Please customize this file as necessary. -->
 <!-- Generated from project settings as of 4/14/11 8:55 PM -->
 <project name="WeaveData" default="build" basedir=".">
-
 	<property environment="env"/>
-	<property name="FLEX_HOME" value="${env.FLEX_HOME}"/>
-
-    <taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
-	<taskdef name="mxmlc" classname="flex.ant.MxmlcTask" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
-	<taskdef name="compc" classname="flex.ant.CompcTask" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
-	<taskdef name="html-wrapper" classname="flex.ant.HtmlWrapperTask" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
-
-	<property name="DEBUG" value="false"/>
-	<property name="PROJECT_DIR" value="${basedir}"/>
-	<property name="SOURCE_DIR" value="${PROJECT_DIR}/src"/>
-	<property name="OUTPUT_DIR" value="${PROJECT_DIR}/bin"/>
-	<property name="LOCALE" value="en_US"/>
-	<property name="API" value="WeaveAPI"/>
-	<property name="CORE" value="WeaveCore"/>
+	<property file="../build.properties"/>
+	<taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
+	<property name="SOURCE_DIR" value="${basedir}/src"/>
+	<property name="OUTPUT_DIR" value="${basedir}/bin"/>
 
 	<target name="build">
 		<antcall target="clean"/>
@@ -61,7 +50,7 @@
 			<external-library-path file="../${API}/bin/${API}.swc" append="true"/>
 			<external-library-path file="../${CORE}/bin/${CORE}.swc" append="true"/>
 
-			<library-path dir="${PROJECT_DIR}/libs" includes="*.swc" append="true"/>
+			<library-path dir="${basedir}/libs" includes="*.swc" append="true"/>
 
 		</compc>
 	</target>

diff --git a/WeaveDesktop/build.xml b/WeaveDesktop/build.xml
@@ -5,29 +5,11 @@
 <!-- Generated from project settings as of 4/14/11 8:55 PM -->
 <!-- Modified for building WeaveDesktop air package 2014.04.09 -->
 <project name="WeaveDesktop" default="build" basedir=".">
-
 	<property environment="env"/>
-	<!--<property name="FLEX_HOME" value="${env.FLEX_HOME}"/>-->
-
-    <taskdef resource="flexTasks.tasks" 
-	     classpath="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
-	<taskdef name="mxmlc" classname="flex.ant.MxmlcTask" 
-		 classpath="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
-	<taskdef name="compc" classname="flex.ant.CompcTask" 
-		 classpath="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
-<!--	<taskdef name="html-wrapper" classname="flex.ant.HtmlWrapperTask" 
-		 classpath="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
--->
-	<property name="DEBUG" value="false"/>
-	<property name="PROJECT_DIR" value="${basedir}"/>
-	<property name="SOURCE_DIR" value="${PROJECT_DIR}/src"/>
-	<property name="OUTPUT_DIR" value="${PROJECT_DIR}/bin"/>
-	<property name="LOCALE" value="en_US"/>
-	<property name="API" value="WeaveAPI"/>
-	<property name="CORE" value="WeaveCore"/>
-	<property name="DATA" value="WeaveData"/>
-	<property name="UISPARK" value="WeaveUISpark"/>
-	<property name="UI" value="WeaveUI"/>
+	<property file="../build.properties"/>
+	<taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
+	<property name="SOURCE_DIR" value="${basedir}/src"/>
+	<property name="OUTPUT_DIR" value="${basedir}/bin"/>
 
 	<target name="build">
 		<antcall target="clean"/>

diff --git a/WeaveExamplePlugin/build.xml b/WeaveExamplePlugin/build.xml
@@ -4,25 +4,11 @@
      Please customize this file as necessary. -->
 <!-- Generated from project settings as of 4/14/11 8:55 PM -->
 <project name="WeaveExamplePlugin" default="build" basedir=".">
-
 	<property environment="env"/>
-	<property name="FLEX_HOME" value="${env.FLEX_HOME}"/>
-
-    <taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
-	<taskdef name="mxmlc" classname="flex.ant.MxmlcTask" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
-	<taskdef name="compc" classname="flex.ant.CompcTask" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
-	<taskdef name="html-wrapper" classname="flex.ant.HtmlWrapperTask" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
-
-	<property name="DEBUG" value="false"/>
-	<property name="PROJECT_DIR" value="${basedir}"/>
-	<property name="SOURCE_DIR" value="${PROJECT_DIR}/src"/>
-	<property name="OUTPUT_DIR" value="${PROJECT_DIR}/bin"/>
-	<property name="LOCALE" value="en_US"/>
-	<property name="API" value="WeaveAPI"/>
-	<property name="CORE" value="WeaveCore"/>
-	<property name="DATA" value="WeaveData"/>
-	<property name="UISPARK" value="WeaveUISpark"/>
-	<property name="UI" value="WeaveUI"/>
+	<property file="../build.properties"/>
+	<taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
+	<property name="SOURCE_DIR" value="${basedir}/src"/>
+	<property name="OUTPUT_DIR" value="${basedir}/bin"/>
 
 	<target name="build">
 		<antcall target="clean"/>
@@ -70,7 +56,7 @@
 			<external-library-path file="../${UISPARK}/bin/${UISPARK}.swc" append="true"/>
 			<external-library-path file="../${UI}/bin/${UI}.swc" append="true"/>
 
-			<library-path dir="${PROJECT_DIR}/libs" includes="*.swc" append="true"/>
+			<library-path dir="${basedir}/libs" includes="*.swc" append="true"/>
 			<arg value="-compatibility-version=3.6"/>
 		</compc>
 	</target>

diff --git a/WeaveUI/build.xml b/WeaveUI/build.xml
@@ -4,24 +4,11 @@
      Please customize this file as necessary. -->
 <!-- Generated from project settings as of 4/14/11 8:55 PM -->
 <project name="WeaveUI" default="build" basedir=".">
-
 	<property environment="env"/>
-	<property name="FLEX_HOME" value="${env.FLEX_HOME}"/>
-
-    <taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
-	<taskdef name="mxmlc" classname="flex.ant.MxmlcTask" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
-	<taskdef name="compc" classname="flex.ant.CompcTask" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
-	<taskdef name="html-wrapper" classname="flex.ant.HtmlWrapperTask" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
-
-	<property name="DEBUG" value="false"/>
-	<property name="PROJECT_DIR" value="${basedir}"/>
-	<property name="SOURCE_DIR" value="${PROJECT_DIR}/src"/>
-	<property name="OUTPUT_DIR" value="${PROJECT_DIR}/bin"/>
-	<property name="LOCALE" value="en_US"/>
-	<property name="API" value="WeaveAPI"/>
-	<property name="CORE" value="WeaveCore"/>
-	<property name="DATA" value="WeaveData"/>
-	<property name="UISPARK" value="WeaveUISpark"/>
+	<property file="../build.properties"/>
+	<taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
+	<property name="SOURCE_DIR" value="${basedir}/src"/>
+	<property name="OUTPUT_DIR" value="${basedir}/bin"/>
 
 	<target name="build">
 		<antcall target="clean"/>
@@ -47,29 +34,19 @@
 			<include-sources dir="${SOURCE_DIR}" includes="**/*.as"/>			
 			<include-sources dir="${SOURCE_DIR}" includes="**/*.mxml"/>
 			<source-path path-element="${SOURCE_DIR}"/>
-<!--			<library-path file="${FLEX_HOME}/frameworks/libs/" append="true"/>	
-			<library-path file="${FLEX_HOME}/frameworks/libs/automation.swc" append="true"/> 
-			<library-path file="${FLEX_HOME}/frameworks/libs/automation_agent.swc" append="true"/> 
-			<library-path file="${FLEX_HOME}/frameworks/libs/automation_dmv.swc" append="true"/> 
-			<library-path file="${FLEX_HOME}/frameworks/libs/automation_flashflexkit.swc" append="true"/> 
-			<library-path file="${FLEX_HOME}/frameworks/libs/datavisualization.swc" append="true"/> 
-			<library-path file="${FLEX_HOME}/frameworks/libs/qtp.swc" append="true"/> 
-			<library-path file="${FLEX_HOME}/frameworks/libs/utilities.swc" append="true"/>
-			<library-path dir="${FLEX_HOME}/frameworks/locale/${LOCALE}" includes="*.swc" append="true"/> -->
 			<external-library-path file="${FLEX_HOME}/frameworks/libs/textLayout.swc" append="true"/> 
 			<external-library-path file="${FLEX_HOME}/frameworks/libs/player/10.2/playerglobal.swc" append="true"/>
 			<external-library-path file="${FLEX_HOME}/frameworks/libs/framework.swc" append="true"/>
 			<external-library-path file="${FLEX_HOME}/frameworks/libs/rpc.swc" append="true"/>
 			<external-library-path file="${FLEX_HOME}/frameworks/libs/mx/mx.swc" append="true"/> 
 			<external-library-path file="${FLEX_HOME}/frameworks/libs/spark.swc" append="true"/> 
 			<external-library-path file="${FLEX_HOME}/frameworks/libs/osmf.swc" append="true"/> 
-<!--                    <external-library-path file="${FLEX_HOME}/frameworks/libs/" append="true"/> -->
 			<external-library-path file="../${API}/bin/${API}.swc" append="true"/>
 			<external-library-path file="../${CORE}/bin/${CORE}.swc" append="true"/>
 			<external-library-path file="../${DATA}/bin/${DATA}.swc" append="true"/>
 			<external-library-path file="../${UISPARK}/bin/${UISPARK}.swc" append="true"/>
 
-			<library-path dir="${PROJECT_DIR}/libs" includes="*.swc" append="true"/>
+			<library-path dir="${basedir}/libs" includes="*.swc" append="true"/>
 			<arg value="-compatibility-version=3.6"/>
 		</compc>
 	</target>

diff --git a/WeaveUISpark/build.xml b/WeaveUISpark/build.xml
@@ -4,23 +4,11 @@
      Please customize this file as necessary. -->
 <!-- Generated from project settings as of 4/14/11 8:55 PM -->
 <project name="WeaveUISpark" default="build" basedir=".">
-
 	<property environment="env"/>
-	<property name="FLEX_HOME" value="${env.FLEX_HOME}"/>
-
-    <taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
-	<taskdef name="mxmlc" classname="flex.ant.MxmlcTask" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
-	<taskdef name="compc" classname="flex.ant.CompcTask" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
-	<taskdef name="html-wrapper" classname="flex.ant.HtmlWrapperTask" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
-
-	<property name="DEBUG" value="false"/>
-	<property name="PROJECT_DIR" value="${basedir}"/>
-	<property name="SOURCE_DIR" value="${PROJECT_DIR}/src"/>
-	<property name="OUTPUT_DIR" value="${PROJECT_DIR}/bin"/>
-	<property name="LOCALE" value="en_US"/>
-	<property name="API" value="WeaveAPI"/>
-	<property name="CORE" value="WeaveCore"/>
-	<property name="DATA" value="WeaveData"/>
+	<property file="../build.properties"/>
+	<taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
+	<property name="SOURCE_DIR" value="${basedir}/src"/>
+	<property name="OUTPUT_DIR" value="${basedir}/bin"/>
 
 	<target name="build">
 		<antcall target="clean"/>
@@ -46,28 +34,18 @@
 			<include-sources dir="${SOURCE_DIR}" includes="**/*.as"/>			
 			<include-sources dir="${SOURCE_DIR}" includes="**/*.mxml"/>
 			<source-path path-element="${SOURCE_DIR}"/>
-<!--			<library-path file="${FLEX_HOME}/frameworks/libs/" />	
-			<library-path file="${FLEX_HOME}/frameworks/libs/automation.swc" append="true"/> 
-			<library-path file="${FLEX_HOME}/frameworks/libs/automation_agent.swc" append="true"/> 
-			<library-path file="${FLEX_HOME}/frameworks/libs/automation_dmv.swc" append="true"/> 
- 			<library-path file="${FLEX_HOME}/frameworks/libs/automation_flashflexkit.swc" append="true"/> 
-			<library-path file="${FLEX_HOME}/frameworks/libs/datavisualization.swc" append="true"/> 
-			<library-path file="${FLEX_HOME}/frameworks/libs/qtp.swc" append="true"/> 
-			<library-path file="${FLEX_HOME}/frameworks/libs/utilities.swc" append="true"/>  
-			<library-path dir="${FLEX_HOME}/frameworks/locale/${LOCALE}" includes="*.swc" append="true"/>  -->
 			<external-library-path file="${FLEX_HOME}/frameworks/libs/textLayout.swc" append="true"/>  
 			<external-library-path file="${FLEX_HOME}/frameworks/libs/player/10.2/playerglobal.swc" append="true"/> 
 			<external-library-path file="${FLEX_HOME}/frameworks/libs/framework.swc" append="true"/> 
 			<external-library-path file="${FLEX_HOME}/frameworks/libs/rpc.swc" append="true"/> 
 			<external-library-path file="${FLEX_HOME}/frameworks/libs/spark.swc" append="true"/>  
 			<external-library-path file="${FLEX_HOME}/frameworks/libs/mx/mx.swc" append="true"/>
 			<external-library-path file="${FLEX_HOME}/frameworks/libs/osmf.swc" append="true"/>
-<!--                    <external-library-path file="${FLEX_HOME}/frameworks/libs/" append="true"/>  -->
 			<external-library-path file="../${API}/bin/${API}.swc" append="true"/>
 			<external-library-path file="../${CORE}/bin/${CORE}.swc" append="true"/>
 			<external-library-path file="../${DATA}/bin/${DATA}.swc" append="true"/>
 
-			<library-path dir="${PROJECT_DIR}/libs" includes="*.swc" append="true"/>
+			<library-path dir="${basedir}/libs" includes="*.swc" append="true"/>
 		</compc>
 	</target>
 

diff --git a/build.properties b/build.properties
@@ -2,6 +2,7 @@ DEBUG=false
 FLEX_HOME=${env.FLEX_HOME}
 FLEX_LIBS=${FLEX_HOME}/frameworks/libs
 WEAVE_DESTROOT=${basedir}/ROOT
+LOCALE=en_US
 
 FRAMEWORK_SWF=framework_4.5.1.21489.swf
 RPC_SWF=rpc_4.5.1.21328.swf