Merge pull request #1474 from ZackerySpytz/OCaml-INPUT-OUTPUT-INOUT-primitives
[OCaml] Add missing INPUT, OUTPUT, and INOUT typemaps for primitives
diff --git a/.travis.yml b/.travis.yml
index bede4a0..6879e9b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -298,7 +298,7 @@
- os: linux
env: SWIGLANG=go VER=1.6 CPP11=1
sudo: required
- dist: trusty
+ dist: xenial
- os: linux
env: SWIGLANG=java CPP11=1
sudo: required
@@ -324,9 +324,9 @@
sudo: required
dist: xenial
- os: linux
- env: SWIGLANG=go GCC=6 CPP14=1
+ env: SWIGLANG=go VER=1.6 GCC=6 CPP14=1
sudo: required
- dist: trusty
+ dist: xenial
- os: linux
env: SWIGLANG=java GCC=6 CPP14=1
sudo: required
diff --git a/Examples/php/pragmas/example.i b/Examples/php/pragmas/example.i
index b72828b..ea9590b 100644
--- a/Examples/php/pragmas/example.i
+++ b/Examples/php/pragmas/example.i
@@ -21,11 +21,11 @@
zend_printf("This was %%rshutdown\n");
}
-%pragma(php) include="./include.php";
+%pragma(php) include="include.php";
%pragma(php) code="
# This code is inserted into example.php
-echo \"this was php code\\n\";
+echo \"This was php code\\n\";
"
%pragma(php) version="1.5"
diff --git a/Examples/php/pragmas/include.php b/Examples/php/pragmas/include.php
index e19880a..11d985d 100644
--- a/Examples/php/pragmas/include.php
+++ b/Examples/php/pragmas/include.php
@@ -1,7 +1,7 @@
<?php
# This code is inserted into example.php
-echo "this is include.php\n";
+echo "This is include.php\n";
?>
diff --git a/Examples/php/pragmas/runme.php b/Examples/php/pragmas/runme.php
index b99cf37..7b2c179 100644
--- a/Examples/php/pragmas/runme.php
+++ b/Examples/php/pragmas/runme.php
@@ -1,6 +1,9 @@
<?php
+# For finding include.php
+set_include_path(realpath(dirname(__FILE__)) . PATH_SEPARATOR . get_include_path());
+
require "example.php";
-echo "Version - " . ((new ReflectionExtension('example'))->getVersion());
+echo "Version - " . ((new ReflectionExtension('example'))->getVersion()) . "\n";
?>
