Revision: 3961
http://vexi.svn.sourceforge.net/vexi/?rev=3961&view=rev
Author: mkpg2
Date: 2010-11-03 23:01:18 +0000 (Wed, 03 Nov 2010)
Log Message:
-----------
Fix. Make sure debugging symbols are removed from class files, this causes
broken output from the shrinker.
Modified Paths:
--------------
trunk/_ebuild/seed/version
trunk/org.vexi-core.download/meta/component-assembly.xml
trunk/org.vexi-core.main/meta/module-build.xml
trunk/org.vexi-core.truetype/meta/module-build.xml
trunk/org.vexi-library.crypto/meta/module-build.xml
trunk/org.vexi-library.io/meta/module-build.xml
trunk/org.vexi-library.js/meta/module-build.xml
trunk/org.vexi-library.net/meta/module-build.xml
trunk/org.vexi-library.util/meta/module-build.xml
Modified: trunk/_ebuild/seed/version
===================================================================
--- trunk/_ebuild/seed/version 2010-11-03 22:48:44 UTC (rev 3960)
+++ trunk/_ebuild/seed/version 2010-11-03 23:01:18 UTC (rev 3961)
@@ -1,4 +1,4 @@
-version.path=trunk/149
-version=rev_149
+version.path=trunk/152
+version=rev_152
#nofetch=true
Modified: trunk/org.vexi-core.download/meta/component-assembly.xml
===================================================================
--- trunk/org.vexi-core.download/meta/component-assembly.xml 2010-11-03
22:48:44 UTC (rev 3960)
+++ trunk/org.vexi-core.download/meta/component-assembly.xml 2010-11-03
23:01:18 UTC (rev 3961)
@@ -3,7 +3,8 @@
<assembly release="stage3">
<assembly-result name="constituents">
- <module-selection group-mapping="debug->debug"
artifact-type="java.classes.jar">
+ <!-- Turn off debugging information, breaks shrinker -->
+ <module-selection group-mapping="!noshrink->nodebug"
artifact-type="java.classes.jar">
<include source="local" name="core.main"/>
<!-- pass 'apache-http' configuration on -->
<include source="local" name="library.net"
mapping="apache_http->apache_http"/>
@@ -14,7 +15,7 @@
<assembly-result name="stage1">
<if confs="noshrink">
<then>
- <assembler source="ebuild.org"
name="jar.combine" >
+ <assembler source="ebuild.org"
name="build.java.jarmerge" >
<input ref="constituents"/>
</assembler>
</then>
@@ -22,7 +23,7 @@
<assembler source="local"
name="build.shrink">
<input name="shrink"
ref="constituents"/>
<input name="preserve">
- <module-selection
artifact-type="java.classes.jar">
+ <module-selection
group-mapping="!noshrink->nodebug" artifact-type="java.classes.jar">
<include
source="local" name="core.truetype"/>
<include
source="local" name="core.devtools" confs="devtools"/>
</module-selection>
Modified: trunk/org.vexi-core.main/meta/module-build.xml
===================================================================
--- trunk/org.vexi-core.main/meta/module-build.xml 2010-11-03 22:48:44 UTC
(rev 3960)
+++ trunk/org.vexi-core.main/meta/module-build.xml 2010-11-03 23:01:18 UTC
(rev 3961)
@@ -1,9 +1,9 @@
-<ebuild-module-build ebuild-version="pre-1.0">>
- <using source="local" name="build.shared"/>
+<ebuild-module-build ebuild-version="0.7">
+ <using source="local" name="library.util" context="build"/>
<builders>
<builder source="local" name="build.jpp"
intermediate="true"/>
<builder source="local" name="build.jencode"
intermediate="true"/>
- <builder source="ebuild.org" name="build.java.compile" />
+ <builder refid="javac" />
</builders>
-</ebuild-module-build>
+</ebuild-module-build>
\ No newline at end of file
Modified: trunk/org.vexi-core.truetype/meta/module-build.xml
===================================================================
--- trunk/org.vexi-core.truetype/meta/module-build.xml 2010-11-03 22:48:44 UTC
(rev 3960)
+++ trunk/org.vexi-core.truetype/meta/module-build.xml 2010-11-03 23:01:18 UTC
(rev 3961)
@@ -1,7 +1,7 @@
-<ebuild-module-build ebuild-version="pre-1.0">
- <using source="local" name="build.shared"/>
-
+<ebuild-module-build ebuild-version="0.7">
+ <using source="local" name="library.util" context="build"/>
+
<builders>
- <builder source="ebuild.org" name="build.java.compile" />
+ <builder refid="javac"/>
</builders>
-</ebuild-module-build>
+</ebuild-module-build>
Modified: trunk/org.vexi-library.crypto/meta/module-build.xml
===================================================================
--- trunk/org.vexi-library.crypto/meta/module-build.xml 2010-11-03 22:48:44 UTC
(rev 3960)
+++ trunk/org.vexi-library.crypto/meta/module-build.xml 2010-11-03 23:01:18 UTC
(rev 3961)
@@ -1,6 +1,8 @@
-<ebuild-module-build ebuild-version="pre-1.0">
- <using source="local" name="build.shared"/>
+<ebuild-module-build ebuild-version="0.7">
+ <using source="local" name="library.util" context="build"/>
+
<builders>
- <builder source="ebuild.org" name="build.java.compile" />
+ <builder refid="javac" />
</builders>
-</ebuild-module-build>
\ No newline at end of file
+</ebuild-module-build>
+
Modified: trunk/org.vexi-library.io/meta/module-build.xml
===================================================================
--- trunk/org.vexi-library.io/meta/module-build.xml 2010-11-03 22:48:44 UTC
(rev 3960)
+++ trunk/org.vexi-library.io/meta/module-build.xml 2010-11-03 23:01:18 UTC
(rev 3961)
@@ -1,8 +1,8 @@
-<ebuild-module-build ebuild-version="pre-1.0">
- <using source="local" name="build.shared"/>
+<ebuild-module-build ebuild-version="0.7">
+ <using source="local" name="library.util" context="build"/>
<builders>
- <builder source="ebuild.org" name="build.java.compile" />
+ <builder refid="javac" />
</builders>
</ebuild-module-build>
Modified: trunk/org.vexi-library.js/meta/module-build.xml
===================================================================
--- trunk/org.vexi-library.js/meta/module-build.xml 2010-11-03 22:48:44 UTC
(rev 3960)
+++ trunk/org.vexi-library.js/meta/module-build.xml 2010-11-03 23:01:18 UTC
(rev 3961)
@@ -1,8 +1,9 @@
-<ebuild-module-build ebuild-version="pre-1.0">
- <using source="local" name="build.shared"/>
-
+<ebuild-module-build ebuild-version="0.7">
+ <using source="local" name="library.util" context="build"/>
+
<builders>
<builder source="local" name="build.jpp"/>
- <builder source="ebuild.org" name="build.java.compile" />
+
+ <builder refid="javac" />
</builders>
</ebuild-module-build>
Modified: trunk/org.vexi-library.net/meta/module-build.xml
===================================================================
--- trunk/org.vexi-library.net/meta/module-build.xml 2010-11-03 22:48:44 UTC
(rev 3960)
+++ trunk/org.vexi-library.net/meta/module-build.xml 2010-11-03 23:01:18 UTC
(rev 3961)
@@ -1,5 +1,5 @@
-<ebuild-module-build ebuild-version="pre-1.0">
- <using source="local" name="build.shared"/>
+<ebuild-module-build ebuild-version="0.7">
+ <using source="local" name="library.util" context="build"/>
<builders>
<builder source="local" name="build.jpp">
@@ -7,8 +7,7 @@
{ "APACHE_HTTP": "true" }
</property>
</builder>
- <builder source="ebuild.org" name="build.java.compile">
- <property key="debug" confs="debug">true</property>
- </builder>
+ <builder refid="javac" />
</builders>
</ebuild-module-build>
+
Modified: trunk/org.vexi-library.util/meta/module-build.xml
===================================================================
--- trunk/org.vexi-library.util/meta/module-build.xml 2010-11-03 22:48:44 UTC
(rev 3960)
+++ trunk/org.vexi-library.util/meta/module-build.xml 2010-11-03 23:01:18 UTC
(rev 3961)
@@ -1,6 +1,8 @@
-<ebuild-module-build ebuild-version="pre-1.0">
+<ebuild-module-build ebuild-version="0.7">
<using source="local" name="build.shared"/>
<builders>
- <builder source="ebuild.org" name="build.java.compile" />
+ <builder id="javac" source="ebuild.org"
name="build.java.compile">
+ <property key="debug" confs="nodebug" value="false"/>
+ </builder>
</builders>
</ebuild-module-build>
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
The Next 800 Companies to Lead America's Growth: New Video Whitepaper
David G. Thomson, author of the best-selling book "Blueprint to a
Billion" shares his insights and actions to help propel your
business during the next growth cycle. Listen Now!
http://p.sf.net/sfu/SAP-dev2dev
_______________________________________________
Vexi-svn mailing list
Vexi-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/vexi-svn
