Merge pull request 'Remove references to old repo' (#336) from tobtoht/feather:old_repo into master

Reviewed-on: https://git.featherwallet.org/feather/feather/pulls/336
This commit is contained in:
tobtoht 2021-02-15 18:53:44 +00:00
commit 191fa013b5
9 changed files with 11 additions and 99 deletions

View file

@ -18,7 +18,7 @@ so that the resulting Feather binary is static. For more information, check the
#### 1. Clone #### 1. Clone
```bash ```bash
git clone --branch master --recursive https://git.wownero.com/feather/feather.git git clone --branch master --recursive https://git.featherwallet.org/feather/feather.git
cd feather cd feather
``` ```
@ -57,7 +57,7 @@ docker run --rm -it -v $PWD:/feather -w /feather feather:linux contrib/build-app
#### 1. Clone #### 1. Clone
```bash ```bash
git clone --branch master --recursive https://git.wownero.com/feather/feather.git git clone --branch master --recursive https://git.featherwallet.org/feather/feather.git
cd feather cd feather
``` ```
@ -94,7 +94,7 @@ HOMEBREW_OPTFLAGS="-march=core2" HOMEBREW_OPTIMIZATION_LEVEL="O0" \
Clone the repository. Clone the repository.
```bash ```bash
git clone --recursive https://git.wownero.com/feather/feather.git git clone --recursive https://git.featherwallet.org/feather/feather.git
``` ```
Get the latest LTS from here: https://www.qt.io/offline-installers and install. Get the latest LTS from here: https://www.qt.io/offline-installers and install.

View file

@ -126,7 +126,7 @@ find_package(monero-seed CONFIG)
if(NOT monero-seed_FOUND) if(NOT monero-seed_FOUND)
if(FETCH_DEPS) if(FETCH_DEPS)
FetchContent_Declare(monero-seed FetchContent_Declare(monero-seed
GIT_REPOSITORY https://git.wownero.com/feather/monero-seed.git) GIT_REPOSITORY https://git.featherwallet.org/feather/monero-seed.git)
FetchContent_GetProperties(monero-seed) FetchContent_GetProperties(monero-seed)
if(NOT monero-seed_POPULATED) if(NOT monero-seed_POPULATED)
message(STATUS "Fetching monero-seed") message(STATUS "Fetching monero-seed")

View file

@ -392,7 +392,7 @@ RUN git clone -b v4.0.2 --depth 1 https://github.com/fukuchi/libqrencode.git &&
make -j$THREADS install && \ make -j$THREADS install && \
rm -rf $(pwd) rm -rf $(pwd)
RUN git clone https://git.wownero.com/feather/monero-seed.git && \ RUN git clone https://git.featherwallet.org/feather/monero-seed.git && \
cd monero-seed && \ cd monero-seed && \
git reset --hard 4674ef09b6faa6fe602ab5ae0b9ca8e1fd7d5e1b && \ git reset --hard 4674ef09b6faa6fe602ab5ae0b9ca8e1fd7d5e1b && \
cmake -DCMAKE_BUILD_TYPE=Release -Bbuild && \ cmake -DCMAKE_BUILD_TYPE=Release -Bbuild && \

View file

@ -172,7 +172,7 @@ RUN git clone -b tor-0.4.5.5-rc --depth 1 https://git.torproject.org/tor.git &&
rm -rf $(pwd) && \ rm -rf $(pwd) && \
strip -s -D /usr/local/tor/bin/tor.exe strip -s -D /usr/local/tor/bin/tor.exe
RUN git clone https://git.wownero.com/feather/monero-seed.git && \ RUN git clone https://git.featherwallet.org/feather/monero-seed.git && \
cd monero-seed && \ cd monero-seed && \
git reset --hard 4674ef09b6faa6fe602ab5ae0b9ca8e1fd7d5e1b && \ git reset --hard 4674ef09b6faa6fe602ab5ae0b9ca8e1fd7d5e1b && \
cmake -DCMAKE_INSTALL_PREFIX=/depends/x86_64-w64-mingw32 \ cmake -DCMAKE_INSTALL_PREFIX=/depends/x86_64-w64-mingw32 \

View file

@ -1,74 +0,0 @@
FROM ubuntu:18.04
ARG THREADS=1
RUN apt clean && apt update
ARG DEBIAN_FRONTEND=noninteractive
ENV TZ=Europe/Amsterdam
RUN apt install -y \
autoconf \
automake \
autopoint \
aptitude \
bash \
build-essential \
bison \
bzip2 \
ccache \
flex \
g++ \
g++-multilib \
gettext \
git \
gperf \
intltool \
libc6-dev-i386 \
libgdk-pixbuf2.0-dev \
libltdl-dev \
libssl-dev \
libtool-bin \
libxml-parser-perl \
lzip \
nano \
make \
openssl \
p7zip-full \
patch \
perl \
python \
python-mako \
ruby \
sed \
scons \
software-properties-common \
unzip \
tzdata \
vim \
wget \
xz-utils
RUN git clone -b feather-patch --depth 1 https://git.wownero.com/feather/mxe.git && \
cd mxe && \
make -j$THREADS MXE_TARGETS='x86_64-w64-mingw32.static' gcc libqrencode pkgconf libgpg_error libgcrypt cmake libsodium lzma readline libzmq boost qtbase qtsvg qtwebsockets qtimageformats qtmultimedia
# plugins
RUN cd mxe && make -j$THREADS MXE_PLUGIN_DIRS='/mxe/plugins/apps/' MXE_TARGETS='x86_64-w64-mingw32.static' tor
# fix env.
RUN echo "export PATH=\"/mxe/usr/bin/:\$PATH\"" >> "/root/.bashrc"
RUN ln -s /mxe/usr/bin/x86_64-w64-mingw32.static-cmake /usr/local/bin/cmake
RUN ln -s /mxe/usr/bin/x86_64-w64-mingw32.static-windres /usr/local/bin/windres
RUN ln -s /mxe/usr/x86_64-w64-mingw32.static/lib/libsicudt.a /mxe/usr/x86_64-w64-mingw32.static/lib/libicudt.a
RUN ln -s /mxe/usr/x86_64-w64-mingw32.static/lib/libsicuio.a /mxe/usr/x86_64-w64-mingw32.static/lib/libicuio.a
RUN ln -s /mxe/usr/x86_64-w64-mingw32.static/lib/libsicutu.a /mxe/usr/x86_64-w64-mingw32.static/lib/libicutu.a
RUN ln -s /mxe/usr/x86_64-w64-mingw32.static/lib/libsicuuc.a /mxe/usr/x86_64-w64-mingw32.static/lib/libicuuc.a
RUN ln -s /mxe/usr/x86_64-w64-mingw32.static/lib/libsicuin.a /mxe/usr/x86_64-w64-mingw32.static/lib/libicuin.a
ENV PATH="/mxe/usr/bin/:$PATH"
RUN git clone https://git.wownero.com/feather/monero-seed.git && \
cd monero-seed && \
cmake -DCMAKE_BUILD_TYPE=Release -Bbuild && \
make -Cbuild -j$THREADS && \
make -Cbuild install

View file

@ -52,20 +52,6 @@ depends:
mkdir -p build/$(target)/release mkdir -p build/$(target)/release
cd build/$(target)/release && cmake -D STATIC=ON -DREPRODUCIBLE=$(or ${SOURCE_DATE_EPOCH},OFF) -DTOR_VERSION=$(or ${TOR_VERSION}, OFF) -DTOR_BIN=$(or ${TOR_BIN},OFF) -D DEV_MODE=$(or ${DEV_MODE},OFF) -D BUILD_TAG=$(tag) -D CMAKE_BUILD_TYPE=Release -D CMAKE_TOOLCHAIN_FILE=$(root)/$(target)/share/toolchain.cmake ../../.. && $(MAKE) cd build/$(target)/release && cmake -D STATIC=ON -DREPRODUCIBLE=$(or ${SOURCE_DATE_EPOCH},OFF) -DTOR_VERSION=$(or ${TOR_VERSION}, OFF) -DTOR_BIN=$(or ${TOR_BIN},OFF) -D DEV_MODE=$(or ${DEV_MODE},OFF) -D BUILD_TAG=$(tag) -D CMAKE_BUILD_TYPE=Release -D CMAKE_TOOLCHAIN_FILE=$(root)/$(target)/share/toolchain.cmake ../../.. && $(MAKE)
windows-mxe-release: CMAKEFLAGS += -DBUILD_TAG="win-x64"
windows-mxe-release: CMAKEFLAGS += -DTOR_BIN=$(or ${TOR_BIN},OFF)
windows-mxe-release: CMAKEFLAGS += -DCMAKE_BUILD_TYPE=Release
windows-mxe-release:
cmake -Bbuild $(CMAKEFLAGS)
$(MAKE) -Cbuild
windows-mxe-debug: CMAKEFLAGS += -DBUILD_TAG="win-x64"
windows-mxe-debug: CMAKEFLAGS += -DTOR_BIN=$(or ${TOR_BIN},OFF)
windows-mxe-debug: CMAKEFLAGS += -DCMAKE_BUILD_TYPE=Debug
windows-mxe-debug:
cmake -Bbuild $(CMAKEFLAGS)
$(MAKE) -Cbuild
mac-release: CMAKEFLAGS += -DSTATIC=Off mac-release: CMAKEFLAGS += -DSTATIC=Off
mac-release: CMAKEFLAGS += -DTOR_BIN=$(or ${TOR_BIN},OFF) mac-release: CMAKEFLAGS += -DTOR_BIN=$(or ${TOR_BIN},OFF)
mac-release: CMAKEFLAGS += -DBUILD_TAG="mac-x64" mac-release: CMAKEFLAGS += -DBUILD_TAG="mac-x64"

View file

@ -11,7 +11,7 @@ url="https://featherwallet.org"
depends=('boost-libs' 'libunwind' 'openssl' 'readline' 'pcsclite' 'hidapi' 'protobuf' 'miniupnpc' 'libgcrypt' 'qrencode' 'libsodium' 'libpgm' 'expat' 'qt5-base' 'qt5-websockets' 'tor') depends=('boost-libs' 'libunwind' 'openssl' 'readline' 'pcsclite' 'hidapi' 'protobuf' 'miniupnpc' 'libgcrypt' 'qrencode' 'libsodium' 'libpgm' 'expat' 'qt5-base' 'qt5-websockets' 'tor')
makedepends=('git' 'cmake' 'boost') makedepends=('git' 'cmake' 'boost')
source=("${pkgname}"::"git+https://git.wownero.com/feather/feather") source=("${pkgname}"::"git+https://git.featherwallet.org/feather/feather")
sha256sums=('SKIP') sha256sums=('SKIP')

View file

@ -6,7 +6,7 @@ Feather is a free, open-source Monero client Linux with ports for Mac OS and Win
## Development resources ## Development resources
* Web: [featherwallet.org](https://featherwallet.org) * Web: [featherwallet.org](https://featherwallet.org)
* Git: [git.wownero.com/feather/feather](https://git.wownero.com/feather/feather) * Git: [git.featherwallet.org/feather/feather](https://git.featherwallet.org/feather/feather)
* IRC: `#feather` on OFTC * IRC: `#feather` on OFTC
* Development builds: [build.featherwallet.org/files](https://build.featherwallet.org/files/) * Development builds: [build.featherwallet.org/files](https://build.featherwallet.org/files/)
@ -20,7 +20,7 @@ Feather uses Monero, as such it requires the same dependencies as outlined in [M
- libqrencode - libqrencode
- openpgp - openpgp
See [BUILDING.md](https://git.wownero.com/feather/feather/src/branch/master/BUILDING.md) for information on how to compile a build. See [BUILDING.md](https://git.featherwallet.org/feather/feather/src/branch/master/BUILDING.md) for information on how to compile a build.
## Supporting the project ## Supporting the project
@ -30,6 +30,6 @@ Feather is a 100% community-sponsored endeavor. If you want to join our efforts,
## Developers ## Developers
See [HACKING.md](https://git.wownero.com/feather/feather/src/branch/master/HACKING.md) for useful development resources. See [HACKING.md](https://git.featherwallet.org/feather/feather/src/branch/master/HACKING.md) for useful development resources.
It is HIGHLY recommended that you join the `#feather` IRC channel on OFTC if you are hacking on Feather. Due to the nature of this open source software project, joining this channel and idling is the best way to stay updated on best practices and new developments. It is HIGHLY recommended that you join the `#feather` IRC channel on OFTC if you are hacking on Feather. Due to the nature of this open source software project, joining this channel and idling is the best way to stay updated on best practices and new developments.

View file

@ -88,7 +88,7 @@ MainWindow::MainWindow(AppContext *ctx, QWidget *parent) :
connect(ui->actionReport_bug, &QAction::triggered, [this](){ connect(ui->actionReport_bug, &QAction::triggered, [this](){
QMessageBox::information(this, "Reporting Bugs", QMessageBox::information(this, "Reporting Bugs",
"<body>Please report any bugs as issues on our git repo:<br>\n" "<body>Please report any bugs as issues on our git repo:<br>\n"
"<a href=\"https://git.wownero.com/feather/feather/issues\" style=\"color: #33A4DF\">https://git.wownero.com/feather/feather/issues</a><br/><br/>" "<a href=\"https://git.featherwallet.org/feather/feather/issues\" style=\"color: #33A4DF\">https://git.featherwallet.org/feather/feather/issues</a><br/><br/>"
"\n" "\n"
"Before reporting a bug, upgrade to the most recent version of Feather " "Before reporting a bug, upgrade to the most recent version of Feather "
"(latest release or git HEAD), and include the version number in your report. " "(latest release or git HEAD), and include the version number in your report. "