Giuseppe Lavagetto has uploaded a new change for review. https://gerrit.wikimedia.org/r/274169
Change subject: New version for HHVM 3.12 ...................................................................... New version for HHVM 3.12 * Updated debian/rules * Updated includes since base-includes.h is gone Change-Id: I64b94ec01486bfe58be7f93f22023b4dfafdae48 --- M debian/changelog M debian/rules M ext_tidy.cpp 3 files changed, 12 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/php/tidy refs/changes/69/274169/1 diff --git a/debian/changelog b/debian/changelog index e9ae7e3..742ce79 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +hhvm-tidy (0.1-3) trusty-wikimedia; urgency=medium + + * Updating debian/rules for HHVM 3.12 + * Change includes given base-includes.h has been removed + + -- Giuseppe Lavagetto <[email protected]> Tue, 01 Mar 2016 18:30:21 +0100 + hhvm-tidy (0.1-2) trusty-wikimedia; urgency=medium * Rewrite as bare-bones HNI extension providing only tidy_repair_string(). diff --git a/debian/rules b/debian/rules index c73bea0..aa07426 100755 --- a/debian/rules +++ b/debian/rules @@ -14,7 +14,8 @@ override_dh_gencontrol: # HHVM does *not* ensure abi compatibility. - echo "hhvm:ApiVersion=hhvm-api-$(shell /usr/bin/hhvm --version | sed -ne 's/^Extension API:\ //p')" >> debian/hhvm-tidy.substvars + hhvmapi=$(shell /usr/bin/hhvm --version | sed -ne 's/^HipHop VM \(.*\)\..*/\1/p') && \ + [ -n "$${hhvmapi}" ] && echo "hhvm:ApiVersion=hhvm-api-$${hhvmapi}" >> debian/hhvm-luasandbox.substvars dh_gencontrol override_dh_strip: diff --git a/ext_tidy.cpp b/ext_tidy.cpp index 714f7c7..4271345 100644 --- a/ext_tidy.cpp +++ b/ext_tidy.cpp @@ -14,7 +14,9 @@ | [email protected] so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/base-includes.h" +#include "hphp/util/lock.h" +#include "hphp/runtime/ext/extension.h" +#include "hphp/util/compatibility.h" #include <tidy.h> #include <buffio.h> -- To view, visit https://gerrit.wikimedia.org/r/274169 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I64b94ec01486bfe58be7f93f22023b4dfafdae48 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/php/tidy Gerrit-Branch: hni Gerrit-Owner: Giuseppe Lavagetto <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
