From f3325f9ec8790f49bbd06a7533ecd5429b6613f5 Mon Sep 17 00:00:00 2001 From: Jason Rhinelander Date: Fri, 26 Mar 2021 16:10:42 -0300 Subject: [PATCH] Clean up unused/unmaintained contrib and utils Everything removed here is unsupported and doesn't work (leftover stuff from Monero). --- .gitignore | 2 + .gitlab-ci.yml | 49 ----------- contrib/codefresh/codefresh.yml | 18 ---- contrib/snap/monerod-wrapper | 8 -- contrib/snap/monerod.conf | 10 --- contrib/snap/setup/gui/icon.png | Bin 1531 -> 0 bytes contrib/snap/snapcraft.yaml | 78 ------------------ snap | 1 - .../collect_from_docker_container.sh | 4 - utils/build_scripts/make-release.sh | 42 ---------- utils/build_scripts/windows.bat | 45 ---------- utils/conf/monerod.conf | 8 -- utils/systemd/monerod.service | 36 -------- 13 files changed, 2 insertions(+), 299 deletions(-) delete mode 100644 .gitlab-ci.yml delete mode 100644 contrib/codefresh/codefresh.yml delete mode 100755 contrib/snap/monerod-wrapper delete mode 100644 contrib/snap/monerod.conf delete mode 100644 contrib/snap/setup/gui/icon.png delete mode 100644 contrib/snap/snapcraft.yaml delete mode 120000 snap delete mode 100755 utils/build_scripts/collect_from_docker_container.sh delete mode 100755 utils/build_scripts/make-release.sh delete mode 100644 utils/build_scripts/windows.bat delete mode 100644 utils/conf/monerod.conf delete mode 100644 utils/systemd/monerod.service diff --git a/.gitignore b/.gitignore index aec4abf3e..f3dcfa1ff 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,8 @@ .DS_Store /doc /build* +/compile_commands.json +/.cache /tags log/ diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index a14faaf85..000000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,49 +0,0 @@ -variables: - GIT_SUBMODULE_STRATEGY: recursive - GIT_STRATEGY: fetch - GIT_DEPTH: "1" - -stages: - - build - - test - -build:windows: - tags: - - windows - stage: build - script: - - export USE_SINGLE_BUILDDIR=1 - - cat /proc/version - - make release-static-win64 - artifacts: - paths: - - "build/release/bin" - -build:osx: - tags: - - osx - stage: build - script: - - sw_vers - - export USE_SINGLE_BUILDDIR=1 - - source ~/Builds/loki_env.sh - - make -j4 release-static-mac-x86_64 - artifacts: - paths: - - "build/release/bin" - -build:linux: - image: registry.gitlab.com/lokiproject/loki:latest - tags: - - ubuntu - stage: build - script: - - export USE_SINGLE_BUILDDIR=1 - # print our runner distro - - cat /proc/version - # print the current commit hash - - echo $CI_COMMIT_SHA - - make -j$THREAD_COUNT release-static - artifacts: - paths: - - "build/release/bin" diff --git a/contrib/codefresh/codefresh.yml b/contrib/codefresh/codefresh.yml deleted file mode 100644 index a22debfa1..000000000 --- a/contrib/codefresh/codefresh.yml +++ /dev/null @@ -1,18 +0,0 @@ -version: '1.0' -steps: - init_submodules: - title: Init Submodules - commands: - - git submodule update --init --recursive - image: codefreshio/git-image:latest - working_directory: ${{main_clone}} - - BuildingDockerImage: - title: Building Docker Image - type: build - image_name: monero - working_directory: ./ - tag: '${{CF_BRANCH_TAG_NORMALIZED}}' - dockerfile: Dockerfile - build_arguments: - - NPROC=1 diff --git a/contrib/snap/monerod-wrapper b/contrib/snap/monerod-wrapper deleted file mode 100755 index f7266e11c..000000000 --- a/contrib/snap/monerod-wrapper +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -if [ ! -d "$SNAP_USER_DATA/etc" ]; then - mkdir $SNAP_USER_DATA/etc/ - cp -R $SNAP/etc/monerod.conf $SNAP_USER_DATA/etc/monerod.conf -fi - -exec "$SNAP/bin/monerod" "$@" diff --git a/contrib/snap/monerod.conf b/contrib/snap/monerod.conf deleted file mode 100644 index 1078e73b2..000000000 --- a/contrib/snap/monerod.conf +++ /dev/null @@ -1,10 +0,0 @@ -# Configuration for monerod -# Syntax: any command line option may be specified as 'clioptionname=value'. -# Boolean options such as 'no-igd' are specified as 'no-igd=1'. -# See 'monerod --help' for all available options. - -# Overridden by snap: -# data-dir=/var/lib/monero -# log-file=/var/log/monero/monero.log - -log-level=0 diff --git a/contrib/snap/setup/gui/icon.png b/contrib/snap/setup/gui/icon.png deleted file mode 100644 index b7e8212704942b8be4e919ad51ff3375fe31c428..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1531 zcmVbQgNCYHG^hpiI1$_|ZK@);6E)N3H2jaq} zF-qb~6O|T4AS@a+f`SMrh#p-XLw6opg!#z`mVLEf~%(T;gGU-g`+;h+GeCM2R zxg+G$fOmoN!2+pMYkD1nuV;Zj zfCqC8vL4tER4{ZZ0qWIK%L&Lf;5G867lGZ`f_$nrbiTC&IFu>KHsBG4k7|KEc0tw; z6H6rOUSNk+keWR2iFA4bc-V?V^w~Yb^B@Tn0o?;xJD!W!G)#4mpT5Gfi-F(lh97>l4T*we4HeZ!#V3r}7mjdDtSIez3 z!?E}@;AEB{@i0Y6VNyfX4$!9^UDAMWa}+CG2lISOtvNI&Y;2vA4k8;Jb^yoIG%B;v z;S>ckcbd!J`E_7C8+~&q*L&ICQDqB4TwirerM(W|Z{UCmRf0*<+_SNs3$-xO^w#f( znd=>dXknfu-?fkB zv!02J)dQCI45no&)#ro2T~;m}qX*a*s9=G=g++z`fQulK>pf(YUX0j`JIuib!#exA zD)=|*#VaD$xXjairR?b$Pq7}vBO(~q50@$GFu7tC0-!)dFmSTQSIeTFW@-vruQ`}| zrB0z1<{oboCGH?d5XV=Q(;Obb2OU-X78*$ufdeC<<0zvX0h}1|5c}1V%%zS2bIkdZ zL=pI+1#}zE1VfmS)h*6W9xM8tDt8;AX30uIQpY2rl<9pVK$c2GdkW_y)$1$Z&K!fB zR3%%H!lwuUg#sDy8*YD>;ld*#I7Vtggdi3}m4G;*Tv*6L$uifPrcS6-&e18sD-knF zw2;3@3t>osLl-hWHfUB=#rN}69(7psTN{8gQqk%{CJp1a0NaOg0sBie*_QH=r<9W% zZaNJtwVPPg0Y45Si1VucW@M5f-k}^>zI76)270ndb?*i~$s@!rV0J7N$u?(yR80MAbGVJk2d_+khE4q*Pm==DLVq5w_611fGBjJ@*%=98#8;MAa%gW@wX zwRdJIOP$MN@E0+k5!L|nF@NrqktfYYzpA|hFc " - exit -fi - -WORKING_DIR=loki-$version - -echo "Working in $WORKING_DIR..." - -mkdir -p $WORKING_DIR -cd $WORKING_DIR - -curl --header 'PRIVATE-TOKEN: '"$TOKEN" "https://gitlab.com/api/v4/projects/7515512/jobs" | - sed 's/},{/\n/g' | - grep $pipeline | - sed 's/.*"id":\([0-9]*\).*name":"build:\([^"]*\)".*/\1 \2/g' | - while read line - do - id=$(echo $line | cut -d' ' -f1) - build=$(echo $line | cut -d' ' -f2) - curl -L --header 'PRIVATE-TOKEN: '"$TOKEN" "https://gitlab.com/lokiproject/loki/-/jobs/$id/artifacts/download" -o artifacts-$build.zip - unzip artifacts-$build.zip - mv build/release/bin loki-$build-x64-$version - zip -r loki-$build-x64-$version.zip loki-$build-x64-$version - done - -echo '#### sha256sum' -sha256sum loki-*-x64-$version.zip diff --git a/utils/build_scripts/windows.bat b/utils/build_scripts/windows.bat deleted file mode 100644 index 717324fab..000000000 --- a/utils/build_scripts/windows.bat +++ /dev/null @@ -1,45 +0,0 @@ -:: Copyright (c) 2014-2018, The Monero Project -:: -:: All rights reserved. -:: -:: Redistribution and use in source and binary forms, with or without modification, are -:: permitted provided that the following conditions are met: -:: -:: 1. Redistributions of source code must retain the above copyright notice, this list of -:: conditions and the following disclaimer. -:: -:: 2. Redistributions in binary form must reproduce the above copyright notice, this list -:: of conditions and the following disclaimer in the documentation and/or other -:: materials provided with the distribution. -:: -:: 3. Neither the name of the copyright holder nor the names of its contributors may be -:: used to endorse or promote products derived from this software without specific -:: prior written permission. -:: -:: THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY -:: EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -:: MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL -:: THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -:: SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -:: PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -:: INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -:: STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF -:: THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -:: Set the following variables according to your environment -set BuildProcessorArchitecture=64 -set LocationDependencyBoostRoot=D:\Development\boost_1_55_0 -set LocationEnvironmentVariableSetterMsbuild=C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat - -call "%LocationEnvironmentVariableSetterMsbuild%" -set LocationDependencyBoostLibrary=%LocationDependencyBoostRoot%\lib%BuildProcessorArchitecture%-msvc-%VisualStudioVersion% - -cd ..\.. -set LocationBuildSource=%CD% -mkdir build\win%BuildProcessorArchitecture% -cd build\win%BuildProcessorArchitecture% - -cmake -G "Visual Studio %VisualStudioVersion:.0=% Win%BuildProcessorArchitecture%" -DBOOST_ROOT="%LocationDependencyBoostRoot%" -DBOOST_LIBRARYDIR="%LocationDependencyBoostLibrary%" "%LocationBuildSource%" -msbuild Project.sln /p:Configuration=Release - -pause diff --git a/utils/conf/monerod.conf b/utils/conf/monerod.conf deleted file mode 100644 index d019576c6..000000000 --- a/utils/conf/monerod.conf +++ /dev/null @@ -1,8 +0,0 @@ -# Configuration for monerod -# Syntax: any command line option may be specified as 'clioptionname=value'. -# Boolean options such as 'no-igd' are specified as 'no-igd=1'. -# See 'monerod --help' for all available options. - -data-dir=/var/lib/monero -log-file=/var/log/monero/monero.log -log-level=0 diff --git a/utils/systemd/monerod.service b/utils/systemd/monerod.service deleted file mode 100644 index 5f37e54b2..000000000 --- a/utils/systemd/monerod.service +++ /dev/null @@ -1,36 +0,0 @@ -[Unit] -Description=Monero Full Node -After=network.target - -[Service] -User=monero -Group=monero -WorkingDirectory=~ -RuntimeDirectory=monero - -# Clearnet config -# -Type=forking -PIDFile=/run/monero/monerod.pid -ExecStart=/usr/bin/monerod --config-file /etc/monerod.conf \ - --detach --pidfile /run/monero/monerod.pid - -# Tor config -# -## We have to use simple, not forking, because we cannot pass --detach -## because stderr/stdout is not available when detached, but torsocks -## attempts to write to it, and fails with 'invalid argument', causing -## monerod to fail. -#Type=simple -#Environment=DNS_PUBLIC=tcp -## The following is needed only when accessing wallet from a different -## host in the LAN, VPN, etc, the RPC must bind to 0.0.0.0, but -## by default torsocks only allows binding to localhost. -#Environment=TORSOCKS_ALLOW_INBOUND=1 -#ExecStart=/usr/bin/torsocks /usr/bin/monerod --config-file /etc/monerod.conf \ -# --non-interactive - -Restart=always - -[Install] -WantedBy=multi-user.target