Revision: 4654
http://sourceforge.net/p/vexi/code/4654
Author: mkpg2
Date: 2014-02-05 11:37:55 +0000 (Wed, 05 Feb 2014)
Log Message:
-----------
Build fix. Getting jpp processing wrong.
Modified Paths:
--------------
branches/vexi3/org.vexi-library.net/src/main/jpp/org/ibex/net/HTTPFactory.jpp
trunk/org.vexi-build.jpp/src/main/java/org/vexi/build/jpp/PreprocessorBuilder.java
trunk/org.vexi-build.jpp/src/poke/java/poke/PreprocessVexiWorkspace.java
Added Paths:
-----------
trunk/org.vexi-build.jpp/src/poke/java/poke/
trunk/org.vexi-build.jpp/src/poke/java/poke/PreprocessHttpFactory.java
Removed Paths:
-------------
trunk/org.vexi-build.jpp/src/poke/java/dev/
Modified:
branches/vexi3/org.vexi-library.net/src/main/jpp/org/ibex/net/HTTPFactory.jpp
===================================================================
---
branches/vexi3/org.vexi-library.net/src/main/jpp/org/ibex/net/HTTPFactory.jpp
2014-02-05 11:10:03 UTC (rev 4653)
+++
branches/vexi3/org.vexi-library.net/src/main/jpp/org/ibex/net/HTTPFactory.jpp
2014-02-05 11:37:55 UTC (rev 4654)
@@ -9,13 +9,11 @@
//#ifdef JRE_HTTP
return JreHTTP.create(logger, url);
//#else
- //#ifdef APACHE_HTTP
- //return ApacheHTTP.create(logger, url);
- //#else
- // return url.startsWith("stdio:") ? OrigHTTP.stdio : (HTTP)new
OrigHTTP_reconnect(logger, url);
- //#endif APACHE_HTTP
-
-
+ //# ifdef APACHE_HTTP
+ //return ApacheHTTP.create(logger, url);
+ //# else
+ return url.startsWith("stdio:") ? OrigHTTP.stdio : (HTTP)new
OrigHTTP_reconnect(logger, url);
+ //# endif APACHE_HTTP
//#endif JRE_HTTP;
}
Modified:
trunk/org.vexi-build.jpp/src/main/java/org/vexi/build/jpp/PreprocessorBuilder.java
===================================================================
---
trunk/org.vexi-build.jpp/src/main/java/org/vexi/build/jpp/PreprocessorBuilder.java
2014-02-05 11:10:03 UTC (rev 4653)
+++
trunk/org.vexi-build.jpp/src/main/java/org/vexi/build/jpp/PreprocessorBuilder.java
2014-02-05 11:37:55 UTC (rev 4654)
@@ -21,7 +21,7 @@
public class PreprocessorBuilder extends AbstractBuilder{
// SHOULD put src paths from other projects on the path
- static private class SourcePath implements Preprocessor.SourcePath {
+ static public class SourcePath implements Preprocessor.SourcePath {
final public File dir;
public SourcePath(File dir){ this.dir = dir; }
public Reader getFile(String sourceName) throws IOException {
Added: trunk/org.vexi-build.jpp/src/poke/java/poke/PreprocessHttpFactory.java
===================================================================
--- trunk/org.vexi-build.jpp/src/poke/java/poke/PreprocessHttpFactory.java
(rev 0)
+++ trunk/org.vexi-build.jpp/src/poke/java/poke/PreprocessHttpFactory.java
2014-02-05 11:37:55 UTC (rev 4654)
@@ -0,0 +1,34 @@
+package poke;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.util.Arrays;
+import java.util.HashMap;
+
+import org.vexi.build.jpp.Preprocessor;
+import org.vexi.build.jpp.PreprocessorBuilder;
+
+import ebuild.api.log.ILogger;
+import ebuild.util.Logger;
+
+public class PreprocessHttpFactory {
+// static String DEFINES = "JRE_HTTP";
+ static String DEFINES = "";
+
+
+ static ILogger logger = Logger.newRootLogger();
+
+ static public void main(String[] args) throws IOException {
+ File projectDir = new File("../org.vexi-library.net");
+ if (!projectDir.isDirectory()) return;
+
+ File sourceDir = new File(projectDir, "src/main/jpp");
+ final Preprocessor preprocessor = new Preprocessor(new
PreprocessorBuilder.SourcePath(sourceDir), DEFINES);
+ OutputStreamWriter os = new OutputStreamWriter(System.out);
+ preprocessor.preprocess("org/ibex/net/HTTPFactory.jpp", os);
+ os.flush();
+ os.close();
+
+ }
+}
Property changes on:
trunk/org.vexi-build.jpp/src/poke/java/poke/PreprocessHttpFactory.java
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified:
trunk/org.vexi-build.jpp/src/poke/java/poke/PreprocessVexiWorkspace.java
===================================================================
--- trunk/org.vexi-build.jpp/src/poke/java/dev/PreprocessVexiWorkspace.java
2014-01-03 16:59:03 UTC (rev 4637)
+++ trunk/org.vexi-build.jpp/src/poke/java/poke/PreprocessVexiWorkspace.java
2014-02-05 11:37:55 UTC (rev 4654)
@@ -1,4 +1,4 @@
-package dev;
+package poke;
import java.io.File;
import java.util.Arrays;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Managing the Performance of Cloud-Based Applications
Take advantage of what the Cloud has to offer - Avoid Common Pitfalls.
Read the Whitepaper.
http://pubads.g.doubleclick.net/gampad/clk?id=121051231&iu=/4140/ostg.clktrk
_______________________________________________
Vexi-svn mailing list
Vexi-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/vexi-svn
