From 3417b3c5ee21ddd6c02039cac663632ad249183f Mon Sep 17 00:00:00 2001 From: lparam Date: Fri, 20 Nov 2015 15:26:53 +0800 Subject: [PATCH] hotfix: android build script --- CHANGES.md | 5 +++++ Makefile | 2 +- dist-build/android-build.sh | 8 ++++---- openwrt/Makefile | 2 +- src/common.h | 2 +- 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 457340d..b1a9494 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,8 @@ +v0.4.3 (2015-10-18) +----------- +* Hotfix: Android build script + + v0.4.2 (2015-10-20) ----------- * Change: Rename program name diff --git a/Makefile b/Makefile index 4e45861..28f966b 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ MAJOR = 0 MINOR = 4 -PATCH = 2 +PATCH = 3 NAME = xSocks ifdef O diff --git a/dist-build/android-build.sh b/dist-build/android-build.sh index 6dca002..5fe8cb1 100755 --- a/dist-build/android-build.sh +++ b/dist-build/android-build.sh @@ -13,7 +13,7 @@ fi export MAKE_TOOLCHAIN="${ANDROID_NDK_HOME}/build/tools/make-standalone-toolchain.sh" export TOOLCHAIN_DIR="$(pwd)/android-toolchain-${TARGET_ARCH}" -export PREFIX="$(pwd)/xsocks-android-${TARGET_ARCH}" +export PREFIX="$(pwd)/xSocks-android-${TARGET_ARCH}" export PATH="${PATH}:${TOOLCHAIN_DIR}/bin" if [ ! -d $TOOLCHAIN_DIR ]; then @@ -24,6 +24,6 @@ if [ ! -d $TOOLCHAIN_DIR ]; then fi make CROSS="${HOST_COMPILER}-" O="${PREFIX}" android -${HOST_COMPILER}-strip --strip-unneeded $PREFIX/xsocks -${HOST_COMPILER}-strip --strip-unneeded $PREFIX/xforwarder -echo "xsocks has been installed into $PREFIX" +${HOST_COMPILER}-strip --strip-unneeded $PREFIX/xSocks +${HOST_COMPILER}-strip --strip-unneeded $PREFIX/xForwarder +echo "xSocks has been installed into $PREFIX" diff --git a/openwrt/Makefile b/openwrt/Makefile index 3bba197..db2c433 100644 --- a/openwrt/Makefile +++ b/openwrt/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xSocks -PKG_VERSION:=0.4.2 +PKG_VERSION:=0.4.3 PKG_RELEASE= PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz diff --git a/src/common.h b/src/common.h index 4470596..d43a9b1 100644 --- a/src/common.h +++ b/src/common.h @@ -4,7 +4,7 @@ #include "uv.h" #include "socks.h" -#define XSOCKS_VERSION "0.4.2" +#define XSOCKS_VERSION "0.4.3" struct server_context { int index;