Revision: 4257 http://vexi.svn.sourceforge.net/vexi/?rev=4257&view=rev Author: mkpg2 Date: 2011-09-23 06:32:06 +0000 (Fri, 23 Sep 2011) Log Message: ----------- Update to ebuild 0.8.0. Fixes apache_http core build problem.
Modified Paths: -------------- trunk/_ebuild/seed/version trunk/org.vexi-build.deployment/meta/module-build.xml trunk/org.vexi-build.deployment/meta/module.xml trunk/org.vexi-build.jencode/meta/module-build.xml trunk/org.vexi-build.jencode/meta/module.xml trunk/org.vexi-build.jpp/meta/module-build.xml trunk/org.vexi-build.jpp/meta/module.xml trunk/org.vexi-build.jsdoc/meta/module-build.xml trunk/org.vexi-build.jsdoc/meta/module.xml trunk/org.vexi-build.shared/meta/module.revisions trunk/org.vexi-build.sign/meta/module-build.xml trunk/org.vexi-build.sign/meta/module.xml trunk/org.vexi-build.vexi.archive/meta/module-build.xml trunk/org.vexi-build.vexi.archive/meta/module.xml trunk/org.vexi-build.vexi.archive/src/main/java/org/vexi/build/vexi/archive/VexidevProject.java 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 trunk/org.vexi-core.devtools/meta/module-build.xml trunk/org.vexi-core.download/meta/product-assembly.xml trunk/org.vexi-distribution/meta/product-assembly.xml trunk/org.vexi-launcher.vexi_org/meta/module-build.xml trunk/org.vexi-launcher.vexi_org/meta/product-assembly.xml trunk/org.vexi-library.js/meta/module-build.xml trunk/org.vexi-library.testing/meta/module-build.xml trunk/org.vexi-library.util/meta/module-build.xml trunk/org.vexi-tools.certify/meta/module-build.xml Modified: trunk/_ebuild/seed/version =================================================================== --- trunk/_ebuild/seed/version 2011-09-23 00:20:41 UTC (rev 4256) +++ trunk/_ebuild/seed/version 2011-09-23 06:32:06 UTC (rev 4257) @@ -1,2 +1,2 @@ #nofetch=true -tag=0.8beta5 +tag=0.8.0 Modified: trunk/org.vexi-build.deployment/meta/module-build.xml =================================================================== --- trunk/org.vexi-build.deployment/meta/module-build.xml 2011-09-23 00:20:41 UTC (rev 4256) +++ trunk/org.vexi-build.deployment/meta/module-build.xml 2011-09-23 06:32:06 UTC (rev 4257) @@ -2,7 +2,7 @@ <using source="local" name="build.shared"/> <builders> - <builder source="ebuild.org" name="build.java.compile" /> + <builder source="ebuild" name="build.java.compile"/> </builders> </ebuild-module> Modified: trunk/org.vexi-build.deployment/meta/module.xml =================================================================== --- trunk/org.vexi-build.deployment/meta/module.xml 2011-09-23 00:20:41 UTC (rev 4256) +++ trunk/org.vexi-build.deployment/meta/module.xml 2011-09-23 06:32:06 UTC (rev 4257) @@ -5,7 +5,7 @@ <dependencies> <dependency source="local" name="tools.certify" /> - <dependency source="ebuild.org" name="api.plugin" /> - <dependency source="ebuild.org" name="lib.util" /> + <dependency source="ebuild" name="api.plugin" /> + <dependency source="ebuild" name="lib.util" /> </dependencies> </ebuild-module> Modified: trunk/org.vexi-build.jencode/meta/module-build.xml =================================================================== --- trunk/org.vexi-build.jencode/meta/module-build.xml 2011-09-23 00:20:41 UTC (rev 4256) +++ trunk/org.vexi-build.jencode/meta/module-build.xml 2011-09-23 06:32:06 UTC (rev 4257) @@ -2,6 +2,6 @@ <using source="local" name="build.shared"/> <builders> - <builder source="ebuild.org" name="build.java.compile" /> + <builder source="ebuild" name="build.java.compile"/> </builders> </ebuild-module-build> Modified: trunk/org.vexi-build.jencode/meta/module.xml =================================================================== --- trunk/org.vexi-build.jencode/meta/module.xml 2011-09-23 00:20:41 UTC (rev 4256) +++ trunk/org.vexi-build.jencode/meta/module.xml 2011-09-23 06:32:06 UTC (rev 4257) @@ -2,8 +2,8 @@ <using source="local" name="build.shared"/> <artifact name="java_classes.jar"/> <dependencies> - <dependency source="ebuild.org" name="api.plugin" /> - <dependency source="ebuild.org" name="lib.util" /> + <dependency source="ebuild" name="api.plugin" /> + <dependency source="ebuild" name="lib.util" /> <dependency source="local" name="library.util" /> </dependencies> </ebuild-module> Modified: trunk/org.vexi-build.jpp/meta/module-build.xml =================================================================== --- trunk/org.vexi-build.jpp/meta/module-build.xml 2011-09-23 00:20:41 UTC (rev 4256) +++ trunk/org.vexi-build.jpp/meta/module-build.xml 2011-09-23 06:32:06 UTC (rev 4257) @@ -2,6 +2,6 @@ <using source="local" name="build.shared"/> <builders> - <builder source="ebuild.org" name="build.java.compile" /> + <builder source="ebuild" name="build.java.compile"/> </builders> </ebuild-module-build> Modified: trunk/org.vexi-build.jpp/meta/module.xml =================================================================== --- trunk/org.vexi-build.jpp/meta/module.xml 2011-09-23 00:20:41 UTC (rev 4256) +++ trunk/org.vexi-build.jpp/meta/module.xml 2011-09-23 06:32:06 UTC (rev 4257) @@ -3,8 +3,8 @@ <artifact name="java_classes.jar"/> <dependencies> <dependency source="system" name="jre" tag="1.6"/> - <dependency source="ebuild.org" name="api.plugin" /> - <dependency source="ebuild.org" name="lib.util" /> + <dependency source="ebuild" name="api.plugin" /> + <dependency source="ebuild" name="lib.util" /> <dependency source="local" name="library.util" /> <dependency source="local" name="library.testing" scope="test"/> <dependency source="ibiblio" org="junit" name="junit" tag="3.8.2" scope="test"/> Modified: trunk/org.vexi-build.jsdoc/meta/module-build.xml =================================================================== --- trunk/org.vexi-build.jsdoc/meta/module-build.xml 2011-09-23 00:20:41 UTC (rev 4256) +++ trunk/org.vexi-build.jsdoc/meta/module-build.xml 2011-09-23 06:32:06 UTC (rev 4257) @@ -2,7 +2,7 @@ <using source="local" name="build.shared"/> <builders> - <builder source="ebuild.org" name="build.java.javacc" /> - <builder source="ebuild.org" name="build.java.compile" /> + <builder source="ebuild" name="build.java.javacc"/> + <builder source="ebuild" name="build.java.compile"/> </builders> </ebuild-module-build> Modified: trunk/org.vexi-build.jsdoc/meta/module.xml =================================================================== --- trunk/org.vexi-build.jsdoc/meta/module.xml 2011-09-23 00:20:41 UTC (rev 4256) +++ trunk/org.vexi-build.jsdoc/meta/module.xml 2011-09-23 06:32:06 UTC (rev 4257) @@ -4,8 +4,8 @@ <dependencies> <dependency source="system" name="jre" tag="1.6"/> <dependency source="ibiblio" org="org.freemarker" name="freemarker" tag="2.3.14"/> - <dependency source="ebuild.org" name="api.plugin" /> - <dependency source="ebuild.org" name="lib.util" /> + <dependency source="ebuild" name="api.plugin" /> + <dependency source="ebuild" name="lib.util" /> <dependency source="local" name="library.util" /> </dependencies> </ebuild-module> Modified: trunk/org.vexi-build.shared/meta/module.revisions =================================================================== --- trunk/org.vexi-build.shared/meta/module.revisions 2011-09-23 00:20:41 UTC (rev 4256) +++ trunk/org.vexi-build.shared/meta/module.revisions 2011-09-23 06:32:06 UTC (rev 4257) @@ -1 +1 @@ -{"https:\/\/svn.origo.ethz.ch\/ebuild":"464"} \ No newline at end of file +{"https:\/\/svn.origo.ethz.ch\/ebuild":"500"} \ 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-09-23 00:20:41 UTC (rev 4256) +++ trunk/org.vexi-build.sign/meta/module-build.xml 2011-09-23 06:32:06 UTC (rev 4257) @@ -2,7 +2,7 @@ <using source="local" name="build.shared"/> <builders> - <builder source="ebuild.org" name="build.java.compile" /> + <builder source="ebuild" name="build.java.compile"/> </builders> </ebuild-module> Modified: trunk/org.vexi-build.sign/meta/module.xml =================================================================== --- trunk/org.vexi-build.sign/meta/module.xml 2011-09-23 00:20:41 UTC (rev 4256) +++ trunk/org.vexi-build.sign/meta/module.xml 2011-09-23 06:32:06 UTC (rev 4257) @@ -5,7 +5,7 @@ <dependencies> <dependency source="local" name="tools.certify" /> - <dependency source="ebuild.org" name="api.plugin" /> - <dependency source="ebuild.org" name="lib.util" /> + <dependency source="ebuild" name="api.plugin" /> + <dependency source="ebuild" name="lib.util" /> </dependencies> </ebuild-module> Modified: trunk/org.vexi-build.vexi.archive/meta/module-build.xml =================================================================== --- trunk/org.vexi-build.vexi.archive/meta/module-build.xml 2011-09-23 00:20:41 UTC (rev 4256) +++ trunk/org.vexi-build.vexi.archive/meta/module-build.xml 2011-09-23 06:32:06 UTC (rev 4257) @@ -2,6 +2,6 @@ <using source="local" name="build.shared"/> <builders> - <builder source="ebuild.org" name="build.java.compile" /> + <builder source="ebuild" name="build.java.compile"/> </builders> </ebuild-module-build> Modified: trunk/org.vexi-build.vexi.archive/meta/module.xml =================================================================== --- trunk/org.vexi-build.vexi.archive/meta/module.xml 2011-09-23 00:20:41 UTC (rev 4256) +++ trunk/org.vexi-build.vexi.archive/meta/module.xml 2011-09-23 06:32:06 UTC (rev 4257) @@ -7,7 +7,7 @@ <system name="jre" tag="1.5"/> <dependency source="local" name="vexidev.conf" /> <dependency source="ibiblio" org="org.antlr" name="stringtemplate" tag="3.2.1" /> - <dependency source="ebuild.org" name="api.plugin" /> - <dependency source="ebuild.org" name="lib.ant" /> + <dependency source="ebuild" name="api.plugin" /> + <dependency source="ebuild" name="lib.ant" /> </dependencies> </ebuild-module> Modified: trunk/org.vexi-build.vexi.archive/src/main/java/org/vexi/build/vexi/archive/VexidevProject.java =================================================================== --- trunk/org.vexi-build.vexi.archive/src/main/java/org/vexi/build/vexi/archive/VexidevProject.java 2011-09-23 00:20:41 UTC (rev 4256) +++ trunk/org.vexi-build.vexi.archive/src/main/java/org/vexi/build/vexi/archive/VexidevProject.java 2011-09-23 06:32:06 UTC (rev 4257) @@ -60,7 +60,7 @@ addSrcFolder("gen", scope, scopePath); - Collection<File> archives = module.getBuildDependencies(scope, "vexi.vexi"); + Collection<File> archives = module.getIDESetupArtifactDependencies(scope, null, "vexi.vexi"); for(File archive: archives){ if(seen.contains(archive)) continue; seen.add(archive); @@ -79,7 +79,7 @@ } - for(IModuleProject mod: module.getWorkspaceDependencies(scope)){ + for(IModuleProject mod: module.getIDESetupProjectDependencies(scope, null)){ if(seen.contains(mod)) continue; seen.add(mod); Modified: trunk/org.vexi-build.vexi.manifest/meta/module-build.xml =================================================================== --- trunk/org.vexi-build.vexi.manifest/meta/module-build.xml 2011-09-23 00:20:41 UTC (rev 4256) +++ trunk/org.vexi-build.vexi.manifest/meta/module-build.xml 2011-09-23 06:32:06 UTC (rev 4257) @@ -2,6 +2,6 @@ <using source="local" name="build.shared"/> <builders> - <builder source="ebuild.org" name="build.java.compile" /> + <builder source="ebuild" name="build.java.compile"/> </builders> </ebuild-module-build> Modified: trunk/org.vexi-build.vexi.manifest/meta/module.xml =================================================================== --- trunk/org.vexi-build.vexi.manifest/meta/module.xml 2011-09-23 00:20:41 UTC (rev 4256) +++ trunk/org.vexi-build.vexi.manifest/meta/module.xml 2011-09-23 06:32:06 UTC (rev 4257) @@ -5,7 +5,7 @@ <dependencies> <system name="java.jre" tag="1.5"/> - <dependency source="ebuild.org" name="api.plugin" /> - <dependency source="ebuild.org" name="lib.util" /> + <dependency source="ebuild" name="api.plugin" /> + <dependency source="ebuild" name="lib.util" /> </dependencies> </ebuild-module> 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-09-23 00:20:41 UTC (rev 4256) +++ trunk/org.vexi-build.vexi.manifest/src/main/java/org/vexi/build/vexi/manifest/VexiManifestBuilder.java 2011-09-23 06:32:06 UTC (rev 4257) @@ -7,7 +7,6 @@ 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; @@ -25,10 +24,10 @@ try { 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()); - } +// Map dependencies = new LinkedHashMap(); +// for(IModuleProject dep: module.getBuildArtifactDependencies(null)){ +// dependencies.put(dep.getName(),dep.getKey().getVersion().toString()); +// } JSONUtil.writeObject(new File(manifestDir, module.getName()),manifest); } catch (IOException e) { Modified: trunk/org.vexi-core.devtools/meta/module-build.xml =================================================================== --- trunk/org.vexi-core.devtools/meta/module-build.xml 2011-09-23 00:20:41 UTC (rev 4256) +++ trunk/org.vexi-core.devtools/meta/module-build.xml 2011-09-23 06:32:06 UTC (rev 4257) @@ -3,6 +3,6 @@ <builders> <builder source="local" name="build.jpp"/> - <builder source="ebuild.org" name="build.java.compile" /> + <builder source="ebuild" name="build.java.compile"/> </builders> </ebuild-module-build> Modified: trunk/org.vexi-core.download/meta/product-assembly.xml =================================================================== --- trunk/org.vexi-core.download/meta/product-assembly.xml 2011-09-23 00:20:41 UTC (rev 4256) +++ trunk/org.vexi-core.download/meta/product-assembly.xml 2011-09-23 06:32:06 UTC (rev 4257) @@ -5,27 +5,32 @@ <!-- 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="maven-public" org="org.apache.httpcomponents" name="httpclient"/> <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" > + <assembler source="ebuild" name="build.java.jarmerge" > <input ref="constituents"/> </assembler> </then> <else> - <assembler source="ebuild.org" name="build.java.jarshrink"> + <assembler source="ebuild" name="build.java.jarshrink"> <input name="shrink" ref="constituents"/> <input name="preserve"> <module-selection conf-mapping="!noshrink->nodebug" artifact="java_classes.jar"> + <!-- nested vm truetype stuff breaks when shrunk --> <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"/> + <!-- do not need shrinking --> + <include source="local" name="core.devtools" conf="devtools"/> + <!-- HACK/WORKAROUND should not have to include version here (duplicated with module) + SHOULD instead be able to select a module dependency by pattern --> + <include source="maven-public" org="org.apache.httpcomponents" name="httpclient" conf="apache_http" tag="4.1.1"/> + </module-selection> </input> <property key="proguard_options"> Modified: trunk/org.vexi-distribution/meta/product-assembly.xml =================================================================== --- trunk/org.vexi-distribution/meta/product-assembly.xml 2011-09-23 00:20:41 UTC (rev 4256) +++ trunk/org.vexi-distribution/meta/product-assembly.xml 2011-09-23 06:32:06 UTC (rev 4257) @@ -2,7 +2,7 @@ <using source="local" name="build.shared"/> <target name="files"> - <assembler source="ebuild.org" name="build.file.layout"> + <assembler source="ebuild" name="build.file.layout"> <input name="jsdoc"> <product source="local" name="docs.reference.script" conf="docs"/> </input> @@ -24,7 +24,7 @@ </assembler> </target> <target name="vexi_dist"> - <assembler source="ebuild.org" name="build.file.archive"> + <assembler source="ebuild" name="build.file.archive"> <input name="files" ref="files"/> <property key="prefix-path-with-name" value="true"/> </assembler> Modified: trunk/org.vexi-launcher.vexi_org/meta/module-build.xml =================================================================== --- trunk/org.vexi-launcher.vexi_org/meta/module-build.xml 2011-09-23 00:20:41 UTC (rev 4256) +++ trunk/org.vexi-launcher.vexi_org/meta/module-build.xml 2011-09-23 06:32:06 UTC (rev 4257) @@ -1,7 +1,7 @@ <ebuild-module-build ebuild-version="0.8"> <using source="local" name="library.util" context="build"/> <builders> - <builder source="ebuild.org" name="build.java.versionclass" /> + <builder source="ebuild" name="build.java.versionclass"/> <builder refid="javac" /> </builders> </ebuild-module-build> \ No newline at end of file Modified: trunk/org.vexi-launcher.vexi_org/meta/product-assembly.xml =================================================================== --- trunk/org.vexi-launcher.vexi_org/meta/product-assembly.xml 2011-09-23 00:20:41 UTC (rev 4256) +++ trunk/org.vexi-launcher.vexi_org/meta/product-assembly.xml 2011-09-23 06:32:06 UTC (rev 4257) @@ -8,7 +8,7 @@ </module-selection> </target> <target name="jar"> - <assembler source="ebuild.org" name="build.java.jarmerge"> + <assembler source="ebuild" name="build.java.jarmerge"> <input ref="constituents" /> </assembler> <!-- BROKEN - shrinking the jar breaks the launcher (at least for 1.5 and before) @@ -16,12 +16,12 @@ <if cond="noshrink"> <then> - <assembler source="ebuild.org" name="build.java.jarmerge" > + <assembler source="ebuild" name="build.java.jarmerge" > <input ref="constituents"/> </assembler> </then> <else> - <assembler source="ebuild.org" name="build.java.jarshrink"> + <assembler source="ebuild" name="build.java.jarshrink"> <input name="shrink" ref="constituents"/> <property key="proguard_options"> -dontobfuscate @@ -35,7 +35,7 @@ </if> --> </target> <target name="signed"> - <assembler source="ebuild.org" name="build.java.jarsign"> + <assembler source="ebuild" name="build.java.jarsign"> <property key="key" value="launcher"/> <input ref="jar"/> </assembler> Modified: trunk/org.vexi-library.js/meta/module-build.xml =================================================================== --- trunk/org.vexi-library.js/meta/module-build.xml 2011-09-23 00:20:41 UTC (rev 4256) +++ trunk/org.vexi-library.js/meta/module-build.xml 2011-09-23 06:32:06 UTC (rev 4257) @@ -7,7 +7,7 @@ <builder refid="javac" /> <builder refid="javaexport" /> - <builder id="jppexport" source="ebuild.org" name="build.export.zip" conf-mapping="->artifact=jpp"/> + <builder id="jppexport" source="ebuild" name="build.export.zip" conf-mapping="->artifact=jpp"/> </builders> </ebuild-module-build> Modified: trunk/org.vexi-library.testing/meta/module-build.xml =================================================================== --- trunk/org.vexi-library.testing/meta/module-build.xml 2011-09-23 00:20:41 UTC (rev 4256) +++ trunk/org.vexi-library.testing/meta/module-build.xml 2011-09-23 06:32:06 UTC (rev 4257) @@ -2,7 +2,7 @@ <using source="local" name="build.shared"/> <builders> - <builder source="ebuild.org" name="build.java.compile" /> + <builder source="ebuild" name="build.java.compile"/> </builders> </ebuild-module> Modified: trunk/org.vexi-library.util/meta/module-build.xml =================================================================== --- trunk/org.vexi-library.util/meta/module-build.xml 2011-09-23 00:20:41 UTC (rev 4256) +++ trunk/org.vexi-library.util/meta/module-build.xml 2011-09-23 06:32:06 UTC (rev 4257) @@ -1,9 +1,9 @@ <ebuild-module-build ebuild-version="0.8"> <using source="local" name="build.shared"/> <builders> - <builder id="javac" source="ebuild.org" name="build.java.compile"> + <builder id="javac" source="ebuild" name="build.java.compile"> <property key="debug" conf="nodebug" value="false"/> </builder> - <builder id="javaexport" source="ebuild.org" name="build.export.zip" conf-mapping="->artifact=java"/> + <builder id="javaexport" source="ebuild" name="build.export.zip" conf-mapping="->artifact=java"/> </builders> </ebuild-module-build> Modified: trunk/org.vexi-tools.certify/meta/module-build.xml =================================================================== --- trunk/org.vexi-tools.certify/meta/module-build.xml 2011-09-23 00:20:41 UTC (rev 4256) +++ trunk/org.vexi-tools.certify/meta/module-build.xml 2011-09-23 06:32:06 UTC (rev 4257) @@ -1,6 +1,6 @@ <ebuild-module-build ebuild-version="0.8"> <using source="local" name="build.shared"/> <builders> - <builder source="ebuild.org" name="build.java.compile" /> + <builder source="ebuild" name="build.java.compile"/> </builders> </ebuild-module-build> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ All of the data generated in your IT infrastructure is seriously valuable. Why? It contains a definitive record of application performance, security threats, fraudulent activity, and more. Splunk takes this data and makes sense of it. IT sense. And common sense. http://p.sf.net/sfu/splunk-d2dcopy2 _______________________________________________ Vexi-svn mailing list Vexi-svn@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/vexi-svn