forked from apple/ccs-calendarserver
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix issue with virtualenv being locked to specific system Python vers…
…ions. git-svn-id: https://svn.calendarserver.org/repository/calendarserver/CalendarServer/branches/release/CalendarServer-6.2-dev@14987 e27351fd-9f3e-4f54-a53b-843176b1656c
- Loading branch information
1 parent
3381087
commit c1bc9c2
Showing
3 changed files
with
110 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| // | ||
| // python-wrapper.c | ||
| // | ||
| // Copyright © 2015 Apple Inc. All rights reserved. | ||
| // | ||
|
|
||
| #include <stdio.h> | ||
| #include <stdlib.h> | ||
| #include <string.h> | ||
| #include <unistd.h> | ||
|
|
||
| const char* python = "/usr/bin/python2.7"; | ||
| const char* bin = "/Applications/Server.app/Contents/ServerRoot/Library/CalendarServer/bin"; | ||
| const char* site = "/Applications/Server.app/Contents/ServerRoot/Library/CalendarServer/lib/python2.7/site-packages"; | ||
|
|
||
| // Prepend a path to the named environment variable | ||
| int prependToPath(const char* name, const char* prepend) { | ||
| const char* old_value = getenv(name); | ||
| char* new_value = NULL; | ||
| if (old_value == NULL) { | ||
| // No existing value - set to the prepend value | ||
| size_t max_length = strlen(prepend) + 1; | ||
| new_value = malloc(max_length); | ||
| strlcpy(new_value, prepend, max_length); | ||
| } else { | ||
| // Existing value - so prepend with a ":" in between | ||
| size_t max_length = strlen(old_value) + strlen(prepend) + 2; | ||
| new_value = malloc(max_length); | ||
| strlcpy(new_value, prepend, max_length); | ||
| strlcat(new_value, ":", max_length); | ||
| strlcat(new_value, old_value, max_length); | ||
| } | ||
| setenv(name, new_value, 1); | ||
| free(new_value); | ||
| return 0; | ||
| } | ||
|
|
||
| int main(int argc, const char * argv[]) { | ||
|
|
||
| // Update PATH and PYTHONPATH | ||
| prependToPath("PATH", bin); | ||
| prependToPath("PYTHONPATH", site); | ||
|
|
||
| // Launch real python | ||
| argv[0] = python; | ||
| return execvp(python, (char* const*)argv); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| #!/bin/sh | ||
|
|
||
| ## | ||
| # Copyright (c) 2015 Apple Inc. All rights reserved. | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
| ## | ||
|
|
||
| set -e | ||
| set -u | ||
|
|
||
| base="${1}"; | ||
| if [ $# == 1 ]; then | ||
| appbase="/Applications/Server.app/Contents/ServerRoot/Library/CalendarServer"; | ||
| else | ||
| appbase="${2}"; | ||
| fi; | ||
|
|
||
| # Remove python binaries | ||
| rm -f "${base}/bin/python"; | ||
| rm -f "${base}/bin/python2"; | ||
| rm -f "${base}/bin/python2.7"; | ||
|
|
||
| # Remove unused virtualenv files | ||
| rm -f "${base}/.Python"; | ||
| rm -f "${base}/include/python2.7"; | ||
| rm -f "${base}/lib/python2.7/"*.py*; | ||
| rm -f "${base}/lib/python2.7/config"; | ||
| rm -rf "${base}/lib/python2.7/distutils"; | ||
| rm -f "${base}/lib/python2.7/encodings"; | ||
| rm -f "${base}/lib/python2.7/lib-dynload"; | ||
| rm -f "${base}/lib/python2.7/orig-prefix.txt"; | ||
|
|
||
| # Create links | ||
| cd "${base}/bin" | ||
| ln -s "python-wrapper" "python"; | ||
| ln -s "python-wrapper" "python2"; | ||
| ln -s "python-wrapper" "python2.7"; |