Revision: 4558
http://sourceforge.net/p/vexi/code/4558
Author: mkpg2
Date: 2013-09-20 14:32:28 +0000 (Fri, 20 Sep 2013)
Log Message:
-----------
Update to latest version of proguard.
Update to ebuild 0.8 api.
Modified Paths:
--------------
trunk/org.vexi-build.shrink/build.xml
trunk/org.vexi-build.shrink/meta/build-plugin.xml
trunk/org.vexi-build.shrink/meta/module-build.xml
trunk/org.vexi-build.shrink/meta/module.xml
trunk/org.vexi-build.shrink/src/main/java/org/vexi/build/shrink/JarShrinkAssembler.java
Modified: trunk/org.vexi-build.shrink/build.xml
===================================================================
--- trunk/org.vexi-build.shrink/build.xml 2013-09-18 22:19:43 UTC (rev
4557)
+++ trunk/org.vexi-build.shrink/build.xml 2013-09-20 14:32:28 UTC (rev
4558)
@@ -1,4 +1,5 @@
<project default="eclipse_setup">
+ <property name="project" location="."/>
<property name="ebuild.home" location="../_ebuild"/>
<import file="${ebuild.home}/interface/workspace.ent"/>
Modified: trunk/org.vexi-build.shrink/meta/build-plugin.xml
===================================================================
--- trunk/org.vexi-build.shrink/meta/build-plugin.xml 2013-09-18 22:19:43 UTC
(rev 4557)
+++ trunk/org.vexi-build.shrink/meta/build-plugin.xml 2013-09-20 14:32:28 UTC
(rev 4558)
@@ -1,3 +1,3 @@
-<ebuild-build-plugin ebuild-version="pre-1.0">
+<ebuild-build-plugin ebuild-version="0.8">
<declare-assembler class="org.vexi.build.shrink.JarShrinkAssembler"/>
</ebuild-build-plugin>
\ No newline at end of file
Modified: trunk/org.vexi-build.shrink/meta/module-build.xml
===================================================================
--- trunk/org.vexi-build.shrink/meta/module-build.xml 2013-09-18 22:19:43 UTC
(rev 4557)
+++ trunk/org.vexi-build.shrink/meta/module-build.xml 2013-09-20 14:32:28 UTC
(rev 4558)
@@ -1,4 +1,4 @@
-<ebuild-module-build ebuild-version="pre-1.0">
+<ebuild-module-build ebuild-version="0.8">
<using source="local" name="build.shared"/>
<builders>
Modified: trunk/org.vexi-build.shrink/meta/module.xml
===================================================================
--- trunk/org.vexi-build.shrink/meta/module.xml 2013-09-18 22:19:43 UTC (rev
4557)
+++ trunk/org.vexi-build.shrink/meta/module.xml 2013-09-20 14:32:28 UTC (rev
4558)
@@ -5,6 +5,6 @@
<dependencies>
<dependency source="ebuild" name="api.plugin"
tag="0.8.0"/>
<dependency source="ebuild-plugins" name="lib.ant" />
- <dependency source="ibiblio" org="net.sf.proguard"
name="proguard" version="4.4"/>
+ <dependency source="ibiblio" org="net.sf.proguard"
name="proguard-base" tag="4.10"/>
</dependencies>
</ebuild-module>
Modified:
trunk/org.vexi-build.shrink/src/main/java/org/vexi/build/shrink/JarShrinkAssembler.java
===================================================================
---
trunk/org.vexi-build.shrink/src/main/java/org/vexi/build/shrink/JarShrinkAssembler.java
2013-09-18 22:19:43 UTC (rev 4557)
+++
trunk/org.vexi-build.shrink/src/main/java/org/vexi/build/shrink/JarShrinkAssembler.java
2013-09-20 14:32:28 UTC (rev 4558)
@@ -6,7 +6,6 @@
import java.io.File;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.HashSet;
import java.util.List;
import org.apache.tools.ant.Project;
@@ -25,6 +24,7 @@
import ebuild.api.plugin.AbstractAssembler;
import ebuild.api.plugin.BuildPluginException;
import ebuild.api.plugin.IPropertyMap;
+import ebuild.util.CollectionUtil;
import ebuild.util.FileUtil;
import ebuild.util.IOUtil;
import ebuild.util.OSUtil;
@@ -67,8 +67,14 @@
IInputMap inputs = argument.getInputMap();
Collection<File> shrinkJars =
inputs.expectInput("shrink").getArtifacts();
- Collection<File> preservedJars = inputs.getArtifacts("preserve", new
HashSet());
- Collection<File> libraryJars = inputs.getArtifacts("library", new
HashSet());
+ Collection<File> preservedJars = CollectionUtil.EMPTY_LIST;
+ Collection<File> libraryJars = CollectionUtil.EMPTY_LIST;
+ if(inputs.getInput("preserve")!=null){
+ preservedJars = inputs.getInput("preserve").getArtifacts();
+ }
+ if(inputs.getInput("library")!=null){
+ libraryJars = inputs.getInput("library").getArtifacts();
+ }
shrinkJars.removeAll(preservedJars);
shrinkJars.removeAll(libraryJars);
//libraryJars.add(getJavaLib());
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
LIMITED TIME SALE - Full Year of Microsoft Training For Just $49.99!
1,500+ hours of tutorials including VisualStudio 2012, Windows 8, SharePoint
2013, SQL 2012, MVC 4, more. BEST VALUE: New Multi-Library Power Pack includes
Mobile, Cloud, Java, and UX Design. Lowest price ever! Ends 9/20/13.
http://pubads.g.doubleclick.net/gampad/clk?id=58041151&iu=/4140/ostg.clktrk
_______________________________________________
Vexi-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/vexi-svn
