Sophie

Sophie

distrib > Mageia > 3 > i586 > media > core-release-src > by-pkgid > 0411ccad07db2e954455d047e504f256 > files > 6

jets3t-0.8.1-2.mga3.src.rpm

diff -Nru jets3t-0.8.1/build.properties jets3t-0.8.1-gil/build.properties
--- jets3t-0.8.1/build.properties	2011-04-10 17:39:06.000000000 +0200
+++ jets3t-0.8.1-gil/build.properties	2011-09-19 19:57:18.788062132 +0200
@@ -20,6 +20,7 @@
 dist.file.uploader=uploader-${version}.jar
 dist.file.gatekeeper=gatekeeper-${version}.war
 dist.file.guisupport=jets3t-gui-${version}.jar
+dist.file.thirdparty=jets3t-deps-${version}.jar
 
 # Comment out the lines below to exclude contributions
 contribs.include-mx
diff -Nru jets3t-0.8.1/build.xml jets3t-0.8.1-gil/build.xml
--- jets3t-0.8.1/build.xml	2011-09-19 19:57:53.620065350 +0200
+++ jets3t-0.8.1-gil/build.xml	2011-09-19 19:55:57.919054660 +0200
@@ -82,11 +82,12 @@
 			<include name="geronimo-jaxrpc-1.1-api.jar"/>
 			<include name="log4j.jar"/>
 		</fileset>
+		<fileset dir="jars" includes="${dist.file.thirdparty}"/>
 	</path>
 	
 	
     <target name="rebuild-all" 
-    	depends="rebuild-service,rebuild-cockpit,rebuild-cockpitlite,rebuild-synchronize,rebuild-uploader,rebuild-gatekeeper"/>
+    	depends="rebuild-thirdparty,rebuild-service,rebuild-cockpit,rebuild-cockpitlite,rebuild-synchronize,rebuild-uploader,rebuild-gatekeeper"/>
 	
 	<target name="unzip-source-code" unless="src-unzipped">
 		<unzip dest="." src="src.zip" overwrite="false"/>
@@ -117,6 +118,21 @@
 		</javac>
 	</target>
 		
+	<target name="compile-thirdparty" depends="init,unzip-source-code">		
+		<mkdir dir="${dir.build}"/>
+		<javac 
+			srcdir="${dir.src}"
+			destdir="${dir.build}"
+			debug="${debug}"
+			source="${build.source}"
+			target="${build.target}">
+			<classpath refid="classpath"/>
+			<exclude name="contribs/**"/>
+			<exclude name="org/**"/>
+			<exclude name="S3PostFormBuilder.java"/>
+		</javac>
+	</target>
+		
 	<target name="rebuild-service" depends="compile">
 		<jar
 			basedir="${dir.build}"			
@@ -125,6 +141,7 @@
 			>
 			<include name="org/jets3t/service/**"/>
 			<include name="org/apache/commons/httpclient/contrib/**"/>
+			<include name="com/centerkey/utils/**"/>
 			<include name="contribs/mx/**" if="contribs.include-mx"/>
 		</jar>
         <jar
@@ -189,6 +206,15 @@
 		</jar>
 	</target>
 	
+	<target name="rebuild-thirdparty" depends="compile-thirdparty">
+		<jar
+			basedir="${dir.build}"			
+			file="jars/${dist.file.thirdparty}"
+            index="true"
+			>
+		</jar>
+	</target>
+	
 	<target name="rebuild-gatekeeper" depends="rebuild-service">
 		<war 
 			destfile="servlets/gatekeeper/${dist.file.gatekeeper}"
@@ -196,11 +222,11 @@
 			>
 			
 			<lib dir="jars" includes="${dist.file.service}"/>
-			<lib dir="${dir.libs}/commons-httpclient" includes="*.jar"/>
+			<!--lib dir="${dir.libs}/commons-httpclient" includes="*.jar"/>
 			<lib dir="${dir.libs}/commons-logging" includes="*.jar"/>
 			<lib dir="${dir.libs}/commons-codec" includes="*.jar"/>
 			<lib dir="${dir.libs}/logging-log4j" includes="*.jar"/>
-			<lib dir="${dir.libs}/safehaus_jug" includes="*.jar"/>
+			<lib dir="${dir.libs}/safehaus_jug" includes="*.jar"/-->
 			
 			<classes dir="${dir.configs}">
                 <include name="commons-logging.properties"/>