From ee7e925420c87dbf4abd6bb4576b277d2df3dd67 Mon Sep 17 00:00:00 2001
From: "Meredith L. Patterson" <mlp@thesmartpolitenerd.com>
Date: Thu, 21 Nov 2013 01:13:44 -0600
Subject: [PATCH] attempt to have travis build with new bindings option
---
.travis.yml | 2 +-
src/bindings/php/SConscript | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 95d25e1e..adb93a6b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,7 +28,7 @@ before_install:
before_script:
- if [ "$BINDINGS" == "php" ]; then phpenv config-add src/bindings/php/hammer.ini; fi
script:
- - scons
+ - scons bindings=$BINDINGS
after_script:
- if [ "$BINDINGS" == "php" ]; then phpunit -v src/bindings/php/Tests; fi
notifications:
diff --git a/src/bindings/php/SConscript b/src/bindings/php/SConscript
index d516d798..f6a33ca1 100644
--- a/src/bindings/php/SConscript
+++ b/src/bindings/php/SConscript
@@ -12,11 +12,11 @@ phpenv.Append(LIBPATH = ['../../'])
phpenv.Command("hammer.i", "../swig/hammer.i", Copy("$TARGET", "$SOURCE"))
phpenv.Command(['hammer.php', 'hammer_wrap.c', 'php_hammer.h'], 'hammer.i', 'swig -php -DHAMMER_INTERNAL__NO_STDARG_H -Isrc/ $SOURCE')
-phpenv.SharedLibrary('hammer', ['hammer_wrap.c'])
+libhammer_php = phpenv.SharedLibrary('hammer', ['hammer_wrap.c'])
+
+phptestenv = phpenv.Clone()
+phptestenv['ENV']['LD_LIBRARY_PATH'] = os.path.dirname(str(libhammer_shared[0]))
+tests = phptestenv.Dir('Tests/')
+phptestenv.Command(tests, [libhammer_php], "phpunit -v --include-path "+os.getcwd()+" $TARGET")
-#phptestenv = phpenv.Clone()
-#phptestenv['ENV']['LD_LIBRARY_PATH'] = os.path.dirname(str(libhammer_shared[0]))
-#tests = phptestenv.Dir('Tests/')
-#phptestenv.Command(tests, [libhammer_php], "phpunit -v --include-path "+os.getcwd()+" $TARGET")
-Clean('.', ['hammer.php', 'php_hammer.h'])
--
GitLab