From 6ba62b66b4b6a17f5ff4dd0a95c54e3217afe33b Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Wed, 30 Sep 2015 08:43:06 -0400
Subject: [PATCH] remove old setup files, sync gam.spec

---
 .gitignore  |  1 -
 gam.spec    | 24 ++++++++++++++++++++++++
 setup-64.py | 17 -----------------
 setup.py    | 16 ----------------
 4 files changed, 24 insertions(+), 34 deletions(-)
 create mode 100644 gam.spec
 delete mode 100644 setup-64.py
 delete mode 100644 setup.py

diff --git a/.gitignore b/.gitignore
index 04e23130..cdf2a6bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -66,5 +66,4 @@ noverifyssl.txt
 gamcache/
 gam/
 gam-64/
-gam.spec
 *.zip
diff --git a/gam.spec b/gam.spec
new file mode 100644
index 00000000..31a0f7b8
--- /dev/null
+++ b/gam.spec
@@ -0,0 +1,24 @@
+# -*- mode: python -*-
+a = Analysis(['gam.py'],
+             pathex=['C:\\Users\\jlee\\Documents\\GitHub\\GAM'],
+             hiddenimports=[],
+             hookspath=None,
+             runtime_hooks=None)
+for d in a.datas:
+    if 'pyconfig' in d[0]: 
+        a.datas.remove(d)
+        break
+a.datas += [('httplib2/cacerts.txt', '\python27-32\lib\site-packages\httplib2\cacerts.txt', 'DATA')]
+a.datas += [('cloudprint-v2.json', 'cloudprint-v2.json', 'DATA')]
+a.datas += [('admin-settings-v1.json', 'admin-settings-v1.json', 'DATA')]
+pyz = PYZ(a.pure)
+exe = EXE(pyz,
+          a.scripts,
+          a.binaries,
+          a.zipfiles,
+          a.datas,
+          name='gam.exe',
+          debug=False,
+          strip=None,
+          upx=True,
+          console=True )
diff --git a/setup-64.py b/setup-64.py
deleted file mode 100644
index b35e23fb..00000000
--- a/setup-64.py
+++ /dev/null
@@ -1,17 +0,0 @@
-from distutils.core import setup
-import py2exe, sys, os
-
-sys.argv.append('py2exe')
-
-setup(
-  console = ['gam.py'],
-
-  zipfile = None,
-  options = {'py2exe': 
-              {'optimize': 2,
-               'bundle_files': 3,
-               'includes': ['passlib.handlers.sha2_crypt'],
-               'dist_dir' : 'gam-64',
-               'compressed' : True}
-            }
-  )
diff --git a/setup.py b/setup.py
deleted file mode 100644
index f60dfc85..00000000
--- a/setup.py
+++ /dev/null
@@ -1,16 +0,0 @@
-from distutils.core import setup
-import py2exe, sys, os
-
-sys.argv.append('py2exe')
-
-setup(
-  console = ['gam.py'],
-
-  zipfile = None,
-  options = {'py2exe': 
-              {'optimize': 2,
-               'bundle_files': 3,
-               'includes': ['passlib.handlers.sha2_crypt'],
-               'dist_dir' : 'gam'}
-            }
-  )