THRIFT-3742 haxe php cli support
Client: Haxe
Patch: Oleksii Prudkyi + minor changes from Jens Geyer
This closes #950
diff --git a/lib/haxe/test/Makefile.am b/lib/haxe/test/Makefile.am
index 7d29f81..5c638d4 100644
--- a/lib/haxe/test/Makefile.am
+++ b/lib/haxe/test/Makefile.am
@@ -24,6 +24,7 @@
BENCHMARK = $(top_srcdir)/lib/rb/benchmark/Benchmark.thrift
BIN_CPP = bin/Main-debug
+BIN_PHP = bin/php/Main-debug.php
gen-haxe/thrift/test/ThriftTest.hx: $(THRIFTTEST)
$(THRIFTCMD) $(THRIFTTEST)
@@ -34,7 +35,7 @@
gen-haxe/thrift/test/BenchmarkService.hx: $(BENCHMARK)
$(THRIFTCMD) $(BENCHMARK)
-all-local: $(BIN_CPP)
+all-local: $(BIN_CPP) $(BIN_PHP)
$(BIN_CPP): \
src/*.hx \
@@ -44,6 +45,14 @@
gen-haxe/thrift/test/BenchmarkService.hx
$(HAXE) --cwd . cpp.hxml
+$(BIN_PHP): \
+ src/*.hx \
+ ../src/org/apache/thrift/**/*.hx \
+ gen-haxe/thrift/test/ThriftTest.hx \
+ gen-haxe/thrift/test/Aggr.hx \
+ gen-haxe/thrift/test/BenchmarkService.hx
+ $(HAXE) --cwd . php.hxml
+
#TODO: other haxe targets
# $(HAXE) --cwd . csharp
@@ -51,15 +60,15 @@
# $(HAXE) --cwd . java
# $(HAXE) --cwd . javascript
# $(HAXE) --cwd . neko
-# $(HAXE) --cwd . php
# $(HAXE) --cwd . python # needs Haxe 3.2.0
clean-local:
$(RM) -r gen-haxe bin
-check: $(BIN_CPP)
+check: $(BIN_CPP) $(BIN_PHP)
$(BIN_CPP)
+ php -f $(BIN_PHP)
EXTRA_DIST = \
src \
diff --git a/lib/haxe/test/php.hxml b/lib/haxe/test/php.hxml
index b86e64c..14f2b2d 100644
--- a/lib/haxe/test/php.hxml
+++ b/lib/haxe/test/php.hxml
@@ -26,7 +26,8 @@
-main Main
#PHP target
--php bin/Test.php
+-php bin/php/
+--php-front Main-debug.php
#Add debug information
-debug
@@ -35,4 +36,4 @@
#"-dce no" : do not remove unused code
#"-dce std" : remove unused code in the std lib (default)
#"-dce full" : remove all unused code
--dce full
\ No newline at end of file
+-dce full