Getting rid of macfs.

This commit is contained in:
Jack Jansen 2003-03-21 12:55:38 +00:00
parent 3e0196cc00
commit bb829b7c02
2 changed files with 11 additions and 11 deletions

View File

@ -33,8 +33,8 @@ import errno as _errno
from random import Random as _Random
if _os.name == 'mac':
import macfs as _macfs
import MACFS as _MACFS
import Carbon.Folder as _Folder
import Carbon.Folders as _Folders
try:
import fcntl as _fcntl
@ -124,11 +124,11 @@ def _candidate_tempdir_list():
# Failing that, try OS-specific locations.
if _os.name == 'mac':
try:
refnum, dirid = _macfs.FindFolder(_MACFS.kOnSystemDisk,
_MACFS.kTemporaryFolderType, 1)
dirname = _macfs.FSSpec((refnum, dirid, '')).as_pathname()
fsr = _Folder.FSFindFolder(_Folders.kOnSystemDisk,
_Folders.kTemporaryFolderType, 1)
dirname = fsr.as_pathname()
dirlist.append(dirname)
except _macfs.error:
except _Folder.error:
pass
elif _os.name == 'riscos':
dirname = _os.getenv('Wimp$ScrapDir')

View File

@ -2,7 +2,7 @@ import cwxmlgen
import cwtalker
import os
from Carbon import AppleEvents
import macfs
import Carbon.File
def mkproject(outputfile, modulename, settings, force=0, templatename=None):
#
@ -58,15 +58,15 @@ def mkproject(outputfile, modulename, settings, force=0, templatename=None):
def makeproject(xmlfile, projectfile):
cw = cwtalker.MyCodeWarrior(start=1)
cw.send_timeout = AppleEvents.kNoTimeOut
xmlfss = macfs.FSSpec(xmlfile)
prjfss = macfs.FSSpec(projectfile)
xmlfss = Carbon.File.FSSpec(xmlfile)
prjfss = Carbon.File.FSSpec(projectfile)
cw.my_mkproject(prjfss, xmlfss)
cw.Close_Project()
def buildproject(projectfile):
cw = cwtalker.MyCodeWarrior(start=1)
cw.send_timeout = AppleEvents.kNoTimeOut
prjfss = macfs.FSSpec(projectfile)
prjfss = Carbon.File.FSSpec(projectfile)
cw.open(prjfss)
cw.Make_Project() # XXX Should set target
cw.Close_Project()
@ -74,7 +74,7 @@ def buildproject(projectfile):
def cleanproject(projectfile):
cw = cwtalker.MyCodeWarrior(start=1)
cw.send_timeout = AppleEvents.kNoTimeOut
prjfss = macfs.FSSpec(projectfile)
prjfss = Carbon.File.FSSpec(projectfile)
cw.open(prjfss)
cw.Remove_Binaries()