Skip to content

Add processing of .pth files from "app_packages". #52

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
freakboy3742 merged 5 commits into from
Mar 25, 2025
Merged

Add processing of .pth files from "app_packages". #52

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fa1f911
Add processing of .pth files from "app_packages".
timrid Mar 17, 2025
d486140
added `site.addsitedir` to the binary instead to "sitecustomize.py"
timrid Mar 18, 2025
62620ac
Update {{ cookiecutter.format }}/{{ cookiecutter.formal_name }}/Main.cpp
timrid Mar 20, 2025
ae164cb
Correct wrong variable check
timrid Mar 21, 2025
26afaff
synchronize exit codes with templates for other platforms
timrid Mar 22, 2025
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
51 changes: 41 additions & 10 deletions {{ cookiecutter.format }}/{{ cookiecutter.formal_name }}/Main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,9 @@ int Main(array<String^>^ args) {
String^ app_module_name;
String^ path;
String^ traceback_str;
wchar_t *app_packages_path_str;
wchar_t *app_module_str;
PyObject *app_packages_path;
PyObject *app_module;
PyObject *module;
PyObject *module_attr;
Expand Down Expand Up @@ -145,16 +147,6 @@ int Main(array<String^>^ args) {
Py_ExitStatusException(status);
}

// Add the app_packages path
path = System::Windows::Forms::Application::StartupPath + "\\app_packages";
debug_log("- %S\n", wstr(path));
status = PyWideStringList_Append(&config.module_search_paths, wstr(path));
if (PyStatus_Exception(status)) {
crash_dialog("Unable to set app packages path: " + gcnew String(status.err_msg));
PyConfig_Clear(&config);
Py_ExitStatusException(status);
}

// Add the app path
path = System::Windows::Forms::Application::StartupPath + "\\app";
debug_log("- %S\n", wstr(path));
Expand Down Expand Up @@ -187,6 +179,45 @@ int Main(array<String^>^ args) {
}

try {
// Adding the app_packages as site directory.
//
// This adds app_packages to sys.path and executes any .pth
// files in that directory.
path = System::Windows::Forms::Application::StartupPath + "\\app_packages";
app_packages_path_str = wstr(path);

debug_log("Adding app_packages as site directory: %S\n", app_packages_path_str);

module = PyImport_ImportModule("site");
if (module == NULL) {
crash_dialog("Could not import site module");
exit(-8);
}

module_attr = PyObject_GetAttrString(module, "addsitedir");
if (module_attr == NULL || !PyCallable_Check(module_attr)) {
crash_dialog("Could not access site.addsitedir");
exit(-9);
}

app_packages_path = PyUnicode_FromWideChar(app_packages_path_str, wcslen(app_packages_path_str));
if (app_module == NULL) {
crash_dialog("Could not convert app_packages path to unicode");
exit(-10);
}

method_args = Py_BuildValue("(O)", app_packages_path);
if (method_args == NULL) {
crash_dialog("Could not create arguments for runpy._run_module_as_main");
exit(-11);
}

result = PyObject_CallObject(module_attr, method_args);
if (result == NULL) {
crash_dialog("Could not add app_packages directory using site.addsitedir");
exit(-12);
}

// Start the app module.
//
// From here to Py_ObjectCall(runmodule...) is effectively
Expand Down