Revision: 4735
http://sourceforge.net/p/vexi/code/4735
Author: mkpg2
Date: 2014-09-17 03:56:29 +0000 (Wed, 17 Sep 2014)
Log Message:
-----------
Remove java 1.7 dependency.
Modified Paths:
--------------
branches/vexi3/org.vexi-core.main/meta/module-build.xml
branches/vexi3/org.vexi-core.main/meta/module.xml
branches/vexi3/org.vexi-library.js/src/main/java/org/ibex/js/JSU.java
trunk/org.vexi-build.shared/meta/module.revisions
trunk/org.vexi-library.crypto/meta/module.xml
Modified: branches/vexi3/org.vexi-core.main/meta/module-build.xml
===================================================================
--- branches/vexi3/org.vexi-core.main/meta/module-build.xml 2014-09-12
23:32:43 UTC (rev 4734)
+++ branches/vexi3/org.vexi-core.main/meta/module-build.xml 2014-09-17
03:56:29 UTC (rev 4735)
@@ -4,7 +4,9 @@
<builders>
<builder source="local" name="build.jpp"
branch="trunk" />
<builder source="local" name="build.jencode"
branch="trunk" />
- <builder refid="javac" />
+ <builder refid="javac">
+ <property key="source.javaversion" value="1.6"/>
+ </builder>
<builder refid="javaexport" />
<builder refid="jppexport" />
</builders>
Modified: branches/vexi3/org.vexi-core.main/meta/module.xml
===================================================================
--- branches/vexi3/org.vexi-core.main/meta/module.xml 2014-09-12 23:32:43 UTC
(rev 4734)
+++ branches/vexi3/org.vexi-core.main/meta/module.xml 2014-09-17 03:56:29 UTC
(rev 4735)
@@ -3,6 +3,7 @@
<artifact name="java.zip" />
<artifact name="jpp.zip" />
<dependencies>
+ <system name="java.jre" tag="1.7"/>
<dependency source="local" name="library.js"/>
<dependency source="local" name="core.truetype"/>
<!-- Test Dependencies -->
Modified: branches/vexi3/org.vexi-library.js/src/main/java/org/ibex/js/JSU.java
===================================================================
--- branches/vexi3/org.vexi-library.js/src/main/java/org/ibex/js/JSU.java
2014-09-12 23:32:43 UTC (rev 4734)
+++ branches/vexi3/org.vexi-library.js/src/main/java/org/ibex/js/JSU.java
2014-09-17 03:56:29 UTC (rev 4735)
@@ -2,7 +2,6 @@
import java.io.*;
import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
import org.ibex.js.JS.ConstructorList;
import org.ibex.js.parse.*;
@@ -436,7 +435,7 @@
return JSU.S( Integer.toHexString(js.hashCode()));
}
static public Charset getCharSet(String name) throws JSExn {
- if(name==null) return StandardCharsets.UTF_8;
+ if(name==null) name="UTF-8";
try{
return Charset.forName(name);
}catch(Exception e){
Modified: trunk/org.vexi-build.shared/meta/module.revisions
===================================================================
--- trunk/org.vexi-build.shared/meta/module.revisions 2014-09-12 23:32:43 UTC
(rev 4734)
+++ trunk/org.vexi-build.shared/meta/module.revisions 2014-09-17 03:56:29 UTC
(rev 4735)
@@ -1 +1 @@
-{"https:\/\/ebuild-project.org\/svn\/ebuild\/plugins":"159","https:\/\/emanate-project.org\/svn\/eapi":"158"}
\ No newline at end of file
+{"https:\/\/ebuild-project.org\/svn\/ebuild\/plugins":"175","https:\/\/emanate-project.org\/svn\/eapi":"214"}
\ No newline at end of file
Modified: trunk/org.vexi-library.crypto/meta/module.xml
===================================================================
--- trunk/org.vexi-library.crypto/meta/module.xml 2014-09-12 23:32:43 UTC
(rev 4734)
+++ trunk/org.vexi-library.crypto/meta/module.xml 2014-09-17 03:56:29 UTC
(rev 4735)
@@ -2,7 +2,6 @@
<artifact name="java_classes.jar" />
<dependencies>
- <system name="java.jre" tag="1.4"/>
<dependency source="local" name="library.util" />
</dependencies>
</ebuild-module>
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Want excitement?
Manually upgrade your production database.
When you want reliability, choose Perforce
Perforce version control. Predictably reliable.
http://pubads.g.doubleclick.net/gampad/clk?id=157508191&iu=/4140/ostg.clktrk
_______________________________________________
Vexi-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/vexi-svn
