From f2709b4c2fd789e23e1878ba637d61f07e217ada Mon Sep 17 00:00:00 2001 From: Marco Esters Date: Thu, 19 Jan 2023 13:55:52 -0800 Subject: [PATCH 1/8] Add patch to remove capitalization of DISTRIBUTION_NAME --- .../0004-distribution-name-subst.patch | 13 +++++++++++++ recipe/meta.yaml | 1 + 2 files changed, 14 insertions(+) create mode 100644 recipe/menuinst_patches/0004-distribution-name-subst.patch diff --git a/recipe/menuinst_patches/0004-distribution-name-subst.patch b/recipe/menuinst_patches/0004-distribution-name-subst.patch new file mode 100644 index 0000000..2b4501c --- /dev/null +++ b/recipe/menuinst_patches/0004-distribution-name-subst.patch @@ -0,0 +1,13 @@ +diff --git a/menuinst/win32.py b/menuinst/win32.py +index 6aabd93..370909e 100644 +--- a/menuinst/win32.py ++++ b/menuinst/win32.py +@@ -171,7 +171,7 @@ def substitute_env_variables(text, dir): + for a, b in ( + (u'${PREFIX}', env_prefix), + (u'${ROOT_PREFIX}', root_prefix), +- (u'${DISTRIBUTION_NAME}', os.path.split(root_prefix)[-1].capitalize()), ++ (u'${DISTRIBUTION_NAME}', os.path.split(root_prefix)[-1]), + (u'${PYTHON_SCRIPTS}', + os.path.normpath(join(env_prefix, u'Scripts')).replace(u"\\", u"/")), + (u'${MENU_DIR}', join(env_prefix, u'Menu')), diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 3fe590a..e0ca029 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -23,6 +23,7 @@ source: folder: menuinst_src # [win] patches: # [win] - menuinst_patches/0003-root-prefix-to-prefix.patch # [win] + - menuinst_patches/0004-distribution-name-subst.patch # [win] - url: https://github.com/conda/constructor/archive/{{ constructor_version }}.tar.gz # [win] sha256: b000dde0ac8641c92f7342362173968505d4e85845be37655b5b9221cb65f3a8 # [win] folder: constructor # [win] From 4d4e75eccae8961328b3880aac93d8cc82b59780 Mon Sep 17 00:00:00 2001 From: Marco Esters Date: Thu, 19 Jan 2023 13:56:07 -0800 Subject: [PATCH 2/8] Increase build number --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e0ca029..e66bc9d 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -29,7 +29,7 @@ source: folder: constructor # [win] build: - number: 0 + number: 1 requirements: build: From 0e1275101c265e4989152dd88694e0f59404f7ff Mon Sep 17 00:00:00 2001 From: Marco Esters Date: Thu, 19 Jan 2023 13:56:35 -0800 Subject: [PATCH 3/8] Add abs.yaml --- abs.yaml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 abs.yaml diff --git a/abs.yaml b/abs.yaml new file mode 100644 index 0000000..6cceec1 --- /dev/null +++ b/abs.yaml @@ -0,0 +1,6 @@ +channels: + paulyim: prompt_name +build_parameters: + - "--suppress-variables" + - "--error-overlinking" + - "--error-overdepending" From ba40dc56f5a2ad12e300899d5d025a52bc25dd06 Mon Sep 17 00:00:00 2001 From: Marco Esters Date: Thu, 19 Jan 2023 14:06:38 -0800 Subject: [PATCH 4/8] Change channel name --- abs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abs.yaml b/abs.yaml index 6cceec1..cb09c8e 100644 --- a/abs.yaml +++ b/abs.yaml @@ -1,5 +1,5 @@ channels: - paulyim: prompt_name + - paulyim build_parameters: - "--suppress-variables" - "--error-overlinking" From 6a9e1d91c8d7abc6f87f09142f1a876b41f349cd Mon Sep 17 00:00:00 2001 From: Marco Esters Date: Thu, 19 Jan 2023 14:24:48 -0800 Subject: [PATCH 5/8] Change channel to c3i_test2 --- abs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abs.yaml b/abs.yaml index cb09c8e..20cc874 100644 --- a/abs.yaml +++ b/abs.yaml @@ -1,5 +1,5 @@ channels: - - paulyim + - c3i_test2 build_parameters: - "--suppress-variables" - "--error-overlinking" From 11ff6905593923819353c9f4e135a37b357b22d6 Mon Sep 17 00:00:00 2001 From: Marco Esters Date: Fri, 20 Jan 2023 14:21:03 -0800 Subject: [PATCH 6/8] Add missing copy command --- recipe/bld.bat | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/bld.bat b/recipe/bld.bat index fca13fb..675f48a 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -5,6 +5,7 @@ COPY conda_src\conda\utils.py "%SP_DIR%\conda\utils.py" COPY conda_src\conda\shell\cli-%ARCH%.exe entry_point_base.exe COPY menuinst_src\menuinst\__init__.py "%SP_DIR%\menuinst\__init__.py" +COPY menuinst_src\menuinst\win32.py "%SP_DIR%\menuinst\win32.py" :: This is ordinarily installed by the installer itself, but since we are building for a :: standalone and have only an env, not an installation, include it here. From a7603e64d73b0e0a209badc37278fddaffbabbe2 Mon Sep 17 00:00:00 2001 From: Marco Esters Date: Mon, 23 Jan 2023 08:28:17 -0800 Subject: [PATCH 7/8] Remove abs.yaml --- abs.yaml | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 abs.yaml diff --git a/abs.yaml b/abs.yaml deleted file mode 100644 index 20cc874..0000000 --- a/abs.yaml +++ /dev/null @@ -1,6 +0,0 @@ -channels: - - c3i_test2 -build_parameters: - - "--suppress-variables" - - "--error-overlinking" - - "--error-overdepending" From 316902208541416c7403ef869433bded26cac6d1 Mon Sep 17 00:00:00 2001 From: Marco Esters Date: Mon, 23 Jan 2023 08:35:21 -0800 Subject: [PATCH 8/8] Add missing extra items --- recipe/meta.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e66bc9d..5733475 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -51,7 +51,10 @@ test: about: home: https://github.com/AnacondaRecipes/conda-standalone-feedstock + dev_url: https://github.com/AnacondaRecipes/conda-standalone-feedstock + doc_url: https://github.com/AnacondaRecipes/conda-standalone-feedstock/blob/master/README.md license: BSD-3-Clause license_family: BSD license_file: LICENSE summary: Entry point and dependency collection for PyInstaller-based standalone conda. + description: Standalone version of conda to bootstrap conda for Miniconda and Anaconda Distribution.