X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=core%2Fbuild.xml;h=7d93b880a735fc2bb20601bbd5a438f09f912b44;hb=2aa9089fe994b2cf381a8c7bdc9201b552b78638;hp=205fb246bcfee2b454e7190dacc92f01925f5e31;hpb=e6f50945950584175a65f7ef5dfdff1c7ed24bc7;p=debian%2Fopenrocket

diff --git a/core/build.xml b/core/build.xml
index 205fb246..7d93b880 100644
--- a/core/build.xml
+++ b/core/build.xml
@@ -38,11 +38,23 @@
 		<pathelement location="${src-test.dir}"/>
 		<fileset dir="lib-test/" includes="*.jar"/>
 	</path>
-	
+
+	<path id="run-classpath">
+		<path refid="classpath"/>
+		<pathelement location="${basedir}/resources"/>
+		<pathelement location="${classes.dir}"/>
+	</path>
+
+	<!-- Add Ant-contrib tasks so we can use for loop -->
+	<taskdef resource="net/sf/antcontrib/antlib.xml">
+		<classpath>
+			<pathelement location="lib-extra/ant-contrib-1.0b3.jar"/>
+		</classpath>
+	</taskdef>
 
 	
 	<!-- CLEAN -->
-	<target name="clean">
+	<target name="clean" description="Removes all build artifacts">
 		<delete dir="${build.dir}"/>
 		<delete dir="tmp/"/>
 	</target>
@@ -57,10 +69,10 @@
 	
 	
 	<!-- JAR -->
-	<target name="jar" depends="build">
+	<target name="jar" depends="build" description="Create the OpenRocket jar file">
 		<copy todir="${dist.dir}/">
 			<fileset dir="." includes="LICENSE.TXT README.TXT ChangeLog ReleaseNotes fileformat.txt" />
-			<fileset dir="resources/" includes="datafiles/ pix/ l10n/ build.properties" />
+			<fileset dir="resources/"/>
 			<fileset dir="src/" includes="META-INF/" />
 		</copy>
 		<mkdir dir="${jar.dir}"/>
@@ -73,9 +85,43 @@
 			<zipfileset src="lib/jcommon-1.0.16.jar" />
 			<zipfileset src="lib/jfreechart-1.0.13.jar" />
 			<zipfileset src="lib/iText-5.0.2.jar" />
+			<zipfileset src="lib/opencsv-2.3.jar" />
 		</jar>
 	</target>
-	
+
+	<!-- CONVERT vendor csv to ORC files -->
+	<macrodef name="build-orc-file">
+		<attribute name="dir"/>
+		<attribute name="vendor"/>
+		<sequential>
+			<echo>Generating ORC file for vendor @{vendor}</echo>
+			<java classname="net.sf.openrocket.preset.loader.RocksimComponentFileTranslator"
+				fork="true"
+				classpathref="run-classpath"
+				failonerror="true">
+				<arg value="@{dir}"/>
+				<arg value="resources/datafiles/presets/@{vendor}.orc"/>
+			</java>
+		</sequential>
+	</macrodef>
+
+	<target name="generate-orc-files"
+		description="Generate ORC file from vendor csv"
+		depends="build">
+
+		<for param="vendor-dir">
+			<dirset dir="resources-src/datafiles/rocksim_components"
+				includes="*"/>
+			<sequential>
+				<propertyregex property="vendor"
+					override="true"
+					input="@{vendor-dir}"
+					select="\1"
+					regexp=".*[/\\]([^/\\]*)$"/>
+				<build-orc-file dir="@{vendor-dir}" vendor="${vendor}"/>
+			</sequential>
+		</for>
+	</target>
 	
 	<!-- DIST-SRC -->
 	<target name="dist-src">
@@ -88,7 +134,7 @@
 			<fileset dir="." includes="*" excludes="*.log">
 				<type type="file"/>
 			</fileset>
-			<fileset dir="" includes="resources/datafiles/ lib/ lib-test/ resources/pix/ src/ test/ resources/l10n/"/>
+			<fileset dir="." includes="resources/ lib/ lib-test/ src/ test/"/>
 		</copy>
 		<zip destfile="${dist.src}" basedir="${build.dir}" includes="${pkgname}/"/>
 		<delete dir="${build.dir}/${pkgname}"/>
@@ -212,4 +258,4 @@ ${nonascii}</fail>
 		</echo>
  	</target>
     
-</project>
\ No newline at end of file
+</project>