Package: jets3t / 0.8.1+dfsg-5

05_add_thirdparty_targets.diff Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
Author: Miguel Landaeta <miguel@miguel.cc>
Subject: compile third-party libs from source before the main compilation
Forwarded: no
Last-Update: 2011-04-13

Since BareBonesBrowserLaunch is needed to compile jets3t, they must be
compiled first. So, this patch add some ant targets to do this.

--- jets3t-0.8.0+dfsg.orig/build.xml
+++ jets3t-0.8.0+dfsg/build.xml
@@ -71,11 +71,12 @@ zip-source-code   : Zips the JetS3t sour
          ================================= -->
 	<path id="classpath">
 		<fileset dir="/" includesfile="debian/classpath-debian"/>
+		<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"/>-->
@@ -105,6 +106,21 @@ zip-source-code   : Zips the JetS3t sour
 			<exclude name="contribs/mx/**" unless="contribs.include-mx"/>
 		</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="1.4"
+			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
@@ -114,6 +130,7 @@ zip-source-code   : Zips the JetS3t sour
 			>
 			<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
@@ -177,6 +194,15 @@ zip-source-code   : Zips the JetS3t sour
             </manifest>
 		</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 
@@ -185,11 +211,13 @@ zip-source-code   : Zips the JetS3t sour
 			>
 			
 			<lib dir="jars" includes="${dist.file.service}"/>
+			<!--
 			<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"/>
+			-->
 			
 			<classes dir="${dir.configs}">
                 <include name="commons-logging.properties"/>
--- jets3t-0.8.0+dfsg.orig/build.properties
+++ jets3t-0.8.0+dfsg/build.properties
@@ -19,6 +19,7 @@ dist.file.synchronize=synchronize-${vers
 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