Finished Release v2.0.8

Infinidat · Dec 20, 2018 · 9c2ed69 · 9c2ed69
2 parents c1bce3d + b0cbd9b
commit 9c2ed69
Show file tree

Hide file tree

Showing 23 changed files with 44 additions and 1,589 deletions.
diff --git a/README.md b/README.md
@@ -42,11 +42,9 @@ In order create an application with proper packaging, you'll need more than just
 * Run `projector devenv pack`; this will build all the sections in `buildout.cfg` that either of the recipes of this module.
 ** the default recipe: `infi.recipe.application_packager`, will build the OS package depending on the operating system.
 ** instead, you can explicitly define one of the following recipes:
-*** `infi.recipe.application_packager.executable`
 *** `infi.recipe.application_packager.deb`
 *** `infi.recipe.application_packager.msi`
 *** `infi.recipe.application_packager.rpm`
-*** `infi.recipe.application_packager.static_library`
 
 At the end, OS packages will be available under the `parts` directory, and single-file executables and static libraries will be placed under `dist`.
 
@@ -55,19 +53,17 @@ To debug exceptions, add 'pdb = true' to the recipe. The results are stored unde
 * `build/Python-<x.y.z>`. the Python source
 * `build/static`. this this where we copy to all the static libraries from the isolated python that will link the static python with
 * `build/dependencies`. this is where all the dependencies are being built
-* `build/embedded`. we the embedded python and the static library are being built
-* `bild/executables`. where we build the final console executables
 
 ### Recipe configuration options
 
 Under the `pack` recipe in your `buildout.cfg`, you can define the following options:
 
 | Key                                   | Applied to                                | Default value                                                | Description                                                              |
 | ------------------------------------- | ----------------------------------------- | ------------------------------------------------------------ | ------------------------------------------------------------------------ |
-| pdb                                   | executable, deb, msi, rpm, static_library | false                                                        | enter pdb if exception is raise for post mortem                          |
-| dependent-scripts                     | executable, deb, msi, rpm                 | false                                                        |                                                                          |
-| eggs                                  | executable, deb, msi, rpm                 | \<project name>                                              |                                                                          |
-| scripts                               | executable, deb, msi, rpm                 | \<empty list>                                                |                                                                          |
+| pdb                                   | deb, msi, rpm                             | false                                                        | enter pdb if exception is raise for post mortem                          |
+| dependent-scripts                     | deb, msi, rpm                             | false                                                        |                                                                          |
+| eggs                                  | deb, msi, rpm                             | \<project name>                                              |                                                                          |
+| scripts                               | deb, msi, rpm                             | \<empty list>                                                |                                                                          |
 | gui-scripts                           | deb, msi, rpm                             | \<empty list>                                                |                                                                          |
 | minimal-packages                      | deb, msi, rpm                             |                                                              | Adds code to the entry point wrapper that tries to use less packages     |
 | shortcuts-icon                        | msi                                       | ~/.msi-ui/icon.exe                                           | Icon file in EXE binary format to be used as icon for shortcuts          |
@@ -172,3 +168,7 @@ Run the following:
 
     easy_install -U infi.projector
     projector devenv build
+
+Python 3 support
+================
+Python 3 support is experimental at this stage.
diff --git a/buildout.cfg b/buildout.cfg
@@ -25,9 +25,9 @@ install_requires = [
 	'infi.winver',
 	'jinja2',
 	'munch',
-	'pystick',
 	'pythonpy',
 	'setuptools',
+	'six',
 	'zc.buildout>=2.9.2'
 	]
 version_file = src/infi/recipe/application_packager/__version__.py

diff --git a/setup.in b/setup.in
@@ -17,6 +17,8 @@ SETUP_INFO = dict(
         "License :: OSI Approved :: BSD License",
         "Operating System :: OS Independent",
         "Programming Language :: Python",
+        "Programming Language :: Python :: 2",
+        "Programming Language :: Python :: 3",
         "Topic :: Software Development :: Libraries :: Python Modules",
     ],
 
@@ -33,9 +35,6 @@ SETUP_INFO = dict(
         'gui_scripts': [],
         'zc.buildout': [
                         'default = ${project:name}.auto:Recipe',
-                        'build_env = ${project:name}.embedded:BuildEnvironment',
-                        'executable = ${project:name}.embedded:Executable',
-                        'static_library = ${project:name}.embedded:StaticLibrary',
                         'msi = ${project:name}.msi:Recipe',
                         'rpm = ${project:name}.rpm:Recipe',
                         'deb = ${project:name}.deb:Recipe',

diff --git a/src/infi/recipe/application_packager/embedded/.gitignore b/src/infi/recipe/application_packager/embedded/.gitignore