Revision: 4405
http://vexi.svn.sourceforge.net/vexi/?rev=4405&view=rev
Author: mkpg2
Date: 2012-06-18 13:52:35 +0000 (Mon, 18 Jun 2012)
Log Message:
-----------
Update-fix build. Point to new ebuild location.
Modified Paths:
--------------
trunk/org.vexi-build.deployment/meta/module.xml
trunk/org.vexi-build.jencode/meta/module.xml
trunk/org.vexi-build.jpp/meta/module.xml
trunk/org.vexi-build.jsdoc/meta/module.xml
trunk/org.vexi-build.shared/meta/module.revisions
trunk/org.vexi-build.shared/meta/module.xml
trunk/org.vexi-build.shrink/meta/module-build.xml
trunk/org.vexi-build.shrink/meta/module.xml
trunk/org.vexi-build.sign/meta/module.xml
trunk/org.vexi-build.vexi.archive/meta/module.revisions
trunk/org.vexi-build.vexi.archive/meta/module.xml
trunk/org.vexi-build.vexi.manifest/meta/module.xml
trunk/org.vexi-core.devtools/src/main/java/org/vexi/instrument/memory/Memory.java
trunk/org.vexi-core.devtools/src/main/java/org/vexi/instrument/memoryhist/MemoryHist.java
Modified: trunk/org.vexi-build.deployment/meta/module.xml
===================================================================
--- trunk/org.vexi-build.deployment/meta/module.xml 2012-06-03 03:08:17 UTC
(rev 4404)
+++ trunk/org.vexi-build.deployment/meta/module.xml 2012-06-18 13:52:35 UTC
(rev 4405)
@@ -4,8 +4,8 @@
<artifact name="java_classes.jar" />
<dependencies>
- <dependency source="local"
name="tools.certify" />
- <dependency source="ebuild"
name="api.plugin" />
- <dependency source="ebuild"
name="lib.util" />
+ <dependency source="local"
name="tools.certify" />
+ <dependency source="ebuild"
name="api.plugin" tag="0.8.0" />
+ <dependency source="ebuild-plugins"
name="lib.util" />
</dependencies>
</ebuild-module>
Modified: trunk/org.vexi-build.jencode/meta/module.xml
===================================================================
--- trunk/org.vexi-build.jencode/meta/module.xml 2012-06-03 03:08:17 UTC
(rev 4404)
+++ trunk/org.vexi-build.jencode/meta/module.xml 2012-06-18 13:52:35 UTC
(rev 4405)
@@ -2,8 +2,8 @@
<using source="local" name="build.shared"/>
<artifact name="java_classes.jar"/>
<dependencies>
- <dependency source="ebuild" name="api.plugin" />
- <dependency source="ebuild" name="lib.util" />
- <dependency source="local" name="library.util" />
+ <dependency source="ebuild" name="api.plugin" tag="0.8.0"/>
+ <dependency source="ebuild-plugins" name="lib.util" />
+ <dependency source="local" name="library.util" />
</dependencies>
</ebuild-module>
Modified: trunk/org.vexi-build.jpp/meta/module.xml
===================================================================
--- trunk/org.vexi-build.jpp/meta/module.xml 2012-06-03 03:08:17 UTC (rev
4404)
+++ trunk/org.vexi-build.jpp/meta/module.xml 2012-06-18 13:52:35 UTC (rev
4405)
@@ -2,11 +2,11 @@
<using source="local" name="build.shared"/>
<artifact name="java_classes.jar"/>
<dependencies>
- <dependency source="system" name="jre"
tag="1.6"/>
- <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="system" name="jre"
tag="1.6"/>
+ <dependency source="ebuild" name="api.plugin" tag="0.8.0"/>
+ <dependency source="ebuild-plugins" 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"/>
</dependencies>
</ebuild-module>
Modified: trunk/org.vexi-build.jsdoc/meta/module.xml
===================================================================
--- trunk/org.vexi-build.jsdoc/meta/module.xml 2012-06-03 03:08:17 UTC (rev
4404)
+++ trunk/org.vexi-build.jsdoc/meta/module.xml 2012-06-18 13:52:35 UTC (rev
4405)
@@ -2,10 +2,10 @@
<using source="local" name="build.shared"/>
<artifact name="java_classes.jar"/>
<dependencies>
- <dependency source="system" name="jre"
tag="1.6"/>
- <dependency source="ibiblio" org="org.freemarker" name="freemarker"
tag="2.3.14"/>
- <dependency source="ebuild" name="api.plugin" />
- <dependency source="ebuild" name="lib.util" />
- <dependency source="local" name="library.util" />
+ <dependency source="system" name="jre"
tag="1.6"/>
+ <dependency source="maven-public" org="org.freemarker"
name="freemarker" tag="2.3.14"/>
+ <dependency source="ebuild" name="api.plugin" tag="0.8.0"/>
+ <dependency source="ebuild-plugins" 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 2012-06-03 03:08:17 UTC
(rev 4404)
+++ trunk/org.vexi-build.shared/meta/module.revisions 2012-06-18 13:52:35 UTC
(rev 4405)
@@ -1 +1 @@
-{"https:\/\/svn.origo.ethz.ch\/ebuild":"500"}
\ No newline at end of file
+{"https:\/\/ebuild-project.org\/svn\/ebuild\/plugins":"19"}
\ No newline at end of file
Modified: trunk/org.vexi-build.shared/meta/module.xml
===================================================================
--- trunk/org.vexi-build.shared/meta/module.xml 2012-06-03 03:08:17 UTC (rev
4404)
+++ trunk/org.vexi-build.shared/meta/module.xml 2012-06-18 13:52:35 UTC (rev
4405)
@@ -1,14 +1,9 @@
<ebuild-module ebuild-version="0.8">
<repositories>
<repository
- name="ebuild.org"
- org="ebuild" type="svn"
url="https://svn.origo.ethz.ch/ebuild/"/>
- <!--
- <repository
- name="ebuild.org"
- ref="ebuild" tag="0.7"/>
- -->
-
+ name="ebuild-plugins"
+ branch="0.8"
+ org="ebuild" type="svn"
url="https://ebuild-project.org/svn/ebuild/plugins/"/>
</repositories>
<dependencies/>
</ebuild-module>
Modified: trunk/org.vexi-build.shrink/meta/module-build.xml
===================================================================
--- trunk/org.vexi-build.shrink/meta/module-build.xml 2012-06-03 03:08:17 UTC
(rev 4404)
+++ trunk/org.vexi-build.shrink/meta/module-build.xml 2012-06-18 13:52:35 UTC
(rev 4405)
@@ -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" tag="0.8"/>
</builders>
</ebuild-module-build>
Modified: trunk/org.vexi-build.shrink/meta/module.xml
===================================================================
--- trunk/org.vexi-build.shrink/meta/module.xml 2012-06-03 03:08:17 UTC (rev
4404)
+++ trunk/org.vexi-build.shrink/meta/module.xml 2012-06-18 13:52:35 UTC (rev
4405)
@@ -1,11 +1,10 @@
-<ebuild-module ebuild-version="pre-1.0">
+<ebuild-module ebuild-version="0.8">
<using source="local" name="build.shared"/>
<dependencies>
- <dependency source="ebuild.org"
name="api.plugin" />
- <dependency source="ebuild.org"
name="lib.util" />
- <dependency source="ebuild.org"
name="lib.ant" />
+ <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"/>
</dependencies>
</ebuild-module>
Modified: trunk/org.vexi-build.sign/meta/module.xml
===================================================================
--- trunk/org.vexi-build.sign/meta/module.xml 2012-06-03 03:08:17 UTC (rev
4404)
+++ trunk/org.vexi-build.sign/meta/module.xml 2012-06-18 13:52:35 UTC (rev
4405)
@@ -4,8 +4,8 @@
<artifact name="java_classes.jar" />
<dependencies>
- <dependency source="local"
name="tools.certify" />
- <dependency source="ebuild"
name="api.plugin" />
- <dependency source="ebuild"
name="lib.util" />
+ <dependency source="local"
name="tools.certify" />
+ <dependency source="ebuild"
name="api.plugin" tag="0.8.0"/>
+ <dependency source="ebuild-plugins"
name="lib.util" />
</dependencies>
</ebuild-module>
Modified: trunk/org.vexi-build.vexi.archive/meta/module.revisions
===================================================================
--- trunk/org.vexi-build.vexi.archive/meta/module.revisions 2012-06-03
03:08:17 UTC (rev 4404)
+++ trunk/org.vexi-build.vexi.archive/meta/module.revisions 2012-06-18
13:52:35 UTC (rev 4405)
@@ -1 +1 @@
-{"https:\/\/svn.origo.ethz.ch\/ebuild\/api":"535"}
\ No newline at end of file
+{"https:\/\/ebuild-project.org\/svn\/ebuild\/api":"19"}
\ No newline at end of file
Modified: trunk/org.vexi-build.vexi.archive/meta/module.xml
===================================================================
--- trunk/org.vexi-build.vexi.archive/meta/module.xml 2012-06-03 03:08:17 UTC
(rev 4404)
+++ trunk/org.vexi-build.vexi.archive/meta/module.xml 2012-06-18 13:52:35 UTC
(rev 4405)
@@ -6,7 +6,7 @@
org="ebuild"
branch="0.8"
type="svn"
- url="https://svn.origo.ethz.ch/ebuild/api/"/>
+
url="https://ebuild-project.org/svn/ebuild/api/"/>
</repositories>
@@ -15,8 +15,8 @@
<dependencies>
<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="maven-public" org="org.antlr"
name="stringtemplate" tag="3.2.1" />
<dependency source="ebuild-api"
name="api.plugin" />
- <dependency source="ebuild" name="lib.ant" />
+ <dependency source="ebuild-plugins"
name="lib.ant"/>
</dependencies>
</ebuild-module>
Modified: trunk/org.vexi-build.vexi.manifest/meta/module.xml
===================================================================
--- trunk/org.vexi-build.vexi.manifest/meta/module.xml 2012-06-03 03:08:17 UTC
(rev 4404)
+++ trunk/org.vexi-build.vexi.manifest/meta/module.xml 2012-06-18 13:52:35 UTC
(rev 4405)
@@ -5,7 +5,7 @@
<dependencies>
<system name="java.jre"
tag="1.5"/>
- <dependency source="ebuild" name="api.plugin" />
- <dependency source="ebuild" name="lib.util" />
+ <dependency source="ebuild" name="api.plugin" tag="0.8.0"/>
+ <dependency source="ebuild-plugins" name="lib.util" />
</dependencies>
</ebuild-module>
Modified:
trunk/org.vexi-core.devtools/src/main/java/org/vexi/instrument/memory/Memory.java
===================================================================
---
trunk/org.vexi-core.devtools/src/main/java/org/vexi/instrument/memory/Memory.java
2012-06-03 03:08:17 UTC (rev 4404)
+++
trunk/org.vexi-core.devtools/src/main/java/org/vexi/instrument/memory/Memory.java
2012-06-18 13:52:35 UTC (rev 4405)
@@ -127,7 +127,7 @@
}
synchronized public void register(JS o){
- if(!(o instanceof JSExn.ExnJSObj)){
+ if(!(o instanceof JSExn.Obj)){
if(!doesOverrideHashCode(o))
throw new RuntimeException("Cannot register
objects with overridden hashcodes " + o.getClass().getName());
@@ -142,7 +142,7 @@
}
synchronized public void unregister(JS o){
- if(!(o instanceof JSExn.ExnJSObj)){
+ if(!(o instanceof JSExn.Obj)){
Integer hash = new Integer(o.hashCode());
ObjInfo oi = (ObjInfo) hashToObjInfo.remove(hash);
Modified:
trunk/org.vexi-core.devtools/src/main/java/org/vexi/instrument/memoryhist/MemoryHist.java
===================================================================
---
trunk/org.vexi-core.devtools/src/main/java/org/vexi/instrument/memoryhist/MemoryHist.java
2012-06-03 03:08:17 UTC (rev 4404)
+++
trunk/org.vexi-core.devtools/src/main/java/org/vexi/instrument/memoryhist/MemoryHist.java
2012-06-18 13:52:35 UTC (rev 4405)
@@ -36,7 +36,7 @@
}
synchronized public void register(JS o){
- if(!(o instanceof JSExn.ExnJSObj)){
+ if(!(o instanceof JSExn.Obj)){
if(!doesOverrideHashCode(o))
throw new RuntimeException("Cannot register
objects with overridden hashcodes " + o.getClass().getName());
@@ -46,7 +46,7 @@
}
synchronized public void unregister(JS o){
- if(!(o instanceof JSExn.ExnJSObj)){
+ if(!(o instanceof JSExn.Obj)){
Integer hash = new Integer(o.hashCode());
hashToObj.remove(hash);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Vexi-svn mailing list
Vexi-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/vexi-svn
