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 b7e821270..000000000 Binary files a/contrib/snap/setup/gui/icon.png and /dev/null differ diff --git a/contrib/snap/snapcraft.yaml b/contrib/snap/snapcraft.yaml deleted file mode 100644 index b3b75d278..000000000 --- a/contrib/snap/snapcraft.yaml +++ /dev/null @@ -1,78 +0,0 @@ -name: monero -version: 0.11.1.0-1 -summary: "Monero: the secure, private, untraceable cryptocurrency https://getmonero.org" -description: | - Monero is a private, secure, untraceable, decentralised digital currency. - You are your bank, you control your funds, and nobody can trace your transfers - unless you allow them to do so. -grade: devel -confinement: strict - -apps: - monerod: - daemon: forking - command: | - monerod-wrapper --detach --data-dir ${SNAP_COMMON} --config-file ${SNAP_USER_DATA}/etc/monerod.conf - plugs: - - network - - network-bind - monero-wallet-rpc: - command: | - monero-wallet-rpc --log-file ${SNAP_USER_DATA} - plugs: - - home - - network - - network-bind - monero-wallet-cli: - command: | - monero-wallet-cli --log-file ${SNAP_USER_DATA} - plugs: - - home - - network - -parts: - cmake-build: - plugin: cmake - configflags: - - -DBDB_STATIC=1 - - -DBoost_USE_STATIC_LIBS=1 - - -DBoost_USE_STATIC_RUNTIME=1 - - -DARCH=default - source: . - build-packages: - - gcc - - pkg-config - - libunbound-dev - - libevent-dev - - libboost-all-dev - - libzmqpp-dev - - libzmq3-dev - - libsodium-dev - - libdb-dev - - libunwind-dev - - libminiupnpc-dev - - libldns-dev - - libexpat1-dev - - libreadline6-dev - - bison - - doxygen - - graphviz - stage-packages: - - libminiupnpc10 - - libunbound2 - - libunwind8 - prime: - - bin - - usr/lib/ - - -usr/lib/gcc - - -usr/share - - dist-files: - plugin: dump - source: . - organize: - contrib/snap/monerod.conf: etc/monerod.conf - contrib/snap/monerod-wrapper: bin/monerod-wrapper - prime: - - etc - - bin diff --git a/snap b/snap deleted file mode 120000 index ef5bb2b3c..000000000 --- a/snap +++ /dev/null @@ -1 +0,0 @@ -contrib/snap \ No newline at end of file diff --git a/utils/build_scripts/collect_from_docker_container.sh b/utils/build_scripts/collect_from_docker_container.sh deleted file mode 100755 index 9d4c189b2..000000000 --- a/utils/build_scripts/collect_from_docker_container.sh +++ /dev/null @@ -1,4 +0,0 @@ -set -ex && mkdir -p build/release/bin -set -ex && docker create --name loki-daemon-container loki-daemon-image -set -ex && docker cp loki-daemon-container:/usr/local/bin/ build/release/ -set -ex && docker rm loki-daemon-container diff --git a/utils/build_scripts/make-release.sh b/utils/build_scripts/make-release.sh deleted file mode 100755 index e71b0cf6c..000000000 --- a/utils/build_scripts/make-release.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash - -TOKEN=$(<$HOME/.gitlab) - -if [ -z "$TOKEN" ] -then - echo Please add a gitlab private access api token to $HOME/.gitlab - exit -fi - -pipeline=$1 -version=$2 - -if [ -z "$version" -o -z "$pipeline" ] -then - echo "Usage: $0 " - 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