From 66eac9cca2c447f18b452ad08f961cd9029b6ba4 Mon Sep 17 00:00:00 2001 From: R4SAS Date: Mon, 30 Oct 2017 20:33:25 +0300 Subject: [PATCH] eleminate i2psam makefiles, update ru locale --- src/i2psam/makefile.linux-mingw | 78 ---------------------- src/i2psam/makefile.mingw | 114 -------------------------------- src/i2psam/makefile.unix | 112 ------------------------------- src/qt/locale/bitcoin_ru.ts | 2 +- 4 files changed, 1 insertion(+), 305 deletions(-) delete mode 100644 src/i2psam/makefile.linux-mingw delete mode 100644 src/i2psam/makefile.mingw delete mode 100644 src/i2psam/makefile.unix diff --git a/src/i2psam/makefile.linux-mingw b/src/i2psam/makefile.linux-mingw deleted file mode 100644 index 200bef3..0000000 --- a/src/i2psam/makefile.linux-mingw +++ /dev/null @@ -1,78 +0,0 @@ -############################################################################# -# Makefile for building: libi2psam -# Generated by qmake (2.01a) (Qt 4.8.3) on: ?? ????. 10 02:43:02 2013 -# Project: i2psam.pro -# Template: lib -############################################################################# - -####### Compiler, tools and options - -CC = i586-mingw32msvc-gcc -CXX = i586-mingw32msvc-g++ -DEFINES = -D_MT -DWIN32 -D_WINDOWS -CFLAGS = -pipe -isystem /usr/i586-mingw32msvc/include/ -O2 -Wall -Wextra $(DEFINES) -CXXFLAGS = -O2 -fexceptions -Wall -Wextra $(DEFINES) -INCPATH = -I'../../dependencies/mingw32/qt/include' -I'../../dependencies/mingw32' -I'../../dependencies/mingw32/qt/include/ActiveQt' -I'../../dependencies/mingw32/qt/mkspecs/unsupported/win32-g++-cross' -LIB = i586-mingw32msvc-ar -ru -COPY = cp -SED = sed -COPY_FILE = $(COPY) -COPY_DIR = cp -R -DEL_FILE = rm -f -DEL_DIR = rmdir -MOVE = mv -CHK_DIR_EXISTS= test -d -MKDIR = mkdir -p -INSTALL_FILE = $(COPY_FILE) -INSTALL_PROGRAM = $(COPY_FILE) -INSTALL_DIR = $(COPY_DIR) - -####### Files - -SOURCES = i2psam.cpp -OBJECTS = i2psam.o -TARGET = libi2psam.a - -####### Implicit rules - -.SUFFIXES: .cpp .cc .cxx .C .c - -.cpp.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< - -.cc.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< - -.cxx.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< - -.C.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< - -.c.o: - $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< - -####### Build rules - -first: all -all: $(TARGET) - -$(TARGET): $(OBJECTS) - $(LIB) $(TARGET) $(OBJECTS) - -clean: - -$(DEL_FILE) release/$(TARGET) - -$(DEL_FILE) release/i2psam.o - -distclean: clean - -$(DEL_FILE) $(TARGET) - -####### Compile - -release/i2psam.o: i2psam.cpp i2psam.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/i2psam.o i2psam.cpp - -####### Install - -FORCE: - diff --git a/src/i2psam/makefile.mingw b/src/i2psam/makefile.mingw deleted file mode 100644 index 81d8015..0000000 --- a/src/i2psam/makefile.mingw +++ /dev/null @@ -1,114 +0,0 @@ -############################################################################# -# Makefile for building: libi2psam.a -# make -f makefile.mingw -############################################################################# - -####### Compiler, tools and options - -CC = gcc -CXX = g++ -DEFINES = -D_MT -DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -DBOOST_SPIRIT_THREADSAFE - -CFLAGS = -pipe -O2 -fPIC -Wall -W -D_REENTRANT $(DEFINES) -CXXFLAGS = -pipe -O2 -std=c++11 -fPIC -Wall -W -D_REENTRANT $(DEFINES) -AR = ar cqs -RANLIB = -TAR = tar -cf -COMPRESS = gzip -9f -COPY = cp -f -SED = sed -COPY_FILE = $(COPY) -COPY_DIR = $(COPY) -r -STRIP = strip -INSTALL_FILE = install -m 644 -p -INSTALL_DIR = $(COPY_DIR) -INSTALL_PROGRAM = install -m 755 -p -DEL_FILE = rm -f -SYMLINK = ln -f -s -DEL_DIR = rmdir -MOVE = mv -f -CHK_DIR_EXISTS= test -d -MKDIR = mkdir -p - -####### Output directory - -OBJECTS_DIR = ./ - -####### Files - -SOURCES = i2psam.cpp -OBJECTS = i2psam.o -DESTDIR = -TARGET = libi2psam.a - -first: all -####### Implicit rules - -.SUFFIXES: .o .c .cpp .cc .cxx .C - -.cpp.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" - -.cc.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" - -.cxx.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" - -.C.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" - -.c.o: - $(CC) -c $(CFLAGS) $(INCPATH) -o "$@" "$<" - -####### Build rules - -all: $(TARGET) - -staticlib: $(TARGET) - -$(TARGET): $(OBJECTS) $(OBJCOMP) - -$(DEL_FILE) $(TARGET) - $(AR) $(TARGET) $(OBJECTS) - - -dist: - @$(CHK_DIR_EXISTS) .tmp/i2psam1.0.0 || $(MKDIR) .tmp/i2psam1.0.0 - $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/i2psam1.0.0/ && $(COPY_FILE) --parents i2psam.h .tmp/i2psam1.0.0/ && $(COPY_FILE) --parents i2psam.cpp .tmp/i2psam1.0.0/ && (cd `dirname .tmp/i2psam1.0.0` && $(TAR) i2psam1.0.0.tar i2psam1.0.0 && $(COMPRESS) i2psam1.0.0.tar) && $(MOVE) `dirname .tmp/i2psam1.0.0`/i2psam1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/i2psam1.0.0 - - -clean: - -$(DEL_FILE) $(TARGET) - -$(DEL_FILE) $(OBJECTS) - - -####### Sub-libraries - -distclean: clean - -$(DEL_FILE) $(TARGET) - - -check: first - -####### Compile - -i2psam.o: i2psam.cpp i2psam.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o i2psam.o i2psam.cpp - -####### Install - -install_target: first FORCE - @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/lib/ || $(MKDIR) $(INSTALL_ROOT)/usr/lib/ - -$(INSTALL_FILE) "$(TARGET)" "$(INSTALL_ROOT)/usr/lib/$(TARGET)" - -uninstall_target: FORCE - -$(DEL_FILE) "$(INSTALL_ROOT)/usr/lib/$(TARGET)" - -$(DEL_DIR) $(INSTALL_ROOT)/usr/lib/ - - -install: install_target FORCE - -uninstall: uninstall_target FORCE - -FORCE: - diff --git a/src/i2psam/makefile.unix b/src/i2psam/makefile.unix deleted file mode 100644 index 0b68896..0000000 --- a/src/i2psam/makefile.unix +++ /dev/null @@ -1,112 +0,0 @@ -############################################################################# -# Makefile for building: libi2psam.a -# make -f makefile.unix -############################################################################# - -####### Compiler, tools and options - -CC = gcc -CXX = g++ -CFLAGS = -pipe -O2 -fPIC -Wall -W -D_REENTRANT $(DEFINES) -CXXFLAGS = -pipe -O2 -std=c++11 -fPIC -Wall -W -D_REENTRANT $(DEFINES) -AR = ar cqs -RANLIB = -TAR = tar -cf -COMPRESS = gzip -9f -COPY = cp -f -SED = sed -COPY_FILE = $(COPY) -COPY_DIR = $(COPY) -r -STRIP = strip -INSTALL_FILE = install -m 644 -p -INSTALL_DIR = $(COPY_DIR) -INSTALL_PROGRAM = install -m 755 -p -DEL_FILE = rm -f -SYMLINK = ln -f -s -DEL_DIR = rmdir -MOVE = mv -f -CHK_DIR_EXISTS= test -d -MKDIR = mkdir -p - -####### Output directory - -OBJECTS_DIR = ./ - -####### Files - -SOURCES = i2psam.cpp -OBJECTS = i2psam.o -DESTDIR = -TARGET = libi2psam.a - -first: all -####### Implicit rules - -.SUFFIXES: .o .c .cpp .cc .cxx .C - -.cpp.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" - -.cc.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" - -.cxx.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" - -.C.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" - -.c.o: - $(CC) -c $(CFLAGS) $(INCPATH) -o "$@" "$<" - -####### Build rules - -all: $(TARGET) - -staticlib: $(TARGET) - -$(TARGET): $(OBJECTS) $(OBJCOMP) - -$(DEL_FILE) $(TARGET) - $(AR) $(TARGET) $(OBJECTS) - - -dist: - @$(CHK_DIR_EXISTS) .tmp/i2psam1.0.0 || $(MKDIR) .tmp/i2psam1.0.0 - $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/i2psam1.0.0/ && $(COPY_FILE) --parents i2psam.h .tmp/i2psam1.0.0/ && $(COPY_FILE) --parents i2psam.cpp .tmp/i2psam1.0.0/ && (cd `dirname .tmp/i2psam1.0.0` && $(TAR) i2psam1.0.0.tar i2psam1.0.0 && $(COMPRESS) i2psam1.0.0.tar) && $(MOVE) `dirname .tmp/i2psam1.0.0`/i2psam1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/i2psam1.0.0 - - -clean: - -$(DEL_FILE) $(TARGET) - -$(DEL_FILE) $(OBJECTS) - - -####### Sub-libraries - -distclean: clean - -$(DEL_FILE) $(TARGET) - - -check: first - -####### Compile - -i2psam.o: i2psam.cpp i2psam.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o i2psam.o i2psam.cpp - -####### Install - -install_target: first FORCE - @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/lib/ || $(MKDIR) $(INSTALL_ROOT)/usr/lib/ - -$(INSTALL_FILE) "$(TARGET)" "$(INSTALL_ROOT)/usr/lib/$(TARGET)" - -uninstall_target: FORCE - -$(DEL_FILE) "$(INSTALL_ROOT)/usr/lib/$(TARGET)" - -$(DEL_DIR) $(INSTALL_ROOT)/usr/lib/ - - -install: install_target FORCE - -uninstall: uninstall_target FORCE - -FORCE: - diff --git a/src/qt/locale/bitcoin_ru.ts b/src/qt/locale/bitcoin_ru.ts index 077773d..499ce1f 100644 --- a/src/qt/locale/bitcoin_ru.ts +++ b/src/qt/locale/bitcoin_ru.ts @@ -1368,7 +1368,7 @@ Address: %4 IPRestriction - IPRestriction + ограничения по IP