Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Add patch to remove capitalization of DISTRIBUTION_NAME #9

Merged
merged 8 commits into from
Jan 23, 2023
Merged

Add patch to remove capitalization of DISTRIBUTION_NAME #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f2709b4
Add patch to remove capitalization of DISTRIBUTION_NAME
marcoesters Jan 19, 2023
4d4e75e
Increase build number
marcoesters Jan 19, 2023
0e12751
Add abs.yaml
marcoesters Jan 19, 2023
ba40dc5
Change channel name
marcoesters Jan 19, 2023
6a9e1d9
Change channel to c3i_test2
marcoesters Jan 19, 2023
11ff690
Add missing copy command
marcoesters Jan 20, 2023
a7603e6
Remove abs.yaml
marcoesters Jan 23, 2023
3169022
Add missing extra items
marcoesters Jan 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions recipe/bld.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
13 changes: 13 additions & 0 deletions recipe/menuinst_patches/0004-distribution-name-subst.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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')),
6 changes: 5 additions & 1 deletion recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,13 @@ 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]

build:
number: 0
number: 1

requirements:
build:
Expand All @@ -50,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.