[Libreoffice-commits] online.git: rename.patch rename.sh
Michael Meeks
michael.meeks at collabora.com
Mon Nov 14 12:06:23 UTC 2016
rename.patch | 195 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
rename.sh | 58 +++++++++++++++++
2 files changed, 253 insertions(+)
New commits:
commit fb39c0e9199b3c216c5818f8e6b0824636eaee98
Author: Michael Meeks <michael.meeks at collabora.com>
Date: Fri Nov 11 16:44:00 2016 +0000
Prototype renaming script and patch for before branching.
diff --git a/rename.patch b/rename.patch
new file mode 100644
index 0000000..9641919
--- /dev/null
+++ b/rename.patch
@@ -0,0 +1,195 @@
+From ece4326de0ba7f960cf28a0db458efd68db469b3 Mon Sep 17 00:00:00 2001
+From: Michael Meeks <michael.meeks at collabora.com>
+Date: Fri, 11 Nov 2016 16:44:00 +0000
+Subject: [PATCH] More proto renaming.
+
+---
+ loolwsd/Makefile.am | 142 ++++++++++++++++++++++++++-------------------------
+ loolwsd/configure.ac | 2 +-
+ 3 files changed, 132 insertions(+), 70 deletions(-)
+ create mode 100755 rename.sh
+
+diff --git a/loolwsd/Makefile.am b/loolwsd/Makefile.am
+index 9ab1f10..7e2600c 100644
+--- a/loolwsd/Makefile.am
++++ b/loolwsd/Makefile.am
+@@ -30,92 +30,96 @@ AM_LDFLAGS = -pthread -Wl,-E
+ AM_ETAGSFLAGS = --c++-kinds=+p --fields=+iaS --extra=+q -R --totals=yes *
+ AM_CTAGSFLAGS = $(AM_ETAGSFLAGS)
+
+-shared_sources = ChildSession.cpp \
+- IoUtil.cpp \
+- Log.cpp \
+- LOOLProtocol.cpp \
+- LOOLSession.cpp \
+- MessageQueue.cpp \
+- Unit.cpp \
+- UnitHTTP.cpp \
+- Util.cpp
+-
+-loolwsd_SOURCES = Admin.cpp \
+- AdminModel.cpp \
+- Auth.cpp \
+- DocumentBroker.cpp \
+- LOOLWSD.cpp \
+- ClientSession.cpp \
+- FileServer.cpp \
+- PrisonerSession.cpp \
+- Storage.cpp \
+- TileCache.cpp \
++shared_sources = common/IoUtil.cpp \
++ common/Log.cpp \
++ common/LOOLProtocol.cpp \
++ common/LOOLSession.cpp \
++ common/MessageQueue.cpp \
++ common/Unit.cpp \
++ common/UnitHTTP.cpp \
++ common/Util.cpp
++
++loolwsd_SOURCES = wsd/Admin.cpp \
++ wsd/AdminModel.cpp \
++ wsd/Auth.cpp \
++ wsd/DocumentBroker.cpp \
++ wsd/LOOLWSD.cpp \
++ wsd/ClientSession.cpp \
++ wsd/FileServer.cpp \
++ wsd/PrisonerSession.cpp \
++ wsd/Storage.cpp \
++ wsd/TileCache.cpp \
+ $(shared_sources)
+
+ noinst_PROGRAMS = connect \
+ lokitclient \
+ loolforkit-nocaps
+
+-connect_SOURCES = Connect.cpp \
+- Log.cpp \
+- LOOLProtocol.cpp \
+- Util.cpp
++connect_SOURCES = tools/Connect.cpp \
++ common/Log.cpp \
++ common/LOOLProbtocol.cpp \
++ common/Util.cpp
+
+-lokitclient_SOURCES = IoUtil.cpp \
+- Log.cpp \
+- LOKitClient.cpp \
+- LOOLProtocol.cpp \
+- Util.cpp
++lokitclient_SOURCES = common/IoUtil.cpp \
++ common/Log.cpp \
++ tools/KitClient.cpp \
++ common/Protocol.cpp \
++ common/Util.cpp
+
+-loolforkit_SOURCES = LOOLForKit.cpp \
+- LOOLKit.cpp \
++loolforkit_SOURCES = kit/ChildSession.cpp \
++ kit/ForKit.cpp \
++ kit/Kit.cpp \
+ $(shared_sources)
+
+ # build a binary with no caps to help debugging
+ loolforkit_nocaps_SOURCES = $(loolforkit_SOURCES)
+
+-loolmount_SOURCES = loolmount.c
++loolmount_SOURCES = tools/mount.c
+
+-loolmap_SOURCES = loolmap.c
++loolmap_SOURCES = tools/map.c
+
+-looltool_SOURCES = LOOLTool.cpp
++looltool_SOURCES = tools/Tool.cpp
+
+ loolstress_CPPFLAGS = -DTDOC=\"$(abs_top_srcdir)/test/data\"
+-loolstress_SOURCES = LOOLStress.cpp \
+- LOOLProtocol.cpp \
+- Log.cpp
+-
+-noinst_HEADERS = Admin.hpp \
+- AdminModel.hpp \
+- Auth.hpp \
+- ChildSession.hpp \
+- Common.hpp \
+- DocumentBroker.hpp \
+- Exceptions.hpp \
+- FileServer.hpp \
+- IoUtil.hpp \
+- LibreOfficeKit.hpp \
+- Log.hpp \
+- LOKitHelper.hpp \
+- LOOLKit.hpp \
+- LOOLProtocol.hpp \
+- LOOLSession.hpp \
+- LOOLWebSocket.hpp \
+- LOOLWSD.hpp \
+- ClientSession.hpp \
+- PrisonerSession.hpp \
+- MessageQueue.hpp \
+- Png.hpp \
+- QueueHandler.hpp \
+- Rectangle.hpp \
+- Storage.hpp \
+- TileCache.hpp \
+- TileDesc.hpp \
+- TraceFile.hpp \
+- Unit.hpp \
+- UnitHTTP.hpp \
+- UserMessages.hpp \
+- Util.hpp \
++loolstress_SOURCES = tools/Stress.cpp \
++ common/Protocol.cpp \
++ common/Log.cpp
++
++wsd_headers = wsd/Admin.hpp \
++ wsd/AdminModel.hpp \
++ wsd/Auth.hpp \
++ wsd/ClientSession.hpp \
++ wsd/DocumentBroker.hpp \
++ wsd/Exceptions.hpp \
++ wsd/FileServer.hpp \
++ wsd/LOOLWebSocket.hpp \
++ wsd/LOOLWSD.hpp \
++ wsd/PrisonerSession.hpp \
++ wsd/QueueHandler.hpp \
++ wsd/Storage.hpp \
++ wsd/TileCache.hpp \
++ wsd/TileDesc.hpp \
++ wsd/TraceFile.hpp \
++ wsd/UserMessages.hpp
++
++shared_headers = common/Common.hpp \
++ common/IoUtil.hpp \
++ common/Log.hpp \
++ common/Protocol.hpp \
++ common/Session.hpp \
++ common/Unit.hpp \
++ common/UnitHTTP.hpp \
++ common/Util.hpp \
++ common/MessageQueue.hpp \
++ common/Png.hpp \
++ common/Rectangle.hpp
++
++kit_headers = kit/ChildSession.hpp \
++ kit/Kit.hpp \
++ kit/LibreOfficeKit.hpp \
++ kit/KitHelper.hpp
++
++noinst_HEADERS = $(wsd_headers) $(shared_headers) $(kit_headers) \
+ bundled/include/LibreOfficeKit/LibreOfficeKit.h \
+ bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h \
+ bundled/include/LibreOfficeKit/LibreOfficeKitInit.h \
+diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
+index 9b6fc3d..7aa8775 100644
+--- a/loolwsd/configure.ac
++++ b/loolwsd/configure.ac
+@@ -32,7 +32,7 @@ AC_SUBST([LOOLWSD_VERSION_HASH])
+
+ AC_DEFINE_UNQUOTED([LOOLWSD_VERSION_HASH],[["$LOOLWSD_VERSION_HASH"]],[LibreOffice On-Line git hash if present])
+
+-AC_CONFIG_SRCDIR([LOOLWSD.cpp])
++AC_CONFIG_SRCDIR([wsd/LOOLWSD.cpp])
+
+ AC_CONFIG_HEADERS([config.h])
+
+
diff --git a/rename.sh b/rename.sh
new file mode 100755
index 0000000..260fe2b
--- /dev/null
+++ b/rename.sh
@@ -0,0 +1,58 @@
+#!/bin/bash
+
+# rename script to be run before branching.
+
+mkdir -p wsd
+mkdir -p doc
+mkdir -p kit
+mkdir -p common
+mkdir -p tools
+mkdir -p test
+mkdir -p bundled
+mkdir -p etc
+mkdir -p debian
+
+git mv loolwsd/* wsd
+
+git mv wsd/test/* test
+git mv wsd/bundled/* bundled
+git mv wsd/etc/* etc
+git mv wsd/debian/* debian
+
+for commonfile in IoUtil Log MessageQueue Unit UnitHTTP Util; do
+ git mv wsd/$commonfile.cpp common;
+ git mv wsd/$commonfile.hpp common;
+done
+git mv wsd/Png.hpp common
+git mv wsd/Common.hpp common
+git mv wsd/Rectangle.hpp common
+git mv wsd/LOOLProtocol.cpp common/Protocol.cpp
+
+git mv wsd/LibreOfficeKit.hpp kit
+git mv wsd/ChildSession.cpp kit
+git mv wsd/ChildSession.hpp kit
+git mv wsd/LOOLForKit.cpp kit/ForKit.cpp
+git mv wsd/LOOLKit.cpp kit/Kit.cpp
+git mv wsd/LOOLKit.hpp kit/Kit.hpp
+git mv wsd/LOKitHelper.hpp kit/KitHelper.hpp
+
+git mv wsd/Connect.cpp tools
+git mv wsd/LOKitClient.cpp tools/KitClient.cpp
+git mv wsd/loolmount.c tools/mount.c
+git mv wsd/loolmap.c tools/map.c
+git mv wsd/LOOLTool.cpp tools/Tool.cpp
+git mv wsd/LOOLStress.cpp tools/Stress.cpp
+
+for file in discovery.xml favicon.ico loolwsd.xml.in \
+ loolwsd.service robots.txt sysconfig.loolwsd \
+ configure.ac Makefile.am autogen.sh \
+ COPYING AUTHORS ChangeLog INSTALL NEWS PROBLEMS \
+ loolstat loolwsd-systemplate-setup loolwsd.spec.in \
+ maketarballfordeb.sh.in TODO \
+ ; do
+ git mv wsd/$file .
+done
+
+git mv loolwsd/.gitignore .
+git mv loolwsd/.clang-tidy .
+rmdir loolwsd
More information about the Libreoffice-commits
mailing list