Giuseppe Lavagetto has submitted this change and it was merged.
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
* Updated code to use req::malloc
Bug: T119637
Change-Id: I64b94ec01486bfe58be7f93f22023b4dfafdae48
---
M debian/changelog
M debian/control
M debian/rules
M ext_tidy.cpp
4 files changed, 21 insertions(+), 6 deletions(-)
Approvals:
Giuseppe Lavagetto: Verified; Looks good to me, approved
diff --git a/debian/changelog b/debian/changelog
index e9ae7e3..c439a78 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+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
+ * Renamed smart_malloc to req::malloc and so on following upstream transition
+ * Update debian/control with new build deps
+ * Changed versioning to debian native
+
+ -- Giuseppe Lavagetto <glavage...@wikimedia.org> 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/control b/debian/control
index a35907a..a22306d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,9 @@
Section: web
Priority: optional
Maintainer: Ori Livneh <o...@wikimedia.org>
-Build-Depends: debhelper (>= 9), hhvm-dev, cmake, libtidy-dev
+Build-Depends: debhelper (>= 9), hhvm-dev, cmake, libtidy-dev, libtbb-dev,
+ libboost1.54-dev, libgoogle-glog-dev, libdouble-conversion-dev,
+ libjemalloc-dev
Standards-Version: 3.9.5
Package: hhvm-tidy
diff --git a/debian/rules b/debian/rules
index c73bea0..184c688 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-tidy.substvars
dh_gencontrol
override_dh_strip:
diff --git a/ext_tidy.cpp b/ext_tidy.cpp
index 714f7c7..b5dcf73 100644
--- a/ext_tidy.cpp
+++ b/ext_tidy.cpp
@@ -14,7 +14,9 @@
| lice...@php.net 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>
@@ -81,9 +83,9 @@
virtual void moduleInit() {
HHVM_FE(tidy_repair_string);
loadSystemlib();
- tidySetMallocCall(smart_malloc);
- tidySetReallocCall(smart_realloc);
- tidySetFreeCall(smart_free);
+ tidySetMallocCall(req::malloc);
+ tidySetReallocCall(req::realloc);
+ tidySetFreeCall(req::free);
}
} s_tidy_extension;
--
To view, visit https://gerrit.wikimedia.org/r/274169
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I64b94ec01486bfe58be7f93f22023b4dfafdae48
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/php/tidy
Gerrit-Branch: hni
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
