From b165ae07c97e3af52528c829d136dd29c37da0a3 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Tue, 1 Sep 2015 14:58:16 -0700
Subject: [PATCH 1/2] Configure PyInstaller using docker-compose.spec

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 .dockerignore            |  1 -
 .gitignore               |  1 -
 docker-compose.spec      | 24 ++++++++++++++++++++++++
 script/build-linux-inner |  2 +-
 script/build-osx         |  2 +-
 5 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100644 docker-compose.spec

diff --git a/.dockerignore b/.dockerignore
index ba7e9155..5a4da301 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -5,6 +5,5 @@
 build
 coverage-html
 dist
-docker-compose.spec
 docs/_site
 venv
diff --git a/.gitignore b/.gitignore
index f6750c1f..1b0c5011 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,5 @@
 /build
 /coverage-html
 /dist
-/docker-compose.spec
 /docs/_site
 /venv
diff --git a/docker-compose.spec b/docker-compose.spec
new file mode 100644
index 00000000..eae63914
--- /dev/null
+++ b/docker-compose.spec
@@ -0,0 +1,24 @@
+# -*- mode: python -*-
+
+block_cipher = None
+
+a = Analysis(['bin/docker-compose'],
+             pathex=['.'],
+             hiddenimports=[],
+             hookspath=None,
+             runtime_hooks=None,
+             cipher=block_cipher)
+
+pyz = PYZ(a.pure,
+             cipher=block_cipher)
+
+exe = EXE(pyz,
+          a.scripts,
+          a.binaries,
+          a.zipfiles,
+          a.datas,
+          name='docker-compose',
+          debug=False,
+          strip=None,
+          upx=True,
+          console=True )
diff --git a/script/build-linux-inner b/script/build-linux-inner
index cfea8380..e5d290eb 100755
--- a/script/build-linux-inner
+++ b/script/build-linux-inner
@@ -8,6 +8,6 @@ mkdir -p `pwd`/dist
 chmod 777 `pwd`/dist
 
 pip install -r requirements-build.txt
-su -c "pyinstaller -F bin/docker-compose" user
+su -c "pyinstaller docker-compose.spec" user
 mv dist/docker-compose $TARGET
 $TARGET version
diff --git a/script/build-osx b/script/build-osx
index d99c1fb9..e1cc7038 100755
--- a/script/build-osx
+++ b/script/build-osx
@@ -8,6 +8,6 @@ virtualenv -p /usr/local/bin/python venv
 venv/bin/pip install -r requirements.txt
 venv/bin/pip install -r requirements-build.txt
 venv/bin/pip install .
-venv/bin/pyinstaller -F bin/docker-compose
+venv/bin/pyinstaller docker-compose.spec
 mv dist/docker-compose dist/docker-compose-Darwin-x86_64
 dist/docker-compose-Darwin-x86_64 version

From ecea79fd4e3ae4ee91c6e34c5230fec8739295f4 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Tue, 1 Sep 2015 15:22:00 -0700
Subject: [PATCH 2/2] Bundle schema files

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 docker-compose.spec | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docker-compose.spec b/docker-compose.spec
index eae63914..678fc132 100644
--- a/docker-compose.spec
+++ b/docker-compose.spec
@@ -17,6 +17,8 @@ exe = EXE(pyz,
           a.binaries,
           a.zipfiles,
           a.datas,
+          [('compose/config/fields_schema.json', 'compose/config/fields_schema.json', 'DATA')],
+          [('compose/config/service_schema.json', 'compose/config/service_schema.json', 'DATA')],
           name='docker-compose',
           debug=False,
           strip=None,