Revision: 3762
http://vexi.svn.sourceforge.net/vexi/?rev=3762&view=rev
Author: mkpg2
Date: 2009-12-08 01:44:48 +0000 (Tue, 08 Dec 2009)
Log Message:
-----------
Workaround. Provide means to exclude apache http core classes when not used
(doesn' go through shrinker so not eliminated).
Modified Paths:
--------------
trunk/core/buildcore/build.conf.txt
trunk/core/buildcore/build.xml
Modified: trunk/core/buildcore/build.conf.txt
===================================================================
--- trunk/core/buildcore/build.conf.txt 2009-11-25 01:56:26 UTC (rev 3761)
+++ trunk/core/buildcore/build.conf.txt 2009-12-08 01:44:48 UTC (rev 3762)
@@ -16,7 +16,11 @@
### Defines to be used by the java preprocessor. A comma separated list.
### Choices: APACHE_HTTP (there is only one choice at the moment)
jpp.defines=APACHE_HTTP
+classes_exclude=
+### Workaround, apache jar cannot be shrunk, and so must be excluded manually
if not used (i.e APACHE_HTTP not defined)
+#jpp.defines=
+#classes_exclude=org/apache/http/**
### Compile in debug information
debug=yes
Modified: trunk/core/buildcore/build.xml
===================================================================
--- trunk/core/buildcore/build.xml 2009-11-25 01:56:26 UTC (rev 3761)
+++ trunk/core/buildcore/build.xml 2009-12-08 01:44:48 UTC (rev 3762)
@@ -120,14 +120,15 @@
</macrodef>
- <property name="jars_noopt"
value="org.ibex.nestedvm_rt.jar,mipsapps.jar,httpcore*.jar"/>
+ <property name="classes_exclude" value=""/>
+ <property name="jars_noopt"
value="org.ibex.nestedvm_rt.jar,mipsapps.jar,httpcore*.jar"/>
<property name="jars_devl"
value="org.vexi.devl.jar,xmlrpc-2.0.jar,commons-codec-1.3.jar"/>
<target name="parts" depends="org.vexi.core">
<!-- two parts, one for code that doesn't survive byte code
shrinkage (mips stuff) and the rest -->
- <jar jarfile="${build_dir}/part_noopt.jar">
- <zipgroupfileset dir="${jar_dir}"
includes="${jars_noopt}" />
+ <jar jarfile="${build_dir}/part_noopt.jar"
excludes="${classes_exclude}">
+ <zipgroupfileset dir="${jar_dir}"
includes="${jars_noopt}" />
</jar>
<jar jarfile="${build_dir}/part_opt.jar">
<zipgroupfileset dir="${jar_dir}" includes="*.jar"
excludes="${jars_devl},${jars_noopt}" />
@@ -146,7 +147,6 @@
-libraryjars <java.home>/${j2se_classes}
-libraryjars ${build_dir}/part_noopt.jar
-
-dontobfuscate
@@ -165,10 +165,16 @@
<makeManifest mainclass="org.vexi.core.Main"/>
<property name="corefile" value="${corename}.jar"/>
<property name="outdir" value="${build_dir}"/>
- <jar jarfile="${outdir}/${corefile}"
manifest="${build_dir}/themanifest.mf">
+ <jar jarfile="${outdir}/_${corefile}"
manifest="${build_dir}/themanifest.mf">
<zipgroupfileset dir="${build_dir}"
- includes="part_noopt.jar,part_optO.jar"/>
+ includes="part_noopt.jar,part_optO.jar" >
+ <exclude name="org/apache/http/**"/>
+ </zipgroupfileset>
</jar>
+ <!-- WORKAROUND only way to get excludes to work ... -->
+ <zip destfile="${outdir}/${corefile}" >
+ <zipfileset src="${outdir}/_${corefile}"
excludes="${classes_exclude}"/>
+ </zip>
</target>
<target name="buildcore_devl" depends="org.vexi.devl" description="-->
combines jars">
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Return on Information:
Google Enterprise Search pays you back
Get the facts.
http://p.sf.net/sfu/google-dev2dev
_______________________________________________
Vexi-svn mailing list
Vexi-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/vexi-svn
