[tor-commits] [flashproxy/master] rename setup.py to be more specific and restricted in purpose

[infinity0@xxxxxxxxxxxxxx]

commit 202faaec39faf95ab62453c947c29e2ca4ef9335
Author: Ximin Luo <infinity0@xxxxxxx>
Date:   Thu Sep 26 18:39:27 2013 +0100

    rename setup.py to be more specific and restricted in purpose
---
 Makefile            |    4 ++--
 setup-client-exe.py |   19 +++++++++++++++++++
 setup.py            |   18 ------------------
 3 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/Makefile b/Makefile
index fb5a38b..d8c85cb 100644
--- a/Makefile
+++ b/Makefile
@@ -50,14 +50,14 @@ sign: dist/$(DISTNAME).zip
 
 $(PY2EXE_TMPDIR)/dist: $(CLIENT_BIN)
 	rm -rf $(PY2EXE_TMPDIR)
-	$(PYTHON) setup.py py2exe -q
+	$(PYTHON) setup-client-exe.py py2exe -q
 
 dist-exe: DISTNAME := $(DISTNAME)-win32
 dist-exe: CLIENT_BIN := $(PY2EXE_TMPDIR)/dist/*
 dist-exe: CLIENT_MAN := $(addsuffix .txt,$(CLIENT_MAN))
 dist-exe: CLIENT_DIST_LIB_COMMON :=# py2exe static-links dependencies
 # Delegate to the "dist" target using the substitutions above.
-dist-exe: $(PY2EXE_TMPDIR)/dist setup.py dist
+dist-exe: $(PY2EXE_TMPDIR)/dist setup-client-exe.py dist
 
 clean:
 	rm -f *.pyc
diff --git a/setup-client-exe.py b/setup-client-exe.py
new file mode 100755
index 0000000..5baf71d
--- /dev/null
+++ b/setup-client-exe.py
@@ -0,0 +1,19 @@
+#!/usr/bin/python
+from distutils.core import setup
+import os
+import py2exe
+
+build_path = os.path.join(os.environ["PY2EXE_TMPDIR"], "build")
+dist_path = os.path.join(os.environ["PY2EXE_TMPDIR"], "dist")
+
+setup(
+    console=["flashproxy-client", "flashproxy-reg-appspot", "flashproxy-reg-email", "flashproxy-reg-http", "flashproxy-reg-url"],
+    zipfile="py2exe-flashproxy.zip",
+    options={
+        "build": { "build_base": build_path },
+        "py2exe": {
+            "includes": ["M2Crypto"],
+            "dist_dir": dist_path
+        }
+    }
+)
diff --git a/setup.py b/setup.py
deleted file mode 100644
index 89ef178..0000000
--- a/setup.py
+++ /dev/null
@@ -1,18 +0,0 @@
-from distutils.core import setup
-import os
-import py2exe
-
-build_path = os.path.join(os.environ["PY2EXE_TMPDIR"], "build")
-dist_path = os.path.join(os.environ["PY2EXE_TMPDIR"], "dist")
-
-setup(
-    console=["flashproxy-client", "flashproxy-reg-appspot", "flashproxy-reg-email", "flashproxy-reg-http", "flashproxy-reg-url"],
-    zipfile="py2exe-flashproxy.zip",
-    options={
-        "build": { "build_base": build_path },
-        "py2exe": {
-            "includes": ["M2Crypto"],
-            "dist_dir": dist_path
-        }
-    }
-)



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits