Commit ac52cd37 authored by Ximin Luo's avatar Ximin Luo
Browse files

have the windows build use a different var for python, to enable wine builds

parent 54b023ed

Makefile

+9 −6
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ FLASHPROXY_HOME = $(SRCDIR)/../flashproxy 
FLASHPROXY_WORK = $(workdir)/flashproxy

FLASHPROXY_DISTNAME = flashproxy-client

FLASHPROXY_DIST = $(FLASHPROXY_WORK)/dist/$(FLASHPROXY_DISTNAME)

FLASHPROXY_DIST_WIN32 = $(FLASHPROXY_DIST)-win32

OBFS_FLASH_HOME = $(SRCDIR)/../obfs-flash

OBFS_FLASH_WORK = $(workdir)/obfs-flash

OBFS_FLASH_DIST_WIN32 = $(OBFS_FLASH_WORK)/dist
@@ -29,6 +30,7 @@ TXSOCKSX_HOME = $(SRCDIR)/../txsocksx 
TXSOCKSX_WORK = $(workdir)/txsocksx



PYTHON = python

PYTHON_W32 = $(PYTHON)

P7Z = "/cygdrive/c/Program Files (x86)/7-Zip/7z"

P7ZG = "/cygdrive/c/Program Files (x86)/7-Zip/7zg"
@@ -102,25 +104,26 @@ $(PT_BUNDLE_WINDOWS): 


	git clone "$(PYPTLIB_HOME)" "$(PYPTLIB_WORK)"

	cd "$(PYPTLIB_WORK)" && git checkout --detach "$(PYPTLIB_TAG)"

	cd "$(PYPTLIB_WORK)" && $(PYTHON) setup.py clean --all build --build-lib build

	cd "$(PYPTLIB_WORK)" && $(PYTHON_W32) setup.py clean --all build --build-lib build



	git clone "$(OBFSPROXY_HOME)" "$(OBFSPROXY_WORK)"

	cd "$(OBFSPROXY_WORK)" && git checkout --detach "$(OBFSPROXY_TAG)"

	cd "$(OBFSPROXY_WORK)" && PYTHONPATH="../pyptlib/build" $(PYTHON) setup_py2exe.py clean --all py2exe

	cd "$(OBFSPROXY_WORK)" && PYTHONPATH="../pyptlib/build" $(PYTHON_W32) setup_py2exe.py clean --all py2exe

	cp -Rn "$(OBFSPROXY_DIST_WIN32)"/{*.pyd,*.dll,*.exe,*.zip} "$(tbbdir)"/App

	mkdir -p "$(tbbdir)"/Docs/Obfsproxy

	cp "$(OBFSPROXY_WORK)"/{LICENSE,README} "$(tbbdir)"/Docs/Obfsproxy



	git clone "$(FLASHPROXY_HOME)" "$(FLASHPROXY_WORK)"

	cd "$(FLASHPROXY_WORK)" && git checkout --detach "$(FLASHPROXY_TAG)"

	cd "$(FLASHPROXY_WORK)" && "$(MAKE)" clean dist-exe DISTNAME="$(FLASHPROXY_DISTNAME)"

	cp -Rn "$(FLASHPROXY_DIST)"/{*.pyd,*.dll,*.exe,*.zip} "$(tbbdir)"/App

	cd "$(FLASHPROXY_WORK)" && "$(MAKE)" PYTHON="$(PYTHON)" PYTHON_W32="$(PYTHON_W32)" \

	  DISTNAME="$(FLASHPROXY_DISTNAME)" clean dist-exe

	cp -Rn "$(FLASHPROXY_DIST_WIN32)"/{*.pyd,*.dll,*.exe,*.zip} "$(tbbdir)"/App

	mkdir -p "$(tbbdir)"/Docs/FlashProxy

	cp "$(FLASHPROXY_DIST)"/{doc/*,README,LICENSE,ChangeLog} "$(tbbdir)"/Docs/FlashProxy

	cp "$(FLASHPROXY_DIST_WIN32)"/{doc/*,README,LICENSE,ChangeLog} "$(tbbdir)"/Docs/FlashProxy



	git clone "$(OBFS_FLASH_HOME)" "$(OBFS_FLASH_WORK)"

	cd "$(OBFS_FLASH_WORK)" && git checkout --detach "$(OBFS_FLASH_TAG)"

	cd "$(OBFS_FLASH_WORK)" && PYTHONPATH="../pyptlib/build" $(PYTHON) setup.py clean --all py2exe

	cd "$(OBFS_FLASH_WORK)" && PYTHONPATH="../pyptlib/build" $(PYTHON_W32) setup.py clean --all py2exe

	cp -Rn "$(OBFS_FLASH_DIST_WIN32)"/{*.pyd,*.dll,*.exe,*.zip} "$(tbbdir)"/App



	mkdir -p "$(tbbdir)"/Docs