10BC0 MACOSX · python/cpython@f84d7e9 · GitHub
[go: up one dir, main page]
Skip to content

Commit f84d7e9

Browse files
ronaldoussorenronaldoussoren
committed
MACOSX
* Remove junk documentation resources from the Python.app inside the framework (This is a left-over from the ancient Python IDE, which was removed before 2.5) * Ensure that the documentation is installed in a location where IDLE will see it
1 parent 9a4414d commit f84d7e9

26 files changed

+5
-712
lines changed

‎Mac/BuildScript/build-installer.py‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -614,10 +614,9 @@ def buildPythonDocs():
614614
runCommand('make update')
615615
runCommand('make html')
616616
os.chdir(curDir)
617-
if not os.path.exists(docdir):
618-
os.mkdir(docdir)
619-
os.rename(os.path.join(buildDir, 'build', 'html'),
620-
os.path.join(docdir, 'python-docs-html'))
617+
if os.path.exists(docdir):
618+
os.rmdir(docdir)
619+
os.rename(os.path.join(buildDir, 'build', 'html'), docdir)
621620

622621

623622
def buildPython():
@@ -663,7 +662,7 @@ def buildPython():
663662
runCommand("make")
664663

665664
print "Running make frameworkinstall"
666-
runCommand("make frameworkinstall DESTDIR=%s"%(
665+
runCommand("make install DESTDIR=%s"%(
667666
shellQuote(rootDir)))
668667

669668
print "Running make frameworkinstallextras"

‎Mac/Makefile.in‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,7 @@ STRIPFLAG=-s
3838
CPMAC=/Developer/Tools/CpMac
3939

4040
APPTEMPLATE=$(srcdir)/Resources/app
41-
APPSUBDIRS=MacOS Resources Resources/English.lproj \
42-
Resources/English.lproj/Documentation \
43-
Resources/English.lproj/Documentation/doc \
44-
Resources/English.lproj/Documentation/ide
45-
DOCDIR=$(srcdir)/Resources/app/Resources/English.lproj/Documentation
46-
DOCINDEX=$(DOCDIR)/"Documentation idx"
41+
APPSUBDIRS=MacOS Resources
4742
compileall=$(srcdir)/../Lib/compileall.py
4843

4944
installapps: install_Python install_PythonLauncher install_IDLE \
@@ -157,9 +152,6 @@ install_PythonLauncher:
157152
cd PythonLauncher && make install DESTDIR=$(DESTDIR)
158153

159154
install_Python:
160-
@if test ! -f $(DOCINDEX); then \
161-
echo WARNING: you should run Apple Help Indexing Tool on $(DOCDIR); \
162-
fi
163155
@for i in "$(PYTHONAPPSDIR)" "$(APPINSTALLDIR)" "$(APPINSTALLDIR)/Contents"; do \
164156
if test ! -d "$(DESTDIR)$$i"; then \
165157
echo "Creating directory $(DESTDIR)$$i"; \

‎Mac/Resources/app/Resources/English.lproj/Documentation/PackageManager.gif‎

-5.94 KB
Binary file not shown.

‎Mac/Resources/app/Resources/English.lproj/Documentation/community.html‎

Lines changed: 0 additions & 69 deletions
This file was deleted.

‎Mac/Resources/app/Resources/English.lproj/Documentation/doc/index.html‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎Mac/Resources/app/Resources/English.lproj/Documentation/finder.html‎

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎Mac/Resources/app/Resources/English.lproj/Documentation/gui.html‎

Lines changed: 0 additions & 54 deletions
This file was deleted.

‎Mac/Resources/app/Resources/English.lproj/Documentation/ide/IDE.gif‎

-10 KB
Binary file not shown.

‎Mac/Resources/app/Resources/English.lproj/Documentation/ide/entering_in_new_window.gif< 2366 !-- -->‎

-15.2 KB
Binary file not shown.

‎Mac/Resources/app/Resources/English.lproj/Documentation/ide/hello_world.gif‎

-15.3 KB
Binary file not shown.

0 commit comments

Comments
 (0)
0