Revision: 4071
http://vexi.svn.sourceforge.net/vexi/?rev=4071&view=rev
Author: mkpg2
Date: 2011-03-24 13:08:42 +0000 (Thu, 24 Mar 2011)
Log Message:
-----------
Uncommited updates. Should fix build.
Modified Paths:
--------------
trunk/org.vexi-build.shared/meta/module.revisions
trunk/org.vexi-build.shared/meta/module.xml
trunk/org.vexi-build.sign/meta/build-plugin.xml
trunk/org.vexi-build.sign/meta/module-build.xml
trunk/org.vexi-build.sign/meta/module.xml
trunk/org.vexi-build.vexi.manifest/meta/build-plugin.xml
trunk/org.vexi-build.vexi.manifest/meta/module-build.xml
trunk/org.vexi-build.vexi.manifest/meta/module.xml
trunk/org.vexi-build.vexi.manifest/src/main/java/org/vexi/build/vexi/manifest/VexiManifestBuilder.java
Added Paths:
-----------
trunk/org.vexi-core.download/meta/product-assembly.xml
trunk/org.vexi-core.download/meta/product.xml
Removed Paths:
-------------
trunk/org.vexi-core.download/meta/component-assembly.xml
trunk/org.vexi-core.download/meta/component.xml
Modified: trunk/org.vexi-build.shared/meta/module.revisions
===================================================================
--- trunk/org.vexi-build.shared/meta/module.revisions 2011-03-24 04:10:08 UTC
(rev 4070)
+++ trunk/org.vexi-build.shared/meta/module.revisions 2011-03-24 13:08:42 UTC
(rev 4071)
@@ -1 +1 @@
-{"https:\/\/svn.origo.ethz.ch\/ebuild":"212"}
\ No newline at end of file
+{"https:\/\/svn.origo.ethz.ch\/ebuild":"412"}
\ No newline at end of file
Modified: trunk/org.vexi-build.shared/meta/module.xml
===================================================================
--- trunk/org.vexi-build.shared/meta/module.xml 2011-03-24 04:10:08 UTC (rev
4070)
+++ trunk/org.vexi-build.shared/meta/module.xml 2011-03-24 13:08:42 UTC (rev
4071)
@@ -1,10 +1,14 @@
-<ebuild-module ebuild-version="0.7">
+<ebuild-module ebuild-version="0.8">
<repositories>
<repository
name="ebuild.org"
- ref="ebuild"
- tag="0.7"/>
- <!-- "org="ebuild" type="svn"
url="https://svn.origo.ethz.ch/ebuild/"/-->
+ org="ebuild" type="svn"
url="https://svn.origo.ethz.ch/ebuild/"/>
+ <!--
+ <repository
+ name="ebuild.org"
+ ref="ebuild" tag="0.7"/>
+ -->
+
</repositories>
<dependencies/>
</ebuild-module>
Modified: trunk/org.vexi-build.sign/meta/build-plugin.xml
===================================================================
--- trunk/org.vexi-build.sign/meta/build-plugin.xml 2011-03-24 04:10:08 UTC
(rev 4070)
+++ trunk/org.vexi-build.sign/meta/build-plugin.xml 2011-03-24 13:08:42 UTC
(rev 4071)
@@ -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.sign.VexiSignAssembler"/>
</ebuild-build-plugin>
\ No newline at end of file
Modified: trunk/org.vexi-build.sign/meta/module-build.xml
===================================================================
--- trunk/org.vexi-build.sign/meta/module-build.xml 2011-03-24 04:10:08 UTC
(rev 4070)
+++ trunk/org.vexi-build.sign/meta/module-build.xml 2011-03-24 13:08:42 UTC
(rev 4071)
@@ -1,4 +1,4 @@
-<ebuild-module ebuild-version="pre-1.0">
+<ebuild-module ebuild-version="0.8">
<using source="local" name="build.shared"/>
<builders>
Modified: trunk/org.vexi-build.sign/meta/module.xml
===================================================================
--- trunk/org.vexi-build.sign/meta/module.xml 2011-03-24 04:10:08 UTC (rev
4070)
+++ trunk/org.vexi-build.sign/meta/module.xml 2011-03-24 13:08:42 UTC (rev
4071)
@@ -1,6 +1,8 @@
-<ebuild-module ebuild-version="pre-1.0">
+<ebuild-module ebuild-version="0.8">
<using source="local" name="build.shared"/>
-
+
+ <artifact name="java_classes.jar" />
+
<dependencies>
<dependency source="local"
name="tools.certify" />
<dependency source="ebuild.org"
name="api.plugin" />
Modified: trunk/org.vexi-build.vexi.manifest/meta/build-plugin.xml
===================================================================
--- trunk/org.vexi-build.vexi.manifest/meta/build-plugin.xml 2011-03-24
04:10:08 UTC (rev 4070)
+++ trunk/org.vexi-build.vexi.manifest/meta/build-plugin.xml 2011-03-24
13:08:42 UTC (rev 4071)
@@ -1,3 +1,3 @@
-<ebuild-build-plugin ebuild-version="pre-1.0">
+<ebuild-build-plugin ebuild-version="0.8">
<declare-builder
class="org.vexi.build.vexi.manifest.VexiManifestBuilder"/>
</ebuild-build-plugin>
\ No newline at end of file
Modified: trunk/org.vexi-build.vexi.manifest/meta/module-build.xml
===================================================================
--- trunk/org.vexi-build.vexi.manifest/meta/module-build.xml 2011-03-24
04:10:08 UTC (rev 4070)
+++ trunk/org.vexi-build.vexi.manifest/meta/module-build.xml 2011-03-24
13:08:42 UTC (rev 4071)
@@ -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.vexi.manifest/meta/module.xml
===================================================================
--- trunk/org.vexi-build.vexi.manifest/meta/module.xml 2011-03-24 04:10:08 UTC
(rev 4070)
+++ trunk/org.vexi-build.vexi.manifest/meta/module.xml 2011-03-24 13:08:42 UTC
(rev 4071)
@@ -1,8 +1,10 @@
-<ebuild-module ebuild-version="pre-1.0">
+<ebuild-module ebuild-version="0.8">
<using source="local" name="build.shared"/>
+ <artifact name="java_classes.jar" />
+
<dependencies>
- <dependency source="system" name="jre"
version="1.5"/>
+ <system name="java.jre"
tag="1.5"/>
<dependency source="ebuild.org" name="api.plugin" />
<dependency source="ebuild.org" name="lib.util" />
</dependencies>
Modified:
trunk/org.vexi-build.vexi.manifest/src/main/java/org/vexi/build/vexi/manifest/VexiManifestBuilder.java
===================================================================
---
trunk/org.vexi-build.vexi.manifest/src/main/java/org/vexi/build/vexi/manifest/VexiManifestBuilder.java
2011-03-24 04:10:08 UTC (rev 4070)
+++
trunk/org.vexi-build.vexi.manifest/src/main/java/org/vexi/build/vexi/manifest/VexiManifestBuilder.java
2011-03-24 13:08:42 UTC (rev 4071)
@@ -2,25 +2,35 @@
import java.io.File;
import java.io.IOException;
+import java.util.LinkedHashMap;
+import java.util.Map;
import ebuild.api.IBuilderArgument;
import ebuild.api.IModuleBuildProject;
+import ebuild.api.IModuleProject;
import ebuild.api.common.Scope;
import ebuild.api.plugin.AbstractBuilder;
import ebuild.api.plugin.BuildPluginException;
-import ebuild.util.IOUtil;
+import ebuild.util.JSONUtil;
public class VexiManifestBuilder extends AbstractBuilder {
public void build(IBuilderArgument argument) throws BuildPluginException{
if(argument.getScope()!=Scope.MAIN) return;
IModuleBuildProject module = argument.getModuleBuildProject();
- File genDir = argument.getOutputDir("vexi");
+ File genDir = argument.getOutputArtifact("vexi",false);
File manifestDir = new File(genDir,"manifest");
manifestDir.mkdirs();
try {
- IOUtil.stringToFile("version "+module.getVersionString(), new
File(manifestDir, module.getName()));
+ Map manifest = new LinkedHashMap();
+ manifest.put("version", module.getVersion().toString());
+ Map dependencies = new LinkedHashMap();
+ for(IModuleProject dep:
module.getProjectDependencies(Scope.MAIN)){
+
dependencies.put(dep.getName(),dep.getKey().getVersion().toString());
+ }
+
+ JSONUtil.writeObject(new File(manifestDir,
module.getName()),manifest);
} catch (IOException e) {
throw new BuildPluginException(e);
}
Deleted: trunk/org.vexi-core.download/meta/component-assembly.xml
===================================================================
--- trunk/org.vexi-core.download/meta/component-assembly.xml 2011-03-24
04:10:08 UTC (rev 4070)
+++ trunk/org.vexi-core.download/meta/component-assembly.xml 2011-03-24
13:08:42 UTC (rev 4071)
@@ -1,67 +0,0 @@
-<ebuild-component-assembly ebuild-version="pre-1.0">
- <using source="local" name="build.shared"/>
-
- <assembly release="stage3">
- <assembly-result name="constituents">
- <!-- 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"/>
- <include source="local" name="core.devtools"
confs="devtools"/>
- <exclude source="system" name="jre"/>
- </module-selection>
- </assembly-result>
- <assembly-result name="stage1">
- <if confs="noshrink">
- <then>
- <assembler source="ebuild.org"
name="build.java.jarmerge" >
- <input ref="constituents"/>
- </assembler>
- </then>
- <else>
- <assembler source="local"
name="build.shrink">
- <input name="shrink"
ref="constituents"/>
- <input name="preserve">
- <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"/>
- <include
source="local" name="library.net" confs="apache_http"
mapping="apache_http->apache_http"/>
- </module-selection>
- </input>
- <property
key="proguard_options">
- -dontobfuscate
-
- <!-- Allow classes and
class members to be made public. -->
- -allowaccessmodification
-
-
- <!-- The entry point -->
- -keep public class
org.vexi.core.Main {
- public static void
main(java.lang.String[]);
- }
- -keep class
org.vexi.plat.Swing
- </property>
- </assembler>
- </else>
- </if>
- </assembly-result>
- <assembly-result name="stage2">
- <assembler source="ebuild.org"
name="build.java.jarmanifest">
- <input ref="stage1"/>
- <property key="Main-Class"
value="org.vexi.core.Main"/>
- </assembler>
- </assembly-result>
- <assembly-result name="stage3">
- <if confs="signed">
- <then>
- <assembler source="local"
name="build.sign">
- <input ref="stage2"/>
- <property key="secret_name"
value="secret.vexi"/>
- </assembler>
- </then>
- <else ref="stage2"/>
- </if>
- </assembly-result>
- </assembly>
-</ebuild-component-assembly>
Deleted: trunk/org.vexi-core.download/meta/component.xml
===================================================================
--- trunk/org.vexi-core.download/meta/component.xml 2011-03-24 04:10:08 UTC
(rev 4070)
+++ trunk/org.vexi-core.download/meta/component.xml 2011-03-24 13:08:42 UTC
(rev 4071)
@@ -1,11 +0,0 @@
-<ebuild-component ebuild-version="pre-1.0">
- <release name="vexi3" suffix=".jar"/>
- <configurations>
- <configuration name="apache_http" />
- <configuration name="signed" suffix=".signed"
use-in-name="false"/>
- <configuration name="unshrunk" />
- <configuration name="devtools" />
- <configuration name="debug" />
- <configuration name="devl"
aliases="devtools,debug,noshrink"/>
- </configurations>
-</ebuild-component>
Copied: trunk/org.vexi-core.download/meta/product-assembly.xml (from rev 4044,
trunk/org.vexi-core.download/meta/component-assembly.xml)
===================================================================
--- trunk/org.vexi-core.download/meta/product-assembly.xml
(rev 0)
+++ trunk/org.vexi-core.download/meta/product-assembly.xml 2011-03-24
13:08:42 UTC (rev 4071)
@@ -0,0 +1,60 @@
+<ebuild-product-assembly ebuild-version="0.8">
+ <using source="local" name="build.shared"/>
+
+ <target name="constituents">
+ <!-- Turn off debugging information, breaks shrinker -->
+ <module-selection conf-mapping="!noshrink->nodebug"
artifact="java_classes.jar">
+ <include source="local" name="core.main"/>
+ <!-- pass 'apache-http' configuration on -->
+ <include source="local" name="library.net"
conf-mapping="apache_http->apache_http"/>
+ <include source="local" name="core.devtools"
conf="devtools"/>
+ <exclude source="system" name="jre"/>
+ </module-selection>
+ </target>
+ <target name="stage1">
+ <if cond="noshrink">
+ <then>
+ <assembler source="ebuild"
name="build.java.jarmerge" tag="0.7" >
+ <input ref="constituents"/>
+ </assembler>
+ </then>
+ <else>
+ <assembler source="ebuild.org"
name="build.java.jarshrink">
+ <input name="shrink"
ref="constituents"/>
+ <input name="preserve">
+ <module-selection
conf-mapping="!noshrink->nodebug" artifact="java_classes.jar">
+ <include source="local"
name="core.truetype"/>
+ <include source="local"
name="core.devtools" conf="devtools"/>
+ <include source="local"
name="library.net" conf="apache_http"
conf-mapping="apache_http->apache_http"/>
+ </module-selection>
+ </input>
+ <property key="proguard_options">
+ -dontobfuscate
+
+ <!-- Allow classes and class
members to be made public. -->
+ -allowaccessmodification
+
+
+ <!-- The entry point -->
+ -keep public class
org.vexi.core.Main {
+ public static void
main(java.lang.String[]);
+ }
+ -keep class org.vexi.plat.Swing
+ </property>
+ </assembler>
+ </else>
+ </if>
+ </target>
+ <target name="unsigned">
+ <assembler source="ebuild" name="build.java.jarmanifest"
tag="0.7">
+ <input ref="stage1"/>
+ <property key="Main-Class" value="org.vexi.core.Main"/>
+ </assembler>
+ </target>
+ <target name="signed">
+ <assembler source="local" name="build.sign">
+ <input ref="unsigned"/>
+ <property key="secret_name" value="secret.vexi"/>
+ </assembler>
+ </target>
+</ebuild-product-assembly>
Copied: trunk/org.vexi-core.download/meta/product.xml (from rev 3948,
trunk/org.vexi-core.download/meta/component.xml)
===================================================================
--- trunk/org.vexi-core.download/meta/product.xml
(rev 0)
+++ trunk/org.vexi-core.download/meta/product.xml 2011-03-24 13:08:42 UTC
(rev 4071)
@@ -0,0 +1,13 @@
+<ebuild-product ebuild-version="0.8">
+ <artifact name="unsigned" prefix="vexi3" suffix=".jar"/>
+ <artifact name="signed" prefix="vexi3" suffix=".jar.signed"/>
+
+ <configurations>
+ <configuration name="apache_http" />
+ <configuration name="signed" />
+ <configuration name="unshrunk" />
+ <configuration name="devtools" />
+ <configuration name="debug" />
+ <configuration name="devl" alias="true"
includes="devtools,debug,unshrunk"/>
+ </configurations>
+</ebuild-product>
Property changes on: trunk/org.vexi-core.download/meta/product.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Enable your software for Intel(R) Active Management Technology to meet the
growing manageability and security demands of your customers. Businesses
are taking advantage of Intel(R) vPro (TM) technology - will your software
be a part of the solution? Download the Intel(R) Manageability Checker
today! http://p.sf.net/sfu/intel-dev2devmar
_______________________________________________
Vexi-svn mailing list
Vexi-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/vexi-svn
