Reorganise files

* Keep the PHP build system at the top level * Move source files to src/ * Move the backend to src/lib * Move assorted tools to tools/ * Remove wikidiff2.ini. I think it was just a helper for packaging, now unused. Bug: T234748 Change-Id: Ib0f6db9ffb1a33e8d7e2da27b7ccf6d88e2e98aa
wikimedia · Mar 2, 2023 · c110020 · c110020
1 parent 3f2e321
commit c110020
Show file tree

Hide file tree

Showing 35 changed files with 12 additions and 6 deletions.
diff --git a/config.m4 b/config.m4
@@ -31,5 +31,12 @@ if test "$PHP_WIKIDIFF2" != "no"; then
   PHP_SUBST(WIKIDIFF2_SHARED_LIBADD)
   AC_DEFINE(HAVE_WIKIDIFF2, 1, [ ])
   export CXXFLAGS="-Wno-write-strings -std=c++11 $CXXFLAGS"
-  PHP_NEW_EXTENSION(wikidiff2, php_wikidiff2.cpp Wikidiff2.cpp Formatter.cpp TableFormatter.cpp InlineFormatter.cpp InlineJSONFormatter.cpp TextUtil.cpp, $ext_shared)
+  PHP_NEW_EXTENSION(wikidiff2, \
+	src/php_wikidiff2.cpp \
+	src/lib/Wikidiff2.cpp \
+	src/lib/Formatter.cpp \
+	src/lib/TableFormatter.cpp \
+	src/lib/InlineFormatter.cpp \
+	src/lib/InlineJSONFormatter.cpp \
+	src/lib/TextUtil.cpp, $ext_shared)
 fi
diff --git a/DiffEngine.h → src/lib/DiffEngine.h b/DiffEngine.h → src/lib/DiffEngine.h
diff --git a/Formatter.cpp → src/lib/Formatter.cpp b/Formatter.cpp → src/lib/Formatter.cpp
diff --git a/Formatter.h → src/lib/Formatter.h b/Formatter.h → src/lib/Formatter.h
diff --git a/InlineFormatter.cpp → src/lib/InlineFormatter.cpp b/InlineFormatter.cpp → src/lib/InlineFormatter.cpp
diff --git a/InlineFormatter.h → src/lib/InlineFormatter.h b/InlineFormatter.h → src/lib/InlineFormatter.h
diff --git a/InlineJSONFormatter.cpp → src/lib/InlineJSONFormatter.cpp b/InlineJSONFormatter.cpp → src/lib/InlineJSONFormatter.cpp
diff --git a/InlineJSONFormatter.h → src/lib/InlineJSONFormatter.h b/InlineJSONFormatter.h → src/lib/InlineJSONFormatter.h
diff --git a/IntSet.h → src/lib/IntSet.h b/IntSet.h → src/lib/IntSet.h
diff --git a/TableFormatter.cpp → src/lib/TableFormatter.cpp b/TableFormatter.cpp → src/lib/TableFormatter.cpp
diff --git a/TableFormatter.h → src/lib/TableFormatter.h b/TableFormatter.h → src/lib/TableFormatter.h
diff --git a/TextUtil.cpp → src/lib/TextUtil.cpp b/TextUtil.cpp → src/lib/TextUtil.cpp
diff --git a/TextUtil.h → src/lib/TextUtil.h b/TextUtil.h → src/lib/TextUtil.h
diff --git a/Wikidiff2.cpp → src/lib/Wikidiff2.cpp b/Wikidiff2.cpp → src/lib/Wikidiff2.cpp
diff --git a/Wikidiff2.h → src/lib/Wikidiff2.h b/Wikidiff2.h → src/lib/Wikidiff2.h
diff --git a/Word.h → src/lib/Word.h b/Word.h → src/lib/Word.h
diff --git a/php_cpp_allocator.h → src/lib/php_cpp_allocator.h b/php_cpp_allocator.h → src/lib/php_cpp_allocator.h
diff --git a/wd2_allocator.h → src/lib/wd2_allocator.h b/wd2_allocator.h → src/lib/wd2_allocator.h
diff --git a/php_wikidiff2.cpp → src/php_wikidiff2.cpp b/php_wikidiff2.cpp → src/php_wikidiff2.cpp
@@ -9,10 +9,10 @@
 #include "ext/standard/info.h"
 #include "zend_API.h"
 #include "php_wikidiff2.h"
-#include "Wikidiff2.h"
-#include "TableFormatter.h"
-#include "InlineFormatter.h"
-#include "InlineJSONFormatter.h"
+#include "lib/Wikidiff2.h"
+#include "lib/TableFormatter.h"
+#include "lib/InlineFormatter.h"
+#include "lib/InlineJSONFormatter.h"
 
 #define WIKIDIFF2_VERSION_STRING "1.13.0"
 

diff --git a/php_wikidiff2.h → src/php_wikidiff2.h b/php_wikidiff2.h → src/php_wikidiff2.h
diff --git a/wikidiff2.stub.php → src/wikidiff2.stub.php b/wikidiff2.stub.php → src/wikidiff2.stub.php
diff --git a/wikidiff2_arginfo.h → src/wikidiff2_arginfo.h b/wikidiff2_arginfo.h → src/wikidiff2_arginfo.h
diff --git a/DiffTest/Api.php → tools/DiffTest/Api.php b/DiffTest/Api.php → tools/DiffTest/Api.php
diff --git a/DiffTest/Change.php → tools/DiffTest/Change.php b/DiffTest/Change.php → tools/DiffTest/Change.php
diff --git a/DiffTest/Differ.php → tools/DiffTest/Differ.php b/DiffTest/Differ.php → tools/DiffTest/Differ.php
diff --git a/DiffTest/test.php → tools/DiffTest/test.php b/DiffTest/test.php → tools/DiffTest/test.php
diff --git a/FuzzTest/fuzz.php → tools/FuzzTest/fuzz.php b/FuzzTest/fuzz.php → tools/FuzzTest/fuzz.php
diff --git a/FuzzTest/random.php → tools/FuzzTest/random.php b/FuzzTest/random.php → tools/FuzzTest/random.php
diff --git a/benchmarks/bench.php → tools/benchmarks/bench.php b/benchmarks/bench.php → tools/benchmarks/bench.php
diff --git a/benchmarks/chinese-reverse-bench.php → tools/benchmarks/chinese-reverse-bench.php b/benchmarks/chinese-reverse-bench.php → tools/benchmarks/chinese-reverse-bench.php
diff --git a/benchmarks/chinese-reverse.zip → tools/benchmarks/chinese-reverse.zip b/benchmarks/chinese-reverse.zip → tools/benchmarks/chinese-reverse.zip
diff --git a/benchmarks/revs.json.gz → tools/benchmarks/revs.json.gz b/benchmarks/revs.json.gz → tools/benchmarks/revs.json.gz
diff --git a/demo/demo.php → tools/demo/demo.php b/demo/demo.php → tools/demo/demo.php
diff --git a/demo/diff.css → tools/demo/diff.css b/demo/diff.css → tools/demo/diff.css
diff --git a/wikidiff2.ini b/wikidiff2.ini