Revision: 4523 http://sourceforge.net/p/vexi/code/4523 Author: mkpg2 Date: 2013-05-24 11:28:02 +0000 (Fri, 24 May 2013) Log Message: ----------- Update-fix build. Build needed to reflect the fact that we are now in a branch, but some library and build module dependencies remain in the trunk.
Modified Paths: -------------- branches/vexi3/org.vexi-core.devtools/meta/module-build.xml branches/vexi3/org.vexi-core.download/meta/product-assembly.xml branches/vexi3/org.vexi-core.main/meta/module-build.xml branches/vexi3/org.vexi-core.main/meta/module.xml branches/vexi3/org.vexi-core.truetype/meta/module-build.xml branches/vexi3/org.vexi-distribution/meta/product-assembly.xml branches/vexi3/org.vexi-docs.reference.script/meta/product-assembly.xml branches/vexi3/org.vexi-library.io/meta/module-build.xml branches/vexi3/org.vexi-library.io/meta/module.xml branches/vexi3/org.vexi-library.js/meta/module-build.xml branches/vexi3/org.vexi-library.js/meta/module.xml branches/vexi3/org.vexi-library.net/meta/module-build.xml branches/vexi3/org.vexi-library.net/meta/module.xml branches/vexi3/org.vexi-library.value/meta/module-build.xml branches/vexi3/org.vexi-library.value/meta/module.xml branches/vexi3/org.vexi-vapp.calc/meta/module-build.xml branches/vexi3/org.vexi-vapp.codetutor/meta/module-build.xml branches/vexi3/org.vexi-vapp.examples/meta/module-build.xml branches/vexi3/org.vexi-vapp.jsoned/meta/module-build.xml branches/vexi3/org.vexi-vapp.viewfont/meta/module-build.xml branches/vexi3/org.vexi-vexi.demo/meta/module-build.xml branches/vexi3/org.vexi-vexi.guide/meta/module-build.xml branches/vexi3/org.vexi-vexi.icons/meta/module-build.xml branches/vexi3/org.vexi-vexi.pageflow/meta/module-build.xml branches/vexi3/org.vexi-vexi.theme.glass/.project branches/vexi3/org.vexi-vexi.theme.glass/.vexipath branches/vexi3/org.vexi-vexi.theme.glass/meta/module-build.xml branches/vexi3/org.vexi-vexi.vunit/meta/module-build.xml branches/vexi3/org.vexi-vexi.vunit.runner/meta/module-build.xml branches/vexi3/org.vexi-vexi.widgets/meta/module-build.xml branches/vexi3/org.vexi-vexi.widgets/src_poke/poke/widgets/textarea_largetext.t branches/vexi3/org.vexi-vexi.widgets_editrefactor/.project branches/vexi3/org.vexi-vexi.widgets_editrefactor/.vexipath branches/vexi3/org.vexi-vexi.widgets_editrefactor/meta/module-build.xml Added Paths: ----------- branches/vexi3/org.vexi-vapp.calc/.vexipath branches/vexi3/org.vexi-vapp.calc/gen_main/ branches/vexi3/org.vexi-vapp.calc/gen_main/manifest/ branches/vexi3/org.vexi-vapp.calc/gen_main/manifest/org.vexi-vapp.calc branches/vexi3/org.vexi-vapp.codetutor/.vexipath branches/vexi3/org.vexi-vapp.codetutor/gen_main/ branches/vexi3/org.vexi-vapp.codetutor/gen_main/manifest/ branches/vexi3/org.vexi-vapp.codetutor/gen_main/manifest/org.vexi-vapp.codetutor branches/vexi3/org.vexi-vapp.examples/.vexipath branches/vexi3/org.vexi-vapp.examples/gen_main/ branches/vexi3/org.vexi-vapp.examples/gen_main/manifest/ branches/vexi3/org.vexi-vapp.examples/gen_main/manifest/org.vexi-vapp.examples branches/vexi3/org.vexi-vapp.jsoned/.vexipath branches/vexi3/org.vexi-vapp.jsoned/gen_main/ branches/vexi3/org.vexi-vapp.jsoned/gen_main/manifest/ branches/vexi3/org.vexi-vapp.jsoned/gen_main/manifest/org.vexi-vapp.jsoned branches/vexi3/org.vexi-vapp.viewfont/gen_main/ branches/vexi3/org.vexi-vapp.viewfont/gen_main/manifest/ branches/vexi3/org.vexi-vapp.viewfont/gen_main/manifest/org.vexi-vapp.viewfont branches/vexi3/org.vexi-vexi.theme.glass/gen_main/ branches/vexi3/org.vexi-vexi.theme.glass/gen_main/manifest/ branches/vexi3/org.vexi-vexi.theme.glass/gen_main/manifest/org.vexi-vexi.theme.glass branches/vexi3/org.vexi-vexi.widgets_editrefactor/gen_main/ branches/vexi3/org.vexi-vexi.widgets_editrefactor/gen_main/manifest/ branches/vexi3/org.vexi-vexi.widgets_editrefactor/gen_main/manifest/org.vexi-vexi.widgets_editrefactor Modified: branches/vexi3/org.vexi-core.devtools/meta/module-build.xml =================================================================== --- branches/vexi3/org.vexi-core.devtools/meta/module-build.xml 2013-05-24 10:52:27 UTC (rev 4522) +++ branches/vexi3/org.vexi-core.devtools/meta/module-build.xml 2013-05-24 11:28:02 UTC (rev 4523) @@ -1,8 +1,8 @@ <ebuild-module-build ebuild-version="0.7"> - <using source="local" name="build.shared"/> + <using source="local" name="build.shared" branch="trunk" /> <builders> - <builder source="local" name="build.jpp"/> + <builder source="local" name="build.jpp" branch="trunk" /> <builder source="ebuild" name="build.java.compile"/> </builders> </ebuild-module-build> Modified: branches/vexi3/org.vexi-core.download/meta/product-assembly.xml =================================================================== --- branches/vexi3/org.vexi-core.download/meta/product-assembly.xml 2013-05-24 10:52:27 UTC (rev 4522) +++ branches/vexi3/org.vexi-core.download/meta/product-assembly.xml 2013-05-24 11:28:02 UTC (rev 4523) @@ -1,5 +1,5 @@ <ebuild-product-assembly ebuild-version="0.8"> - <using source="local" name="build.shared"/> + <using source="local" name="build.shared" branch="trunk" /> <target name="constituents"> <!-- Turn off debugging information, breaks shrinker --> @@ -19,7 +19,7 @@ </assembler> </then> <else> - <assembler source="ebuild" 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"> @@ -57,7 +57,7 @@ </assembler> </target> <target name="signed"> - <assembler source="local" name="build.sign"> + <assembler source="local" name="build.sign" branch="trunk" > <input ref="unsigned"/> <property key="secret_name" value="secret.vexi"/> </assembler> Modified: branches/vexi3/org.vexi-core.main/meta/module-build.xml =================================================================== --- branches/vexi3/org.vexi-core.main/meta/module-build.xml 2013-05-24 10:52:27 UTC (rev 4522) +++ branches/vexi3/org.vexi-core.main/meta/module-build.xml 2013-05-24 11:28:02 UTC (rev 4523) @@ -2,8 +2,8 @@ <using source="local" name="library.js" context="build"/> <builders> - <builder source="local" name="build.jpp" /> - <builder source="local" name="build.jencode" /> + <builder source="local" name="build.jpp" branch="trunk" /> + <builder source="local" name="build.jencode" branch="trunk" /> <builder refid="javac" /> <builder refid="javaexport" /> <builder refid="jppexport" /> Modified: branches/vexi3/org.vexi-core.main/meta/module.xml =================================================================== --- branches/vexi3/org.vexi-core.main/meta/module.xml 2013-05-24 10:52:27 UTC (rev 4522) +++ branches/vexi3/org.vexi-core.main/meta/module.xml 2013-05-24 11:28:02 UTC (rev 4523) @@ -6,6 +6,6 @@ <dependency source="local" name="library.js"/> <dependency source="local" name="core.truetype"/> <!-- Test Dependencies --> - <dependency source="local" name="library.testing" scope="test"/> + <dependency source="local" name="library.testing" branch="trunk" scope="test"/> </dependencies> </ebuild-module> Modified: branches/vexi3/org.vexi-core.truetype/meta/module-build.xml =================================================================== --- branches/vexi3/org.vexi-core.truetype/meta/module-build.xml 2013-05-24 10:52:27 UTC (rev 4522) +++ branches/vexi3/org.vexi-core.truetype/meta/module-build.xml 2013-05-24 11:28:02 UTC (rev 4523) @@ -1,5 +1,5 @@ <ebuild-module-build ebuild-version="0.8"> - <using source="local" name="library.util" context="build"/> + <using source="local" name="library.util" branch="trunk" context="build"/> <builders> <builder refid="javac"/> Modified: branches/vexi3/org.vexi-distribution/meta/product-assembly.xml =================================================================== --- branches/vexi3/org.vexi-distribution/meta/product-assembly.xml 2013-05-24 10:52:27 UTC (rev 4522) +++ branches/vexi3/org.vexi-distribution/meta/product-assembly.xml 2013-05-24 11:28:02 UTC (rev 4523) @@ -1,5 +1,5 @@ <ebuild-product-assembly ebuild-version="0.8"> - <using source="local" name="build.shared"/> + <using source="local" name="build.shared" branch="trunk" /> <target name="files"> <assembler source="ebuild" name="build.file.layout"> Modified: branches/vexi3/org.vexi-docs.reference.script/meta/product-assembly.xml =================================================================== --- branches/vexi3/org.vexi-docs.reference.script/meta/product-assembly.xml 2013-05-24 10:52:27 UTC (rev 4522) +++ branches/vexi3/org.vexi-docs.reference.script/meta/product-assembly.xml 2013-05-24 11:28:02 UTC (rev 4523) @@ -1,8 +1,8 @@ <ebuild-component-assembly ebuild-version="0.8">> - <using source="local" name="build.shared"/> + <using source="local" name="build.shared" branch="trunk" /> <target name="script_reference"> - <assembler source="local" name="build.jsdoc"> + <assembler source="local" name="build.jsdoc" branch="trunk" > <input> <module-selection artifact="jpp.zip,java.zip"> <include source="local" name="core.main" dependencies="false"/> Modified: branches/vexi3/org.vexi-library.io/meta/module-build.xml =================================================================== --- branches/vexi3/org.vexi-library.io/meta/module-build.xml 2013-05-24 10:52:27 UTC (rev 4522) +++ branches/vexi3/org.vexi-library.io/meta/module-build.xml 2013-05-24 11:28:02 UTC (rev 4523) @@ -1,5 +1,5 @@ <ebuild-module-build ebuild-version="0.8"> - <using source="local" name="library.util" context="build"/> + <using source="local" name="library.util" branch="trunk" context="build"/> <builders> <builder refid="javac" /> Modified: branches/vexi3/org.vexi-library.io/meta/module.xml =================================================================== --- branches/vexi3/org.vexi-library.io/meta/module.xml 2013-05-24 10:52:27 UTC (rev 4522) +++ branches/vexi3/org.vexi-library.io/meta/module.xml 2013-05-24 11:28:02 UTC (rev 4523) @@ -2,6 +2,6 @@ <artifact name="java_classes.jar" /> <dependencies> - <dependency source="local" name="library.util"/> + <dependency source="local" name="library.util" branch="trunk"/> </dependencies> </ebuild-module> Modified: branches/vexi3/org.vexi-library.js/meta/module-build.xml =================================================================== --- branches/vexi3/org.vexi-library.js/meta/module-build.xml 2013-05-24 10:52:27 UTC (rev 4522) +++ branches/vexi3/org.vexi-library.js/meta/module-build.xml 2013-05-24 11:28:02 UTC (rev 4523) @@ -1,9 +1,9 @@ <ebuild-module-build ebuild-version="0.8"> - <using source="local" name="library.util" context="build"/> + <using source="local" name="library.util" branch="trunk" context="build"/> <builders> - <builder source="local" name="build.jpp"/> + <builder source="local" name="build.jpp" branch="trunk" /> <builder refid="javac" /> <builder refid="javaexport" /> Modified: branches/vexi3/org.vexi-library.js/meta/module.xml =================================================================== --- branches/vexi3/org.vexi-library.js/meta/module.xml 2013-05-24 10:52:27 UTC (rev 4522) +++ branches/vexi3/org.vexi-library.js/meta/module.xml 2013-05-24 11:28:02 UTC (rev 4523) @@ -8,7 +8,7 @@ <dependency source="local" name="library.net"/> <dependency source="local" name="library.io"/> <!-- Test Dependencies --> - <dependency source="local" name="library.testing" scope="test"/> + <dependency source="local" name="library.testing" branch="trunk" scope="test"/> <dependency source="ibiblio" org="org.apache.xmlrpc" name="xmlrpc-server" tag="3.1.3" scope="test"/> </dependencies> </ebuild-module> Modified: branches/vexi3/org.vexi-library.net/meta/module-build.xml =================================================================== --- branches/vexi3/org.vexi-library.net/meta/module-build.xml 2013-05-24 10:52:27 UTC (rev 4522) +++ branches/vexi3/org.vexi-library.net/meta/module-build.xml 2013-05-24 11:28:02 UTC (rev 4523) @@ -1,8 +1,8 @@ <ebuild-module-build ebuild-version="0.8"> - <using source="local" name="library.util" context="build"/> + <using source="local" name="library.util" branch="trunk" context="build"/> <builders> - <builder source="local" name="build.jpp"> + <builder source="local" name="build.jpp" branch="trunk" > <property key="defines" conf="apache_http"> { "APACHE_HTTP": "true" } </property> Modified: branches/vexi3/org.vexi-library.net/meta/module.xml =================================================================== --- branches/vexi3/org.vexi-library.net/meta/module.xml 2013-05-24 10:52:27 UTC (rev 4522) +++ branches/vexi3/org.vexi-library.net/meta/module.xml 2013-05-24 11:28:02 UTC (rev 4523) @@ -11,12 +11,12 @@ <!-- <checked-in name="httpcore-4.0.1.jar" conf="apache_http" type="java_classes.jar"/> --> <dependency source="maven-public" conf="apache_http" org="org.apache.httpcomponents" name="httpclient" tag="4.1.1"/> - <dependency source="local" name="library.crypto" /> + <dependency source="local" name="library.crypto" branch="trunk"/> <!-- Test Dependencies --> <dependency source="maven-public" org="junit" name="junit" tag="3.8.2" scope="test"/> <dependency source="maven-public" org="org.mortbay.jetty" name="jetty" tag="6.1.24" scope="test"/> - <dependency source="local" org="org.vexi" name="library.testing" scope="test"/> + <dependency source="local" org="org.vexi" name="library.testing" branch="trunk" scope="test"/> </dependencies> </ebuild-module> Modified: branches/vexi3/org.vexi-library.value/meta/module-build.xml =================================================================== --- branches/vexi3/org.vexi-library.value/meta/module-build.xml 2013-05-24 10:52:27 UTC (rev 4522) +++ branches/vexi3/org.vexi-library.value/meta/module-build.xml 2013-05-24 11:28:02 UTC (rev 4523) @@ -1,5 +1,5 @@ <ebuild-module-build ebuild-version="0.8"> - <using source="local" name="build.shared"/> + <using source="local" name="build.shared" branch="trunk" /> <builders> <builder id="javac" source="ebuild" name="build.java.compile"> <property key="debug" conf="nodebug" value="false"/> Modified: branches/vexi3/org.vexi-library.value/meta/module.xml =================================================================== --- branches/vexi3/org.vexi-library.value/meta/module.xml 2013-05-24 10:52:27 UTC (rev 4522) +++ branches/vexi3/org.vexi-library.value/meta/module.xml 2013-05-24 11:28:02 UTC (rev 4523) @@ -5,7 +5,7 @@ <dependencies> <system name="java.jre" tag="1.4"/> <!-- Test dependencies --> - <dependency source="local" org="org.vexi" name="library.testing" scope="test"/> + <dependency source="local" org="org.vexi" name="library.testing" branch="trunk" scope="test"/> <dependency source="ibiblio" org="junit" name="junit" tag="3.8.1" scope="test"/> <dependency source="ibiblio" org="commons-collections" name="commons-collections-testframework" tag="3.1" scope="test"/> </dependencies> Added: branches/vexi3/org.vexi-vapp.calc/.vexipath =================================================================== --- branches/vexi3/org.vexi-vapp.calc/.vexipath (rev 0) +++ branches/vexi3/org.vexi-vapp.calc/.vexipath 2013-05-24 11:28:02 UTC (rev 4523) @@ -0,0 +1,21 @@ +<project-path> + <core path="C:\Users\Mike\Eclipse\vexi3\org.vexi-core.download\release\vexi3-branch_vexi3-working.jar"/> + <main> + <sources> + <source-dir path="src_main"/> + <source-dir path="gen_main"/> + </sources> + <dependencies> + <path-entry type="project" name="org.vexi-vexi.widgets"/> + <path-entry type="project" name="org.vexi-vexi.icons"/> + </dependencies> + </main> + <test> + <sources/> + <dependencies/> + </test> + <poke> + <sources/> + <dependencies/> + </poke> +</project-path> \ No newline at end of file Added: branches/vexi3/org.vexi-vapp.calc/gen_main/manifest/org.vexi-vapp.calc =================================================================== --- branches/vexi3/org.vexi-vapp.calc/gen_main/manifest/org.vexi-vapp.calc (rev 0) +++ branches/vexi3/org.vexi-vapp.calc/gen_main/manifest/org.vexi-vapp.calc 2013-05-24 11:28:02 UTC (rev 4523) @@ -0,0 +1 @@ +{"version":"branch_vexi3-working"} \ No newline at end of file Modified: branches/vexi3/org.vexi-vapp.calc/meta/module-build.xml =================================================================== --- branches/vexi3/org.vexi-vapp.calc/meta/module-build.xml 2013-05-24 10:52:27 UTC (rev 4522) +++ branches/vexi3/org.vexi-vapp.calc/meta/module-build.xml 2013-05-24 11:28:02 UTC (rev 4523) @@ -1,8 +1,8 @@ <ebuild-module-build ebuild-version="0.8"> - <using source="local" name="build.shared"/> + <using source="local" name="build.shared" branch="trunk" /> <builders> - <builder source="local" name="build.vexi.manifest" /> - <builder source="local" name="build.vexi.archive" /> + <builder source="local" name="build.vexi.manifest" branch="trunk" /> + <builder source="local" name="build.vexi.archive" branch="trunk" /> </builders> </ebuild-module-build> \ No newline at end of file Added: branches/vexi3/org.vexi-vapp.codetutor/.vexipath =================================================================== --- branches/vexi3/org.vexi-vapp.codetutor/.vexipath (rev 0) +++ branches/vexi3/org.vexi-vapp.codetutor/.vexipath 2013-05-24 11:28:02 UTC (rev 4523) @@ -0,0 +1,21 @@ +<project-path> + <core path="C:\Users\Mike\Eclipse\vexi3\org.vexi-core.download\release\vexi3-branch_vexi3-working.jar"/> + <main> + <sources> + <source-dir path="src_main"/> + <source-dir path="gen_main"/> + </sources> + <dependencies> + <path-entry type="project" name="org.vexi-vexi.widgets"/> + <path-entry type="project" name="org.vexi-vexi.icons"/> + </dependencies> + </main> + <test> + <sources/> + <dependencies/> + </test> + <poke> + <sources/> + <dependencies/> + </poke> +</project-path> \ No newline at end of file Added: branches/vexi3/org.vexi-vapp.codetutor/gen_main/manifest/org.vexi-vapp.codetutor =================================================================== --- branches/vexi3/org.vexi-vapp.codetutor/gen_main/manifest/org.vexi-vapp.codetutor (rev 0) +++ branches/vexi3/org.vexi-vapp.codetutor/gen_main/manifest/org.vexi-vapp.codetutor 2013-05-24 11:28:02 UTC (rev 4523) @@ -0,0 +1 @@ +{"version":"branch_vexi3-working"} \ No newline at end of file Modified: branches/vexi3/org.vexi-vapp.codetutor/meta/module-build.xml =================================================================== --- branches/vexi3/org.vexi-vapp.codetutor/meta/module-build.xml 2013-05-24 10:52:27 UTC (rev 4522) +++ branches/vexi3/org.vexi-vapp.codetutor/meta/module-build.xml 2013-05-24 11:28:02 UTC (rev 4523) @@ -1,8 +1,8 @@ <ebuild-module-build ebuild-version="0.8"> - <using source="local" name="build.shared"/> + <using source="local" name="build.shared" branch="trunk" /> <builders> - <builder source="local" name="build.vexi.manifest" /> - <builder source="local" name="build.vexi.archive" /> + <builder source="local" name="build.vexi.manifest" branch="trunk" /> + <builder source="local" name="build.vexi.archive" branch="trunk" /> </builders> </ebuild-module-build> \ No newline at end of file Added: branches/vexi3/org.vexi-vapp.examples/.vexipath =================================================================== --- branches/vexi3/org.vexi-vapp.examples/.vexipath (rev 0) +++ branches/vexi3/org.vexi-vapp.examples/.vexipath 2013-05-24 11:28:02 UTC (rev 4523) @@ -0,0 +1,21 @@ +<project-path> + <core path="C:\Users\Mike\Eclipse\vexi3\org.vexi-core.download\release\vexi3-branch_vexi3-working.jar"/> + <main> + <sources> + <source-dir path="src_main"/> + <source-dir path="gen_main"/> + </sources> + <dependencies> + <path-entry type="project" name="org.vexi-vexi.widgets"/> + <path-entry type="project" name="org.vexi-vexi.icons"/> + </dependencies> + </main> + <test> + <sources/> + <dependencies/> + </test> + <poke> + <sources/> + <dependencies/> + </poke> +</project-path> \ No newline at end of file Added: branches/vexi3/org.vexi-vapp.examples/gen_main/manifest/org.vexi-vapp.examples =================================================================== --- branches/vexi3/org.vexi-vapp.examples/gen_main/manifest/org.vexi-vapp.examples (rev 0) +++ branches/vexi3/org.vexi-vapp.examples/gen_main/manifest/org.vexi-vapp.examples 2013-05-24 11:28:02 UTC (rev 4523) @@ -0,0 +1 @@ +{"version":"branch_vexi3-working"} \ No newline at end of file Modified: branches/vexi3/org.vexi-vapp.examples/meta/module-build.xml =================================================================== --- branches/vexi3/org.vexi-vapp.examples/meta/module-build.xml 2013-05-24 10:52:27 UTC (rev 4522) +++ branches/vexi3/org.vexi-vapp.examples/meta/module-build.xml 2013-05-24 11:28:02 UTC (rev 4523) @@ -1,8 +1,8 @@ <ebuild-module-build ebuild-version="0.8"> - <using source="local" name="build.shared"/> + <using source="local" name="build.shared" branch="trunk" /> <builders> - <builder source="local" name="build.vexi.manifest" /> - <builder source="local" name="build.vexi.archive" /> + <builder source="local" name="build.vexi.manifest" branch="trunk" /> + <builder source="local" name="build.vexi.archive" branch="trunk" /> </builders> </ebuild-module-build> \ No newline at end of file Added: branches/vexi3/org.vexi-vapp.jsoned/.vexipath =================================================================== --- branches/vexi3/org.vexi-vapp.jsoned/.vexipath (rev 0) +++ branches/vexi3/org.vexi-vapp.jsoned/.vexipath 2013-05-24 11:28:02 UTC (rev 4523) @@ -0,0 +1,21 @@ +<project-path> + <core path="C:\Users\Mike\Eclipse\vexi3\org.vexi-core.download\release\vexi3-branch_vexi3-working.jar"/> + <main> + <sources> + <source-dir path="src_main"/> + <source-dir path="gen_main"/> + </sources> + <dependencies> + <path-entry type="project" name="org.vexi-vexi.widgets"/> + <path-entry type="project" name="org.vexi-vexi.icons"/> + </dependencies> + </main> + <test> + <sources/> + <dependencies/> + </test> + <poke> + <sources/> + <dependencies/> + </poke> +</project-path> \ No newline at end of file Added: branches/vexi3/org.vexi-vapp.jsoned/gen_main/manifest/org.vexi-vapp.jsoned =================================================================== --- branches/vexi3/org.vexi-vapp.jsoned/gen_main/manifest/org.vexi-vapp.jsoned (rev 0) +++ branches/vexi3/org.vexi-vapp.jsoned/gen_main/manifest/org.vexi-vapp.jsoned 2013-05-24 11:28:02 UTC (rev 4523) @@ -0,0 +1 @@ +{"version":"branch_vexi3-working"} \ No newline at end of file Modified: branches/vexi3/org.vexi-vapp.jsoned/meta/module-build.xml =================================================================== --- branches/vexi3/org.vexi-vapp.jsoned/meta/module-build.xml 2013-05-24 10:52:27 UTC (rev 4522) +++ branches/vexi3/org.vexi-vapp.jsoned/meta/module-build.xml 2013-05-24 11:28:02 UTC (rev 4523) @@ -1,8 +1,8 @@ <ebuild-module-build ebuild-version="0.8"> - <using source="local" name="build.shared"/> + <using source="local" name="build.shared" branch="trunk" /> <builders> - <builder source="local" name="build.vexi.manifest" /> - <builder source="local" name="build.vexi.archive" /> + <builder source="local" name="build.vexi.manifest" branch="trunk" /> + <builder source="local" name="build.vexi.archive" branch="trunk" /> </builders> </ebuild-module-build> \ No newline at end of file Added: branches/vexi3/org.vexi-vapp.viewfont/gen_main/manifest/org.vexi-vapp.viewfont =================================================================== --- branches/vexi3/org.vexi-vapp.viewfont/gen_main/manifest/org.vexi-vapp.viewfont (rev 0) +++ branches/vexi3/org.vexi-vapp.viewfont/gen_main/manifest/org.vexi-vapp.viewfont 2013-05-24 11:28:02 UTC (rev 4523) @@ -0,0 +1 @@ +{"version":"branch_vexi3-working"} \ No newline at end of file Modified: branches/vexi3/org.vexi-vapp.viewfont/meta/module-build.xml =================================================================== --- branches/vexi3/org.vexi-vapp.viewfont/meta/module-build.xml 2013-05-24 10:52:27 UTC (rev 4522) +++ branches/vexi3/org.vexi-vapp.viewfont/meta/module-build.xml 2013-05-24 11:28:02 UTC (rev 4523) @@ -1,8 +1,8 @@ <ebuild-module-build ebuild-version="0.8"> - <using source="local" name="build.shared"/> + <using source="local" name="build.shared" branch="trunk" /> <builders> - <builder source="local" name="build.vexi.manifest" /> - <builder source="local" name="build.vexi.archive" /> + <builder source="local" name="build.vexi.manifest" branch="trunk" /> + <builder source="local" name="build.vexi.archive" branch="trunk" /> </builders> </ebuild-module-build> \ No newline at end of file Modified: branches/vexi3/org.vexi-vexi.demo/meta/module-build.xml =================================================================== --- branches/vexi3/org.vexi-vexi.demo/meta/module-build.xml 2013-05-24 10:52:27 UTC (rev 4522) +++ branches/vexi3/org.vexi-vexi.demo/meta/module-build.xml 2013-05-24 11:28:02 UTC (rev 4523) @@ -1,8 +1,8 @@ <ebuild-module-build ebuild-version="0.8"> - <using source="local" name="build.shared"/> + <using source="local" name="build.shared" branch="trunk" /> <builders> - <builder source="local" name="build.vexi.manifest" /> - <builder source="local" name="build.vexi.archive" /> + <builder source="local" name="build.vexi.manifest" branch="trunk" /> + <builder source="local" name="build.vexi.archive" branch="trunk" /> </builders> </ebuild-module-build> \ No newline at end of file Modified: branches/vexi3/org.vexi-vexi.guide/meta/module-build.xml =================================================================== --- branches/vexi3/org.vexi-vexi.guide/meta/module-build.xml 2013-05-24 10:52:27 UTC (rev 4522) +++ branches/vexi3/org.vexi-vexi.guide/meta/module-build.xml 2013-05-24 11:28:02 UTC (rev 4523) @@ -1,8 +1,8 @@ <ebuild-module-build ebuild-version="0.8"> - <using source="local" name="build.shared"/> + <using source="local" name="build.shared" branch="trunk" /> <builders> - <builder source="local" name="build.vexi.manifest" /> - <builder source="local" name="build.vexi.archive" /> + <builder source="local" name="build.vexi.manifest" branch="trunk" /> + <builder source="local" name="build.vexi.archive" branch="trunk" /> </builders> </ebuild-module-build> Modified: branches/vexi3/org.vexi-vexi.icons/meta/module-build.xml =================================================================== --- branches/vexi3/org.vexi-vexi.icons/meta/module-build.xml 2013-05-24 10:52:27 UTC (rev 4522) +++ branches/vexi3/org.vexi-vexi.icons/meta/module-build.xml 2013-05-24 11:28:02 UTC (rev 4523) @@ -1,8 +1,8 @@ <ebuild-module-build ebuild-version="0.8"> - <using source="local" name="build.shared"/> + <using source="local" name="build.shared" branch="trunk" /> <builders> - <builder source="local" name="build.vexi.manifest" /> - <builder source="local" name="build.vexi.archive" /> + <builder source="local" name="build.vexi.manifest" branch="trunk" /> + <builder source="local" name="build.vexi.archive" branch="trunk" /> </builders> </ebuild-module-build> Modified: branches/vexi3/org.vexi-vexi.pageflow/meta/module-build.xml =================================================================== --- branches/vexi3/org.vexi-vexi.pageflow/meta/module-build.xml 2013-05-24 10:52:27 UTC (rev 4522) +++ branches/vexi3/org.vexi-vexi.pageflow/meta/module-build.xml 2013-05-24 11:28:02 UTC (rev 4523) @@ -1,8 +1,8 @@ <ebuild-module-build ebuild-version="0.8"> - <using source="local" name="build.shared"/> + <using source="local" name="build.shared" branch="trunk" /> <builders> - <builder source="local" name="build.vexi.manifest" /> - <builder source="local" name="build.vexi.archive" /> + <builder source="local" name="build.vexi.manifest" branch="trunk" /> + <builder source="local" name="build.vexi.archive" branch="trunk" /> </builders> </ebuild-module-build> Modified: branches/vexi3/org.vexi-vexi.theme.glass/.project =================================================================== --- branches/vexi3/org.vexi-vexi.theme.glass/.project 2013-05-24 10:52:27 UTC (rev 4522) +++ branches/vexi3/org.vexi-vexi.theme.glass/.project 2013-05-24 11:28:02 UTC (rev 4523) @@ -6,12 +6,13 @@ </projects> <buildSpec> <buildCommand> - <name>org.vexi.vexidev.vexiBuilder</name> - <arguments> - </arguments> - </buildCommand> + <name>org.vexi.vexidev.vexiBuilder</name> + <arguments/> + </buildCommand> + </buildSpec> <natures> <nature>org.vexi.vexidev.vexiNature</nature> + </natures> </projectDescription> Modified: branches/vexi3/org.vexi-vexi.theme.glass/.vexipath =================================================================== --- branches/vexi3/org.vexi-vexi.theme.glass/.vexipath 2013-05-24 10:52:27 UTC (rev 4522) +++ branches/vexi3/org.vexi-vexi.theme.glass/.vexipath 2013-05-24 11:28:02 UTC (rev 4523) @@ -1,9 +1,13 @@ <project-path> + <core path="C:\Users\Mike\Eclipse\vexi3\org.vexi-core.download\release\vexi3-branch_vexi3-working.jar"/> <main> <sources> <source-dir path="src_main"/> + <source-dir path="gen_main"/> </sources> - <dependencies/> + <dependencies> + <path-entry type="project" name="org.vexi-vexi.widgets"/> + </dependencies> </main> <test> <sources/> Added: branches/vexi3/org.vexi-vexi.theme.glass/gen_main/manifest/org.vexi-vexi.theme.glass =================================================================== --- branches/vexi3/org.vexi-vexi.theme.glass/gen_main/manifest/org.vexi-vexi.theme.glass (rev 0) +++ branches/vexi3/org.vexi-vexi.theme.glass/gen_main/manifest/org.vexi-vexi.theme.glass 2013-05-24 11:28:02 UTC (rev 4523) @@ -0,0 +1 @@ +{"version":"branch_vexi3-working"} \ No newline at end of file Modified: branches/vexi3/org.vexi-vexi.theme.glass/meta/module-build.xml =================================================================== --- branches/vexi3/org.vexi-vexi.theme.glass/meta/module-build.xml 2013-05-24 10:52:27 UTC (rev 4522) +++ branches/vexi3/org.vexi-vexi.theme.glass/meta/module-build.xml 2013-05-24 11:28:02 UTC (rev 4523) @@ -1,8 +1,8 @@ <ebuild-module-build ebuild-version="0.8"> - <using source="local" name="build.shared"/> + <using source="local" name="build.shared" branch="trunk" /> <builders> - <builder source="local" name="build.vexi.manifest" /> - <builder source="local" name="build.vexi.archive" /> + <builder source="local" name="build.vexi.manifest" branch="trunk" /> + <builder source="local" name="build.vexi.archive" branch="trunk" /> </builders> </ebuild-module-build> Modified: branches/vexi3/org.vexi-vexi.vunit/meta/module-build.xml =================================================================== --- branches/vexi3/org.vexi-vexi.vunit/meta/module-build.xml 2013-05-24 10:52:27 UTC (rev 4522) +++ branches/vexi3/org.vexi-vexi.vunit/meta/module-build.xml 2013-05-24 11:28:02 UTC (rev 4523) @@ -1,8 +1,8 @@ <ebuild-module-build ebuild-version="0.8"> - <using source="local" name="build.shared"/> + <using source="local" name="build.shared" branch="trunk" /> <builders> - <builder source="local" name="build.vexi.manifest" /> - <builder source="local" name="build.vexi.archive" /> + <builder source="local" name="build.vexi.manifest" branch="trunk" /> + <builder source="local" name="build.vexi.archive" branch="trunk" /> </builders> </ebuild-module-build> Modified: branches/vexi3/org.vexi-vexi.vunit.runner/meta/module-build.xml =================================================================== --- branches/vexi3/org.vexi-vexi.vunit.runner/meta/module-build.xml 2013-05-24 10:52:27 UTC (rev 4522) +++ branches/vexi3/org.vexi-vexi.vunit.runner/meta/module-build.xml 2013-05-24 11:28:02 UTC (rev 4523) @@ -1,8 +1,8 @@ <ebuild-module-build ebuild-version="0.8"> - <using source="local" name="build.shared"/> + <using source="local" name="build.shared" branch="trunk" /> <builders> - <builder source="local" name="build.vexi.manifest" /> - <builder source="local" name="build.vexi.archive" /> + <builder source="local" name="build.vexi.manifest" branch="trunk" /> + <builder source="local" name="build.vexi.archive" branch="trunk" /> </builders> </ebuild-module-build> Modified: branches/vexi3/org.vexi-vexi.widgets/meta/module-build.xml =================================================================== --- branches/vexi3/org.vexi-vexi.widgets/meta/module-build.xml 2013-05-24 10:52:27 UTC (rev 4522) +++ branches/vexi3/org.vexi-vexi.widgets/meta/module-build.xml 2013-05-24 11:28:02 UTC (rev 4523) @@ -1,8 +1,8 @@ <ebuild-module-build ebuild-version="0.8"> - <using source="local" name="build.shared"/> + <using source="local" name="build.shared" branch="trunk" /> <builders> - <builder source="local" name="build.vexi.manifest" /> - <builder source="local" name="build.vexi.archive" /> + <builder source="local" name="build.vexi.manifest" branch="trunk" /> + <builder source="local" name="build.vexi.archive" branch="trunk" /> </builders> </ebuild-module-build> Modified: branches/vexi3/org.vexi-vexi.widgets/src_poke/poke/widgets/textarea_largetext.t =================================================================== --- branches/vexi3/org.vexi-vexi.widgets/src_poke/poke/widgets/textarea_largetext.t 2013-05-24 10:52:27 UTC (rev 4522) +++ branches/vexi3/org.vexi-vexi.widgets/src_poke/poke/widgets/textarea_largetext.t 2013-05-24 11:28:02 UTC (rev 4523) @@ -21,8 +21,8 @@ trace("1: time taken: "+(t1-t0)+"ms"); return; + }; - </ui:Box> </vexi> \ No newline at end of file Modified: branches/vexi3/org.vexi-vexi.widgets_editrefactor/.project =================================================================== --- branches/vexi3/org.vexi-vexi.widgets_editrefactor/.project 2013-05-24 10:52:27 UTC (rev 4522) +++ branches/vexi3/org.vexi-vexi.widgets_editrefactor/.project 2013-05-24 11:28:02 UTC (rev 4523) @@ -6,12 +6,13 @@ </projects> <buildSpec> <buildCommand> - <name>org.vexi.vexidev.vexiBuilder</name> - <arguments> - </arguments> - </buildCommand> + <name>org.vexi.vexidev.vexiBuilder</name> + <arguments/> + </buildCommand> + </buildSpec> <natures> <nature>org.vexi.vexidev.vexiNature</nature> + </natures> </projectDescription> Modified: branches/vexi3/org.vexi-vexi.widgets_editrefactor/.vexipath =================================================================== --- branches/vexi3/org.vexi-vexi.widgets_editrefactor/.vexipath 2013-05-24 10:52:27 UTC (rev 4522) +++ branches/vexi3/org.vexi-vexi.widgets_editrefactor/.vexipath 2013-05-24 11:28:02 UTC (rev 4523) @@ -1,15 +1,17 @@ <project-path> + <core path="C:\Users\Mike\Eclipse\vexi3\org.vexi-core.download\release\vexi3-branch_vexi3-working.jar"/> <main> <sources> <source-dir path="src_main"/> + <source-dir path="gen_main"/> </sources> - <dependencies> - <path-entry type="project" name="org.vexi-vexi.widgets"/> - </dependencies> + <dependencies/> </main> <test> <sources/> - <dependencies/> + <dependencies> + <path-entry type="project" name="org.vexi-vexi.vunit"/> + </dependencies> </test> <poke> <sources/> Added: branches/vexi3/org.vexi-vexi.widgets_editrefactor/gen_main/manifest/org.vexi-vexi.widgets_editrefactor =================================================================== --- branches/vexi3/org.vexi-vexi.widgets_editrefactor/gen_main/manifest/org.vexi-vexi.widgets_editrefactor (rev 0) +++ branches/vexi3/org.vexi-vexi.widgets_editrefactor/gen_main/manifest/org.vexi-vexi.widgets_editrefactor 2013-05-24 11:28:02 UTC (rev 4523) @@ -0,0 +1 @@ +{"version":"branch_vexi3-working"} \ No newline at end of file Modified: branches/vexi3/org.vexi-vexi.widgets_editrefactor/meta/module-build.xml =================================================================== --- branches/vexi3/org.vexi-vexi.widgets_editrefactor/meta/module-build.xml 2013-05-24 10:52:27 UTC (rev 4522) +++ branches/vexi3/org.vexi-vexi.widgets_editrefactor/meta/module-build.xml 2013-05-24 11:28:02 UTC (rev 4523) @@ -1,8 +1,8 @@ <ebuild-module-build ebuild-version="0.8"> - <using source="local" name="build.shared"/> + <using source="local" name="build.shared" branch="trunk" /> <builders> - <builder source="local" name="build.vexi.manifest" /> - <builder source="local" name="build.vexi.archive" /> + <builder source="local" name="build.vexi.manifest" branch="trunk" /> + <builder source="local" name="build.vexi.archive" branch="trunk" /> </builders> </ebuild-module-build> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ Try New Relic Now & We'll Send You this Cool Shirt New Relic is the only SaaS-based application performance monitoring service that delivers powerful full stack analytics. Optimize and monitor your browser, app, & servers with just a few lines of code. Try New Relic and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may _______________________________________________ Vexi-svn mailing list Vexi-svn@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/vexi-svn