Chris,

Thanks for this fix.  My machines are Linux.  Windows is a shot in
the dark for me.  So, I appreciate your help.

I'm traveling right now, but will be home soon, and will look at it
in a couple of days.

Dave


On Sat, Oct 27, 2018 at 02:54:19PM +0100, Christopher Horler via 
generateds-users wrote:
>    Hi,
>    These patches fix the "pip install" of the egg on Windows, also tested on
>    Linux.
>    Chris

> From 8a932a3f3c0be162bfc91c9f7fdf808ec7a62d0f Mon Sep 17 00:00:00 2001
> From: Chris HORLER <cshor...@googlemail.com>
> Date: Sat, 27 Oct 2018 13:39:39 +0100
> Subject: [PATCH 1/3] add command line tools sub package for packaging scripts
>  on windows
> 
> ---
>  libgenerateDS/cmd/__init__.py | 0
>  1 file changed, 0 insertions(+), 0 deletions(-)
>  create mode 100644 libgenerateDS/cmd/__init__.py
> 
> diff --git a/libgenerateDS/cmd/__init__.py b/libgenerateDS/cmd/__init__.py
> new file mode 100644
> index 0000000..e69de29
> -- 
> 2.16.4
> 

> From c61b140e598e72b19ae7023f59edb7a424f3dbee Mon Sep 17 00:00:00 2001
> From: Chris HORLER <cshor...@googlemail.com>
> Date: Sat, 27 Oct 2018 13:42:03 +0100
> Subject: [PATCH 2/3] move gends django utils to cmd sub package
> 
> ---
>  {django => libgenerateDS/cmd}/gends_extract_simple_types.py | 0
>  {django => libgenerateDS/cmd}/gends_generate_django.py      | 0
>  {django => libgenerateDS/cmd}/gends_run_gen_django.py       | 0
>  3 files changed, 0 insertions(+), 0 deletions(-)
>  rename {django => libgenerateDS/cmd}/gends_extract_simple_types.py (100%)
>  rename {django => libgenerateDS/cmd}/gends_generate_django.py (100%)
>  rename {django => libgenerateDS/cmd}/gends_run_gen_django.py (100%)
> 
> diff --git a/django/gends_extract_simple_types.py 
> b/libgenerateDS/cmd/gends_extract_simple_types.py
> similarity index 100%
> rename from django/gends_extract_simple_types.py
> rename to libgenerateDS/cmd/gends_extract_simple_types.py
> diff --git a/django/gends_generate_django.py 
> b/libgenerateDS/cmd/gends_generate_django.py
> similarity index 100%
> rename from django/gends_generate_django.py
> rename to libgenerateDS/cmd/gends_generate_django.py
> diff --git a/django/gends_run_gen_django.py 
> b/libgenerateDS/cmd/gends_run_gen_django.py
> similarity index 100%
> rename from django/gends_run_gen_django.py
> rename to libgenerateDS/cmd/gends_run_gen_django.py
> -- 
> 2.16.4
> 

> From 7950d68c648ce91519e1e8b9a53fbf1c402c8430 Mon Sep 17 00:00:00 2001
> From: Chris HORLER <cshor...@googlemail.com>
> Date: Sat, 27 Oct 2018 14:40:20 +0100
> Subject: [PATCH 3/3] fix egg build / script pip install on Windows
> 
> ---
>  setup.py | 20 ++++++++------------
>  1 file changed, 8 insertions(+), 12 deletions(-)
> 
> diff --git a/setup.py b/setup.py
> index 167bf5d..ddffb7c 100644
> --- a/setup.py
> +++ b/setup.py
> @@ -28,29 +28,25 @@ XML document.""",
>      platforms="platform-independent",
>      license="http://www.opensource.org/licenses/mit-license.php";,
>      py_modules=[
> +        "generateDS",
>          "process_includes",
>      ],
>      # include_package_data=True,
>      packages=[
>          "libgenerateDS",
>          "libgenerateDS.gui",
> -    ],
> -    scripts=[
> -        "generateDS.py",
> -        "process_includes.py",
> -        "libgenerateDS/gui/generateds_gui.py",
> -        "django/gends_run_gen_django.py",
> -        "django/gends_extract_simple_types.py",
> -        "django/gends_generate_django.py",
> +        "libgenerateDS.cmd",
>      ],
>      entry_points={
>          "console_scripts": [
>              "generateDS = generateDS:main",
>              "process_includes = process_includes:main",
> -            "generateds_gui = generateds_gui:main",
> -            "gends_run_gen_django = gends_run_gen_django:main",
> -            "gends_extract_simple_types = gends_extract_simple_types:main",
> -            "gends_generate_django = gends_generate_django:main",
> +            "gends_run_gen_django = 
> libgenerateDS.cmd.gends_run_gen_django:main",
> +            "gends_extract_simple_types = 
> libgenerateDS.cmd.gends_extract_simple_types:main",
> +            "gends_generate_django = 
> libgenerateDS.cmd.gends_generate_django:main",
> +        ],
> +        "gui_scripts": [
> +            "generateds_gui = libgenerateDS.gui.generateds_gui:main",
>          ],
>      },
>      install_requires=[
> -- 
> 2.16.4
> 


> _______________________________________________
> generateds-users mailing list
> generateds-users@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/generateds-users


-- 

Dave Kuhlman
http://www.davekuhlman.org


_______________________________________________
generateds-users mailing list
generateds-users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/generateds-users

Reply via email to