Repo: contrib cleanup

.clang-format

@@ -1,19 +0,0 @@
-Language: Cpp
-BasedOnStyle: Google
-
-AlignAfterOpenBracket: AlwaysBreak
-AlignTrailingComments: false
-AllowAllParametersOfDeclarationOnNextLine: false
-AllowShortBlocksOnASingleLine: false
-AllowShortFunctionsOnASingleLine: Empty
-AllowShortIfStatementsOnASingleLine: false
-AllowShortLoopsOnASingleLine: false
-BinPackArguments: false
-BinPackParameters: false
-BreakBeforeBinaryOperators: NonAssignment
-BreakBeforeBraces: GNU
-ColumnLimit: 80
-CommentPragmas: '.*'
-DerivePointerAlignment: false
-PointerAlignment: Left
-SpacesBeforeTrailingComments: 2

.clang-format

@@ -0,0 +1 @@
+contrib/utils/clang-format

.cppdep.yml

@@ -1,45 +0,0 @@
-internal:
-    - name: kovri
-      path: src
-      packages:
-          - name: include
-            include:
-                - .
-          - name: core
-            src:
-                - core
-          - name: app
-            src:
-                - app
-          - name: client
-            src:
-                - client
-          - name: util
-            src:
-                - util
-external:
-    - name: Dependencies
-      path: /usr/include
-      packages:
-          - name: STL
-            pattern:
-                - "[a-z_]+$"
-          - name: Boost
-            pattern:
-                - boost
-          - name: LibXML
-            pattern:
-                - libxml
-          - name: Qt5
-            pattern:
-                - Q\w+
-                - ui_
-          - name: Windows System
-            pattern:
-                - windows.h
-    - name: ExternalProjects
-      path: deps
-      packages:
-          - name: cryptopp
-            pattern:
-                - cryptopp

.cppdep.yml

@@ -0,0 +1 @@
+contrib/utils/cppdep.yml

.dockerignore

@@ -1 +0,0 @@
-Dockerfile

.dockerignore

@@ -0,0 +1 @@
+contrib/pkg/docker/dockerignore

CPPLINT.cfg

@@ -1 +1 @@
-contrib/CPPLINT.cfg
+contrib/utils/CPPLINT.cfg

Dockerfile

@@ -1 +1 @@
-contrib/docker/Dockerfile
+contrib/pkg/docker/Dockerfile

cmake/UseDoxygen.cmake

@@ -86,7 +86,7 @@ find_package(Doxygen)
 
 if(DOXYGEN_FOUND)
   find_file(DOXYFILE_IN "Doxyfile.in"
-      PATHS "${CMAKE_CURRENT_SOURCE_DIR}/contrib"
+      PATHS "${CMAKE_CURRENT_SOURCE_DIR}/contrib/utils/doxygen"
       NO_DEFAULT_PATH
       DOC "Path to the doxygen configuration template file")
   set(DOXYFILE "${CMAKE_CURRENT_BINARY_DIR}/Doxyfile")

contrib/pkg/docker/dockerignore

@@ -0,0 +1 @@
+Dockerfile

contrib/testnet/testnet.sh

@@ -41,7 +41,7 @@ mount_testnet="${mount}/testnet"
 
 kovri_data_dir=".kovri"
 
-docker_dir="contrib/docker/testnet"
+docker_dir="contrib/testnet"
 
 # TODO(unassigned): only useful if we don't use Apache
 web_name="kovri-webserver"
@@ -221,7 +221,7 @@ set_images()
     KOVRI_DOCKERFILE=${_default_dockerfile}
     read_input "Change Dockerfile?: [KOVRI_DOCKERFILE=${KOVRI_DOCKERFILE}]" KOVRI_DOCKERFILE
   fi
-  local _kovri_dockerfile_path="${KOVRI_REPO}/${docker_dir}/dockerfiles/${KOVRI_DOCKERFILE}"
+  local _kovri_dockerfile_path="${KOVRI_REPO}/${docker_dir}/Dockerfiles/${KOVRI_DOCKERFILE}"
   read_bool_input "Build Kovri Docker image? [$KOVRI_IMAGE]" KOVRI_BUILD_IMAGE "docker build -t $KOVRI_IMAGE -f $_kovri_dockerfile_path $KOVRI_REPO"
 
   # Select Kovri Webserver Dockerfile
@@ -230,7 +230,7 @@ set_images()
     KOVRI_WEB_DOCKERFILE=${_default_web_dockerfile}
     read_input "Change Dockerfile?: [KOVRI_WEB_DOCKERFILE=${KOVRI_WEB_DOCKERFILE}]" KOVRI_WEB_DOCKERFILE
   fi
-  local _web_dockerfile_path="${KOVRI_REPO}/${docker_dir}/dockerfiles/${KOVRI_WEB_DOCKERFILE}"
+  local _web_dockerfile_path="${KOVRI_REPO}/${docker_dir}/Dockerfiles/${KOVRI_WEB_DOCKERFILE}"
   read_bool_input "Build Web Docker image? [$KOVRI_WEB_IMAGE]" KOVRI_BUILD_WEB_IMAGE "docker build -t $KOVRI_WEB_IMAGE -f $_web_dockerfile_path $KOVRI_REPO"
 
   popd
@@ -414,7 +414,7 @@ create_data_dir()
   catch "Could not set ownership ${pid}:${gid}"
 
   # Create data-dir + copy only what's needed from pkg
-  mkdir -p ${_host_data_dir}/core && cp -r ${KOVRI_REPO}/pkg/{client,config,*.sh} "$_host_data_dir"
+  mkdir -p ${_host_data_dir}/core && cp -r ${KOVRI_REPO}/{pkg/client,pkg/config,contrib/kovri-bash.sh} "$_host_data_dir"
 
   # Set webserver IP
   local _web_host="${network_octets}${web_host_octet}"

contrib/utils/clang-format

@@ -0,0 +1,19 @@
+Language: Cpp
+BasedOnStyle: Google
+
+AlignAfterOpenBracket: AlwaysBreak
+AlignTrailingComments: false
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortBlocksOnASingleLine: false
+AllowShortFunctionsOnASingleLine: Empty
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+BinPackArguments: false
+BinPackParameters: false
+BreakBeforeBinaryOperators: NonAssignment
+BreakBeforeBraces: GNU
+ColumnLimit: 80
+CommentPragmas: '.*'
+DerivePointerAlignment: false
+PointerAlignment: Left
+SpacesBeforeTrailingComments: 2

contrib/utils/cppdep.yml

@@ -0,0 +1,45 @@
+internal:
+    - name: kovri
+      path: src
+      packages:
+          - name: include
+            include:
+                - .
+          - name: core
+            src:
+                - core
+          - name: app
+            src:
+                - app
+          - name: client
+            src:
+                - client
+          - name: util
+            src:
+                - util
+external:
+    - name: Dependencies
+      path: /usr/include
+      packages:
+          - name: STL
+            pattern:
+                - "[a-z_]+$"
+          - name: Boost
+            pattern:
+                - boost
+          - name: LibXML
+            pattern:
+                - libxml
+          - name: Qt5
+            pattern:
+                - Q\w+
+                - ui_
+          - name: Windows System
+            pattern:
+                - windows.h
+    - name: ExternalProjects
+      path: deps
+      packages:
+          - name: cryptopp
+            pattern:
+                - cryptopp

pkg/installers/kovri-install.sh

@@ -107,7 +107,7 @@ shift "$(($OPTIND -1))"
 
 # Set default resources if needed
 if [[ -z $resources ]]; then
-  resources="pkg/client pkg/config pkg/kovri-bash.sh build/${bins[0]} build/${bins[1]}"
+  resources="pkg/client pkg/config contrib/utils/kovri-bash.sh build/${bins[0]} build/${bins[1]}"
 fi
 
 # Test if resources are available

snap

@@ -1 +1 @@
-contrib/snap/
+contrib/pkg/snap/